Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 993ac10

Browse files
authored
Merge branch '11.0' into 11-nl-credit-control
2 parents 3c5aaff + 07374b3 commit 993ac10

File tree

69 files changed

+2770
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2770
-112
lines changed

l10n_nl_account_tax_unece/README.rst

+68-25
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1-
.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
2-
:target: https://www.gnu.org/licenses/agpl
3-
:alt: License: AGPL-3
4-
51
=========================
62
L10n NL Account Tax UNECE
73
=========================
84

5+
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
6+
!! This file is generated by oca-gen-addon-readme !!
7+
!! changes will be overwritten. !!
8+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
9+
10+
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
11+
:target: https://odoo-community.org/page/development-status
12+
:alt: Beta
13+
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
14+
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
15+
:alt: License: AGPL-3
16+
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--netherlands-lightgray.png?logo=github
17+
:target: https://github.com/OCA/l10n-netherlands/tree/11.0/l10n_nl_account_tax_unece
18+
:alt: OCA/l10n-netherlands
19+
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
20+
:target: https://translation.odoo-community.org/projects/l10n-netherlands-11-0/l10n-netherlands-11-0-l10n_nl_account_tax_unece
21+
:alt: Translate me on Weblate
22+
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
23+
:target: https://runbot.odoo-community.org/runbot/176/11.0
24+
:alt: Try me on Runbot
25+
26+
|badge1| |badge2| |badge3| |badge4| |badge5|
27+
928
This module will auto-configure the values *UNECE Tax Type* and *UNECE Tax Category* on taxes that come from the *l10n_nl* module.
1029

1130
Both the values will also be set in the template of the tax accounts.
1231
This will be useful in case of setting new companies with the Dutch chart of accounts in a multi-company environment.
1332

33+
**Table of contents**
34+
35+
.. contents::
36+
:local:
37+
1438
Installation
1539
============
1640

@@ -22,49 +46,68 @@ Usage
2246
#. Simply install the module to set the values *UNECE Tax Type* and *UNECE Tax Category* on existing taxes that come from the *l10n_nl* module.
2347
#. If you create a new Dutch company and set its chart of accounts ( with the one that comes from *l10n_nl*), the newly created taxes will also get the values *UNECE Tax Type* and *UNECE Tax Category* set.
2448

25-
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
26-
:alt: Try me on Runbot
27-
:target: https://runbot.odoo-community.org/runbot/176/11.0
49+
Changelog
50+
=========
51+
52+
11.0.1.1.0
53+
~~~~~~~~~~
54+
55+
* Add support for tax codes 9%, introduced in Odoo 11.0 with `commit <https://github.com/odoo/odoo/commit/06ad641b0a978296e3eaef40f54157360e97075e>`_)
56+
57+
11.0.1.0.0
58+
~~~~~~~~~~
2859

29-
Known issues / Roadmap
30-
======================
60+
* Porting to V11
3161

32-
* The definition of the fields *UNECE Tax Type* and *UNECE Tax Category* should be moved to module ``account_payment_unece``.
62+
10.0.1.0.0
63+
~~~~~~~~~~
64+
65+
* Initial release.
3366

3467
Bug Tracker
3568
===========
3669

37-
Bugs are tracked on `GitHub Issues
38-
<https://github.com/OCA/l10n-netherlands/issues>`_. In case of trouble, please
39-
check there if your issue has already been reported. If you spotted it first,
40-
help us smash it by providing detailed and welcomed feedback.
70+
Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-netherlands/issues>`_.
71+
In case of trouble, please check there if your issue has already been reported.
72+
If you spotted it first, help us smashing it by providing a detailed and welcomed
73+
`feedback <https://github.com/OCA/l10n-netherlands/issues/new?body=module:%20l10n_nl_account_tax_unece%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
74+
75+
Do not contact contributors directly about support or help with technical issues.
4176

4277
Credits
4378
=======
4479

45-
* This module, expecially the `post_install` script, is based on the job made by
46-
* Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
47-
Module: OCA/l10n-france/l10n_fr_account_tax_unece
48-
Link: https://github.com/OCA/l10n-france/tree/10.0/l10n_fr_account_tax_unece
80+
Authors
81+
~~~~~~~
82+
83+
* Onestein
4984

