odoo-addon-l10n-br-fiscal 15.0.1.20.1__py3-none-any.whl → 15.0.1.20.2__py3-none-any.whl

odoo/addons/l10n_br_fiscal/README.rst

@@ -7,7 +7,7 @@ Módulo fiscal brasileiro
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:fb99440555421340156360e65e8496f85f0f246347b73581f72157af8ab88217
+   !! source digest: sha256:6b5dddb9fe0735e01e0e41387881e3a446601cc47681c79f129fc004e527ec29
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

odoo/addons/l10n_br_fiscal/__manifest__.py

@@ -10,7 +10,7 @@
     "maintainers": ["renatonlima"],
     "website": "https://github.com/OCA/l10n-brazil",
     "development_status": "Production/Stable",
-    "version": "15.0.1.20.1",
+    "version": "15.0.1.20.2",
     "depends": [
         "product",
         "l10n_br_base",

odoo/addons/l10n_br_fiscal/i18n/l10n_br_fiscal.pot

@@ -856,8 +856,6 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_financial_total_gross
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__financial_total_gross
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__financial_total_gross
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_financial_total_gross
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin_fields__amount_financial_total_gross
 msgid "Amount Financial Gross"
@@ -871,8 +869,6 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_price_gross
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__price_gross
-#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__price_gross
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_price_gross
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin_fields__amount_price_gross
 msgid "Amount Gross"
@@ -930,8 +926,6 @@ msgstr ""
 
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document__amount_price_gross
-#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line__price_gross
-#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__price_gross
 #: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin__amount_price_gross
 #: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_mixin_fields__amount_price_gross
 msgid "Amount without discount."
@@ -3200,6 +3194,12 @@ msgstr ""
 msgid "Financial Discount Value"
 msgstr ""
 
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__financial_total_gross
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__financial_total_gross
+msgid "Financial Gross Amount"
+msgstr ""
+
 #. module: l10n_br_fiscal
 #: model:ir.model.fields.selection,name:l10n_br_fiscal.selection__l10n_br_fiscal_comment__comment_type__fiscal
 #: model:ir.ui.menu,name:l10n_br_fiscal.fiscal_menu
@@ -3670,6 +3670,12 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list"
 msgstr ""
 
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line__price_gross
+#: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__price_gross
+msgid "Gross Product/Service Amount"
+msgstr ""
+
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_tax_ipi_guideline__cst_group
 #: model_terms:ir.ui.view,arch_db:l10n_br_fiscal.tax_ipi_guideline_search
@@ -9037,6 +9043,20 @@ msgstr ""
 msgid "To States"
 msgstr ""
 
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line__financial_total_gross
+#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__financial_total_gross
+msgid "Total amount before any discounts are applied."
+msgstr ""
+
+#. module: l10n_br_fiscal
+#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line__price_gross
+#: model:ir.model.fields,help:l10n_br_fiscal.field_l10n_br_fiscal_document_line_mixin__price_gross
+msgid ""
+"Total value of products or services (quantity x unit price)before any "
+"discounts."
+msgstr ""
+
 #. module: l10n_br_fiscal
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_cfop__type_in_out
 #: model:ir.model.fields,field_description:l10n_br_fiscal.field_l10n_br_fiscal_cst__cst_type

odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin.py

@@ -196,9 +196,12 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     )
 
     price_gross = fields.Monetary(
+        string="Gross Product/Service Amount",
+        help=(
+            "Total value of products or services (quantity x unit price)"
+            "before any discounts."
+        ),
         compute="_compute_amounts",
-        string="Amount Gross",
-        help="Amount without discount.",
     )
 
     amount_untaxed = fields.Monetary(
@@ -223,7 +226,8 @@ class FiscalDocumentLineMixin(models.AbstractModel):
     )
 
     financial_total_gross = fields.Monetary(
-        string="Amount Financial Gross",
+        string="Financial Gross Amount",
+        help="Total amount before any discounts are applied.",
         compute="_compute_amounts",
     )
 

odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py

@@ -145,19 +145,13 @@ class FiscalDocumentLineMixinMethods(models.AbstractModel):
     def _compute_amounts(self):
         for record in self:
             round_curr = record.currency_id or self.env.ref("base.BRL")
-            # Valor dos produtos
 
-            amount_subtotal = round_curr.round(record.price_unit * record.quantity)
+            # Total value of products or services
+            record.price_gross = round_curr.round(record.price_unit * record.quantity)
 
