[MIG] l10n_us_form_1099: Migration to 17.0

OCA · Apr 22, 2024 · f553669 · f553669
1 parent 6c428b5
commit f553669
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 34 deletions.
diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst
@@ -36,8 +36,8 @@ their payment to the IRS as a 1099?".
 This module extends the functionality of a partner and allows you to
 specify 1099 suppliers, their 1099 type and their 1099-MISC box.
 
-It also provide a report of payments by types and boxes in Accounting >
-Reporting > 1099 Report.
+It also provides a report of payments by vendors, types and boxes in
+Accounting > Reporting > 1099 Report.
 
 You will still need to manage payment and IRS reporting separately.
 
@@ -65,7 +65,7 @@ To use this module, you need to:
 4. Check the "Is a 1099" box
 5. Select their 1099 type
 6. If their type is 1099-MISC, you can select their box
-7. Go to Invoicing > Bills > Vendors
+7. Go to Invoicing > Vendors > Bills (or Payments)
 8. Create vendor bills and payments for those 1099 vendors
 9. Go to Invoicing > Reporting > 1099 Report
 

diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2017 Open Source Integrators
-# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2017-2024 Open Source Integrators
+# Copyright (C) 2019-2024 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     "name": "US Form 1099",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Open Source Integrators, "
     "Brian McMaster, "
     "Odoo Community Association (OCA)",
@@ -18,9 +18,9 @@
         "data/type_1099_data.xml",
         "data/box_1099_misc_data.xml",
         "security/ir.model.access.csv",
-        "views/type_1099_view.xml",
-        "views/box_1099_misc_view.xml",
-        "views/res_partner.xml",
+        "views/type_1099_views.xml",
+        "views/box_1099_misc_views.xml",
+        "views/res_partner_views.xml",
         "reports/account_payment_1099_report_views.xml",
     ],
     "installable": True,

diff --git a/l10n_us_form_1099/models/box_1099_misc.py b/l10n_us_form_1099/models/box_1099_misc.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019-2024 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2017 Open Source Integrators
-# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2017-2024 Open Source Integrators
+# Copyright (C) 2019-2024 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/l10n_us_form_1099/models/type_1099.py b/l10n_us_form_1099/models/type_1099.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Brian McMaster
+# Copyright (C) 2019-2024 Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/l10n_us_form_1099/readme/DESCRIPTION.md b/l10n_us_form_1099/readme/DESCRIPTION.md
@@ -6,7 +6,7 @@ their payment to the IRS as a 1099?".
 This module extends the functionality of a partner and allows you to
 specify 1099 suppliers, their 1099 type and their 1099-MISC box.
 
-It also provide a report of payments by types and boxes in Accounting \>
+It also provides a report of payments by vendors, types and boxes in Accounting \>
 Reporting \> 1099 Report.
 
 You will still need to manage payment and IRS reporting separately.
diff --git a/l10n_us_form_1099/readme/USAGE.md b/l10n_us_form_1099/readme/USAGE.md
@@ -6,6 +6,6 @@ To use this module, you need to:
 4.  Check the "Is a 1099" box
 5.  Select their 1099 type
 6.  If their type is 1099-MISC, you can select their box
-7.  Go to Invoicing \> Bills \> Vendors
+7.  Go to Invoicing \> Vendors \> Bills (or Payments)
 8.  Create vendor bills and payments for those 1099 vendors
 9.  Go to Invoicing \> Reporting \> 1099 Report
diff --git a/l10n_us_form_1099/reports/account_payment_1099_report.py b/l10n_us_form_1099/reports/account_payment_1099_report.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2019 Brian McMaster
-# Copyright (C) 2019 Open Source Integrators
+# Copyright (C) 2019-2024 Brian McMaster
+# Copyright (C) 2019-2024 Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from psycopg2.extensions import AsIs

diff --git a/l10n_us_form_1099/reports/account_payment_1099_report_views.xml b/l10n_us_form_1099/reports/account_payment_1099_report_views.xml
@@ -1,6 +1,6 @@
 <odoo>
