changeset 65856fef91bc in modules/account_es:default
details:
https://hg.tryton.org/modules/account_es?cmd=changeset&node=65856fef91bc
description:
Include new keys in model 303 format
Also remove 61 tax code which is no longer used
issue11404
review394091002
diffstat:
CHANGELOG | 2 ++
aeat303.txt | 2 +-
company.py | 11 +++++++++++
tax.xml | 7 -------
tax_normal.xml | 40 ----------------------------------------
tax_pyme.xml | 40 ----------------------------------------
tests/303.txt | 2 +-
tests/303_compensate.txt | 2 +-
8 files changed, 16 insertions(+), 90 deletions(-)
diffs (203 lines):
diff -r ff94316bbb52 -r 65856fef91bc CHANGELOG
--- a/CHANGELOG Sat Apr 16 18:30:16 2022 +0200
+++ b/CHANGELOG Thu Apr 21 17:16:53 2022 +0200
@@ -1,3 +1,5 @@
+* Remove 61 tax code no more used in AEAT303
+* Include 120, 122, 123 and 124 new keys in model 303 format
* Add support for Python 3.10
* Remove support for Python 3.6
diff -r ff94316bbb52 -r 65856fef91bc aeat303.txt
--- a/aeat303.txt Sat Apr 16 18:30:16 2022 +0200
+++ b/aeat303.txt Thu Apr 21 17:16:53 2022 +0200
@@ -1,1 +1,1 @@
-<T3030${year}${period}0000><AUX>${justify('', 300)}</AUX><T30301000>
${declaration_type}${company.party.tax_identifier.code[2:]}${justify(company.rec_name.upper(),
80)}${year}${period}223222222 2${'2' if period in ['4T', '12'] else
'0'}${'2' if period in ['4T', '12'] else
'0'}${format_decimal(amounts['01'])}${format_percentage(amounts['02'])}${format_decimal(amounts['03'])}${format_decimal(amounts['04'])}${format_percentage(amounts['05'])}${format_decimal(amounts['06'])}${format_decimal(amounts['07'])}${format_percentage(amounts['08'])}${format_decimal(amounts['09'])}${format_decimal(amounts['10'])}${format_decimal(amounts['11'])}${format_decimal(amounts['12'])}${format_decimal(amounts['13'])}${format_decimal(amounts['14'],
True)}${format_decimal(amounts['15'],
True)}${format_decimal(amounts['16'])}${format_percentage(amounts['017'])}${format_decimal(amounts['18'])}${format_decimal(amounts['19'])}${format_percentage(amounts['20'])}${format_decimal(amounts['21'])}${format_decimal(amounts['22'])}${format_percentage(amounts['23'])}${format_decimal(amounts['24'])}${format_decimal(amounts['25'],
True)}${format_decimal(amounts['26'], True)}${format_decimal(amounts['27'],
True)}${format_decimal(amounts['28'])}${format_decimal(amounts['29'])}${format_decimal(amounts['30'])}${format_decimal(amounts['31'])}${format_decimal(amounts['32'])}${format_decimal(amounts['33'])}${format_decimal(amounts['34'])}${format_decimal(amounts['35'])}${format_decimal(amounts['36'])}${format_decimal(amounts['37'])}${format_decimal(amounts['38'])}${format_decimal(amounts['39'])}${format_decimal(amounts['40'],
True)}${format_decimal(amounts['41'], True)}${format_decimal(amounts['42'],
True)}${format_decimal(amounts['43'], True)}${format_decimal(amounts['44'],
True)}${format_decimal(amounts['45'], True)}${format_decimal(amounts['46'],
True)}${justify('',
613)}</T30301000><T30303000>${format_decimal(amounts['59'])}${format_decimal(amounts['60'])}${format_decimal(amounts['61'])}${format_decimal(0)
*
5}${format_decimal(amounts['62'])}${format_decimal(amounts['63'])}${format_decimal(amounts['74'])}${format_decimal(amounts['75'])}${format_decimal(amounts['76'])}${format_decimal(amounts['64'],
True)}${format_percentage(amounts['65'])}${format_decimal(amounts['66'],
True)}${format_decimal(amounts['77'])}${format_decimal(amounts['110'])}${format_decimal(amounts['78'])}${format_decimal(amounts['87'])}${format_decimal(amounts['68'],
True)}${format_decimal(amounts['69'], True)}${format_decimal(amounts['70'],
True)}${format_decimal(amounts['71'], True)}${justify('',
660)}</T30303000></T3030${year}${period}0000>
\ No newline at end of file
+<T3030${year}${period}0000><AUX>${justify('', 300)}</AUX><T30301000>
${declaration_type}${company.party.tax_identifier.code[2:]}${justify(company.rec_name.upper(),
80)}${year}${period}223222222 2${'2' if period in ['4T', '12'] else
'0'}${'2' if period in ['4T', '12'] else
'0'}${format_decimal(amounts['01'])}${format_percentage(amounts['02'])}${format_decimal(amounts['03'])}${format_decimal(amounts['04'])}${format_percentage(amounts['05'])}${format_decimal(amounts['06'])}${format_decimal(amounts['07'])}${format_percentage(amounts['08'])}${format_decimal(amounts['09'])}${format_decimal(amounts['10'])}${format_decimal(amounts['11'])}${format_decimal(amounts['12'])}${format_decimal(amounts['13'])}${format_decimal(amounts['14'],
True)}${format_decimal(amounts['15'],
True)}${format_decimal(amounts['16'])}${format_percentage(amounts['017'])}${format_decimal(amounts['18'])}${format_decimal(amounts['19'])}${format_percentage(amounts['20'])}${format_decimal(amounts['21'])}${format_decimal(amounts['22'])}${format_percentage(amounts['23'])}${format_decimal(amounts['24'])}${format_decimal(amounts['25'],
True)}${format_decimal(amounts['26'], True)}${format_decimal(amounts['27'],
True)}${format_decimal(amounts['28'])}${format_decimal(amounts['29'])}${format_decimal(amounts['30'])}${format_decimal(amounts['31'])}${format_decimal(amounts['32'])}${format_decimal(amounts['33'])}${format_decimal(amounts['34'])}${format_decimal(amounts['35'])}${format_decimal(amounts['36'])}${format_decimal(amounts['37'])}${format_decimal(amounts['38'])}${format_decimal(amounts['39'])}${format_decimal(amounts['40'],
True)}${format_decimal(amounts['41'], True)}${format_decimal(amounts['42'],
True)}${format_decimal(amounts['43'], True)}${format_decimal(amounts['44'],
True)}${format_decimal(amounts['45'], True)}${format_decimal(amounts['46'],
True)}${justify('',
613)}</T30301000><T30303000>${format_decimal(amounts['59'])}${format_decimal(amounts['60'])}${format_decimal(amounts['120'])}${format_decimal(amounts['122'])}${format_decimal(amounts['123'])}${format_decimal(amounts['124'])}${format_decimal(amounts['62'])}${format_decimal(amounts['63'])}${format_decimal(amounts['74'])}${format_decimal(amounts['75'])}${format_decimal(amounts['76'])}${format_decimal(amounts['64'],
True)}${format_percentage(amounts['65'])}${format_decimal(amounts['66'],
True)}${format_decimal(amounts['77'])}${format_decimal(amounts['110'])}${format_decimal(amounts['78'])}${format_decimal(amounts['87'])}${format_decimal(amounts['68'],
True)}${format_decimal(amounts['69'], True)}${format_decimal(amounts['70'],
True)}${format_decimal(amounts['71'], True)}${justify('',
815)}</T30303000></T3030${year}${period}0000>
\ No newline at end of file
diff -r ff94316bbb52 -r 65856fef91bc company.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/company.py Thu Apr 21 17:16:53 2022 +0200
@@ -0,0 +1,11 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.pool import PoolMeta
+
+
+class Company(metaclass=PoolMeta):
+ __name__ = 'company.company'
+
+ @property
+ def es_aeat_contact_phone(self):
+ return self.party.phone
diff -r ff94316bbb52 -r 65856fef91bc tax.xml
--- a/tax.xml Sat Apr 16 18:30:16 2022 +0200
+++ b/tax.xml Thu Apr 21 17:16:53 2022 +0200
@@ -2046,13 +2046,6 @@
<field name="amount">base</field>
<field name="type">credit</field>
</record>
- <record model="account.tax.code.template" id="vat_code_iva_no_sujetas">
- <field name="name">Operaciones no sujetas o con inversión del
sujeto pasivo que originen derecho a deducción</field>
- <field name="code">61</field>
- <field name="aeat_report">303</field>
- <field name="parent" ref="vat_code_iva"/>
- <field name="account" ref="pgc_0"/>
- </record>
<record model="account.tax.code.template" id="vat_code_irpf_purchase">
<field name="name">Retenciones e ingresos a cuentra sobre
actividades económicas - Autoliquidación Empresas</field>
diff -r ff94316bbb52 -r 65856fef91bc tax_normal.xml
--- a/tax_normal.xml Sat Apr 16 18:30:16 2022 +0200
+++ b/tax_normal.xml Thu Apr 21 17:16:53 2022 +0200
@@ -2046,13 +2046,6 @@
<field name="amount">base</field>
<field name="type">credit</field>
</record>
- <record id="vat_code_iva_no_sujetas_normal"
model="account.tax.code.template">
- <field name="name">Operaciones no sujetas o con inversión del
sujeto pasivo que originen derecho a deducción</field>
- <field name="code">61</field>
- <field name="aeat_report">303</field>
- <field name="parent" ref="vat_code_iva_normal"/>
- <field name="account" ref="pgc_0_normal"/>
- </record>
<record id="vat_code_irpf_purchase_normal"
model="account.tax.code.template">
<field name="name">Retenciones e ingresos a cuentra sobre
actividades económicas - Autoliquidación Empresas</field>
@@ -2499,51 +2492,18 @@
<record id="fptt_intra_purchase_normal_normal"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_normal"/>
<field name="tax" ref="iva_sop_intracomunitario_normal"/>
- <field name="origin_tax" ref="iva_sop_21_normal"/>
- <field name="group" ref="tax_group_purchase"/>
- </record>
- <record id="fptt_intra_purchase_normal_10_normal"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_normal"/>
- <field name="tax" ref="iva_sop_intracomunitario_10_normal"/>
- <field name="origin_tax" ref="iva_sop_10_normal"/>
- <field name="group" ref="tax_group_purchase"/>
- </record>
- <record id="fptt_intra_purchase_normal_4_normal"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_normal"/>
- <field name="tax" ref="iva_sop_intracomunitario_4_normal"/>
- <field name="origin_tax" ref="iva_sop_4_normal"/>
<field name="group" ref="tax_group_purchase"/>
</record>
<record id="fptt_intra_purchase_service_normal"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_normal"/>
<field name="tax" ref="iva_sop_intracomunitario_servicios_normal"/>
- <field name="origin_tax" ref="iva_sop_21_servicios_normal"/>
- <field name="group" ref="tax_group_purchase_service"/>
- </record>
- <record id="fptt_intra_purchase_service_10_normal"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_normal"/>
- <field name="tax"
ref="iva_sop_intracomunitario_servicios_10_normal"/>
- <field name="origin_tax" ref="iva_sop_10_servicios_normal"/>
<field name="group" ref="tax_group_purchase_service"/>
</record>
<record id="fptt_intra_purchase_investment_normal"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_normal"/>
<field name="tax" ref="iva_sop_intracomunitario_inv_normal"/>
- <field name="origin_tax" ref="iva_sop_21_inv_normal"/>
- <field name="group" ref="tax_group_purchase_investment"/>
- </record>
- <record id="fptt_intra_purchase_investment_10_normal"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_normal"/>
- <field name="tax" ref="iva_sop_intracomunitario_inv_10_normal"/>
- <field name="origin_tax" ref="iva_sop_10_inv_normal"/>
- <field name="group" ref="tax_group_purchase_investment"/>
- </record>
- <record id="fptt_intra_purchase_investment_4_normal"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_normal"/>
- <field name="tax" ref="iva_sop_intracomunitario_inv_4_normal"/>
- <field name="origin_tax" ref="iva_sop_4_inv_normal"/>
<field name="group" ref="tax_group_purchase_investment"/>
</record>
diff -r ff94316bbb52 -r 65856fef91bc tax_pyme.xml
--- a/tax_pyme.xml Sat Apr 16 18:30:16 2022 +0200
+++ b/tax_pyme.xml Thu Apr 21 17:16:53 2022 +0200
@@ -2046,13 +2046,6 @@
<field name="amount">base</field>
<field name="type">credit</field>
</record>
- <record id="vat_code_iva_no_sujetas_pyme"
model="account.tax.code.template">
- <field name="name">Operaciones no sujetas o con inversión del
sujeto pasivo que originen derecho a deducción</field>
- <field name="code">61</field>
- <field name="aeat_report">303</field>
- <field name="parent" ref="vat_code_iva_pyme"/>
- <field name="account" ref="pgc_0_pyme"/>
- </record>
<record id="vat_code_irpf_purchase_pyme"
model="account.tax.code.template">
<field name="name">Retenciones e ingresos a cuentra sobre
actividades económicas - Autoliquidación Empresas</field>
@@ -2499,51 +2492,18 @@
<record id="fptt_intra_purchase_normal_pyme"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_pyme"/>
<field name="tax" ref="iva_sop_intracomunitario_pyme"/>
- <field name="origin_tax" ref="iva_sop_21_pyme"/>
- <field name="group" ref="tax_group_purchase"/>
- </record>
- <record id="fptt_intra_purchase_normal_10_pyme"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_pyme"/>
- <field name="tax" ref="iva_sop_intracomunitario_10_pyme"/>
- <field name="origin_tax" ref="iva_sop_10_pyme"/>
- <field name="group" ref="tax_group_purchase"/>
- </record>
- <record id="fptt_intra_purchase_normal_4_pyme"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_pyme"/>
- <field name="tax" ref="iva_sop_intracomunitario_4_pyme"/>
- <field name="origin_tax" ref="iva_sop_4_pyme"/>
<field name="group" ref="tax_group_purchase"/>
</record>
<record id="fptt_intra_purchase_service_pyme"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_pyme"/>
<field name="tax" ref="iva_sop_intracomunitario_servicios_pyme"/>
- <field name="origin_tax" ref="iva_sop_21_servicios_pyme"/>
- <field name="group" ref="tax_group_purchase_service"/>
- </record>
- <record id="fptt_intra_purchase_service_10_pyme"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_pyme"/>
- <field name="tax"
ref="iva_sop_intracomunitario_servicios_10_pyme"/>
- <field name="origin_tax" ref="iva_sop_10_servicios_pyme"/>
<field name="group" ref="tax_group_purchase_service"/>
</record>
<record id="fptt_intra_purchase_investment_pyme"
model="account.tax.rule.line.template">
<field name="rule" ref="fp_intra_purchase_pyme"/>
<field name="tax" ref="iva_sop_intracomunitario_inv_pyme"/>
- <field name="origin_tax" ref="iva_sop_21_inv_pyme"/>
- <field name="group" ref="tax_group_purchase_investment"/>
- </record>
- <record id="fptt_intra_purchase_investment_10_pyme"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_pyme"/>
- <field name="tax" ref="iva_sop_intracomunitario_inv_10_pyme"/>
- <field name="origin_tax" ref="iva_sop_10_inv_pyme"/>
- <field name="group" ref="tax_group_purchase_investment"/>
- </record>
- <record id="fptt_intra_purchase_investment_4_pyme"
model="account.tax.rule.line.template">
- <field name="rule" ref="fp_intra_purchase_pyme"/>
- <field name="tax" ref="iva_sop_intracomunitario_inv_4_pyme"/>
- <field name="origin_tax" ref="iva_sop_4_inv_pyme"/>
<field name="group" ref="tax_group_purchase_investment"/>
</record>
diff -r ff94316bbb52 -r 65856fef91bc tests/303.txt
--- a/tests/303.txt Sat Apr 16 18:30:16 2022 +0200
+++ b/tests/303.txt Thu Apr 21 17:16:53 2022 +0200
@@ -1,1 +1,1 @@
-<T30302018010000><AUX>
</AUX><T30301000> IB01000009DUNDER MIFFLIN
201801223222222
20000000000000000000004000000000000000000000000000000000000010000000000000000000000000000000020000021000000000000000420000000000000010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000630000000000000010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000420000000000000002100
</T30301000><T30303000>000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000210010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000002100
</T30303000></T30302018010000>
\ No newline at end of file
+<T30302018010000><AUX>
</AUX><T30301000> IB01000009DUNDER MIFFLIN
201801223222222
20000000000000000000004000000000000000000000000000000000000010000000000000000000000000000000020000021000000000000000420000000000000010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000630000000000000010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000420000000000000002100
</T30301000><T30303000>00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000210010000000000000000021000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000002100
</T30303000></T30302018010000>
\ No newline at end of file
diff -r ff94316bbb52 -r 65856fef91bc tests/303_compensate.txt
--- a/tests/303_compensate.txt Sat Apr 16 18:30:16 2022 +0200
+++ b/tests/303_compensate.txt Thu Apr 21 17:16:53 2022 +0200
@@ -1,1 +1,1 @@
-<T30302018020000><AUX>
</AUX><T30301000> CB01000009DUNDER MIFFLIN
201802223222222
20000000000000000000004000000000000000000000000000000000000010000000000000000000000000000000005000021000000000000000105000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000105000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050
</T30301000><T30303000>000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105010000000000000000010500000000000000000000000000000004000000000000000040000000000000000000000000000000000000N000000000000295000000000000000000N0000000000002950
</T30303000></T30302018020000>
\ No newline at end of file
+<T30302018020000><AUX>
</AUX><T30301000> CB01000009DUNDER MIFFLIN
201802223222222
20000000000000000000004000000000000000000000000000000000000010000000000000000000000000000000005000021000000000000000105000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000105000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050
</T30301000><T30303000>00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105010000000000000000010500000000000000000000000000000004000000000000000040000000000000000000000000000000000000N000000000000295000000000000000000N0000000000002950
</T30303000></T30302018020000>
\ No newline at end of file
