From 6b5458a514b2993cdea926a8e73d71ad8b7068c2 Mon Sep 17 00:00:00 2001 From: Jenny Wu Date: Fri, 9 Jun 2017 13:17:55 -0700 Subject: [PATCH 01/24] l10n_us_form_1099 --- l10n_us_form_1099/README.rst | 63 ++++++++++++++ l10n_us_form_1099/__init__.py | 5 ++ l10n_us_form_1099/__manifest__.py | 21 +++++ l10n_us_form_1099/models/__init__.py | 5 ++ l10n_us_form_1099/models/res_partner.py | 28 +++++++ .../static/description/l10n_us_form_1099.png | Bin 0 -> 9455 bytes .../static/description/l10n_us_form_1099.svg | 79 ++++++++++++++++++ l10n_us_form_1099/views/res_partner.xml | 17 ++++ 8 files changed, 218 insertions(+) create mode 100644 l10n_us_form_1099/README.rst create mode 100644 l10n_us_form_1099/__init__.py create mode 100644 l10n_us_form_1099/__manifest__.py create mode 100644 l10n_us_form_1099/models/__init__.py create mode 100644 l10n_us_form_1099/models/res_partner.py create mode 100644 l10n_us_form_1099/static/description/l10n_us_form_1099.png create mode 100644 l10n_us_form_1099/static/description/l10n_us_form_1099.svg create mode 100644 l10n_us_form_1099/views/res_partner.xml diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst new file mode 100644 index 00000000..002e0bd4 --- /dev/null +++ b/l10n_us_form_1099/README.rst @@ -0,0 +1,63 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============ +US Form 1099 +============ + +This module extends the functionality of res partner to support indicating 1099s. + +Usage +===== + +To use this module, you need to: + +#. Go to a partner and check the "Is a 1099?" box + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/203/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Jenny Wu + +Funders +------- + +The development of this module has been financially supported by: + +* Ursa Information Systems + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/l10n_us_form_1099/__init__.py b/l10n_us_form_1099/__init__.py new file mode 100644 index 00000000..de609015 --- /dev/null +++ b/l10n_us_form_1099/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Ursa Information Systems +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py new file mode 100644 index 00000000..4effc454 --- /dev/null +++ b/l10n_us_form_1099/__manifest__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Ursa Information Systems +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "l10n_us_form_1099", + "version": "10.0.1.0.0", + "author": "Ursa Information Systems, Odoo Community Association (OCA)", + "license": "AGPL-3", + "summary": "Add 1099 field to res.partner that will auto-check supplier", + "category": "Customers", + "maintainer": "Ursa Information Systems", + "website": "http://www.ursainfosystems.com", + "depends": ["base"], + "data": [ + "views/res_partner.xml", + ], + "qweb": [ + ], + "installable": True, +} diff --git a/l10n_us_form_1099/models/__init__.py b/l10n_us_form_1099/models/__init__.py new file mode 100644 index 00000000..a563cb28 --- /dev/null +++ b/l10n_us_form_1099/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Ursa Information Systems +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import res_partner diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py new file mode 100644 index 00000000..02d89bcc --- /dev/null +++ b/l10n_us_form_1099/models/res_partner.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Ursa Information Systems +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + is1099 = fields.Boolean('Is a 1099') + supplier = fields.Boolean(string='Is a Vendor', + help="Check this box if\ + contact is a vendor." + "If not checked, purchase people will\ + not see it when encoding purchase order.") + + @api.onchange('is1099') + def _on_change_is1099(self): + + if self.is1099 and not self.supplier: + self.supplier = True + + @api.onchange('supplier') + def _on_change_supplier(self): + + if self.is1099 and not self.supplier: + self.is1099 = False diff --git a/l10n_us_form_1099/static/description/l10n_us_form_1099.png b/l10n_us_form_1099/static/description/l10n_us_form_1099.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/l10n_us_form_1099/static/description/l10n_us_form_1099.svg b/l10n_us_form_1099/static/description/l10n_us_form_1099.svg new file mode 100644 index 00000000..a7a26d09 --- /dev/null +++ b/l10n_us_form_1099/static/description/l10n_us_form_1099.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml new file mode 100644 index 00000000..bacd7e1c --- /dev/null +++ b/l10n_us_form_1099/views/res_partner.xml @@ -0,0 +1,17 @@ + + + + + res_partner_view_form + res.partner + + + + + + + + + + + From 684e8326d9b31660241d9305a18c5babfdb33c2b Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 1 Jul 2017 06:21:12 +0200 Subject: [PATCH 02/24] OCA Transbot updated translations from Transifex --- l10n_us_form_1099/i18n/nl_NL.po | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 l10n_us_form_1099/i18n/nl_NL.po diff --git a/l10n_us_form_1099/i18n/nl_NL.po b/l10n_us_form_1099/i18n/nl_NL.po new file mode 100644 index 00000000..ee30b44c --- /dev/null +++ b/l10n_us_form_1099/i18n/nl_NL.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_us_form_1099 +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-27 02:45+0000\n" +"PO-Revision-Date: 2017-06-27 02:45+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner_is1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users_is1099 +msgid "Is a 1099" +msgstr "Is een 1099" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_res_partner +msgid "Partner" +msgstr "Relatie" From 484dbf6f2a2845932c4dbd03806a482aa5929a40 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Tue, 5 Dec 2017 17:05:41 -0600 Subject: [PATCH 03/24] l10n_us_form_1099: Migration to 11.0 --- l10n_us_form_1099/README.rst | 26 ++++++++++++++---- l10n_us_form_1099/__init__.py | 3 +- l10n_us_form_1099/__manifest__.py | 17 +++++------- l10n_us_form_1099/models/__init__.py | 3 +- l10n_us_form_1099/models/res_partner.py | 20 +++++--------- .../{l10n_us_form_1099.png => icon.png} | Bin l10n_us_form_1099/tests/__init__.py | 4 +++ .../tests/test_l10n_us_form_1099.py | 25 +++++++++++++++++ l10n_us_form_1099/views/res_partner.xml | 2 +- 9 files changed, 67 insertions(+), 33 deletions(-) rename l10n_us_form_1099/static/description/{l10n_us_form_1099.png => icon.png} (100%) create mode 100644 l10n_us_form_1099/tests/__init__.py create mode 100644 l10n_us_form_1099/tests/test_l10n_us_form_1099.py diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst index 002e0bd4..c1da3221 100644 --- a/l10n_us_form_1099/README.rst +++ b/l10n_us_form_1099/README.rst @@ -1,4 +1,4 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 @@ -6,18 +6,33 @@ US Form 1099 ============ -This module extends the functionality of res partner to support indicating 1099s. +When companies hire others as contractors, the contractor in question may +work for themselves, another company or be the whole other company. This +is a huge range, but it can be simplified down to "do I report their +payment to the IRS as a 1099?". + +This module extends the functionality of a partner and allow you to specify 1099 suppliers. + +You will still need to manage payment and IRS reporting separately. Usage ===== To use this module, you need to: -#. Go to a partner and check the "Is a 1099?" box +#. Go to Contacts +#. Create or select a partner +#. Go to the Sales & Purchases tab +#. Check the "Is a 1099" box .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/203/10.0 + :target: https://runbot.odoo-community.org/runbot/203/11.0 + +Known issues / Roadmap +====================== + +* Add unit tests Bug Tracker =========== @@ -39,13 +54,14 @@ Contributors ------------ * Jenny Wu +* Maxime Chambreuil Funders ------- The development of this module has been financially supported by: -* Ursa Information Systems +* Open Source Integrators Maintainer ---------- diff --git a/l10n_us_form_1099/__init__.py b/l10n_us_form_1099/__init__.py index de609015..c13193f2 100644 --- a/l10n_us_form_1099/__init__.py +++ b/l10n_us_form_1099/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Ursa Information Systems +# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index 4effc454..d34185c0 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -1,21 +1,18 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Ursa Information Systems +# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - "name": "l10n_us_form_1099", - "version": "10.0.1.0.0", - "author": "Ursa Information Systems, Odoo Community Association (OCA)", + "name": "US Form 1099", + "version": "11.0.1.0.0", + "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", "summary": "Add 1099 field to res.partner that will auto-check supplier", "category": "Customers", - "maintainer": "Ursa Information Systems", - "website": "http://www.ursainfosystems.com", - "depends": ["base"], + "maintainer": "Open Source Integrators", + "website": "https://www.opensourceintegrators.com", + "depends": ["contacts"], "data": [ "views/res_partner.xml", ], - "qweb": [ - ], "installable": True, } diff --git a/l10n_us_form_1099/models/__init__.py b/l10n_us_form_1099/models/__init__.py index a563cb28..957954b5 100644 --- a/l10n_us_form_1099/models/__init__.py +++ b/l10n_us_form_1099/models/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Ursa Information Systems +# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import res_partner diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py index 02d89bcc..ae4dd30b 100644 --- a/l10n_us_form_1099/models/res_partner.py +++ b/l10n_us_form_1099/models/res_partner.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Ursa Information Systems +# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models @@ -8,21 +7,16 @@ class ResPartner(models.Model): _inherit = "res.partner" - is1099 = fields.Boolean('Is a 1099') - supplier = fields.Boolean(string='Is a Vendor', - help="Check this box if\ - contact is a vendor." - "If not checked, purchase people will\ - not see it when encoding purchase order.") + is_1099 = fields.Boolean('Is a 1099') - @api.onchange('is1099') - def _on_change_is1099(self): + @api.onchange('is_1099') + def _on_change_is_1099(self): - if self.is1099 and not self.supplier: + if self.is_1099 and not self.supplier: self.supplier = True @api.onchange('supplier') def _on_change_supplier(self): - if self.is1099 and not self.supplier: - self.is1099 = False + if self.is_1099 and not self.supplier: + self.is_1099 = False diff --git a/l10n_us_form_1099/static/description/l10n_us_form_1099.png b/l10n_us_form_1099/static/description/icon.png similarity index 100% rename from l10n_us_form_1099/static/description/l10n_us_form_1099.png rename to l10n_us_form_1099/static/description/icon.png diff --git a/l10n_us_form_1099/tests/__init__.py b/l10n_us_form_1099/tests/__init__.py new file mode 100644 index 00000000..28db6149 --- /dev/null +++ b/l10n_us_form_1099/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2018 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_l10n_us_form_1099 diff --git a/l10n_us_form_1099/tests/test_l10n_us_form_1099.py b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py new file mode 100644 index 00000000..0067511e --- /dev/null +++ b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py @@ -0,0 +1,25 @@ +# Copyright 2018 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestL10nUsForm1099(TransactionCase): + + def test_on_change_is_1099(self): + """ + Test that supplier is True if is_1099 is True + """ + partner = self.env.ref('base.res_partner_2') + partner.is_1099 = True + partner._on_change_is_1099() + self.assertEquals(partner.supplier, True) + + def test_on_change_supplier(self): + """ + Test that is_1099 is False if supplier is False + """ + partner = self.env.ref('base.res_partner_2') + partner.supplier = False + partner._on_change_supplier() + self.assertEquals(partner.is_1099, False) diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index bacd7e1c..90ac686e 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -8,7 +8,7 @@ - + From 0438f1795b9a9cf7d828392fac71c389c3f38976 Mon Sep 17 00:00:00 2001 From: Nikul Chaudhary Date: Fri, 16 Nov 2018 12:36:13 +0530 Subject: [PATCH 04/24] [MIG] Migrated l10n_us_form_1099 v11 to v12 --- l10n_us_form_1099/README.rst | 3 ++- l10n_us_form_1099/__init__.py | 1 - l10n_us_form_1099/__manifest__.py | 8 +++++--- l10n_us_form_1099/models/__init__.py | 1 - l10n_us_form_1099/models/res_partner.py | 4 +--- l10n_us_form_1099/tests/__init__.py | 1 - l10n_us_form_1099/tests/test_l10n_us_form_1099.py | 4 ++-- l10n_us_form_1099/views/res_partner.xml | 8 +++----- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst index c1da3221..82737e7c 100644 --- a/l10n_us_form_1099/README.rst +++ b/l10n_us_form_1099/README.rst @@ -27,7 +27,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/203/11.0 + :target: https://runbot.odoo-community.org/runbot/203/12.0 Known issues / Roadmap ====================== @@ -55,6 +55,7 @@ Contributors * Jenny Wu * Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. Funders ------- diff --git a/l10n_us_form_1099/__init__.py b/l10n_us_form_1099/__init__.py index c13193f2..69f7babd 100644 --- a/l10n_us_form_1099/__init__.py +++ b/l10n_us_form_1099/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index d34185c0..af8c3492 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -3,14 +3,16 @@ { "name": "US Form 1099", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", "summary": "Add 1099 field to res.partner that will auto-check supplier", "category": "Customers", "maintainer": "Open Source Integrators", - "website": "https://www.opensourceintegrators.com", - "depends": ["contacts"], + "website": "https://github.com/OCA/l10n-usa", + "depends": [ + "contacts" + ], "data": [ "views/res_partner.xml", ], diff --git a/l10n_us_form_1099/models/__init__.py b/l10n_us_form_1099/models/__init__.py index 957954b5..88fed283 100644 --- a/l10n_us_form_1099/models/__init__.py +++ b/l10n_us_form_1099/models/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2017 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import res_partner diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py index ae4dd30b..a9d52a73 100644 --- a/l10n_us_form_1099/models/res_partner.py +++ b/l10n_us_form_1099/models/res_partner.py @@ -7,16 +7,14 @@ class ResPartner(models.Model): _inherit = "res.partner" - is_1099 = fields.Boolean('Is a 1099') + is_1099 = fields.Boolean('Is a 1099?') @api.onchange('is_1099') def _on_change_is_1099(self): - if self.is_1099 and not self.supplier: self.supplier = True @api.onchange('supplier') def _on_change_supplier(self): - if self.is_1099 and not self.supplier: self.is_1099 = False diff --git a/l10n_us_form_1099/tests/__init__.py b/l10n_us_form_1099/tests/__init__.py index 28db6149..a06ceb59 100644 --- a/l10n_us_form_1099/tests/__init__.py +++ b/l10n_us_form_1099/tests/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2018 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import test_l10n_us_form_1099 diff --git a/l10n_us_form_1099/tests/test_l10n_us_form_1099.py b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py index 0067511e..ca619774 100644 --- a/l10n_us_form_1099/tests/test_l10n_us_form_1099.py +++ b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py @@ -13,7 +13,7 @@ def test_on_change_is_1099(self): partner = self.env.ref('base.res_partner_2') partner.is_1099 = True partner._on_change_is_1099() - self.assertEquals(partner.supplier, True) + self.assertTrue(partner.supplier) def test_on_change_supplier(self): """ @@ -22,4 +22,4 @@ def test_on_change_supplier(self): partner = self.env.ref('base.res_partner_2') partner.supplier = False partner._on_change_supplier() - self.assertEquals(partner.is_1099, False) + self.assertFalse(partner.is_1099) diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index 90ac686e..b4fe8d9b 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -6,11 +6,9 @@ res.partner - - - - - + + + From 51a59da4c04d959f3726c3c57abde8a58f1d9677 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 21 Nov 2018 08:54:32 +0000 Subject: [PATCH 05/24] [UPD] Update l10n_us_form_1099.pot --- l10n_us_form_1099/i18n/l10n_us_form_1099.pot | 25 ++++++++++++++++++++ l10n_us_form_1099/i18n/nl_NL.po | 24 +++++++++++-------- 2 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 l10n_us_form_1099/i18n/l10n_us_form_1099.pot diff --git a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot new file mode 100644 index 00000000..a8f52a35 --- /dev/null +++ b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_us_form_1099 +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_res_partner +msgid "Contact" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__is_1099 +msgid "Is a 1099?" +msgstr "" + diff --git a/l10n_us_form_1099/i18n/nl_NL.po b/l10n_us_form_1099/i18n/nl_NL.po index ee30b44c..e40e5c8c 100644 --- a/l10n_us_form_1099/i18n/nl_NL.po +++ b/l10n_us_form_1099/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * l10n_us_form_1099 -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,20 +11,24 @@ msgstr "" "POT-Creation-Date: 2017-06-27 02:45+0000\n" "PO-Revision-Date: 2017-06-27 02:45+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: l10n_us_form_1099 -#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner_is1099 -#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users_is1099 -msgid "Is a 1099" -msgstr "Is een 1099" +#: model:ir.model,name:l10n_us_form_1099.model_res_partner +msgid "Contact" +msgstr "" #. module: l10n_us_form_1099 -#: model:ir.model,name:l10n_us_form_1099.model_res_partner -msgid "Partner" -msgstr "Relatie" +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__is_1099 +#, fuzzy +msgid "Is a 1099?" +msgstr "Is een 1099" + +#~ msgid "Partner" +#~ msgstr "Relatie" From 44cbcad7e168b2765139ccebff188abac61a7e90 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 5 Jul 2019 14:56:48 +0000 Subject: [PATCH 06/24] [UPD] Update l10n_us_form_1099.pot --- l10n_us_form_1099/i18n/l10n_us_form_1099.pot | 1 + 1 file changed, 1 insertion(+) diff --git a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot index a8f52a35..3474b37f 100644 --- a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot +++ b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot @@ -20,6 +20,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__is_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__is_1099 msgid "Is a 1099?" msgstr "" From 6005cf8660ba60be329def637f649dee38b1e369 Mon Sep 17 00:00:00 2001 From: brian10048 Date: Fri, 12 Jul 2019 21:25:38 -0400 Subject: [PATCH 07/24] [IMP] l10us_form_1099 --- l10n_us_form_1099/models/res_partner.py | 24 ++++++++++++++++++++++++ l10n_us_form_1099/views/res_partner.xml | 1 + 2 files changed, 25 insertions(+) diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py index a9d52a73..2b6c9e86 100644 --- a/l10n_us_form_1099/models/res_partner.py +++ b/l10n_us_form_1099/models/res_partner.py @@ -4,10 +4,34 @@ from odoo import api, fields, models +TYPES_1099 = [ + ('a', "1099-A"), + ('b', "1099-B"), + ('c', "1099-C"), + ('cap', "1099-CAP"), + ('div', "1099-DIV"), + ('g', "1099-G"), + ('h', "1099-H"), + ('int', "1099-INT"), + ('k', "1099-K"), + ('ltc', "1099-LTC"), + ('misc', "1099-MISC"), + ('oid', "1099-OID"), + ('pair', "1099-PATR"), + ('q', "1099-Q"), + ('r', "1099-R"), + ('s', "1099-S"), + ('sa', "1099-SA"), + ('rrb', "RRB-1099"), + ('ssa', "SSA-1099"), +] + class ResPartner(models.Model): _inherit = "res.partner" is_1099 = fields.Boolean('Is a 1099?') + type_1099 = fields.Selection( + TYPES_1099, string='1099 Type') @api.onchange('is_1099') def _on_change_is_1099(self): diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index b4fe8d9b..a2831001 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -8,6 +8,7 @@ + From e5ccb145d263473baa4e3f1c67bbb62c6a56fc38 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Wed, 17 Jul 2019 13:29:23 +0530 Subject: [PATCH 08/24] [ADD] Following points: - Add a new object 'type.1099' with a char field 'Name', - Add a many2one field '1099 Type' on res.partner to type.1099, - Add data for type.1099 with: 1099-A, 1099-B, 1099-C, 1099-CAP, 1099-DIV, 1099-G, 1099-H, 1099-INT, 1099-K, 1099-LTC, 1099-MISC, 1099-OID, 1099-PATR, 1099-Q, 1099-R, 1099-S, 1099-SA, RRB-1099 and SSA-1099 - Add security for new object --- l10n_us_form_1099/README.rst | 10 ++- l10n_us_form_1099/__manifest__.py | 3 + l10n_us_form_1099/data/type_1099_data.xml | 80 +++++++++++++++++++ l10n_us_form_1099/models/__init__.py | 1 + l10n_us_form_1099/models/res_partner.py | 25 +----- l10n_us_form_1099/models/type_1099.py | 11 +++ .../security/ir.model.access.csv | 3 + l10n_us_form_1099/views/res_partner.xml | 2 +- l10n_us_form_1099/views/type_1099_view.xml | 46 +++++++++++ 9 files changed, 155 insertions(+), 26 deletions(-) create mode 100644 l10n_us_form_1099/data/type_1099_data.xml create mode 100644 l10n_us_form_1099/models/type_1099.py create mode 100644 l10n_us_form_1099/security/ir.model.access.csv create mode 100644 l10n_us_form_1099/views/type_1099_view.xml diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst index 82737e7c..6ef66568 100644 --- a/l10n_us_form_1099/README.rst +++ b/l10n_us_form_1099/README.rst @@ -11,10 +11,17 @@ work for themselves, another company or be the whole other company. This is a huge range, but it can be simplified down to "do I report their payment to the IRS as a 1099?". -This module extends the functionality of a partner and allow you to specify 1099 suppliers. +This module extends the functionality of a partner and allow you to specify +1099 suppliers and 1099 types. You will still need to manage payment and IRS reporting separately. +Configuration +============= + +#. Go to Contacts > Configuration > 1099 Type +#. Create 1099 Type like 1099-A, 1099-B, 1099-xxx. + Usage ===== @@ -56,6 +63,7 @@ Contributors * Jenny Wu * Maxime Chambreuil * Serpent Consulting Services Pvt. Ltd. +* Bhavesh Odedra Funders ------- diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index af8c3492..051b6c0d 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -14,6 +14,9 @@ "contacts" ], "data": [ + "security/ir.model.access.csv", + "data/type_1099_data.xml", + "views/type_1099_view.xml", "views/res_partner.xml", ], "installable": True, diff --git a/l10n_us_form_1099/data/type_1099_data.xml b/l10n_us_form_1099/data/type_1099_data.xml new file mode 100644 index 00000000..fff806cd --- /dev/null +++ b/l10n_us_form_1099/data/type_1099_data.xml @@ -0,0 +1,80 @@ + + + + + 1099-A + + + + 1099-B + + + + 1099-C + + + + 1099-CAP + + + + 1099-DIV + + + + 1099-G + + + + 1099-H + + + + 1099-INT + + + + 1099-K + + + + 1099-LTC + + + + 1099-MISC + + + + 1099-OID + + + + 1099-PATR + + + + 1099-Q + + + + 1099-R + + + + 1099-S + + + + 1099-SA + + + + RRB-1099 + + + + SSA-1099 + + + diff --git a/l10n_us_form_1099/models/__init__.py b/l10n_us_form_1099/models/__init__.py index 88fed283..a0015542 100644 --- a/l10n_us_form_1099/models/__init__.py +++ b/l10n_us_form_1099/models/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import type_1099 from . import res_partner diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py index 2b6c9e86..d244319c 100644 --- a/l10n_us_form_1099/models/res_partner.py +++ b/l10n_us_form_1099/models/res_partner.py @@ -4,34 +4,11 @@ from odoo import api, fields, models -TYPES_1099 = [ - ('a', "1099-A"), - ('b', "1099-B"), - ('c', "1099-C"), - ('cap', "1099-CAP"), - ('div', "1099-DIV"), - ('g', "1099-G"), - ('h', "1099-H"), - ('int', "1099-INT"), - ('k', "1099-K"), - ('ltc', "1099-LTC"), - ('misc', "1099-MISC"), - ('oid', "1099-OID"), - ('pair', "1099-PATR"), - ('q', "1099-Q"), - ('r', "1099-R"), - ('s', "1099-S"), - ('sa', "1099-SA"), - ('rrb', "RRB-1099"), - ('ssa', "SSA-1099"), -] - class ResPartner(models.Model): _inherit = "res.partner" is_1099 = fields.Boolean('Is a 1099?') - type_1099 = fields.Selection( - TYPES_1099, string='1099 Type') + type_1099_id = fields.Many2one('type.1099', string='1099 Type') @api.onchange('is_1099') def _on_change_is_1099(self): diff --git a/l10n_us_form_1099/models/type_1099.py b/l10n_us_form_1099/models/type_1099.py new file mode 100644 index 00000000..97f8d417 --- /dev/null +++ b/l10n_us_form_1099/models/type_1099.py @@ -0,0 +1,11 @@ +# Copyright (C) 2019 - TODAY, Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from odoo import fields, models + + +class Type1099(models.Model): + _name = 'type.1099' + _description = '1099 Type' + + name = fields.Char() diff --git a/l10n_us_form_1099/security/ir.model.access.csv b/l10n_us_form_1099/security/ir.model.access.csv new file mode 100644 index 00000000..42e745af --- /dev/null +++ b/l10n_us_form_1099/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_type_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 +access_type_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index a2831001..e8787840 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -8,7 +8,7 @@ - + diff --git a/l10n_us_form_1099/views/type_1099_view.xml b/l10n_us_form_1099/views/type_1099_view.xml new file mode 100644 index 00000000..5f0f84b3 --- /dev/null +++ b/l10n_us_form_1099/views/type_1099_view.xml @@ -0,0 +1,46 @@ + + + + view.type.1099.form + type.1099 + form + +
+ + + + + + + +
+
+
+ + + + type.1099.tree + type.1099 + + + + + + + + + 1099 Type + type.1099 + ir.actions.act_window + form + tree,form + + + + +
From af32e0f857dbce7382d6bb274e3b32103859dfa2 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Wed, 17 Jul 2019 17:33:56 +0530 Subject: [PATCH 09/24] [FIX] CI, make unique ID for access right --- l10n_us_form_1099/security/ir.model.access.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_form_1099/security/ir.model.access.csv b/l10n_us_form_1099/security/ir.model.access.csv index 42e745af..1b4be20b 100644 --- a/l10n_us_form_1099/security/ir.model.access.csv +++ b/l10n_us_form_1099/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_type_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 -access_type_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 +access_type_user_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 +access_type_system_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 From b1658e29a2437489aced65d949ea28836770e2fd Mon Sep 17 00:00:00 2001 From: brian10048 Date: Wed, 17 Jul 2019 08:30:22 -0400 Subject: [PATCH 10/24] [IMP] start of 1099 report --- l10n_us_form_1099/__init__.py | 1 + l10n_us_form_1099/__manifest__.py | 8 ++- l10n_us_form_1099/reports/__init__.py | 3 + .../reports/account_payment_1099_report.py | 55 +++++++++++++++++ .../account_payment_1099_report_views.xml | 60 +++++++++++++++++++ .../security/ir.model.access.csv | 2 + 6 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 l10n_us_form_1099/reports/__init__.py create mode 100644 l10n_us_form_1099/reports/account_payment_1099_report.py create mode 100644 l10n_us_form_1099/reports/account_payment_1099_report_views.xml diff --git a/l10n_us_form_1099/__init__.py b/l10n_us_form_1099/__init__.py index 69f7babd..f3fa6d83 100644 --- a/l10n_us_form_1099/__init__.py +++ b/l10n_us_form_1099/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models +from . import reports diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index 051b6c0d..2c287db0 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -6,18 +6,22 @@ "version": "12.0.1.0.0", "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", - "summary": "Add 1099 field to res.partner that will auto-check supplier", + "summary": """Add 1099 field to res.partner that will auto-check supplier + and aid in reporting payments to these 1099 partners for US + tax purposes""", "category": "Customers", "maintainer": "Open Source Integrators", "website": "https://github.com/OCA/l10n-usa", "depends": [ - "contacts" + "contacts", + "account", ], "data": [ "security/ir.model.access.csv", "data/type_1099_data.xml", "views/type_1099_view.xml", "views/res_partner.xml", + "reports/account_payment_1099_report.xml", ], "installable": True, } diff --git a/l10n_us_form_1099/reports/__init__.py b/l10n_us_form_1099/reports/__init__.py new file mode 100644 index 00000000..253195b7 --- /dev/null +++ b/l10n_us_form_1099/reports/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import account_payment_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 new file mode 100644 index 00000000..6f6b46b8 --- /dev/null +++ b/l10n_us_form_1099/reports/account_payment_1099_report.py @@ -0,0 +1,55 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, fields, api, tools + + +class AccountPayment1099Report(models.Model): + _name = "account.payment.1099.report" + _description = "1099 Payment Statistics" + _auto = False + + date = fields.Date('Payment Date', readonly=True) + amount = fields.Float('Payment Amount', readonly=True) + vendor_id = fields.Many2one('res.partner', 'Vendor',readonly=True) + type_1099 = fields.Char('1099 Type', readonly=True) + + def _select(self): + return """ + SELECT + pmt.id AS id, + pmt.payment_date AS date, + pmt.amount AS amount, + v.id AS vendor_id, + v.type_1099_id AS type_1099 + """ + + def _from(self): + return """ + FROM account_payment AS pmt + """ + + def _join(self): + return """ + JOIN res_partner AS v ON pmt.partner_id = v.id + """ + + def _where(self): + return """ + WHERE + v.is_1099 = TRUE + """ + + @api.model_cr + def init(self): + tools.drop_view_if_exists(self._cr, self._table) + self._cr.execute(""" + CREATE OR REPLACE VIEW %s AS ( + %s + %s + %s + %s + ) + """ % (self._table, self._select(), self._from(), + self._join(), self._where()) + ) 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 new file mode 100644 index 00000000..ae0f94dd --- /dev/null +++ b/l10n_us_form_1099/reports/account_payment_1099_report_views.xml @@ -0,0 +1,60 @@ + + + + + + account.payment.1099.report.pivot + account.payment.1099.report + + + + + + + + + + + account.payment.1099.report.graph + account.payment.1099.report + + + + + + + + + + + account.payment.1099.report.search + account.payment.1099.report + + + + + + + + + + + + + + 1099 Payment Analysis + account.payment.1099.report + form + pivot,graph + + From this report, you can have an overview of the amount paid to your 1099 vendors. + + + + + + diff --git a/l10n_us_form_1099/security/ir.model.access.csv b/l10n_us_form_1099/security/ir.model.access.csv index 1b4be20b..4c070893 100644 --- a/l10n_us_form_1099/security/ir.model.access.csv +++ b/l10n_us_form_1099/security/ir.model.access.csv @@ -1,3 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_type_user_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 access_type_system_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 +access_account_payment_1099_report_user,account_payment_1099_report,model_account_payment_1099_report,account.group_account_user,1,0,0,0 +access_account_payment_1099_report_manager,account_payment_1099_report,model_account_payment_1099_report,account.group_account_manager,1,1,1,1 \ No newline at end of file From 1e34b6e57080b31968d8666ee8a3193c55dffffc Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Wed, 17 Jul 2019 18:40:58 +0530 Subject: [PATCH 11/24] [FIX] travis and CI, change Char to Many2one type_1099 field in SQL report --- l10n_us_form_1099/__manifest__.py | 2 +- l10n_us_form_1099/reports/account_payment_1099_report.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index 2c287db0..18a1f0bd 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -21,7 +21,7 @@ "data/type_1099_data.xml", "views/type_1099_view.xml", "views/res_partner.xml", - "reports/account_payment_1099_report.xml", + "reports/account_payment_1099_report_views.xml", ], "installable": True, } 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 6f6b46b8..1d6bf955 100644 --- a/l10n_us_form_1099/reports/account_payment_1099_report.py +++ b/l10n_us_form_1099/reports/account_payment_1099_report.py @@ -1,7 +1,7 @@ # Copyright 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields, api, tools +from odoo import api, fields, models, tools class AccountPayment1099Report(models.Model): @@ -11,8 +11,8 @@ class AccountPayment1099Report(models.Model): date = fields.Date('Payment Date', readonly=True) amount = fields.Float('Payment Amount', readonly=True) - vendor_id = fields.Many2one('res.partner', 'Vendor',readonly=True) - type_1099 = fields.Char('1099 Type', readonly=True) + vendor_id = fields.Many2one('res.partner', 'Vendor', readonly=True) + type_1099 = fields.Many2one('type.1099', '1099 Type', readonly=True) def _select(self): return """ From 3f117b533850865df5b66013f56874a58fb468ca Mon Sep 17 00:00:00 2001 From: brian10048 Date: Wed, 17 Jul 2019 09:28:21 -0400 Subject: [PATCH 12/24] [FIX] data and manifest Remove noupdate for 1099 data Shorten summary in manifest --- l10n_us_form_1099/__manifest__.py | 4 +--- l10n_us_form_1099/data/type_1099_data.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index 18a1f0bd..5dd81aae 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -6,9 +6,7 @@ "version": "12.0.1.0.0", "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", - "summary": """Add 1099 field to res.partner that will auto-check supplier - and aid in reporting payments to these 1099 partners for US - tax purposes""", + "summary": "Manage 1099 Types and Suppliers", "category": "Customers", "maintainer": "Open Source Integrators", "website": "https://github.com/OCA/l10n-usa", diff --git a/l10n_us_form_1099/data/type_1099_data.xml b/l10n_us_form_1099/data/type_1099_data.xml index fff806cd..e88c797f 100644 --- a/l10n_us_form_1099/data/type_1099_data.xml +++ b/l10n_us_form_1099/data/type_1099_data.xml @@ -1,5 +1,5 @@ - + 1099-A From 849ab3bc56900941bcfc3a4498407ab8ea709814 Mon Sep 17 00:00:00 2001 From: brian10048 Date: Wed, 17 Jul 2019 09:53:21 -0400 Subject: [PATCH 13/24] [IMP] review comments --- l10n_us_form_1099/security/ir.model.access.csv | 2 +- l10n_us_form_1099/views/res_partner.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_form_1099/security/ir.model.access.csv b/l10n_us_form_1099/security/ir.model.access.csv index 4c070893..da58902b 100644 --- a/l10n_us_form_1099/security/ir.model.access.csv +++ b/l10n_us_form_1099/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_type_user_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 access_type_system_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 access_account_payment_1099_report_user,account_payment_1099_report,model_account_payment_1099_report,account.group_account_user,1,0,0,0 -access_account_payment_1099_report_manager,account_payment_1099_report,model_account_payment_1099_report,account.group_account_manager,1,1,1,1 \ No newline at end of file +access_account_payment_1099_report_manager,account_payment_1099_report,model_account_payment_1099_report,account.group_account_manager,1,1,1,1 diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index e8787840..8e116974 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -8,7 +8,7 @@ - + From 55ada6695d61f69fe3e06fd8d2941df1959425fc Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 17 Jul 2019 14:37:51 +0000 Subject: [PATCH 14/24] [UPD] Update l10n_us_form_1099.pot --- l10n_us_form_1099/i18n/l10n_us_form_1099.pot | 104 +++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot index 3474b37f..85b655f2 100644 --- a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot +++ b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot @@ -13,14 +13,118 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_account_payment_report_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_report_1099_graph +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_report_1099_pivot +msgid "1099 Payment Analysis" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_account_payment_1099_report +msgid "1099 Payment Statistics" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.ui.menu,name:l10n_us_form_1099.menu_action_account_payment_report_1099 +msgid "1099 Reports" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view +#: model:ir.model,name:l10n_us_form_1099.model_type_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__type_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__type_1099_id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__type_1099_id +#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_form +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree +msgid "1099 Type" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model,name:l10n_us_form_1099.model_res_partner msgid "Contact" msgstr "" +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_uid +msgid "Created by" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_date +msgid "Created on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +msgid "Date" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__display_name +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__display_name +msgid "Display Name" +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.actions.act_window,help:l10n_us_form_1099.action_account_payment_report_1099 +msgid "From this report, you can have an overview of the amount paid to your 1099 vendors." +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +msgid "Group By" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__id +msgid "ID" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__is_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__is_1099 msgid "Is a 1099?" msgstr "" +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report____last_update +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099____last_update +msgid "Last Modified on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_date +msgid "Last Updated on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__name +msgid "Name" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__amount +msgid "Payment Amount" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__date +msgid "Payment Date" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__vendor_id +msgid "Vendor" +msgstr "" + From bc4258c6267c007e382ce362c7c700285f29d11e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 17 Jul 2019 15:15:01 +0000 Subject: [PATCH 15/24] l10n_us_form_1099 12.0.1.1.0 --- l10n_us_form_1099/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index 5dd81aae..b22ead5c 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -3,7 +3,7 @@ { "name": "US Form 1099", - "version": "12.0.1.0.0", + "version": "12.0.1.1.0", "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", "summary": "Manage 1099 Types and Suppliers", From bfd7397661982997f0baaf25b9935fd046efb746 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 20 Jul 2019 12:05:07 +0000 Subject: [PATCH 16/24] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: l10n-usa-12.0/l10n-usa-12.0-l10n_us_form_1099 Translate-URL: https://translation.odoo-community.org/projects/l10n-usa-12-0/l10n-usa-12-0-l10n_us_form_1099/ --- l10n_us_form_1099/i18n/nl_NL.po | 107 ++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/l10n_us_form_1099/i18n/nl_NL.po b/l10n_us_form_1099/i18n/nl_NL.po index e40e5c8c..b29f9868 100644 --- a/l10n_us_form_1099/i18n/nl_NL.po +++ b/l10n_us_form_1099/i18n/nl_NL.po @@ -19,16 +19,123 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_account_payment_report_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_report_1099_graph +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_report_1099_pivot +msgid "1099 Payment Analysis" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_account_payment_1099_report +msgid "1099 Payment Statistics" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.ui.menu,name:l10n_us_form_1099.menu_action_account_payment_report_1099 +msgid "1099 Reports" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view +#: model:ir.model,name:l10n_us_form_1099.model_type_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__type_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__type_1099_id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__type_1099_id +#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_form +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree +msgid "1099 Type" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model,name:l10n_us_form_1099.model_res_partner msgid "Contact" msgstr "" +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_uid +msgid "Created by" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_date +msgid "Created on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +msgid "Date" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__display_name +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__display_name +msgid "Display Name" +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.actions.act_window,help:l10n_us_form_1099.action_account_payment_report_1099 +msgid "" +"From this report, you can have an overview of the amount paid to your 1099 " +"vendors." +msgstr "" + +#. module: l10n_us_form_1099 +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +msgid "Group By" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__id +msgid "ID" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__is_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__is_1099 #, fuzzy msgid "Is a 1099?" msgstr "Is een 1099" +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report____last_update +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099____last_update +msgid "Last Modified on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_date +msgid "Last Updated on" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__name +msgid "Name" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__amount +msgid "Payment Amount" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__date +msgid "Payment Date" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__vendor_id +msgid "Vendor" +msgstr "" + #~ msgid "Partner" #~ msgstr "Relatie" From 950dc4decee7a5fff1cf1ed7eea20c150fb47d31 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 19 Jul 2019 13:59:58 -0500 Subject: [PATCH 17/24] [IMP] l10n_us_form_1099: Add 1099-MISC boxes --- l10n_us_form_1099/__init__.py | 2 + l10n_us_form_1099/__manifest__.py | 13 +- l10n_us_form_1099/data/box_1099_misc_data.xml | 79 +++++++++++++ l10n_us_form_1099/data/type_1099_data.xml | 1 - l10n_us_form_1099/models/__init__.py | 9 +- l10n_us_form_1099/models/box_1099_misc.py | 11 ++ l10n_us_form_1099/models/res_partner.py | 5 +- l10n_us_form_1099/models/type_1099.py | 4 +- l10n_us_form_1099/readme/CONFIGURE.rst | 4 + l10n_us_form_1099/readme/CONTRIBUTORS.rst | 5 + l10n_us_form_1099/readme/CREDITS.rst | 4 + l10n_us_form_1099/readme/DESCRIPTION.rst | 11 ++ l10n_us_form_1099/readme/USAGE.rst | 11 ++ l10n_us_form_1099/reports/__init__.py | 1 + .../reports/account_payment_1099_report.py | 8 +- .../account_payment_1099_report_views.xml | 111 ++++++++++-------- .../security/ir.model.access.csv | 6 +- l10n_us_form_1099/tests/__init__.py | 2 + .../tests/test_l10n_us_form_1099.py | 3 +- .../views/box_1099_misc_view.xml | 47 ++++++++ l10n_us_form_1099/views/res_partner.xml | 10 +- l10n_us_form_1099/views/type_1099_view.xml | 19 +-- 22 files changed, 290 insertions(+), 76 deletions(-) create mode 100644 l10n_us_form_1099/data/box_1099_misc_data.xml create mode 100644 l10n_us_form_1099/models/box_1099_misc.py create mode 100644 l10n_us_form_1099/readme/CONFIGURE.rst create mode 100644 l10n_us_form_1099/readme/CONTRIBUTORS.rst create mode 100644 l10n_us_form_1099/readme/CREDITS.rst create mode 100644 l10n_us_form_1099/readme/DESCRIPTION.rst create mode 100644 l10n_us_form_1099/readme/USAGE.rst create mode 100644 l10n_us_form_1099/views/box_1099_misc_view.xml diff --git a/l10n_us_form_1099/__init__.py b/l10n_us_form_1099/__init__.py index f3fa6d83..1382cbf6 100644 --- a/l10n_us_form_1099/__init__.py +++ b/l10n_us_form_1099/__init__.py @@ -1,3 +1,5 @@ +# Copyright (C) 2017 Open Source Integrators +# Copyright (C) 2019 Brian McMaster # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index b22ead5c..eefc9544 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -1,10 +1,13 @@ -# Copyright 2017 Open Source Integrators +# Copyright (C) 2017 Open Source Integrators +# Copyright (C) 2019 Brian McMaster # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "US Form 1099", "version": "12.0.1.1.0", - "author": "Open Source Integrators, Odoo Community Association (OCA)", + "author": "Open Source Integrators, " + "Brian McMaster, " + "Odoo Community Association (OCA)", "license": "AGPL-3", "summary": "Manage 1099 Types and Suppliers", "category": "Customers", @@ -15,11 +18,15 @@ "account", ], "data": [ - "security/ir.model.access.csv", "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", "reports/account_payment_1099_report_views.xml", ], "installable": True, + "development_status": "Stable", + "maintainers": ["max3903"], } diff --git a/l10n_us_form_1099/data/box_1099_misc_data.xml b/l10n_us_form_1099/data/box_1099_misc_data.xml new file mode 100644 index 00000000..10427106 --- /dev/null +++ b/l10n_us_form_1099/data/box_1099_misc_data.xml @@ -0,0 +1,79 @@ + + + + Box 1 Rents + + + + Box 2 Royalties + + + + Box 3 Other Income + + + + Box 4 Fed Income Tax withheld + + + + Box 5 Fishing Boat Proceeds + + + + Box 6 Medical & Health Care + + + + Box 7 Nonemployee Compensation + + + + Box 8 Substitute Payments + + + + Box 9 Payer made direct sales of $5,000... + + + + Box 10 Crop Insurance Proceeds + + + + Box 13 Excess Golden Parachute + + + + Box 14 Gross Amount Paid to an Attorney + + + + Box 15a Section 409A deferrals + + + + Box 15b Section 409A Income + + + + Box 16a State Tax withheld + + + + Box 16b Local Tax Withheld + + + + Box 17 State No. + + + + Box 18a State Income + + + + Box 18b Local Income + + + diff --git a/l10n_us_form_1099/data/type_1099_data.xml b/l10n_us_form_1099/data/type_1099_data.xml index e88c797f..0cb3020d 100644 --- a/l10n_us_form_1099/data/type_1099_data.xml +++ b/l10n_us_form_1099/data/type_1099_data.xml @@ -1,4 +1,3 @@ - diff --git a/l10n_us_form_1099/models/__init__.py b/l10n_us_form_1099/models/__init__.py index a0015542..fa51dcf5 100644 --- a/l10n_us_form_1099/models/__init__.py +++ b/l10n_us_form_1099/models/__init__.py @@ -1,4 +1,9 @@ +# Copyright (C) 2019 Open Source Integrators +# Copyright (C) 2019 Brian McMaster # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import type_1099 -from . import res_partner +from . import ( + type_1099, + box_1099_misc, + res_partner +) diff --git a/l10n_us_form_1099/models/box_1099_misc.py b/l10n_us_form_1099/models/box_1099_misc.py new file mode 100644 index 00000000..83f5ff09 --- /dev/null +++ b/l10n_us_form_1099/models/box_1099_misc.py @@ -0,0 +1,11 @@ +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class Box1099Misc(models.Model): + _name = 'box.1099.misc' + _description = '1099-MISC Box' + + name = fields.Char() diff --git a/l10n_us_form_1099/models/res_partner.py b/l10n_us_form_1099/models/res_partner.py index d244319c..945f7c82 100644 --- a/l10n_us_form_1099/models/res_partner.py +++ b/l10n_us_form_1099/models/res_partner.py @@ -1,4 +1,5 @@ -# Copyright 2017 Open Source Integrators +# Copyright (C) 2017 Open Source Integrators +# Copyright (C) 2019 Brian McMaster # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models @@ -9,6 +10,8 @@ class ResPartner(models.Model): is_1099 = fields.Boolean('Is a 1099?') type_1099_id = fields.Many2one('type.1099', string='1099 Type') + box_1099_misc_id = fields.Many2one('box.1099.misc', + string='1099-MISC Box') @api.onchange('is_1099') def _on_change_is_1099(self): diff --git a/l10n_us_form_1099/models/type_1099.py b/l10n_us_form_1099/models/type_1099.py index 97f8d417..1f6d1532 100644 --- a/l10n_us_form_1099/models/type_1099.py +++ b/l10n_us_form_1099/models/type_1099.py @@ -1,5 +1,5 @@ -# Copyright (C) 2019 - TODAY, Open Source Integrators -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +# Copyright (C) 2019 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/CONFIGURE.rst b/l10n_us_form_1099/readme/CONFIGURE.rst new file mode 100644 index 00000000..387d33df --- /dev/null +++ b/l10n_us_form_1099/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +#. Go to Contacts > Configuration > 1099 Types +#. Review the existing types and update them if necessary +#. Go to Contacts > Configuration > 1099-MISC Boxes +#. Review the existing boxes and update them if necessary diff --git a/l10n_us_form_1099/readme/CONTRIBUTORS.rst b/l10n_us_form_1099/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..eb032474 --- /dev/null +++ b/l10n_us_form_1099/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* Jenny Wu +* Maxime Chambreuil +* Serpent Consulting Services Pvt. Ltd. +* Bhavesh Odedra +* Brian McMaster diff --git a/l10n_us_form_1099/readme/CREDITS.rst b/l10n_us_form_1099/readme/CREDITS.rst new file mode 100644 index 00000000..33ed8872 --- /dev/null +++ b/l10n_us_form_1099/readme/CREDITS.rst @@ -0,0 +1,4 @@ +The development of this module has been financially supported by: + +* Open Source Integrators +* Brian McMaster diff --git a/l10n_us_form_1099/readme/DESCRIPTION.rst b/l10n_us_form_1099/readme/DESCRIPTION.rst new file mode 100644 index 00000000..25798f6a --- /dev/null +++ b/l10n_us_form_1099/readme/DESCRIPTION.rst @@ -0,0 +1,11 @@ +When companies hire others as contractors, the contractor in question may +work for themselves, another company or be the whole other company. This +is a huge range, but it can be simplified down to "do I report 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. + +You will still need to manage payment and IRS reporting separately. diff --git a/l10n_us_form_1099/readme/USAGE.rst b/l10n_us_form_1099/readme/USAGE.rst new file mode 100644 index 00000000..7d1eade9 --- /dev/null +++ b/l10n_us_form_1099/readme/USAGE.rst @@ -0,0 +1,11 @@ +To use this module, you need to: + +#. Go to Contacts +#. Create or select a partner +#. Go to the Sales & Purchases tab +#. Check the "Is a 1099" box +#. Select their 1099 type +#. If their type is 1099-MISC, you can select their box +#. Go to Accounting > Purchases +#. Create vendor bills and payments for those 1099 vendors +#. Go to Accounting > Reporting > 1099 Report diff --git a/l10n_us_form_1099/reports/__init__.py b/l10n_us_form_1099/reports/__init__.py index 253195b7..680840ad 100644 --- a/l10n_us_form_1099/reports/__init__.py +++ b/l10n_us_form_1099/reports/__init__.py @@ -1,3 +1,4 @@ +# Copyright (C) 2019 Brian McMaster # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import account_payment_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 1d6bf955..54f72996 100644 --- a/l10n_us_form_1099/reports/account_payment_1099_report.py +++ b/l10n_us_form_1099/reports/account_payment_1099_report.py @@ -1,4 +1,5 @@ -# Copyright 2019 Open Source Integrators +# Copyright (C) 2019 Brian McMaster +# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models, tools @@ -13,6 +14,8 @@ class AccountPayment1099Report(models.Model): amount = fields.Float('Payment Amount', readonly=True) vendor_id = fields.Many2one('res.partner', 'Vendor', readonly=True) type_1099 = fields.Many2one('type.1099', '1099 Type', readonly=True) + box_1099_misc = fields.Many2one('box.1099.misc', '1099-MISC Box', + readonly=True) def _select(self): return """ @@ -21,7 +24,8 @@ def _select(self): pmt.payment_date AS date, pmt.amount AS amount, v.id AS vendor_id, - v.type_1099_id AS type_1099 + v.type_1099_id AS type_1099, + v.box_1099_misc_id AS box_1099_misc """ def _from(self): 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 ae0f94dd..6841c116 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,60 +1,67 @@ - - - - account.payment.1099.report.pivot - account.payment.1099.report - - - - - - - - + - - account.payment.1099.report.graph - account.payment.1099.report - - - - - - - - + + account.payment.1099.report.pivot + account.payment.1099.report + + + + + + + + - - account.payment.1099.report.search - account.payment.1099.report - - - - - - - - - - - + + account.payment.1099.report.graph + account.payment.1099.report + + + + + + + + - - 1099 Payment Analysis - account.payment.1099.report - form - pivot,graph - - From this report, you can have an overview of the amount paid to your 1099 vendors. - + + account.payment.1099.report.search + account.payment.1099.report + + + + + + + + + + + + + - + + 1099 Payment Analysis + account.payment.1099.report + form + pivot,graph + + From this report, you can have an overview of the amount paid to your 1099 vendors. + + + - diff --git a/l10n_us_form_1099/security/ir.model.access.csv b/l10n_us_form_1099/security/ir.model.access.csv index da58902b..fede60fa 100644 --- a/l10n_us_form_1099/security/ir.model.access.csv +++ b/l10n_us_form_1099/security/ir.model.access.csv @@ -1,5 +1,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_type_user_1099,access_type_1099,model_type_1099,base.group_user,1,1,1,1 -access_type_system_1099,access_type_1099,model_type_1099,base.group_system,1,1,1,1 +access_type_user_1099,access_type_1099,model_type_1099,base.group_user,1,0,0,0 +access_type_system_1099,access_type_1099,model_type_1099,account.group_account_manager,1,1,1,1 +access_box_1099_misc_user,access_box_1099_misc,model_box_1099_misc,base.group_user,1,0,0,0 +access_box_1099_misc_manager,access_box_1099_misc,model_box_1099_misc,account.group_account_manager,1,1,1,1 access_account_payment_1099_report_user,account_payment_1099_report,model_account_payment_1099_report,account.group_account_user,1,0,0,0 access_account_payment_1099_report_manager,account_payment_1099_report,model_account_payment_1099_report,account.group_account_manager,1,1,1,1 diff --git a/l10n_us_form_1099/tests/__init__.py b/l10n_us_form_1099/tests/__init__.py index a06ceb59..61a5f7d0 100644 --- a/l10n_us_form_1099/tests/__init__.py +++ b/l10n_us_form_1099/tests/__init__.py @@ -1,3 +1,5 @@ +# Copyright (C) 2019 Brian McMaster +# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import test_l10n_us_form_1099 diff --git a/l10n_us_form_1099/tests/test_l10n_us_form_1099.py b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py index ca619774..898421fe 100644 --- a/l10n_us_form_1099/tests/test_l10n_us_form_1099.py +++ b/l10n_us_form_1099/tests/test_l10n_us_form_1099.py @@ -1,4 +1,5 @@ -# Copyright 2018 Open Source Integrators +# Copyright (C) 2019 Brian McMaster +# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tests.common import TransactionCase diff --git a/l10n_us_form_1099/views/box_1099_misc_view.xml b/l10n_us_form_1099/views/box_1099_misc_view.xml new file mode 100644 index 00000000..4132e4fb --- /dev/null +++ b/l10n_us_form_1099/views/box_1099_misc_view.xml @@ -0,0 +1,47 @@ + + + + + view.box.1099.misc.form + box.1099.misc + +
+ + + + + + + +
+
+
+ + + box.1099.misc.tree + box.1099.misc + + + + + + + + + 1099-MISC Boxes + box.1099.misc + ir.actions.act_window + form + tree,form + + + + + +
diff --git a/l10n_us_form_1099/views/res_partner.xml b/l10n_us_form_1099/views/res_partner.xml index 8e116974..561a8951 100644 --- a/l10n_us_form_1099/views/res_partner.xml +++ b/l10n_us_form_1099/views/res_partner.xml @@ -1,6 +1,9 @@ - + + res_partner_view_form res.partner @@ -8,7 +11,10 @@ - + + diff --git a/l10n_us_form_1099/views/type_1099_view.xml b/l10n_us_form_1099/views/type_1099_view.xml index 5f0f84b3..ddb6e8ed 100644 --- a/l10n_us_form_1099/views/type_1099_view.xml +++ b/l10n_us_form_1099/views/type_1099_view.xml @@ -1,9 +1,12 @@ - + + + view.type.1099.form type.1099 - form
@@ -16,31 +19,31 @@
- - + type.1099.tree type.1099 - + - 1099 Type + 1099 Types type.1099 ir.actions.act_window form tree,form - + +
From 15d6b7a65bd7ebb684fb53161e9e0ff605022fc7 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 24 Jul 2019 20:08:25 +0000 Subject: [PATCH 18/24] [UPD] Update l10n_us_form_1099.pot --- l10n_us_form_1099/i18n/l10n_us_form_1099.pot | 38 +++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot index 85b655f2..e96c0689 100644 --- a/l10n_us_form_1099/i18n/l10n_us_form_1099.pot +++ b/l10n_us_form_1099/i18n/l10n_us_form_1099.pot @@ -28,33 +28,56 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.ui.menu,name:l10n_us_form_1099.menu_action_account_payment_report_1099 -msgid "1099 Reports" +msgid "1099 Report" msgstr "" #. module: l10n_us_form_1099 -#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view #: model:ir.model,name:l10n_us_form_1099.model_type_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__type_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__type_1099_id #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__type_1099_id -#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config #: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search #: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_form -#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree msgid "1099 Type" msgstr "" +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view +#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree +msgid "1099 Types" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_box_1099_misc +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__box_1099_misc +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__box_1099_misc_id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__box_1099_misc_id +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_box_1099_misc_form +msgid "1099-MISC Box" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_box_1099_misc_view +#: model:ir.ui.menu,name:l10n_us_form_1099.box_1099_misc_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_box_1099_misc_tree +msgid "1099-MISC Boxes" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model,name:l10n_us_form_1099.model_res_partner msgid "Contact" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__create_uid #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_uid msgid "Created by" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__create_date #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_date msgid "Created on" msgstr "" @@ -66,6 +89,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__display_name +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__display_name #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__display_name msgid "Display Name" msgstr "" @@ -82,6 +106,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__id #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__id msgid "ID" msgstr "" @@ -94,21 +119,25 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report____last_update +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc____last_update #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099____last_update msgid "Last Modified on" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__write_uid #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_uid msgid "Last Updated by" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__write_date #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_date msgid "Last Updated on" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__name #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__name msgid "Name" msgstr "" @@ -125,6 +154,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__vendor_id +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search msgid "Vendor" msgstr "" From e9bf21a4616e577ab07ea8ab394d485f93e637a5 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 24 Jul 2019 20:38:44 +0000 Subject: [PATCH 19/24] [UPD] README.rst --- l10n_us_form_1099/README.rst | 100 ++-- .../static/description/index.html | 468 ++++++++++++++++++ 2 files changed, 536 insertions(+), 32 deletions(-) create mode 100644 l10n_us_form_1099/static/description/index.html diff --git a/l10n_us_form_1099/README.rst b/l10n_us_form_1099/README.rst index 6ef66568..bdcf35e5 100644 --- a/l10n_us_form_1099/README.rst +++ b/l10n_us_form_1099/README.rst @@ -1,26 +1,51 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ============ US Form 1099 ============ +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge2| image:: https://img.shields.io/badge/github-OCA%2Fl10n--usa-lightgray.png?logo=github + :target: https://github.com/OCA/l10n-usa/tree/12.0/l10n_us_form_1099 + :alt: OCA/l10n-usa +.. |badge3| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/l10n-usa-12-0/l10n-usa-12-0-l10n_us_form_1099 + :alt: Translate me on Weblate +.. |badge4| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/203/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| + When companies hire others as contractors, the contractor in question may work for themselves, another company or be the whole other company. This is a huge range, but it can be simplified down to "do I report their payment to the IRS as a 1099?". -This module extends the functionality of a partner and allow you to specify -1099 suppliers and 1099 types. +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. You will still need to manage payment and IRS reporting separately. +**Table of contents** + +.. contents:: + :local: + Configuration ============= -#. Go to Contacts > Configuration > 1099 Type -#. Create 1099 Type like 1099-A, 1099-B, 1099-xxx. +#. Go to Contacts > Configuration > 1099 Types +#. Review the existing types and update them if necessary +#. Go to Contacts > Configuration > 1099-MISC Boxes +#. Review the existing boxes and update them if necessary Usage ===== @@ -31,58 +56,69 @@ To use this module, you need to: #. Create or select a partner #. Go to the Sales & Purchases tab #. Check the "Is a 1099" box - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/203/12.0 - -Known issues / Roadmap -====================== - -* Add unit tests +#. Select their 1099 type +#. If their type is 1099-MISC, you can select their box +#. Go to Accounting > Purchases +#. Create vendor bills and payments for those 1099 vendors +#. Go to Accounting > Reporting > 1099 Report Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smash it by providing detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Open Source Integrators +* Brian McMaster Contributors ------------- +~~~~~~~~~~~~ * Jenny Wu * Maxime Chambreuil * Serpent Consulting Services Pvt. Ltd. * Bhavesh Odedra +* Brian McMaster -Funders -------- +Other credits +~~~~~~~~~~~~~ The development of this module has been financially supported by: * Open Source Integrators +* Brian McMaster -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px + :target: https://github.com/max3903 + :alt: max3903 + +Current `maintainer `__: + +|maintainer-max3903| + +This module is part of the `OCA/l10n-usa `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_us_form_1099/static/description/index.html b/l10n_us_form_1099/static/description/index.html new file mode 100644 index 00000000..0ae191ac --- /dev/null +++ b/l10n_us_form_1099/static/description/index.html @@ -0,0 +1,468 @@ + + + + + + +US Form 1099 + + + +
+

