[MIG] account_invoice_inter_company: Migration to 17.0

OCA · Mar 15, 2024 · 17b5222 · 17b5222
1 parent 1d14f35
commit 17b5222
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 60 deletions.
diff --git a/account_invoice_inter_company/README.rst b/account_invoice_inter_company/README.rst
@@ -106,6 +106,9 @@ Contributors
    -  Pedro M. Baeza
 
 -  Isaac Gallart <igallart@puntsistemes.es>
+-  \`Komit <https://komit-consulting.com>\`:
+
+   -  Cuong Nguyen Mtm <cuong.nmtm@komit-consulting.com>
 
 Maintainers
 -----------

diff --git a/account_invoice_inter_company/__manifest__.py b/account_invoice_inter_company/__manifest__.py
@@ -7,7 +7,7 @@
 {
     "name": "Inter Company Invoices",
     "summary": "Intercompany invoice rules",
-    "version": "16.0.1.0.2",
+    "version": "17.0.1.0.0",
     "category": "Accounting & Finance",
     "website": "https://github.com/OCA/multi-company",
     "author": "Odoo SA, Akretion, Odoo Community Association (OCA)",

diff --git a/account_invoice_inter_company/readme/CONTRIBUTORS.md b/account_invoice_inter_company/readme/CONTRIBUTORS.md
@@ -11,3 +11,5 @@
   - David Vidal
   - Pedro M. Baeza
 - Isaac Gallart \<<igallart@puntsistemes.es>\>
+- \`Komit \<<https://komit-consulting.com>\>\`:
+  - Cuong Nguyen Mtm \<<cuong.nmtm@komit-consulting.com>\>
diff --git a/account_invoice_inter_company/static/description/index.html b/account_invoice_inter_company/static/description/index.html
@@ -453,6 +453,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 </ul>
 </li>
 <li>Isaac Gallart &lt;<a class="reference external" href="mailto:igallart&#64;puntsistemes.es">igallart&#64;puntsistemes.es</a>&gt;</li>
+<li>`Komit &lt;<a class="reference external" href="https://komit-consulting.com">https://komit-consulting.com</a>&gt;`:<ul>
+<li>Cuong Nguyen Mtm &lt;<a class="reference external" href="mailto:cuong.nmtm&#64;komit-consulting.com">cuong.nmtm&#64;komit-consulting.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/account_invoice_inter_company/tests/test_inter_company_invoice.py b/account_invoice_inter_company/tests/test_inter_company_invoice.py
@@ -443,9 +443,9 @@ def test03_confirm_invoice_and_cancel(self):
             self.invoice_company_a.invoice_line_ids[0].product_id,
         )
         # Cancel the invoice of company A
-        invoice_origin = ("%s - Canceled Invoice: %s") % (
-            self.invoice_company_a.company_id.name,
-            self.invoice_company_a.name,
+        invoice_origin = "{company_name} - Canceled Invoice: {invoice_name}".format(
+            company_name=self.invoice_company_a.company_id.name,
+            invoice_name=self.invoice_company_a.name,
         )
         self.invoice_company_a.with_user(self.user_company_a.id).button_cancel()
         # Check invoices after to cancel invoice of company A

diff --git a/account_invoice_inter_company/views/res_config_settings_view.xml b/account_invoice_inter_company/views/res_config_settings_view.xml
@@ -4,74 +4,53 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='inter_company']" position="attributes">
-                <attribute name="title" />
+            <xpath expr="//setting[@id='inter_company']" position="attributes">
+                <attribute name="invisible">1</attribute>
             </xpath>
-            <xpath expr="//div[@id='inter_company']/div[2]/span" position="before">
-                <div class="o_form_label">Inter Company OCA features
-                    <span
-                        class="fa fa-lg fa-building-o"
-                        title="Values set here are company-specific."
-                        aria-label="Values set here are company-specific."
-                        groups="base.group_multi_company"
-                        role="img"
-                    />
-                </div>
-            </xpath>
-            <xpath expr="//div[@id='inter_company']/div[2]" position="inside">
-                <div id="company_share_product">
-                    <field name="company_share_product" class="oe_inline" />
-                    <label
-                        string="Common Product Catalog"
-                        class="o_light_label"
-                        for="company_share_product"
-                    />
-                </div>
-            </xpath>
-            <xpath expr="//div[@id='inter_company']" position="after">
-                <div class="col-12 col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane" />
-                    <div class="o_setting_right_pane">
-                        <div class="o_form_label mt8">Invoicing</div>
-                        <div id="intercompany_invoice_user">
+            <xpath expr="//setting[@id='inter_company']" position="before">
+                <setting
+                    id="inter_company_oca"
+                    string="Inter Company OCA features"
+                    company_dependent="1"
+                    help="Automatically generate counterpart documents for orders/invoices between companies"
+                    groups="base.group_multi_company"
+                >
+                    <div>
+                        <div>
+                            <field name="company_share_product" />
                             <label
-                                string="Intercompany user for invoices"
+                                for="company_share_product"
+                                string="Common Product Catalog"
                                 class="o_light_label"
-                                for="intercompany_invoice_user_id"
                             />
-                            <field
-                                name="intercompany_invoice_user_id"
-                                class="oe_inline"
+                        </div>
+                    </div>
+                </setting>
+                <setting
+                    id="inter_company_oca_invoice"
+                    string="Invoicing"
+                    class="mt24"
+                    groups="base.group_multi_company"
+                >
+                    <div>
+                        <div>
+                            <label
+                                for="invoice_auto_validation"
+                                string="Intercompany user for invoices"
+                                class="o_light_label"
                             />
+                            <field name="intercompany_invoice_user_id" />
                         </div>
-                        <div id="inter_company_invoice_validation">
-                            <field name="invoice_auto_validation" class="oe_inline" />
+                        <div>
+                            <field name="invoice_auto_validation" />
                             <label
+                                for="invoice_auto_validation"
                                 string="Invoice Auto Validation"
                                 class="o_light_label"
-                                for="invoice_auto_validation"
                             />
                         </div>
                     </div>
-                </div>
-            </xpath>
-            <xpath
-                expr="//div[@id='inter_company']//field[@name='module_account_inter_company_rules']"
-                position="attributes"
-            >
-                <attribute name="attrs">{'invisible': True}</attribute>
-            </xpath>
-            <xpath
-                expr="//div[@id='inter_company']//label[@for='module_account_inter_company_rules']"
-                position="attributes"
-            >
-                <attribute name="attrs">{'invisible': True}</attribute>
-            </xpath>
-            <xpath
-                expr="//div[@id='inter_company']//field[@name='module_account_inter_company_rules']/../../div[2]/span"
-                position="attributes"
-            >
-                <attribute name="attrs">{'invisible': True}</attribute>
+                </setting>
             </xpath>
         </field>
     </record>