5085
Contributors
51-
------------
86+
~~~~~~~~~~~~
5287

5388
* Andrea Stirpe <a.stirpe@onestein.nl>
5489

55-
Do not contact contributors directly about support or help with technical issues.
90+
Other credits
91+
~~~~~~~~~~~~~
5692

57-
Maintainer
58-
----------
93+
* This module, expecially the `post_install` script, is based on the job made by
94+
* Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
95+
Module: OCA/l10n-france/l10n_fr_account_tax_unece
96+
Link: https://github.com/OCA/l10n-france/tree/10.0/l10n_fr_account_tax_unece
97+
98+
Maintainers
99+
~~~~~~~~~~~
100+
101+
This module is maintained by the OCA.
59102

60103
.. image:: https://odoo-community.org/logo.png
61104
:alt: Odoo Community Association
62105
:target: https://odoo-community.org
63106

64-
This module is maintained by the OCA.
65-
66107
OCA, or the Odoo Community Association, is a nonprofit organization whose
67108
mission is to support the collaborative development of Odoo features and
68109
promote its widespread use.
69110

70-
To contribute to this module, please visit https://odoo-community.org.
111+
This module is part of the `OCA/l10n-netherlands <https://github.com/OCA/l10n-netherlands/tree/11.0/l10n_nl_account_tax_unece>`_ project on GitHub.
112+
113+
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

