[IMP] l10n_br_fiscal: tax_definition add Service Type

OCA · Oct 28, 2024 · 1167db2 · 1167db2
1 parent e81bb43
commit 1167db2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/l10n_br_fiscal/models/document_line_mixin_methods.py b/l10n_br_fiscal/models/document_line_mixin_methods.py
@@ -393,6 +393,7 @@ def _onchange_fiscal_operation_line_id(self):
                 nbs=self.nbs_id,
                 cest=self.cest_id,
                 city_taxation_code=self.city_taxation_code_id,
+                service_type=self.service_type_id,
                 ind_final=self.ind_final,
             )
 

diff --git a/l10n_br_fiscal/models/operation_line.py b/l10n_br_fiscal/models/operation_line.py
@@ -202,6 +202,7 @@ def map_fiscal_taxes(
         nbs=None,
         cest=None,
         city_taxation_code=None,
+        service_type=None,
         ind_final=None,
     ):
         mapping_result = {
@@ -226,6 +227,7 @@ def map_fiscal_taxes(
             nbs=nbs,
             cest=cest,
             city_taxation_code=city_taxation_code,
+            service_type=service_type,
         ):
             self._build_mapping_result(mapping_result, tax_definition)
 
@@ -270,6 +272,7 @@ def map_fiscal_taxes(
             nbs=nbs,
             cest=cest,
             city_taxation_code=city_taxation_code,
+            service_type=service_type,
         ):
             self._build_mapping_result(mapping_result, tax_definition)
 
@@ -285,6 +288,7 @@ def map_fiscal_taxes(
             nbs=nbs,
             cest=cest,
             city_taxation_code=city_taxation_code,
+            service_type=service_type,
         ):
             self._build_mapping_result(mapping_result, tax_definition)
 
@@ -300,6 +304,7 @@ def map_fiscal_taxes(
             nbs=nbs,
             cest=cest,
             city_taxation_code=city_taxation_code,
+            service_type=service_type,
         ):
             self._build_mapping_result(mapping_result, tax_definition)
 

diff --git a/l10n_br_fiscal/models/tax_definition.py b/l10n_br_fiscal/models/tax_definition.py
@@ -216,6 +216,14 @@ def name_get(self):
         string="City Taxation Codes",
     )
 
+    service_type_ids = fields.Many2many(
+        comodel_name="l10n_br_fiscal.service.type",
+        relation="tax_definition_service_type_rel",
+        column1="tax_definition_id",
+        column2="service_type_id",
+        string="Fiscal Service Types",
+    )
+
     ind_final = fields.Selection(
         selection=FINAL_CUSTOMER,
         string="Final Consumption Operation",
@@ -423,6 +431,7 @@ def map_tax_definition(
         nbs=None,
         cest=None,
         city_taxation_code=None,
+        service_type=None,
     ):
         if not ncm:
             ncm = product.ncm_id
@@ -452,6 +461,9 @@ def map_tax_definition(
             ("city_taxation_code_ids", "=", False),
             ("city_taxation_code_ids", "=", city_taxation_code.id),
             "|",
+            ("service_type_ids", "=", False),
+            ("service_type_ids", "=", service_type.id),
+            "|",
             ("product_ids", "=", False),
             ("product_ids", "=", product.id),
         ]

diff --git a/l10n_br_fiscal/views/tax_definition_view.xml b/l10n_br_fiscal/views/tax_definition_view.xml
@@ -108,15 +108,12 @@
                         string="Tax Benefit"
                         attrs="{'invisible': [('is_benefit', '=', False)]}"
                     >
-                <field
-                            name="code"
-                            attrs="{'required': [('is_benefit', '!=', False)]}"
-                        />
-                <field
+            <field name="code" attrs="{'required': [('is_benefit', '!=', False)]}" />
+            <field
                             name="description"
                             attrs="{'required': [('is_benefit', '!=', False)]}"
                         />
-                <field
+            <field
                             name="benefit_type"
                             attrs="{'required': [('is_benefit', '!=', False)]}"
                         />
@@ -210,22 +207,27 @@
                                 />
               </group>
             </page>
+            <page name="service_types_page" string="Fiscal Service Type">
+              <group name="service_types" string="Fiscal Service Types">
+                <field name="service_type_ids" force_save="1" nolabel="1" colspan="2" />
+              </group>
+            </page>
             <page name="products_page" string="Product">
               <group name="products" string="Products">
                 <field name="product_ids" force_save="1" nolabel="1" colspan="2" />
               </group>
             </page>
             <page name="fiscal_profile_page" string="Fiscal Profile">
-                <group name="fiscal_profile" string="Fiscal Profile">
-                    <field name="ind_final" />
-                </group>
+              <group name="fiscal_profile" string="Fiscal Profile">
+                <field name="ind_final" />
+              </group>
             </page>
           </notebook>
         </sheet>
         <div class="oe_chatter">
-            <field name="message_follower_ids" groups="base.group_user" />
-            <field name="activity_ids" />
-            <field name="message_ids" />
+          <field name="message_follower_ids" groups="base.group_user" />
+          <field name="activity_ids" />
+          <field name="message_ids" />
         </div>
       </form>
     </field>