diff --git a/aeat.py b/aeat.py index 39f1344..873a183 100644 --- a/aeat.py +++ b/aeat.py @@ -19,7 +19,6 @@ from pyAEATsii import mapping from pyAEATsii import callback_utils from trytond.model import ModelSQL, ModelView, Model, fields, Workflow -from trytond.model import Model from trytond.pyson import Eval from trytond.pool import Pool from trytond.transaction import Transaction @@ -367,6 +366,7 @@ class SIIReport(Workflow, ModelSQL, ModelView): else: default = default.copy() default['communication_state'] = None + default['csv'] = None return super(SIIReport, cls).copy(records, default=default) @classmethod diff --git a/invoice.py b/invoice.py index 451fdfe..20d3d5b 100644 --- a/invoice.py +++ b/invoice.py @@ -54,6 +54,13 @@ class Invoice: 'sii_received_key', 'sii_issued_key', 'sii_subjected_key', 'sii_excemption_key', 'sii_intracomunity_key'] + @staticmethod + def default_sii_book_key(): + type_ = Transaction().context.get('type', 'out_invoice') + if type_.startswith('in_'): + return 'R' + return 'E' + @staticmethod def default_sii_operation_key(): type_ = Transaction().context.get('type', 'out_invoice') diff --git a/locale/es_ES.po b/locale/es_ES.po index f94a79a..58dd6d3 100644 --- a/locale/es_ES.po +++ b/locale/es_ES.po @@ -18,7 +18,7 @@ msgctxt "field:account.invoice,sii_book_key:" msgid "SII Book Key" msgstr "Clave de Libro" -msgctxt "field:account.invoice,sii_excemption_cause:" +msgctxt "field:account.invoice,sii_excemption_key:" msgid "Excemption Cause" msgstr "Exención" @@ -46,7 +46,7 @@ msgctxt "field:account.invoice,sii_state:" msgid "SII State" msgstr "Estado SII" -msgctxt "field:account.invoice,sii_subjected:" +msgctxt "field:account.invoice,sii_subjected_key:" msgid "Subjected" msgstr "Sujeta" @@ -318,31 +318,31 @@ msgctxt "selection:account.invoice,sii_book_key:" msgid "Received Invoices" msgstr "Facturas recibidas" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "" msgstr " " -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Article 20" msgstr "Exenta por el artículo 20" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Article 21" msgstr "Exenta por el artículo 21" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Article 22" msgstr "Exenta por el artículo 22" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Article 24" msgstr "Exenta por el artículo 24" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Article 25" msgstr "Exenta por el artículo 25" -msgctxt "selection:account.invoice,sii_excemption_cause:" +msgctxt "selection:account.invoice,sii_excemption_key:" msgid "Excempt. Other" msgstr "Exenta, otros" @@ -616,15 +616,15 @@ msgctxt "selection:account.invoice,sii_state:" msgid "Rejected" msgstr "Rechazado" -msgctxt "selection:account.invoice,sii_subjected:" +msgctxt "selection:account.invoice,sii_subjected_key:" msgid "" msgstr " " -msgctxt "selection:account.invoice,sii_subjected:" +msgctxt "selection:account.invoice,sii_subjected_key:" msgid "Subjected - Not Excempt" msgstr "Sujeto - No exento." -msgctxt "selection:account.invoice,sii_subjected:" +msgctxt "selection:account.invoice,sii_subjected_key:" msgid "Subjected - Not Excempt , Inv. Suj. Pass" msgstr "No exenta - Con Inversion sujeto pasivo" @@ -694,7 +694,7 @@ msgstr "Cancelado" msgctxt "selection:aeat.sii.report,state:" msgid "Confirmed" -msgstr "Confirmados" +msgstr "Confirmado" msgctxt "selection:aeat.sii.report,state:" msgid "Done"