|
@@ -34,10 +34,10 @@ class analytic_invoice_report(models.Model):
|
|
'Pedido de Venta' AS origin,
|
|
'Pedido de Venta' AS origin,
|
|
invoice_line.quantity AS qty,
|
|
invoice_line.quantity AS qty,
|
|
journal.store_id AS store_id,
|
|
journal.store_id AS store_id,
|
|
- invoice_line.price_subtotal AS subtotal_untaxed,
|
|
|
|
- (invoice_line.quantity * invoice_line.price_unit) - (((invoice_line.quantity * invoice_line.price_unit) * invoice_line.discount) / 100) AS subtotal_taxed,
|
|
|
|
- (array_agg(history.cost ORDER BY history.id DESC))[1] * invoice_line.quantity AS standard_price,
|
|
|
|
- ((invoice_line.quantity * invoice_line.price_unit) - (((invoice_line.quantity * invoice_line.price_unit) * invoice_line.discount) / 100) - ((array_agg(history.cost ORDER BY history.id DESC))[1] * invoice_line.quantity)) AS utility,
|
|
|
|
|
|
+ (invoice_line.quantity * invoice_line.price_unit) AS subtotal_untaxed,
|
|
|
|
+ (invoice_line.quantity * invoice_line.price_unit) AS subtotal_taxed,
|
|
|
|
+ (invoice_line.price_unit) AS standard_price,
|
|
|
|
+ ((invoice_line.quantity * invoice_line.price_unit)) AS utility,
|
|
template.categ_id
|
|
template.categ_id
|
|
FROM account_invoice_line AS invoice_line
|
|
FROM account_invoice_line AS invoice_line
|
|
LEFT JOIN account_invoice AS invoice
|
|
LEFT JOIN account_invoice AS invoice
|
|
@@ -60,7 +60,7 @@ class analytic_invoice_report(models.Model):
|
|
product.product_tmpl_id,
|
|
product.product_tmpl_id,
|
|
invoice.company_id,
|
|
invoice.company_id,
|
|
journal.store_id,
|
|
journal.store_id,
|
|
- invoice_line.price_subtotal,
|
|
|
|
|
|
+ invoice_line.price_unit,
|
|
template.categ_id
|
|
template.categ_id
|
|
"""
|
|
"""
|
|
return select
|
|
return select
|