trabalho em andamento 2

OCA · Dec 7, 2024 · f201935 · f201935
1 parent 941edf2
commit f201935
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 80 deletions.
diff --git a/l10n_br_account/models/account_move.py b/l10n_br_account/models/account_move.py
@@ -300,6 +300,7 @@ def _compute_amount(self):
                 sign = 1
             inv_line_ids = move.line_ids.filtered(
                 lambda line: line.display_type == "product"
+                and (not line.cfop_id or line.cfop_id.finance_move)
             )
             move.amount_untaxed = sum(inv_line_ids.mapped("amount_untaxed"))
             move.amount_tax = sum(inv_line_ids.mapped("amount_tax"))
@@ -338,47 +339,18 @@ def _compute_needed_terms(self):
                                 pass
                             else:
                                 untaxed_amount_currency += line.price_subtotal
-                            for tax_result in (line.compute_all_tax or {}).values():
-                                tax_amount_currency += -sign * tax_result.get(
-                                    "amount_currency", 0.0
-                                )
+                                for tax_result in (line.compute_all_tax or {}).values():
+                                    tax_amount_currency += -sign * tax_result.get(
+                                        "amount_currency", 0.0
+                                    )
                         untaxed_amount = untaxed_amount_currency
                         tax_amount = tax_amount_currency
                     else:
                         tax_amount_currency = invoice.amount_tax * sign
                         tax_amount = invoice.amount_tax_signed
-                        if invoice.fiscal_operation_id:
-                            if invoice.fiscal_operation_id.deductible_taxes:
-                                amount_currency = (
-                                    invoice.amount_total
-                                    + invoice.amount_tax_withholding
-                                )
-                            else:
-                                amount_currency = (
-                                    invoice.amount_total - invoice.amount_ipi_value
-                                ) * sign
-
-                            # Embora seja improvável que haja um caso real disso,
-                            # estou convertendo os valores para a moeda da empresa,
-                            # caso seja diferente da moeda da fatura, para manter a
-                            # consistência. Os montantes brasileiros acima estão na
-                            # moeda da fatura. Assim, o amount_currency fica na moeda
-                            # da empresa, conforme o comportamento nativo.
-                            amount_currency = invoice.currency_id._convert(
-                                from_amount=amount_currency,
-                                to_currency=invoice.company_currency_id,
-                                company=invoice.company_id,
-                                date=invoice.invoice_date or invoice.date,
-                            )
-                            amount_currency = invoice.company_id.currency_id.round(
-                                amount_currency
-                            )
-                            untaxed_amount_currency = amount_currency * sign
-                            untaxed_amount = amount_currency * sign
 
-                        else:
-                            untaxed_amount_currency = invoice.amount_untaxed * sign
-                            untaxed_amount = invoice.amount_untaxed_signed
+                        untaxed_amount_currency = invoice.amount_untaxed * sign
+                        untaxed_amount = invoice.amount_untaxed_signed
                     invoice_payment_terms = (
                         invoice.invoice_payment_term_id._compute_terms(
                             date_ref=invoice.invoice_date

diff --git a/l10n_br_account/models/account_move_line.py b/l10n_br_account/models/account_move_line.py
@@ -110,6 +110,18 @@ class AccountMoveLine(models.Model):
         " and '3-3' for the last installment.",
     )
 
+    # These fields are already inherited by _inherits, but there is some limitation of
+    # the ORM that the values of these fields are zeroed when called by onchange. This
+    # limitation directly affects the _get_amount_credit_debit method.
+    amount_untaxed = fields.Monetary(compute="_compute_amounts")
+    amount_total = fields.Monetary(
+        compute="_compute_amounts",
+    )
+
+    def _compute_amounts(self):
+        res = super()._compute_amounts()
+        return res
+
     @api.depends(
         "quantity",
         "price_unit",
@@ -301,6 +313,20 @@ def changed(fname):
                 else:  # BRAZIL CASE:
                     if line.cfop_id and not line.cfop_id.finance_move:
                         unsigned_amount_currency = 0
+                        if not line.move_id.fiscal_operation_id.deductible_taxes:
+                            # Quando não há financeiro, mas há imposto, e não há
+                            # dedutíveis, é necessário registrar a contrapartida dos
+                            # impostos para equilibrar o balanço. Na versão 14, essa
+                            # diferença era automaticamente alocada às contas dos
+                            # termos de pagamento.
+                            # TODO:
+                            # o correto mesmo seria não lançar os impostos nesse caso,
+                            # resolver depois.
+                            unsigned_amount_currency = -(
+                                line.amount_tax_included
+                                + line.amount_tax_not_included
+                                - line.amount_tax_withholding
+                            )
                     else:
                         if line.move_id.fiscal_operation_id.deductible_taxes:
                             unsigned_amount_currency = (
@@ -312,12 +338,8 @@ def changed(fname):
                             )
                             unsigned_amount_currency = line.currency_id.round(
                                 amount_total
-                                - (
-                                    line.amount_tax_included
-                                    - line.amount_tax_withholding
-                                )
+                                - line.amount_tax_included
                                 - line.amount_tax_not_included
-                                - line.icms_relief_value
                             )
                 amount_currency = unsigned_amount_currency * line.move_id.direction_sign
                 if line.amount_currency != amount_currency or line not in before:

diff --git a/l10n_br_account/tests/test_account_move_lc.py b/l10n_br_account/tests/test_account_move_lc.py
@@ -666,8 +666,8 @@ def test_simples_remessa(self):
             "price_total": 1050.0,
             "tax_line_id": False,
             "currency_id": self.company_data["currency"].id,
-            "amount_currency": 0.0,
-            "debit": 0.0,
+            "amount_currency": 206.5,
+            "debit": 206.5,
             "credit": 0.0,
             "date_maturity": False,
         }
@@ -775,6 +775,8 @@ def test_simples_remessa(self):
             "date_maturity": False,
         }
 
