diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst index 3439dc79..6f74cf0b 100644 --- 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 +Invoicing > 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 index b0118b5a..e88c7575 100644 --- 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 index 2c5583e9..18e7ecda 100644 --- 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 index bcaf7c5e..567d67db 100644 --- 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 index 6f478d13..e27a90d0 100644 --- 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 index 4c9bf648..dad6553f 100644 --- 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 Invoicing \> 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 index c6926cc1..49b2b95a 100644 --- 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 index 84ac892c..8dcdfb19 100644 --- 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 index 54d3870c..177bbdad 100644 --- 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 @@ - account.payment.1099.report.pivot diff --git a/l10n_us_form_1099/static/description/index.html b/l10n_us_form_1099/static/description/index.html index 84ccb3d3..110f42bb 100644 --- a/l10n_us_form_1099/static/description/index.html +++ b/l10n_us_form_1099/static/description/index.html @@ -376,8 +376,8 @@

US Form 1099

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 +Invoicing > Reporting > 1099 Report.

You will still need to manage payment and IRS reporting separately.

Table of contents

@@ -413,7 +413,7 @@

Usage

  • Check the β€œIs a 1099” box
  • Select their 1099 type
  • If their type is 1099-MISC, you can select their box
    • -
  • Go to Invoicing > Bills > Vendors
    • +
  • Go to Invoicing > Vendors > Bills (or Payments)
  • Create vendor bills and payments for those 1099 vendors
  • Go to Invoicing > Reporting > 1099 Report
    • diff --git a/l10n_us_form_1099/views/box_1099_misc_view.xml b/l10n_us_form_1099/views/box_1099_misc_views.xml similarity index 96% rename from l10n_us_form_1099/views/box_1099_misc_view.xml rename to l10n_us_form_1099/views/box_1099_misc_views.xml index 6235442f..970cfc47 100644 --- a/l10n_us_form_1099/views/box_1099_misc_view.xml +++ b/l10n_us_form_1099/views/box_1099_misc_views.xml @@ -1,5 +1,5 @@ - view.box.1099.misc.form diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner_views.xml similarity index 59% rename from l10n_us_form_1099/views/res_partner.xml rename to l10n_us_form_1099/views/res_partner_views.xml index 8dd789be..3eee0ffd 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner_views.xml @@ -1,9 +1,9 @@ - - res_partner_view_form + res_partner_view_form - l10n_us_form_1099 res.partner @@ -12,15 +12,11 @@ position="before" > - + diff --git a/l10n_us_form_1099/views/type_1099_view.xml b/l10n_us_form_1099/views/type_1099_views.xml similarity index 93% rename from l10n_us_form_1099/views/type_1099_view.xml rename to l10n_us_form_1099/views/type_1099_views.xml index c63ab460..195bf5c1 100644 --- a/l10n_us_form_1099/views/type_1099_view.xml +++ b/l10n_us_form_1099/views/type_1099_views.xml @@ -1,6 +1,6 @@ - view.type.1099.form