Ver código fonte

ADD FIX Extensión eiru_reports informe especial para radio positiva - suceso

Sebas 6 anos atrás
pai
commit
72be407d6d
3 arquivos alterados com 19 adições e 3 exclusões
  1. 18 2
      models.py
  2. BIN
      models.pyc
  3. 1 1
      static/src/js/reports/report_account_pay.js

+ 18 - 2
models.py

@@ -87,10 +87,26 @@ class AccountInvoiceLine(models.Model):
 				'journal_id' : line.invoice_id.journal_id.id,
 				'product_id': {
 					'id' : line.product_id.id,
-					'name' : line.product_id.name,
-					'standard_price' : line.product_id.standard_price,
+					'name' : line.product_id.display_name,
 				},
+				'name' : line.name,
+				'price_unit': line.price_unit,
+				'price_subtotal': line.price_subtotal,
 				'quantity' : line.quantity,
+				'company_currency':[
+					line.invoice_id.company_id.currency_id.id,
+					line.invoice_id.company_id.currency_id.name,
+					line.invoice_id.company_id.currency_id.rate,
+				],
+				'invoice_currency':[
+					line.invoice_id.currency_id.id,
+					line.invoice_id.currency_id.name,
+					line.invoice_id.currency_id.rate,
+				],
+				'price_unit_currency': round(line.price_unit * (line.invoice_id.company_id.currency_id.rate / line.invoice_id.currency_id.rate),decimal_precision),
+				'price_subtotal_currency': round(line.price_subtotal * (line.invoice_id.company_id.currency_id.rate / line.invoice_id.currency_id.rate),decimal_precision),
+				'tax_currency': round((line.price_unit * (line.invoice_id.company_id.currency_id.rate / line.invoice_id.currency_id.rate) * line.quantity) - line.price_subtotal * (line.invoice_id.company_id.currency_id.rate / line.invoice_id.currency_id.rate),decimal_precision),
+				'amount_currency': round((line.quantity * line.price_unit) * (line.invoice_id.company_id.currency_id.rate / line.invoice_id.currency_id.rate),decimal_precision),
 			})
 
 		return values

BIN
models.pyc


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

@@ -575,7 +575,7 @@ function report_account_pay(reporting){
                         amount = accounting.formatMoney(index.amount_currency, '', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator);
                     }
                     info.push({
-                        product_name : index.product_id[1],
+                        product_name : index.name,
                         price_unit : price_unit,
                         quantity : index.quantity,
                         amount: amount,