Quellcode durchsuchen

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

SEBAS vor 1 Jahr
Ursprung
Commit
a66e9e26b9

+ 1 - 0
models.py

@@ -57,6 +57,7 @@ class AccountInvoice(models.Model):
                 ],
                 'amount_untaxed': invoice.amount_untaxed,
                 'origin': invoice.origin,
+				'comment': invoice.comment,
                 'residual': invoice.residual,
                 'amount_tax': invoice.amount_tax,
 				'amount_total': invoice.amount_total,

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

@@ -608,7 +608,7 @@ function report_account_receivable(reporting){
                     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']),
+                    partner_local : self.valorNull(item.comment),
                     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,

+ 1 - 1
static/src/reports/report_account_receivable.xml

@@ -101,7 +101,7 @@
                                 <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="comment" 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>