Browse Source

Retocar informe de DNA

root 3 years ago
parent
commit
d56413da6f
3 changed files with 2 additions and 2 deletions
  1. 1 1
      models.py
  2. BIN
      models.pyc
  3. 1 1
      static/src/js/reports/report_cuenta_resumen_dna.js

+ 1 - 1
models.py

@@ -68,7 +68,7 @@ class AccountInvoice(models.Model):
 				'amount_tax_currency': invoice.amount_tax * (invoice.company_id.currency_id.rate / invoice.currency_id.rate),
 				'amount_total_currency': invoice.amount_total * (invoice.company_id.currency_id.rate / invoice.currency_id.rate),
 				'comment' : invoice.comment,
-				'date_pay' : invoice.date_pay,
+				'date_pay' : invoice.date_pay or "",
 			})
 
 		return values

BIN
models.pyc


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

@@ -694,7 +694,7 @@ function report_cuenta_resumen_dna(reporting){
                         invoice_name : self.valorNull(item2.number),
                         supplier_invoice_number: self.valorNull(item2.supplier_invoice_number),
                         forma: forma,
-                        date_pay:  self.valorNull(moment(item2.date_pay).format('DD/MM/YYYY')),
+                        date_pay:  moment(item2.date_pay).format('DD/MM/YYYY'),
                         product_name: description_product,
                         amount_total: accounting.formatMoney(item2.amount_total_currency, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
                         amount_pagado:accounting.formatMoney(item2.amount_total - item2.residual,'',CurrencyBase.decimal_places,CurrencyBase.thousands_separator,CurrencyBase.decimal_separator),