l10n_nl_account_tax_unece/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
{
55
'name': 'L10n NL Account Tax UNECE',
66
'summary': 'Auto-configure UNECE params on Dutch taxes',
7-
'version': '11.0.1.0.0',
7+
'version': '11.0.1.1.0',
88
'category': 'Localization',
99
'author': 'Onestein, Odoo Community Association (OCA)',
10-
'website': 'http://www.onestein.eu',
10+
'website': 'https://github.com/OCA/l10n-netherlands',
1111
'license': 'AGPL-3',
1212
'depends': ['l10n_nl', 'account_tax_unece'],
1313
'data': [

l10n_nl_account_tax_unece/data/account_tax_template.xml

+68
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
1515
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
1616
</record>
17+
<record id="l10n_nl.btw_9" model="account.tax.template">
18+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
19+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
20+
</record>
1721
<record id="l10n_nl.btw_21" model="account.tax.template">
1822
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
1923
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -31,6 +35,10 @@
3135
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
3236
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
3337
</record>
38+
<record id="l10n_nl.btw_9_d" model="account.tax.template">
39+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
40+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
41+
</record>
3442
<record id="l10n_nl.btw_21_d" model="account.tax.template">
3543
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
3644
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -48,6 +56,14 @@
4856
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
4957
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
5058
</record>
59+
<record id="l10n_nl.btw_9_buy" model="account.tax.template">
60+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
61+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
62+
</record>
63+
<record id="l10n_nl.btw_9_buy_incl" model="account.tax.template">
64+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
65+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
66+
</record>
5167
<record id="l10n_nl.btw_21_buy" model="account.tax.template">
5268
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
5369
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -65,6 +81,10 @@
6581
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
6682
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
6783
</record>
84+
<record id="l10n_nl.btw_9_buy_d" model="account.tax.template">
85+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
86+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
87+
</record>
6888
<record id="l10n_nl.btw_21_buy_d" model="account.tax.template">
6989
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
7090
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -104,6 +124,18 @@
104124
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
105125
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
106126
</record>
127+
<record id="l10n_nl.btw_I_9_1" model="account.tax.template">
128+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
129+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
130+
</record>
131+
<record id="l10n_nl.btw_I_9_2" model="account.tax.template">
132+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
133+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
134+
</record>
135+
<record id="l10n_nl.btw_I_9" model="account.tax.template">
136+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
137+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
138+
</record>
107139
<record id="l10n_nl.btw_I_21_1" model="account.tax.template">
108140
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
109141
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -150,6 +182,18 @@
150182
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
151183
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
152184
</record>
185+
<record id="l10n_nl.btw_I_9_d_1" model="account.tax.template">
186+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
187+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
188+
</record>
189+
<record id="l10n_nl.btw_I_9_d_2" model="account.tax.template">
190+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
191+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
192+
</record>
193+
<record id="l10n_nl.btw_I_9_d" model="account.tax.template">
194+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
195+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
196+
</record>
153197
<record id="l10n_nl.btw_I_21_d_1" model="account.tax.template">
154198
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
155199
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -189,6 +233,18 @@
189233
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
190234
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
191235
</record>
236+
<record id="l10n_nl.btw_E1_1_9" model="account.tax.template">
237+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
238+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
239+
</record>
240+
<record id="l10n_nl.btw_E1_2_9" model="account.tax.template">
241+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
242+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
243+
</record>
244+
<record id="l10n_nl.btw_E1_9" model="account.tax.template">
245+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
246+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
247+
</record>
192248
<record id="l10n_nl.btw_E2_1" model="account.tax.template">
193249
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
194250
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>
@@ -235,6 +291,18 @@
235291
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
236292
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
237293
</record>
294+
<record id="l10n_nl.btw_E1_d_1_9" model="account.tax.template">
295+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
296+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
297+
</record>
298+
<record id="l10n_nl.btw_E1_d_2_9" model="account.tax.template">
299+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
300+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
301+
</record>
302+
<record id="l10n_nl.btw_E1_d_9" model="account.tax.template">
303+
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
304+
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_aa')"/>
305+
</record>
238306
<record id="l10n_nl.btw_E2_d_1" model="account.tax.template">
239307
<field name="unece_type_id" eval="ref('account_tax_unece.tax_type_vat')"/>
240308
<field name="unece_categ_id" eval="ref('account_tax_unece.tax_categ_h')"/>

l10n_nl_account_tax_unece/models/res_company.py

+19
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
MAPPING = {
77
'btw_0': {'categ': 'tax_categ_z'},
88
'btw_6': {'categ': 'tax_categ_aa'},
9+
'btw_9': {'categ': 'tax_categ_aa'},
910
'btw_21': {'categ': 'tax_categ_h'},
1011
'btw_overig': {'categ': 'tax_categ_s'},
1112
'btw_0_d': {'categ': 'tax_categ_z'},
1213
'btw_6_d': {'categ': 'tax_categ_aa'},
14+
'btw_9_d': {'categ': 'tax_categ_aa'},
1315
'btw_21_d': {'categ': 'tax_categ_h'},
1416
'btw_overig_d': {'categ': 'tax_categ_s'},
1517
'btw_6_buy': {'categ': 'tax_categ_aa'},
1618
'btw_6_buy_incl': {'categ': 'tax_categ_aa'},
19+
'btw_9_buy': {'categ': 'tax_categ_aa'},
20+
'btw_9_buy_incl': {'categ': 'tax_categ_aa'},
1721
'btw_21_buy': {'categ': 'tax_categ_h'},
1822
'btw_21_buy_incl': {'categ': 'tax_categ_h'},
1923
'btw_overig_buy': {'categ': 'tax_categ_s'},
2024
'btw_6_buy_d': {'categ': 'tax_categ_aa'},
25+
'btw_9_buy_d': {'categ': 'tax_categ_aa'},
2126
'btw_21_buy_d': {'categ': 'tax_categ_h'},
2227
'btw_overig_buy_d': {'categ': 'tax_categ_s'},
2328
'btw_verk_0': {'categ': 'tax_categ_b'},
@@ -27,17 +32,25 @@
2732
'btw_I_6_1': {'categ': 'tax_categ_aa'},
2833
'btw_I_6_2': {'categ': 'tax_categ_aa'},
2934
'btw_I_6': {'categ': 'tax_categ_aa'},
35+
'btw_I_9_1': {'categ': 'tax_categ_aa'},
36+
'btw_I_9_2': {'categ': 'tax_categ_aa'},
37+
'btw_I_9': {'categ': 'tax_categ_aa'},
3038
'btw_I_21_1': {'categ': 'tax_categ_h'},
3139
'btw_I_21_2': {'categ': 'tax_categ_h'},
3240
'btw_I_21': {'categ': 'tax_categ_h'},
3341
'btw_I_overig_1': {'categ': 'tax_categ_s'},
3442
'btw_I_overig_2': {'categ': 'tax_categ_s'},
3543
'btw_I_overig': {'categ': 'tax_categ_s'},
3644
'btw_X0': {'categ': 'tax_categ_e'},
45+
'btw_X0_producten': {'categ': 'tax_categ_e'},
46+
'btw_X0_diensten': {'categ': 'tax_categ_e'},
3747
'btw_X2': {'categ': 'tax_categ_e'},
3848
'btw_I_6_d_1': {'categ': 'tax_categ_aa'},
3949
'btw_I_6_d_2': {'categ': 'tax_categ_aa'},
4050
'btw_I_6_d': {'categ': 'tax_categ_aa'},
51+
'btw_I_9_d_1': {'categ': 'tax_categ_aa'},
52+
'btw_I_9_d_2': {'categ': 'tax_categ_aa'},
53+
'btw_I_9_d': {'categ': 'tax_categ_aa'},
4154
'btw_I_21_d_1': {'categ': 'tax_categ_h'},
4255
'btw_I_21_d_2': {'categ': 'tax_categ_h'},
4356
'btw_I_21_d': {'categ': 'tax_categ_h'},
@@ -47,6 +60,9 @@
4760
'btw_E1_1': {'categ': 'tax_categ_aa'},
4861
'btw_E1_2': {'categ': 'tax_categ_aa'},
4962
'btw_E1': {'categ': 'tax_categ_aa'},
63+
'btw_E1_1_9': {'categ': 'tax_categ_aa'},
64+
'btw_E1_2_9': {'categ': 'tax_categ_aa'},
65+
'btw_E1_9': {'categ': 'tax_categ_aa'},
5066
'btw_E2_1': {'categ': 'tax_categ_h'},
5167
'btw_E2_2': {'categ': 'tax_categ_h'},
5268
'btw_E2': {'categ': 'tax_categ_h'},
@@ -58,6 +74,9 @@
5874
'btw_E1_d_1': {'categ': 'tax_categ_aa'},
5975
'btw_E1_d_2': {'categ': 'tax_categ_aa'},
6076
'btw_E1_d': {'categ': 'tax_categ_aa'},
77+
'btw_E1_d_1_9': {'categ': 'tax_categ_aa'},
78+
'btw_E1_d_2_9': {'categ': 'tax_categ_aa'},
79+
'btw_E1_d_9': {'categ': 'tax_categ_aa'},
6180
'btw_E2_d_1': {'categ': 'tax_categ_h'},
6281
'btw_E2_d_2': {'categ': 'tax_categ_h'},
6382
'btw_E2_d': {'categ': 'tax_categ_h'},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* Andrea Stirpe <a.stirpe@onestein.nl>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* This module, expecially the `post_install` script, is based on the job made by
2+
* Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
3+
Module: OCA/l10n-france/l10n_fr_account_tax_unece
4+
Link: https://github.com/OCA/l10n-france/tree/10.0/l10n_fr_account_tax_unece
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This module will auto-configure the values *UNECE Tax Type* and *UNECE Tax Category* on taxes that come from the *l10n_nl* module.
2+
3+
Both the values will also be set in the template of the tax accounts.
4+
This will be useful in case of setting new companies with the Dutch chart of accounts in a multi-company environment.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
11.0.1.1.0
2+
~~~~~~~~~~
3+
4+
* Add support for tax codes 9%, introduced in Odoo 11.0 with `commit <https://github.com/odoo/odoo/commit/06ad641b0a978296e3eaef40f54157360e97075e>`_)
5+
6+
11.0.1.0.0
7+
~~~~~~~~~~
8+
9+
* Porting to V11
10+
11+
10.0.1.0.0
12+
~~~~~~~~~~
13+
14+
* Initial release.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This module will be installed automatically if modules ``l10n_nl`` and ``account_tax_unece`` are installed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#. Simply install the module to set the values *UNECE Tax Type* and *UNECE Tax Category* on existing taxes that come from the *l10n_nl* module.
2+
#. If you create a new Dutch company and set its chart of accounts ( with the one that comes from *l10n_nl*), the newly created taxes will also get the values *UNECE Tax Type* and *UNECE Tax Category* set.

0 commit comments

Comments
 (0)