From c069e69affe6317e745fa4428556d72680c5163f Mon Sep 17 00:00:00 2001
From: Diego Paradeda <diego.paradeda@kmee.com.br>
Date: Thu, 11 Apr 2024 11:03:39 -0300
Subject: [PATCH 1/2] [FIX] Remove old FCP-ST value from FCP section

---
 l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml b/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
index e2e631f94a4a..a11242c6a9cd 100644
--- a/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
+++ b/l10n_br_fiscal/views/document_fiscal_line_mixin_view.xml
@@ -335,11 +335,6 @@
                                             force_save="1"
                                             attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', '=', '500')]}"
                                         />
-                          <field
-                                            name="icmsfcpst_value"
-                                            force_save="1"
-                                            attrs="{'readonly': [('icmsfcp_tax_id', '!=', False)], 'invisible': [('icms_cst_code', 'not in', ('10', '30', '70', '90', '201', '202', '203', '900'))]}"
-                                        />
                           <field
                                             name="icmsfcp_base_wh"
                                             force_save="1"

From 18aecdb3d7e9bd587c00d266650a575267488679 Mon Sep 17 00:00:00 2001
From: Diego Paradeda <diego.paradeda@kmee.com.br>
Date: Thu, 11 Apr 2024 11:04:21 -0300
Subject: [PATCH 2/2] [FIX] Use NCM/CEST/NBM rules for FCP-ST  (like ICMSST)

---
 l10n_br_fiscal/models/icms_regulation.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/l10n_br_fiscal/models/icms_regulation.py b/l10n_br_fiscal/models/icms_regulation.py
index 324b5c07c793..2b05f489f39c 100644
--- a/l10n_br_fiscal/models/icms_regulation.py
+++ b/l10n_br_fiscal/models/icms_regulation.py
@@ -1968,6 +1968,9 @@ def _build_map_tax_def_domain(
             domain += [
                 ("state_from_id", "=", company.state_id.id),
                 ("state_to_ids", "=", partner.state_id.id),
+                ("ncm_ids", "=", ncm.id),
+                ("nbm_ids", "=", nbm.id),
+                ("cest_ids", "=", cest.id),
             ]
 
         return domain