Merge df5d946 into 8290fcf

OCA · Oct 23, 2016 · 4ca61f6 · 4ca61f6
2 parents 8290fcf + df5d946
commit 4ca61f6
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 4 deletions.
diff --git a/l10n_br_account_product/report/account_invoice_report.py b/l10n_br_account_product/report/account_invoice_report.py
@@ -4,22 +4,72 @@
 
 from openerp import models, fields
 
+from openerp.addons import decimal_precision as dp
+
 
 class AccountInvoiceReport(models.Model):
 
     _inherit = "account.invoice.report"
 
     cfop_id = fields.Many2one(
-        'l10n_br_account_product.cfop', 'CFOP', readonly=True)
+        'l10n_br_account_product.cfop',
+        'CFOP',
+        readonly=True
+    )
+    icms_value = fields.Float(
+        'Valor ICMS',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
+    icms_st_value = fields.Float(
+        'Valor ICMS ST',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
+    ipi_value = fields.Float(
+        'Valor IPI',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
+    pis_value = fields.Float(
+        'Valor PIS',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
+    cofins_value = fields.Float(
+        'Valor COFINS',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
+    ii_value = fields.Float(
+        'Valor II',
+        required=True,
+        digits=dp.get_precision('Account'),
+    )
 
     def _select(self):
-        return super(AccountInvoiceReport, self)._select() + \
+        return super(AccountInvoiceReport, self)._select() + (
             ", sub.cfop_id as cfop_id"
+            ", sub.icms_value as icms_value"
+            ", sub.icms_st_value as icms_st_value"
+            ", sub.ipi_value as ipi_value"
+            ", sub.pis_value as pis_value"
+            ", sub.cofins_value as cofins_value"
+            ", sub.ii_value as ii_value"
+        )
 
     def _sub_select(self):
-        return super(AccountInvoiceReport, self)._sub_select() + \
+        return super(AccountInvoiceReport, self)._sub_select() + (
             ", ail.cfop_id as cfop_id"
+            ", SUM(ail.icms_value) as icms_value"
+            ", SUM(ail.icms_st_value) as icms_st_value"
+            ", SUM(ail.ipi_value) as ipi_value"
+            ", SUM(ail.pis_value) as pis_value"
+            ", SUM(ail.cofins_value) as cofins_value"
+            ", SUM(ail.ii_value) as ii_value"
+        )
 
     def _group_by(self):
-        return super(AccountInvoiceReport, self)._group_by() + \
+        return super(AccountInvoiceReport, self)._group_by() + (
             ", ail.cfop_id"
+        )
diff --git a/l10n_br_account_product/report/account_invoice_report_view.xml b/l10n_br_account_product/report/account_invoice_report_view.xml
@@ -14,5 +14,21 @@
             </field>
         </record>
 
+        <record id="l10n_br_account_product_view_account_invoice_report_pivot" model="ir.ui.view">
+            <field name="name">l10n_br_account.invoice.report.graph</field>
+            <field name="model">account.invoice.report</field>
+            <field name="inherit_id" ref="account.view_account_invoice_report_graph"/>
+            <field name="arch" type="xml">
+                <field name="price_total" position="after">
+                    <field name="icms_value"/>
+                    <field name="icms_st_value"/>
+                    <field name="ipi_value"/>
+                    <field name="pis_value"/>
+                    <field name="cofins_value"/>
+                    <field name="ii_value"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>