|
@@ -205,7 +205,7 @@ openerp.eiru_utilidad_golden = function (instance,local) {
|
|
|
return item.invoice_line;
|
|
|
}));
|
|
|
var InvoiceLine = new instance.web.Model('account.invoice.line');
|
|
|
- InvoiceLine.query(['id', 'quantity', 'price_unit', 'discount', 'name', 'product_id', 'origin','invoice_id']).filter([['id', 'in', linesIds]]).all().then(function (results) {
|
|
|
+ InvoiceLine.query(['id', 'quantity', 'price_unit', 'discount', 'name', 'product_id', 'origin','invoice_id', 'price_subtotal']).filter([['id', 'in', linesIds]]).all().then(function (results) {
|
|
|
defer.resolve(results)
|
|
|
});
|
|
|
return defer;
|
|
@@ -316,14 +316,14 @@ openerp.eiru_utilidad_golden = function (instance,local) {
|
|
|
quantity : accounting.formatNumber((item.quantity),0, ".", ","),
|
|
|
price_unity : accounting.formatNumber((item.price_unit / invoice.rate),2, ".", ","),
|
|
|
standar_price : accounting.formatNumber((producto.standard_price),2, ".", ","),
|
|
|
- price_tot : accounting.formatNumber((item.quantity * (item.price_unit / invoice.rate)),2, ".", ","),
|
|
|
+ price_tot : accounting.formatNumber((item.price_subtotal / invoice.rate),2, ".", ","),
|
|
|
standar_tot : accounting.formatNumber((item.quantity * producto.standard_price),2, ".", ","),
|
|
|
- utility : accounting.formatNumber(((item.quantity * (item.price_unit / invoice.rate)) - (item.quantity * producto.standard_price)),2, ".", ","),
|
|
|
+ utility : accounting.formatNumber(((item.price_subtotal / invoice.rate) - (item.quantity * producto.standard_price)),2, ".", ","),
|
|
|
journal_id :(invoice.journal_id[0]),
|
|
|
quantity_tot : (item.quantity),
|
|
|
- price_tot_tot : (item.quantity * (item.price_unit / invoice.rate)),
|
|
|
+ price_tot_tot : (item.price_subtotal / invoice.rate),
|
|
|
standar_tot_tot : ((item.quantity * producto.standard_price)),
|
|
|
- utility_total : (((item.quantity * (item.price_unit / invoice.rate)) - (item.quantity * producto.standard_price))),
|
|
|
+ utility_total : (((item.price_subtotal / invoice.rate) - (item.quantity * producto.standard_price))),
|
|
|
company_id :(invoice.company_id[0]),
|
|
|
company_name :(invoice.company_id[1]),
|
|
|
journal_name :(invoice.journal_id[1]),
|