[12.0][l10n_br_product_contract] 12.0 pre commit l10n_br_product_cont…

…ract
Escodoo · Apr 12, 2023 · f8d0deb · f8d0deb
1 parent b295ce6
commit f8d0deb
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 64 deletions.
diff --git a/l10n_br_product_contract/__manifest__.py b/l10n_br_product_contract/__manifest__.py
@@ -2,23 +2,23 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'L10n Br Product Contract',
-    'summary': """
+    "name": "L10n Br Product Contract",
+    "summary": """
         Criação de contratos através dos Pedidos de Vendas""",
-    'version': '12.0.1.0.0',
-    'license': 'AGPL-3',
-    'author': 'KMEE, Escodoo, Odoo Community Association (OCA)',
-    'website': 'https://github.com/OCA/l10n-brazil',
-    'development_status': 'Beta',
-    'maintainers': ['mileo', 'marcelsavegnago'],
-    'depends': [
-        'l10n_br_sale',
-        'l10n_br_contract',
-        'product_contract',
+    "version": "12.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "KMEE, Escodoo, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/l10n-brazil",
+    "development_status": "Beta",
+    "maintainers": ["mileo", "marcelsavegnago"],
+    "depends": [
+        "l10n_br_sale",
+        "l10n_br_contract",
+        "product_contract",
     ],
-    'demo': [
-        'demo/contract_template.xml',
-        'demo/product.xml',
-        'demo/sale_order.xml',
+    "demo": [
+        "demo/contract_template.xml",
+        "demo/product.xml",
+        "demo/sale_order.xml",
     ],
 }
diff --git a/l10n_br_product_contract/demo/contract_template.xml b/l10n_br_product_contract/demo/contract_template.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 - TODAY, Marcel Savegnago - Escodoo - https://www.escodoo.com.br
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
 
     <record id="main_contract_template_sale" model="contract.template">
         <field name="name">Main Company - Sale Contract Template</field>
         <field name="contract_type">sale</field>
-        <field name="company_id" ref="base.main_company"/>
+        <field name="company_id" ref="base.main_company" />
     </record>
 
 </odoo>
diff --git a/l10n_br_product_contract/demo/product.xml b/l10n_br_product_contract/demo/product.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 - TODAY, Marcel Savegnago - Escodoo - https://www.escodoo.com.br
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
 
     <!-- Recurrency Service -->
@@ -11,17 +10,20 @@
         <field name="standard_price">0.0</field>
         <field name="type">service</field>
         <field name="default_code">RECURRENCY_01</field>
-        <field name="uom_id" ref="uom.product_uom_unit"/>
-        <field name="uom_po_id" ref="uom.product_uom_unit"/>
-        <field name="categ_id" ref="product.product_category_4"/>
-        <field name="ncm_id" ref="l10n_br_fiscal.ncm_00000000"/>
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="uom_po_id" ref="uom.product_uom_unit" />
+        <field name="categ_id" ref="product.product_category_4" />
+        <field name="ncm_id" ref="l10n_br_fiscal.ncm_00000000" />
         <field name="fiscal_type">09</field>
         <field name="tax_icms_or_issqn">issqn</field>
-        <field name="fiscal_genre_id" ref="l10n_br_fiscal.product_genre_00"/>
-        <field name="icms_origin" eval=""/>
-        <field name="service_type_id" ref="l10n_br_fiscal.service_type_105"/>
+        <field name="fiscal_genre_id" ref="l10n_br_fiscal.product_genre_00" />
+        <field name="icms_origin" eval="" />
+        <field name="service_type_id" ref="l10n_br_fiscal.service_type_105" />
         <field name="is_contract">True</field>
-        <field name="property_contract_template_id" ref="l10n_br_product_contract.main_contract_template_sale"/>
+        <field
+            name="property_contract_template_id"
+            ref="l10n_br_product_contract.main_contract_template_sale"
+        />
 
     </record>
 

diff --git a/l10n_br_product_contract/demo/sale_order.xml b/l10n_br_product_contract/demo/sale_order.xml
@@ -1,44 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 - TODAY, Marcel Savegnago - Escodoo - https://www.escodoo.com.br
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
     <!-- Main Company Simples Nacional -->
     <!-- Sale Order with Recurrency Service -->
     <record id="main_so_recurrency_service" model="sale.order">
         <field name="name">Main l10n_br_product_contract - Serviço Recorrente</field>
-        <field name="partner_id" ref="l10n_br_base.res_partner_akretion"/>
-        <field name="partner_invoice_id" ref="l10n_br_base.res_partner_akretion"/>
-        <field name="partner_shipping_id" ref="l10n_br_base.res_partner_akretion"/>
-        <field name="user_id" ref="base.user_admin"/>
-        <field name="pricelist_id" ref="product.list0"/>
-        <field name="team_id" ref="sales_team.crm_team_1"/>
+        <field name="partner_id" ref="l10n_br_base.res_partner_akretion" />
+        <field name="partner_invoice_id" ref="l10n_br_base.res_partner_akretion" />
+        <field name="partner_shipping_id" ref="l10n_br_base.res_partner_akretion" />
+        <field name="user_id" ref="base.user_admin" />
+        <field name="pricelist_id" ref="product.list0" />
+        <field name="team_id" ref="sales_team.crm_team_1" />
         <field name="state">draft</field>
-        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda"/>
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
         <field name="note">TESTE</field>
-        <field name="company_id" ref="base.main_company"/>
+        <field name="company_id" ref="base.main_company" />
     </record>
 
     <record id="main_sl_recurrency_service_1_1" model="sale.order.line">
-        <field name="order_id" ref="main_so_recurrency_service"/>
+        <field name="order_id" ref="main_so_recurrency_service" />
         <field name="name">Serviço Recorrente</field>
-        <field name="product_id" ref="l10n_br_product_contract.recurrency_service_product"/>
+        <field
+            name="product_id"
+            ref="l10n_br_product_contract.recurrency_service_product"
+        />
         <field name="product_uom_qty">2</field>
-        <field name="product_uom" ref="uom.product_uom_unit"/>
+        <field name="product_uom" ref="uom.product_uom_unit" />
         <field name="price_unit">500</field>
         <field name="fiscal_operation_type">out</field>
-        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda"/>
-        <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_servico"/>
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_servico" />
         <field name="recurring_invoicing_type">pre-paid</field>
         <field name="recurring_rule_type">monthly</field>
     </record>
 
     <function model="sale.order.line" name="_onchange_fiscal_operation_id">
-        <value eval="[ref('main_sl_recurrency_service_1_1')]"/>
+        <value eval="[ref('main_sl_recurrency_service_1_1')]" />
     </function>
 
     <function model="sale.order.line" name="_onchange_fiscal_operation_line_id">
-        <value eval="[ref('main_sl_recurrency_service_1_1')]"/>
+        <value eval="[ref('main_sl_recurrency_service_1_1')]" />
     </function>
 
 </odoo>
diff --git a/l10n_br_product_contract/models/sale_order.py b/l10n_br_product_contract/models/sale_order.py
@@ -6,7 +6,7 @@
 
 class SaleOrder(models.Model):
 
-    _inherit = 'sale.order'
+    _inherit = "sale.order"
 
     def _prepare_contract_value(self, contract_template):
         self.ensure_one()

diff --git a/l10n_br_product_contract/models/sale_order_line.py b/l10n_br_product_contract/models/sale_order_line.py
@@ -6,14 +6,16 @@
 
 class SaleOrderLine(models.Model):
 
-    _inherit = 'sale.order.line'
+    _inherit = "sale.order.line"
 
     def _prepare_contract_line_values(
         self, contract, predecessor_contract_line_id=False
     ):
         self.ensure_one()
         vals = self._prepare_br_fiscal_dict()
-        vals.update(super()._prepare_contract_line_values(
-            contract, predecessor_contract_line_id
-        ))
+        vals.update(
+            super()._prepare_contract_line_values(
+                contract, predecessor_contract_line_id
+            )
+        )
         return vals
diff --git a/l10n_br_product_contract/readme/CONTRIBUTORS.rst b/l10n_br_product_contract/readme/CONTRIBUTORS.rst
@@ -1,3 +1,2 @@
 * Luis Felipe Mileo <[email protected]>
 * Marcel Savegnago <[email protected]>
-
diff --git a/l10n_br_product_contract/readme/USAGE.rst b/l10n_br_product_contract/readme/USAGE.rst
@@ -2,4 +2,3 @@ To use this module, you need to:
 
 #. Configure the products as contracts;
 #. Create a sale order, with this product and confirm.
-
diff --git a/l10n_br_product_contract/tests/test_l10n_br_product_contract.py b/l10n_br_product_contract/tests/test_l10n_br_product_contract.py
@@ -5,20 +5,27 @@
 
 
 class L10nBrSaleBaseTest(SavepointCase):
-
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.main_company = cls.env.ref('base.main_company')
-        cls.company = cls.env.ref('base.main_company')
-        cls.so_recurrency_service = \
-            cls.env.ref('l10n_br_product_contract.main_so_recurrency_service')
-        cls.sl_recurrency_service = \
-            cls.env.ref('l10n_br_product_contract.main_sl_recurrency_service_1_1')
+        cls.main_company = cls.env.ref("base.main_company")
+        cls.company = cls.env.ref("base.main_company")
+        cls.so_recurrency_service = cls.env.ref(
+            "l10n_br_product_contract.main_so_recurrency_service"
+        )
+        cls.sl_recurrency_service = cls.env.ref(
+            "l10n_br_product_contract.main_sl_recurrency_service_1_1"
+        )
 
     def test_l10n_br_product_contract_confirm_so(self):
         self.so_recurrency_service.action_confirm()
-        self.assertTrue(self.sl_recurrency_service.contract_id.
-                        contract_line_ids[0].fiscal_operation_id)
-        self.assertTrue(self.sl_recurrency_service.contract_id.
-                        contract_line_ids[0].fiscal_operation_line_id)
+        self.assertTrue(
+            self.sl_recurrency_service.contract_id.contract_line_ids[
+                0
+            ].fiscal_operation_id
+        )
+        self.assertTrue(
+            self.sl_recurrency_service.contract_id.contract_line_ids[
+                0
+            ].fiscal_operation_line_id
+        )
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		* Luis Felipe Mileo <[email protected]>
		* Marcel Savegnago <[email protected]>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@ To use this module, you need to:

		#. Configure the products as contracts;
		#. Create a sale order, with this product and confirm.