[17.0] [MIG] account_product_fiscal_classification

account_product_fiscal_classification/README.rst

@@ -130,6 +130,10 @@ Contributors
 
 -  Danimar RIBEIRO
 
+-  Open Source Integrators (https://opensourceintegrators.com)
+
+   -  Nikul Chaudhary <[email protected]>
+
 Maintainers
 -----------
 

account_product_fiscal_classification/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Account Product - Fiscal Classification",
     "summary": "Simplify taxes management for products",
-    "version": "16.0.1.0.6",
+    "version": "17.0.1.0.0",
     "category": "Accounting",
     "author": "Akretion,GRAP,La Louve,Odoo Community Association (OCA)",
     "maintainers": ["legalsylvain"],

account_product_fiscal_classification/demo/account_chart_template.xml

@@ -7,31 +7,13 @@
 <!-- oca-hooks: disable=xml-duplicate-record-id -->
 <odoo>
 
-    <record id="chart_template" model="account.chart.template">
-        <field name="name">Demo Chart Template</field>
-        <field name="bank_account_code_prefix">1014</field>
-        <field name="cash_account_code_prefix">1015</field>
-        <field name="transfer_account_code_prefix">1017</field>
-        <field name="currency_id" ref="base.USD" />
-    </record>
-
-    <record id="fake_account_001" model="account.account.template">
-        <field name="code">001</field>
-        <field name="name">Fake Account 001</field>
-        <field name="account_type">income_other</field>
-        <field name="chart_template_id" ref="chart_template" />
-    </record>
-
-    <record id="fake_account_002" model="account.account.template">
-        <field name="code">002</field>
-        <field name="name">Fake Account 002</field>
-        <field name="account_type">income_other</field>
-        <field name="chart_template_id" ref="chart_template" />
-    </record>
-
-    <record id="chart_template" model="account.chart.template">
-        <field name="property_account_income_categ_id" ref="fake_account_001" />
-        <field name="property_account_expense_categ_id" ref="fake_account_002" />
-    </record>
+    <function model="account.chart.template" name="try_loading">
+        <value eval="[]" />
+        <value>generic_coa</value>
+        <value
+            model="res.company"
+            search="[('partner_id.country_id.code', 'in', ['US', False])]"
+        />
+    </function>
 
 </odoo>

account_product_fiscal_classification/demo/account_product_fiscal_classification_template.xml

@@ -10,7 +10,7 @@
         model="account.product.fiscal.classification.template"
     >
         <field name="name">Demo Fiscal Classification Template</field>
-        <field name="chart_template_id" ref="chart_template" />
+        <field name="chart_template_id">generic_coa</field>
         <field
             name="purchase_tax_ids"
             eval="[(6, 0, [ref('account_tax_template_purchase')])]"

account_product_fiscal_classification/demo/account_tax.xml

@@ -7,26 +7,36 @@
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
+
+    <!-- Account Tax Group -->
+    <record id="tax_group_taxes" model="account.tax.group">
+        <field name="name">Taxes</field>
+        <field name="sequence">0</field>
+    </record>
+
     <!-- Your Company Taxes -->
     <record id="account_tax_purchase_20_company_1" model="account.tax">
         <field name="name">Demo Purchase Tax 20% (Your Company)</field>
         <field name="company_id" ref="base.main_company" />
         <field name="type_tax_use">purchase</field>
         <field name="amount">20</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <record id="account_tax_sale_20_company_1" model="account.tax">
         <field name="name">Demo Sale Tax 20% (Your Company)</field>
         <field name="company_id" ref="base.main_company" />
         <field name="type_tax_use">sale</field>
         <field name="amount">20</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <record id="account_tax_sale_5_company_1" model="account.tax">
         <field name="name">Demo Sale Tax 5%  (Your Company)</field>
         <field name="company_id" ref="base.main_company" />
         <field name="type_tax_use">sale</field>
         <field name="amount">5</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <!-- Company 2 Taxes -->
@@ -35,27 +45,31 @@
         <field name="company_id" ref="company_2" />
         <field name="type_tax_use">purchase</field>
         <field name="amount">7</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <record id="account_tax_purchase_30_company_2" model="account.tax">
         <field name="name">Demo Purchase Tax 30% (Company 2)</field>
         <field name="company_id" ref="company_2" />
         <field name="type_tax_use">purchase</field>
         <field name="amount">30</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <record id="account_tax_sale_7_company_2" model="account.tax">
         <field name="name">Demo Sale Tax 7% (Company 2)</field>
         <field name="company_id" ref="company_2" />
         <field name="type_tax_use">sale</field>
         <field name="amount">7</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
     <record id="account_tax_sale_30_company_2" model="account.tax">
         <field name="name">Demo Sale Tax 30% (Company 2)</field>
         <field name="company_id" ref="company_2" />
         <field name="type_tax_use">sale</field>
         <field name="amount">30</field>
+        <field name="tax_group_id" ref="tax_group_taxes" />
     </record>
 
 </odoo>

account_product_fiscal_classification/demo/account_tax_template.xml

@@ -5,17 +5,19 @@
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
-    <record id="account_tax_template_purchase" model="account.tax.template">
-        <field name="chart_template_id" ref="chart_template" />
+    <record id="account_tax_template_purchase" model="account.tax">
+       <!--  <field name="chart_template_id" ref="chart_template" /> -->
         <field name="name">Demo Purchase Tax Template 20%</field>
         <field name="type_tax_use">purchase</field>
+        <field name="amount_type">fixed</field>
         <field name="amount">0.2</field>
     </record>
 
-    <record id="account_tax_template_sale" model="account.tax.template">
-        <field name="chart_template_id" ref="chart_template" />
+    <record id="account_tax_template_sale" model="account.tax">
+        <!-- <field name="chart_template_id" ref="chart_template" /> -->
         <field name="name">Demo Sale Tax Template 20%</field>
         <field name="type_tax_use">sale</field>
+        <field name="amount_type">fixed</field>
         <field name="amount">0.2</field>
     </record>
 

account_product_fiscal_classification/demo/res_company.xml

@@ -3,6 +3,7 @@
     <record id="company_2" model="res.company">
         <field name="name">Company 2</field>
         <field name="currency_id" ref="base.USD" />
+        <field name="country_id" ref="base.us" />
     </record>
 
 </odoo>

account_product_fiscal_classification/hooks.py

@@ -4,13 +4,11 @@
 
 import logging
 
-from odoo import SUPERUSER_ID, api
-
 _logger = logging.getLogger(__name__)
 
 
-def create_fiscal_classification_from_product_template(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
+def create_fiscal_classification_from_product_template(env):
+    # env = api.Environment(cr, SUPERUSER_ID, {})
     AccountTax = env["account.tax"]
     AccountProductFiscalClassification = env["account.product.fiscal.classification"]
     template_values = (

account_product_fiscal_classification/models/account_chart_template.py

@@ -5,7 +5,7 @@
 from odoo import fields, models
 
 
-class AccountChartTemplate(models.Model):
+class AccountChartTemplate(models.AbstractModel):
     _inherit = "account.chart.template"
 
     classification_template_ids = fields.One2many(

account_product_fiscal_classification/models/account_product_fiscal_classification_template.py

@@ -14,9 +14,11 @@ class AccountProductFiscalClassificationTemplate(models.Model):
 
     description = fields.Text()
 
-    chart_template_id = fields.Many2one(
-        comodel_name="account.chart.template",
-        string="Chart Template",
+    chart_template_id = fields.Selection(
+        string="Chart of Accounts",
+        selection=lambda self: self.env[
+            "account.chart.template"
+        ]._select_chart_template(),
         required=True,
     )
 
@@ -27,27 +29,21 @@ class AccountProductFiscalClassificationTemplate(models.Model):
     )
 
     purchase_tax_ids = fields.Many2many(
-        comodel_name="account.tax.template",
+        comodel_name="account.tax",
         relation="fiscal_classification_template_purchase_tax_rel",
         column1="fiscal_classification_id",
         column2="tax_id",
         string="Purchase Taxes",
-        domain="["
-        "('type_tax_use', 'in', ['purchase', 'all']),"
-        "('chart_template_id', '=', chart_template_id),"
-        "]",
+        domain="[('type_tax_use', 'in', ['purchase', 'all'])]",
     )
 
     sale_tax_ids = fields.Many2many(
-        comodel_name="account.tax.template",
+        comodel_name="account.tax",
         relation="fiscal_classification_template_sale_tax_rel",
         column1="fiscal_classification_id",
         column2="tax_id",
         string="Sale Taxes",
-        domain="["
-        "('type_tax_use', 'in', ['sale', 'all']),"
-        "('chart_template_id', '=', chart_template_id),"
-        "]",
+        domain="[('type_tax_use', 'in', ['sale', 'all'])]",
     )
 
     def _prepare_fiscal_classification(self, company, taxes_ref):

account_product_fiscal_classification/models/product_template.py

@@ -70,7 +70,9 @@ def _update_vals_fiscal_classification(self, vals):
                     "taxes_id": [(6, 0, classification.sale_tax_ids.ids)],
                 }
             )
-        elif vals.get("supplier_taxes_id") or vals.get("taxes_id"):
+        elif self.env.context.get("lang") is not None and (
+            vals.get("supplier_taxes_id") or vals.get("taxes_id")
+        ):
             raise ValidationError(
                 _(
                     "You can not create or write products with"

account_product_fiscal_classification/readme/CONTRIBUTORS.md

@@ -7,3 +7,7 @@
   > - Renato Lima \<<[email protected]>\>
 
 - Danimar RIBEIRO
+
+- Open Source Integrators (<https://opensourceintegrators.com>)
+  - Nikul Chaudhary \<<[email protected]>\>
+

account_product_fiscal_classification/security/ir_rule.xml

@@ -4,7 +4,7 @@
     @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
-<odoo>
+<odoo noupdate="1">
     <record id="rule_account_product_fiscal_classification" model="ir.rule">
         <field name="name">Rule: Fiscal Classification</field>
         <field name="model_id" ref="model_account_product_fiscal_classification" />

account_product_fiscal_classification/static/description/index.html

@@ -470,6 +470,11 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </li>
 <li><p class="first">Danimar RIBEIRO</p>
 </li>
+<li><p class="first">Open Source Integrators (<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>)</p>
+<ul class="simple">
+<li>Nikul Chaudhary &lt;<a class="reference external" href="mailto:nchaudhary&#64;opensourceintegrators.com">nchaudhary&#64;opensourceintegrators.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">