-            record.price_gross = (
-                amount_subtotal
-                + record.amount_tax_not_included
-                - record.amount_tax_withholding
-            )
-
-            record.amount_untaxed = amount_subtotal - record.discount_value
+            record.amount_untaxed = record.price_gross - record.discount_value
 
-            record.amount_fiscal = amount_subtotal - record.discount_value
+            record.amount_fiscal = record.price_gross - record.discount_value
 
             record.amount_tax = record.amount_tax_not_included
 

odoo/addons/l10n_br_fiscal/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:fb99440555421340156360e65e8496f85f0f246347b73581f72157af8ab88217
+!! source digest: sha256:6b5dddb9fe0735e01e0e41387881e3a446601cc47681c79f129fc004e527ec29
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-brazil/tree/15.0/l10n_br_fiscal"><img alt="OCA/l10n-brazil" src="https://img.shields.io/badge/github-OCA%2Fl10n--brazil-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-brazil-15-0/l10n-brazil-15-0-l10n_br_fiscal"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-brazil&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <img alt="https://raw.githubusercontent.com/OCA/l10n-brazil/15.0/l10n_br_fiscal/static/img/fiscal_dashboard.png" src="https://raw.githubusercontent.com/OCA/l10n-brazil/15.0/l10n_br_fiscal/static/img/fiscal_dashboard.png" />

odoo/addons/l10n_br_fiscal/tests/test_fiscal_document_generic.py

@@ -49,7 +49,16 @@ class TestFiscalDocumentGeneric(TransactionCase):
         self.nfe_same_state._onchange_fiscal_operation_id()
 
         for line in self.nfe_same_state.fiscal_line_ids:
+            # Save the original price_unit value of the line as defined in
+            # the NFe demo data.
+            original_price_unit = line.price_unit
+
             line._onchange_product_id_fiscal()
+
+            # Restore the original price_unit value,
+            # as the product change might have altered it.
+            line.price_unit = original_price_unit
+
             line._onchange_commercial_quantity()
             line._onchange_ncm_id()
             line._onchange_fiscal_operation_id()
@@ -158,6 +167,9 @@ class TestFiscalDocumentGeneric(TransactionCase):
                 " Básica to COFINS 3% de Venda de Contribuinte Dentro do Estado.",
             )
 
+            product_total = line.price_unit * line.quantity
+            self.assertEqual(line.price_gross, product_total)
+
         self.nfe_same_state.action_document_confirm()
 
         self.assertEqual(
@@ -174,6 +186,9 @@ class TestFiscalDocumentGeneric(TransactionCase):
             "Document is not in Authorized state",
         )
 
+        # Total value of the products
+        self.assertEqual(self.nfe_same_state.amount_price_gross, 200)
+
         result = self.nfe_same_state.action_document_cancel()
         self.assertTrue(result)
 

{odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info → odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-l10n_br_fiscal
-Version: 15.0.1.20.1
+Version: 15.0.1.20.2
 Summary: Brazilian fiscal core module.
 Home-page: https://github.com/OCA/l10n-brazil
 Author: Akretion, Odoo Community Association (OCA)
@@ -25,7 +25,7 @@ Módulo fiscal brasileiro
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:fb99440555421340156360e65e8496f85f0f246347b73581f72157af8ab88217
+   !! source digest: sha256:6b5dddb9fe0735e01e0e41387881e3a446601cc47681c79f129fc004e527ec29
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

{odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info → odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/l10n_br_fiscal/README.rst,sha256=x6yGSIrc9zMRlO2D8vVoZPBXtB245NC9rgKR8pw9KKI,13503
+odoo/addons/l10n_br_fiscal/README.rst,sha256=VPokZ2vSqxeCkVeeepsF1zJ6BbIPPmG6fgcamrjsmTU,13503
 odoo/addons/l10n_br_fiscal/__init__.py,sha256=16Tdff74OkWmnKSfmV6qrNkgsK12gOtMMppwWmIAFIo,144
-odoo/addons/l10n_br_fiscal/__manifest__.py,sha256=LhH1sbtek35v86feIPglApML_CY9O7fzgQruDwjZS3k,4115
+odoo/addons/l10n_br_fiscal/__manifest__.py,sha256=k-p0ppzQh-f_nHEfCUchORANc8QU6c4KwxFaB-sTUl4,4115
 odoo/addons/l10n_br_fiscal/hooks.py,sha256=cna_821w1vrwbfQd59YVY66cU9hhY0av2Zwzr5nHDVI,4825
 odoo/addons/l10n_br_fiscal/tools.py,sha256=nh67fxnJjF3Y-yfHl2mJh6TxMkr8r8GKEQ6NJliTAHE,2488
 odoo/addons/l10n_br_fiscal/constants/fiscal.py,sha256=ICWcrew-iUcWFgF4bLzdjUtbMdaejZ0AucwLFu5u1fo,14935
@@ -58,7 +58,7 @@ odoo/addons/l10n_br_fiscal/demo/partner_demo.xml,sha256=Nuw5PaZ4ernV9bqEP4oRcsmV
 odoo/addons/l10n_br_fiscal/demo/product_demo.xml,sha256=D61ewI_-geCkYnCVYN9nbflZlmX_j8xwE1UWVBTr5XE,83686
 odoo/addons/l10n_br_fiscal/demo/res_users_demo.xml,sha256=CL7BmZ1xnWSh6MSWxrG9dK9C1ObTYGvgj21vCcY4_qE,599
 odoo/addons/l10n_br_fiscal/demo/subsequent_operation_demo.xml,sha256=U-PJXr6uerccXT5dR8_KXKTu1YOahR0dKBcowlHgQIU,560
-odoo/addons/l10n_br_fiscal/i18n/l10n_br_fiscal.pot,sha256=zoTX8FKCIIngeW0A-guZIBqn8xe8HnK09dQs-Zgqv2Q,467427
+odoo/addons/l10n_br_fiscal/i18n/l10n_br_fiscal.pot,sha256=OA5AtntPL7fj_f1GEN6OKnnl-aaAm84KqVOoCFyQvZA,468005
 odoo/addons/l10n_br_fiscal/i18n/pt_BR.po,sha256=jfsD5kCHaJopUGJYu5l-vqMMe53GiI0d0yAw2VmcW0I,526763
 odoo/addons/l10n_br_fiscal/models/__init__.py,sha256=Baltz2F1zNbKQ1ctk1hUYepi4TxLP_SDNL45MJlfR88,2187
 odoo/addons/l10n_br_fiscal/models/cest.py,sha256=FKWv89l6m9LiB-LPN789917BwCkWshSj2nlZ6yrNtpE,1955
@@ -74,8 +74,8 @@ odoo/addons/l10n_br_fiscal/models/document.py,sha256=S8HMr4qxM7tkrh9W0R4aognlELW
 odoo/addons/l10n_br_fiscal/models/document_eletronic.py,sha256=sBM2hS_S20840zVThaOM4LIGWScS8yVIvuUakU2hYGg,6993
 odoo/addons/l10n_br_fiscal/models/document_email.py,sha256=ikGhCrTI18X01RszlCqO0tvhTOKr2d5KJLcj_QA1o_Y,2113
 odoo/addons/l10n_br_fiscal/models/document_event.py,sha256=iO8CxGe7_Til9tsvywxS4b4wNBwm4Cr9wyiv7IK_FMw,11311
-odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin.py,sha256=bFeFQaLGwFwGloW_9onYeZWh4NLd9dLdNKmM6mwrHXo,26066
-odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py,sha256=sgFnIKhujhMMPVGq1dbTY6VUCUGz2JStlEBcnVhHIJ0,33130
+odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin.py,sha256=v9Wv0b206PBoUg5WmldqIGlpWwaulNmBxFO_3Ii9714,26240
+odoo/addons/l10n_br_fiscal/models/document_fiscal_line_mixin_methods.py,sha256=0EnhGSHgP1531dmoDs6Kjy4NXEzrUkK8Y2j5y4dFPeQ,32977
 odoo/addons/l10n_br_fiscal/models/document_fiscal_mixin.py,sha256=1Ep0ClxXpMTB_mzikF_3gdA3Nk6N2YxMR8yDq_QoOAg,282
 odoo/addons/l10n_br_fiscal/models/document_fiscal_mixin_fields.py,sha256=tLYUrorgnXmsWAVM80AI60lsh8cee8pJ_bFDIAioz04,11347
 odoo/addons/l10n_br_fiscal/models/document_fiscal_mixin_methods.py,sha256=XdbVoBuRCgPL_viEfELzp0mQgbqf-h696QC_RlA45DE,11427
@@ -141,14 +141,14 @@ odoo/addons/l10n_br_fiscal/readme/USAGE.rst,sha256=jDnMjM42hjTlqhbpIzjkhJo59eX4j
 odoo/addons/l10n_br_fiscal/security/fiscal_security.xml,sha256=c4D3MoIsVnkZ1pDY_iw8jM2hBPz3VCkl5JKnm_hkau0,3700
 odoo/addons/l10n_br_fiscal/security/ir.model.access.csv,sha256=63NQv85E3jV-T-Zw4pB72Jrdh6xPQ42glHQpOASGte0,15362
 odoo/addons/l10n_br_fiscal/static/description/icon.png,sha256=Vd1HydYBoGCzNfCqxLlch2i2aeCcyxo-uRxWNp6oMbw,14836
-odoo/addons/l10n_br_fiscal/static/description/index.html,sha256=nUUreCdAfRIpoX5s5wFD3S1KNAosRwwc1jm-pl2ysjM,26256
+odoo/addons/l10n_br_fiscal/static/description/index.html,sha256=abrqwKzZs1HG5YPqZ_L_6JPBxfK2CmFVYlHuNRkAjOk,26256
 odoo/addons/l10n_br_fiscal/static/img/fiscal_dashboard.png,sha256=Q0fpqFNqEXh6m6E1aJfzSKV2tQ9lC1Y-ofUt6qxVupc,151668
 odoo/addons/l10n_br_fiscal/static/img/fiscal_line.png,sha256=S4Q4OGSzGnbfm4W5sQVvnD4uUzxS6tbJGT_gs3pB4K0,134276
 odoo/addons/l10n_br_fiscal/static/img/fiscal_operation.png,sha256=2614c1XjxwVznh707e9gujlUXg0ttutKD1ZiSMTqyv8,105871
 odoo/addons/l10n_br_fiscal/static/img/fiscal_total.png,sha256=MaR6ZoM6ZZEaNZk2ynSmaHjkRUU0SOkeUW5_HbJQS50,132739
 odoo/addons/l10n_br_fiscal/tests/__init__.py,sha256=ZhXpC9YiUNYIdeEISO84mHNUDwwi2XCKiqhimLRtSg4,414
 odoo/addons/l10n_br_fiscal/tests/test_cnae.py,sha256=mmskSfWaoFSohjmRbnGci_6Euc9fc2zbhyH5FdyeIeA,616
-odoo/addons/l10n_br_fiscal/tests/test_fiscal_document_generic.py,sha256=wtm4oxnGgaaiIGm5s7Fv_yQO4ApcwKMY5-OBuHXDwB8,43510
+odoo/addons/l10n_br_fiscal/tests/test_fiscal_document_generic.py,sha256=bAAj2qm2UQSbpUBD9GylHhVQW64V6MdPy4kNjh41L34,44065
 odoo/addons/l10n_br_fiscal/tests/test_fiscal_document_nfse.py,sha256=6Q-Ms42oju7vdcWv4bsRvxSd0DzchqaaHDIdw5ZZtME,1751
 odoo/addons/l10n_br_fiscal/tests/test_fiscal_tax.py,sha256=U6JbuqKTcyyFTiW5FZGqGY5yi_aPKaC6_LWz_3sKdpg,11322
 odoo/addons/l10n_br_fiscal/tests/test_ibpt.py,sha256=db7F_WNefarpIjODC94Tya_XCAdaUfK3VPY2v8ihoYw,5226
@@ -224,7 +224,7 @@ odoo/addons/l10n_br_fiscal/wizards/document_status_wizard.py,sha256=_hsF1mQdknc0
 odoo/addons/l10n_br_fiscal/wizards/document_status_wizard.xml,sha256=S9hSkgbBKCt78bTe3sRupfnIcmZZ8KWhaZ9q_PKYvgc,2483
 odoo/addons/l10n_br_fiscal/wizards/invalidate_number_wizard.py,sha256=VYw_GXEdqsEW5kV8RJk-vP1X6KW_CafP1nxggdOICNY,1083
 odoo/addons/l10n_br_fiscal/wizards/invalidate_number_wizard.xml,sha256=H0JzzzbJmWziLZjZ8acQsqJcgsaYD3M6I3OydoNFuUc,1215
-odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info/METADATA,sha256=z38L3KMMQLudaAXGl5BdsQHaaVXP5XuzNf2EyF85RZg,14171
-odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_l10n_br_fiscal-15.0.1.20.1.dist-info/RECORD,,
+odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info/METADATA,sha256=4_l1MZAXFPTWoop_pG3ZoKRMaywTNy-k7x-Xvb69olo,14171
+odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_l10n_br_fiscal-15.0.1.20.2.dist-info/RECORD,,