Browse Source

Retocar impresión de lista de cuentas a cobrar agregar origen y local

SEBAS 2 years ago
parent
commit
2e00f12f0e

+ 1 - 0
models.py

@@ -42,6 +42,7 @@ class AccountInvoice(models.Model):
 					invoice.partner_id.ruc
 				],
 				'partner_info': {
+				    'street': invoice.partner_id.street,
 					'mobile': invoice.partner_id.mobile,
 					'phone': invoice.partner_id.phone,
 				},

+ 5 - 1
static/src/js/reports/report_account_receivable.js

@@ -602,11 +602,13 @@ function report_account_receivable(reporting){
                         INFO
                     =======================*/
                     number : item.number,
+                    origin: self.valorNull(item.origin),
                     supplier_invoice_number: self.valorNull(item.supplier_invoice_number),
                     date_invoice : moment(item.date_invoice).format('DD/MM/YYYY'),
                     date : moment(item.date_invoice).format('YYYY-MM-DD'),
                     user_id : item.user_id[1],
                     partner_id : self.valorNull(item.partner_id[1]),
+                    partner_local : self.valorNull(item.partner_info['street']),
                     residual_total : residual_total,
                     amortized_total: accounting.formatMoney(item.amount_total_currency - item.residual_currency, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                     amount_total : amount_total,
@@ -910,8 +912,10 @@ function report_account_receivable(reporting){
                 var pdf_columnStyles = {
                     number :{columnWidth: 25, halign:'center'},
                     date_invoice :{columnWidth: 18, halign:'center'},
-                    user_id :{columnWidth: 23, halign:'left'},
+                    origin :{columnWidth: 10, halign:'center'},
+                    user_id :{columnWidth: 18, halign:'left'},
                     partner_id : {halign:'left'},
+                    partner_local : {halign:'left'},
                     amount_total : {columnWidth: 23, halign:'right'},
                     amortized_total : {columnWidth: 23, halign:'right'},
                     residual_total : {columnWidth: 23, halign:'right'},

+ 2 - 0
static/src/reports/report_account_receivable.xml

@@ -98,8 +98,10 @@
                                 <th data-field="number" data-align="center" data-footer-formatter="Totales">Factura</th>
                                 <th data-field="supplier_invoice_number" data-align="center" data-visible="false">Factura Física</th>
                                 <th data-field="date_invoice" data-align="center">Fecha</th>
+                                <th data-field="origin" data-align="center">Origen</th>
                                 <th data-field="user_id" data-align="left">Responsable</th>
                                 <th data-field="partner_id" data-align="left">Cliente</th>
+                                <th data-field="partner_local" data-align="left">Local</th>
                                 <th data-field="amount_total" data-align="right" data-footer-formatter="totalFormatter" data-width="12%">Total</th>
                                 <th data-field="amortized_total" data-align="right" data-footer-formatter="totalAmortizedFormatter" data-width="12%">Amortizado</th>
                                 <th data-field="residual_total" data-align="right" data-footer-formatter="totalResidualFormatter" data-width="12%">Pendiente</th>