US Form 1099

+ + +

License: AGPL-3 OCA/l10n-usa Translate me on Weblate Try me on Runbot

+

When companies hire others as contractors, the contractor in question may +work for themselves, another company or be the whole other company. This +is a huge range, but it can be simplified down to “do I report 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.

+

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

+

Table of contents

+ +
+

Configuration

+
    +
  1. Go to Contacts > Configuration > 1099 Types
  2. +
  3. Review the existing types and update them if necessary
  4. +
  5. Go to Contacts > Configuration > 1099-MISC Boxes
  6. +
  7. Review the existing boxes and update them if necessary
  8. +
+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Contacts
  2. +
  3. Create or select a partner
  4. +
  5. Go to the Sales & Purchases tab
  6. +
  7. Check the “Is a 1099” box
  8. +
  9. Select their 1099 type
  10. +
  11. If their type is 1099-MISC, you can select their box
  12. +
  13. Go to Accounting > Purchases
  14. +
  15. Create vendor bills and payments for those 1099 vendors
  16. +
  17. Go to Accounting > Reporting > 1099 Report
  18. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Open Source Integrators
  • +
  • Brian McMaster
  • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

max3903

+

This module is part of the OCA/l10n-usa project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 70270ebb181490295eba9b43b7bca024d7eecbe4 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 24 Jul 2019 20:38:45 +0000 Subject: [PATCH 20/24] l10n_us_form_1099 12.0.1.2.0 --- l10n_us_form_1099/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_us_form_1099/__manifest__.py b/l10n_us_form_1099/__manifest__.py index eefc9544..b8ae25be 100644 --- a/l10n_us_form_1099/__manifest__.py +++ b/l10n_us_form_1099/__manifest__.py @@ -4,7 +4,7 @@ { "name": "US Form 1099", - "version": "12.0.1.1.0", + "version": "12.0.1.2.0", "author": "Open Source Integrators, " "Brian McMaster, " "Odoo Community Association (OCA)", From 2f8b9304b0611b6b6ab7564ed5b59fe864e0ea8a Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 27 Jul 2019 17:19:33 +0000 Subject: [PATCH 21/24] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: l10n-usa-12.0/l10n-usa-12.0-l10n_us_form_1099 Translate-URL: https://translation.odoo-community.org/projects/l10n-usa-12-0/l10n-usa-12-0-l10n_us_form_1099/ --- l10n_us_form_1099/i18n/nl_NL.po | 38 +++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/l10n_us_form_1099/i18n/nl_NL.po b/l10n_us_form_1099/i18n/nl_NL.po index b29f9868..a9bb3ef2 100644 --- a/l10n_us_form_1099/i18n/nl_NL.po +++ b/l10n_us_form_1099/i18n/nl_NL.po @@ -34,33 +34,56 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.ui.menu,name:l10n_us_form_1099.menu_action_account_payment_report_1099 -msgid "1099 Reports" +msgid "1099 Report" msgstr "" #. module: l10n_us_form_1099 -#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view #: model:ir.model,name:l10n_us_form_1099.model_type_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__type_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__type_1099_id #: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__type_1099_id -#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config #: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search #: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_form -#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree msgid "1099 Type" msgstr "" +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_type_1099_view +#: model:ir.ui.menu,name:l10n_us_form_1099.type_1099_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_type_1099_tree +msgid "1099 Types" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.model,name:l10n_us_form_1099.model_box_1099_misc +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__box_1099_misc +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_partner__box_1099_misc_id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_res_users__box_1099_misc_id +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_box_1099_misc_form +msgid "1099-MISC Box" +msgstr "" + +#. module: l10n_us_form_1099 +#: model:ir.actions.act_window,name:l10n_us_form_1099.action_box_1099_misc_view +#: model:ir.ui.menu,name:l10n_us_form_1099.box_1099_misc_menu_config +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_box_1099_misc_tree +msgid "1099-MISC Boxes" +msgstr "" + #. module: l10n_us_form_1099 #: model:ir.model,name:l10n_us_form_1099.model_res_partner msgid "Contact" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__create_uid #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_uid msgid "Created by" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__create_date #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__create_date msgid "Created on" msgstr "" @@ -72,6 +95,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__display_name +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__display_name #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__display_name msgid "Display Name" msgstr "" @@ -90,6 +114,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__id +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__id #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__id msgid "ID" msgstr "" @@ -103,21 +128,25 @@ msgstr "Is een 1099" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report____last_update +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc____last_update #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099____last_update msgid "Last Modified on" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__write_uid #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_uid msgid "Last Updated by" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__write_date #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__write_date msgid "Last Updated on" msgstr "" #. module: l10n_us_form_1099 +#: model:ir.model.fields,field_description:l10n_us_form_1099.field_box_1099_misc__name #: model:ir.model.fields,field_description:l10n_us_form_1099.field_type_1099__name msgid "Name" msgstr "" @@ -134,6 +163,7 @@ msgstr "" #. module: l10n_us_form_1099 #: model:ir.model.fields,field_description:l10n_us_form_1099.field_account_payment_1099_report__vendor_id +#: model_terms:ir.ui.view,arch_db:l10n_us_form_1099.view_account_payment_1099_report_search msgid "Vendor" msgstr "" From c86c24530dbce3205d8ccae344181ae865e54fda Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:08:44 +0000 Subject: [PATCH 22/24] [UPD] README.rst --- l10n_us_form_1099/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_us_form_1099/static/description/index.html b/l10n_us_form_1099/static/description/index.html index 0ae191ac..88fc1384 100644 --- a/l10n_us_form_1099/static/description/index.html +++ b/l10n_us_form_1099/static/description/index.html @@ -3,7 +3,7 @@ - + US Form 1099