-    <!-- Copyright (C) 2019 Brian McMaster
-         Copyright (C) 2019 Open Source Integrators
+    <!-- Copyright (C) 2019-2024 Brian McMaster
+         Copyright (C) 2019-2024 Open Source Integrators
          License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
     <record id="view_account_payment_report_1099_pivot" model="ir.ui.view">
         <field name="name">account.payment.1099.report.pivot</field>

diff --git a/l10n_us_form_1099/static/description/index.html b/l10n_us_form_1099/static/description/index.html
@@ -376,8 +376,8 @@ <h1 class="title">US Form 1099</h1>
 their payment to the IRS as a 1099?”.</p>
 <p>This module extends the functionality of a partner and allows you to
 specify 1099 suppliers, their 1099 type and their 1099-MISC box.</p>
-<p>It also provide a report of payments by types and boxes in Accounting &gt;
-Reporting &gt; 1099 Report.</p>
+<p>It also provides a report of payments by vendors, types and boxes in
+Accounting &gt; Reporting &gt; 1099 Report.</p>
 <p>You will still need to manage payment and IRS reporting separately.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -413,7 +413,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <li>Check the “Is a 1099” box</li>
 <li>Select their 1099 type</li>
 <li>If their type is 1099-MISC, you can select their box</li>
-<li>Go to Invoicing &gt; Bills &gt; Vendors</li>
+<li>Go to Invoicing &gt; Vendors &gt; Bills (or Payments)</li>
 <li>Create vendor bills and payments for those 1099 vendors</li>
 <li>Go to Invoicing &gt; Reporting &gt; 1099 Report</li>
 </ol>

diff --git a/...us_form_1099/views/box_1099_misc_view.xml → ...s_form_1099/views/box_1099_misc_views.xml b/...us_form_1099/views/box_1099_misc_view.xml → ...s_form_1099/views/box_1099_misc_views.xml
@@ -1,5 +1,5 @@
 <odoo>
-    <!-- Copyright (C) 2019 Open Source Integrators
+    <!-- Copyright (C) 2019-2024 Open Source Integrators
          License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
     <record id="view_box_1099_misc_form" model="ir.ui.view">
         <field name="name">view.box.1099.misc.form</field>

diff --git a/l10n_us_form_1099/views/res_partner.xml → ..._us_form_1099/views/res_partner_views.xml b/l10n_us_form_1099/views/res_partner.xml → ..._us_form_1099/views/res_partner_views.xml
@@ -1,9 +1,9 @@
 <odoo>
-    <!-- Copyright (C) 2017 Open Source Integrators
-         Copyright (C) 2019 Brian McMaster
+    <!-- Copyright (C) 2017-2024 Open Source Integrators
+         Copyright (C) 2019-2024 Brian McMaster
          License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
     <record id="res_partner_view_form" model="ir.ui.view">
-        <field name="name">res_partner_view_form</field>
+        <field name="name">res_partner_view_form - l10n_us_form_1099</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
@@ -12,15 +12,11 @@
                 position="before"
             >
                 <field name="is_1099" />
-                <field
-                    name="type_1099_id"
-                    widget="selection"
-                    attrs="{'invisible': [('is_1099', '=', False)]}"
-                />
+                <field name="type_1099_id" widget="selection" invisible="not is_1099" />
                 <field
                     name="box_1099_misc_id"
                     widget="selection"
-                    attrs="{'invisible': [('type_1099_id', '!=', %(l10n_us_form_1099.1099_type_misc)d)]}"
+                    invisible="type_1099_id != %(l10n_us_form_1099.1099_type_misc)d"
                 />
             </xpath>
         </field>

diff --git a/l10n_us_form_1099/views/type_1099_view.xml → l10n_us_form_1099/views/type_1099_views.xml b/l10n_us_form_1099/views/type_1099_view.xml → l10n_us_form_1099/views/type_1099_views.xml
@@ -1,6 +1,6 @@
 <odoo>
-    <!-- Copyright (C) 2019 Brian McMaster
-         Copyright (C) 2019 Open Source Integrators
+    <!-- Copyright (C) 2019-2024 Brian McMaster
+         Copyright (C) 2019-2024 Open Source Integrators
          License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
     <record id="view_type_1099_form" model="ir.ui.view">
         <field name="name">view.type.1099.form</field>