+        # Remessa não gera financeiro, as linhas das condições de pagamento
+        # devem estar zeradas!
         term_line_vals_1 = {
             "name": "",
             "product_id": False,
@@ -789,8 +791,8 @@ def test_simples_remessa(self):
             "tax_ids": [],
             "tax_line_id": False,
             "currency_id": self.company_data["currency"].id,
-            "amount_currency": 206.5,
-            "debit": 206.5,
+            "amount_currency": 0,
+            "debit": 0,
             "credit": 0.0,
             "date_maturity": fields.Date.from_string("2019-01-01"),
         }
@@ -803,9 +805,9 @@ def test_simples_remessa(self):
             "fiscal_position_id": False,
             "payment_reference": "",
             "invoice_payment_term_id": self.pay_terms_a.id,
-            "amount_untaxed": 1000,
-            "amount_tax": 50,
-            "amount_total": 206.5,
+            "amount_untaxed": 0.0,
+            "amount_tax": 0.0,
+            "amount_total": 0.0,
         }
 
         self.assertInvoiceValues(
@@ -1271,9 +1273,9 @@ def test_simples_remessa_tax_withholding(self):
             "price_total": 1050.0,
             "tax_line_id": False,
             "currency_id": self.company_data["currency"].id,
-            "amount_currency": 0.0,
+            "amount_currency": 133.5,
             "debit": 0.0,
-            "credit": 0.0,
+            "credit": 133.5,
             "date_maturity": False,
         }
 
@@ -1390,8 +1392,8 @@ def test_simples_remessa_tax_withholding(self):
             "tax_ids": [],
             "tax_line_id": False,
             "currency_id": self.company_data["currency"].id,
-            "amount_currency": 133.5,
-            "debit": 133.5,
+            "amount_currency": 0.0,
+            "debit": 0.0,
             "credit": 0.0,
             "date_maturity": fields.Date.from_string("2019-01-01"),
         }
@@ -1404,9 +1406,9 @@ def test_simples_remessa_tax_withholding(self):
             "fiscal_position_id": False,
             "payment_reference": "",
             "invoice_payment_term_id": self.pay_terms_a.id,
-            "amount_untaxed": 1000.0,  # FIXME is this correct for a simples remessa??
-            "amount_tax": 50.0,
-            "amount_total": 133.5,
+            "amount_untaxed": 0.0,
+            "amount_tax": 0.0,
+            "amount_total": 0.0,
         }
 
         self.assertInvoiceValues(

diff --git a/l10n_br_fiscal/models/document_line_mixin_methods.py b/l10n_br_fiscal/models/document_line_mixin_methods.py
@@ -127,27 +127,28 @@ def _get_view(self, view_id=None, view_type="form", **options):
         "company_id",
         "price_unit",
         "quantity",
+        "icms_relief_id",
     )
     def _compute_amounts(self):
         for record in self:
             round_curr = record.currency_id or self.env.ref("base.BRL")
 
             # Total value of products or services
             record.price_gross = round_curr.round(record.price_unit * record.quantity)
-
-            record.amount_untaxed = record.price_gross - record.discount_value
-
             record.amount_fiscal = record.price_gross - record.discount_value
-
             record.amount_tax = record.amount_tax_not_included
 
             add_to_amount = sum(record[a] for a in record._add_fields_to_amount())
             rm_to_amount = sum(record[r] for r in record._rm_fields_to_amount())
+            record.amount_untaxed = (
+                record.price_gross
+                - record.discount_value
+                + add_to_amount
+                - rm_to_amount
+            )
 
             # Valor do documento (NF)
-            record.amount_total = (
-                record.amount_untaxed + record.amount_tax + add_to_amount - rm_to_amount
-            )
+            record.amount_total = record.amount_untaxed + record.amount_tax
 
             # Valor Liquido (TOTAL + IMPOSTOS - RETENÇÕES)
             record.amount_taxed = record.amount_total - record.amount_tax_withholding

diff --git a/l10n_br_fiscal/models/tax.py b/l10n_br_fiscal/models/tax.py
@@ -699,19 +699,15 @@ def compute_taxes(self, **kwargs):
             except AttributeError:
                 taxes[tax.tax_domain].update(tax._compute_tax(tax, taxes, **kwargs))
 
-            if taxes[tax.tax_domain]["tax_include"]:
-                result_amounts["amount_included"] += taxes[tax.tax_domain].get(
-                    "tax_value", 0.00
-                )
+            tax_domain = taxes[tax.tax_domain]
+            tax_value = tax_domain.get("tax_value", 0.00)
+            if tax_domain["tax_withholding"]:
+                result_amounts["amount_withholding"] += tax_value
             else:
-                result_amounts["amount_not_included"] += taxes[tax.tax_domain].get(
-                    "tax_value", 0.00
-                )
-
-            if taxes[tax.tax_domain]["tax_withholding"]:
-                result_amounts["amount_withholding"] += taxes[tax.tax_domain].get(
-                    "tax_value", 0.00
-                )
+                if tax_domain["tax_include"]:
+                    result_amounts["amount_included"] += tax_value
+                else:
+                    result_amounts["amount_not_included"] += tax_value
 
         # Estimate taxes
         result_amounts["estimate_tax"] = self._compute_estimate_taxes(**kwargs)

diff --git a/l10n_br_sale_stock/static/description/index.html b/l10n_br_sale_stock/static/description/index.html
@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -475,9 +474,7 @@ <h2><a class="toc-backref" href="#toc-entry-13">Other credits</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-14">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>