Merge PR OCA#3256 into 15.0

Signed-off-by rvalyi
kmee · Aug 1, 2024 · 35ef5f7 · 35ef5f7
2 parents 9c49e34 + 550ce8c
commit 35ef5f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/l10n_br_nfse/models/document.py b/l10n_br_nfse/models/document.py
@@ -264,7 +264,7 @@ def _prepare_lote_rps(self):
             "codigo_obra": self.civil_construction_code or "",
             "art": self.civil_construction_art or "",
             "carga_tributaria": self.amount_tax,
-            "total_recebido": self.amount_total,
+            "total_recebido": self.amount_price_gross,
             "carga_tributaria_estimada": self.amount_estimate_tax,
         }
 

diff --git a/l10n_br_nfse/models/document_line.py b/l10n_br_nfse/models/document_line.py
@@ -68,7 +68,7 @@ def fields_view_get(
 
     def prepare_line_servico(self):
         return {
-            "valor_servicos": round(self.amount_total, 2),
+            "valor_servicos": round(self.price_gross, 2),
             "valor_deducoes": round(self.fiscal_deductions_value, 2),
             "valor_pis": round(self.pis_value, 2) or round(self.pis_wh_value, 2),
             "valor_pis_retido": round(self.pis_wh_value, 2),

diff --git a/l10n_br_nfse/report/danfse.xml b/l10n_br_nfse/report/danfse.xml
@@ -512,7 +512,7 @@ row {
                     Base de Cálculo
                 </div>
                 <div class="col-2 linha centro">
-                    <span t-field="doc.amount_total" />
+                    <span t-field="doc.amount_price_gross" />
                 </div>
             </div>