Datalife/trytond-aeat_sii
1
0
Fork 0
mirror of https://gitlab.com/datalifeit/trytond-aeat_sii synced 2023-12-13 20:30:37 +01:00
Code Issues 1 Projects Releases Wiki Activity

Fix PR feedback

Browse source 
- Change namespacing from "search" to "add" invoices
- Fix translations
- Promote imperative mood for buttons
- Remove commented code
- Simplify dummy domain clauses
- Fix xml styling
This commit is contained in:
Daniel Möller 2018-06-14 16:32:55 +02:00
parent ddbf189fed
commit 9855bf8715
7 changed files with 68 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
__init__.py
View file

@ -30,5 +30,5 @@ def register():
module='aeat_sii', type_='model')
Pool.register(
load_pkcs12.LoadPKCS12,
search_invoices.SearchInvoicesWizard,
search_invoices.AddInvoicesWizard,
module='aeat_sii', type_='wizard')

6
aeat.py
View file

@ -325,7 +325,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
'invisible': ~(Eval('state').in_(['draft']) &
Eval('operation_type').in_(['A0', 'A1'])),
},
'search_invoices': {
'add_invoices': {
'invisible': ~(Eval('state').in_(['draft']) &
Eval('operation_type').in_(['A0', 'A1', 'D0'])),
},
@ -472,8 +472,8 @@ class SIIReport(Workflow, ModelSQL, ModelView):
ReportLine.create(to_create)
@classmethod
@ModelView.button_action('aeat_sii.search_invoices_act_wizard')
def search_invoices(cls, reports):
@ModelView.button_action('aeat_sii.add_invoices_act_wizard')
def add_invoices(cls, reports):
pass
def submit_issued_invoices(self):

48
locale/ca_ES.po
View file

@ -374,15 +374,15 @@ msgctxt "field:aeat.sii.report.lines,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
msgctxt "field:aeat.sii.search_invoices.start,company:"
msgctxt "field:aeat.sii.add_invoices.start,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:aeat.sii.search_invoices.start,id:"
msgctxt "field:aeat.sii.add_invoices.start,id:"
msgid "ID"
msgstr "Identificador"
msgstr "ID"
msgctxt "field:aeat.sii.search_invoices.start,invoices:"
msgctxt "field:aeat.sii.add_invoices.start,invoices:"
msgid "Invoices"
msgstr "Factures"
@ -426,9 +426,9 @@ msgctxt "model:aeat.sii.report.lines,name:"
msgid "AEAT SII Issued"
msgstr "Emitidas"
msgctxt "model:aeat.sii.search_invoices.start,name:"
msgid "Search Invoices Start View"
msgstr "Vista Inicial Cercar Factures"
msgctxt "model:aeat.sii.add_invoices.start,name:"
msgid "Add Invoices Start View"
msgstr "Vista inicial afegir factures"
msgctxt "model:ir.action,name:act_aeat_sii_intra_report"
msgid "SII Report Intracommunity"
@ -466,9 +466,9 @@ msgctxt "model:ir.action,name:act_aeat_sii_report_lines"
msgid "SII Report Lines"
msgstr "Líneas informe SII"
msgctxt "model:ir.action,name:search_invoices_act_wizard"
msgid "Search Invoices"
msgstr "Cercar Factures"
msgctxt "model:ir.action,name:add_invoices_act_wizard"
msgid "Add Invoices"
msgstr "Afegir factures"
msgctxt "model:ir.ui.menu,name:"
msgid "AEAT SII Report"
@ -1628,40 +1628,40 @@ msgstr "Confirmar"
msgctxt "view:aeat.sii.report:"
msgid "Draft"
msgstr "Borrador"
msgstr "Esborrany"
msgctxt "view:aeat.sii.report:"
msgid "Load Invoices"
msgstr "Cargar facturas"
msgctxt "view:aeat.sii.report:"
msgid "Manual Search"
msgstr "Cerca Manual"
msgid "Add Invoices"
msgstr "Afegir factures"
msgctxt "view:aeat.sii.report:"
msgid "Send"
msgstr "Enviar"
msgctxt "view:aeat.sii.search_invoices.start:"
msgid "Search Invoices"
msgstr "Cercar Factures"
msgctxt "view:aeat.sii.add_invoices.start:"
msgid "Add Invoices"
msgstr "Afegir factures"
msgctxt "view:company.company:"
msgid "Certificate"
msgstr "Certificado"
msgstr "Certificat"
msgctxt "wizard_button:aeat.sii.load_pkcs12,start,end:"
msgid "Cancel"
msgstr "Cancelar"
msgstr "Cancel·la"
msgctxt "wizard_button:aeat.sii.load_pkcs12,start,load:"
msgid "Load"
msgstr "Cargar"
msgstr "Carrega"
msgctxt "wizard_button:aeat.sii.search_invoices.wizard,start,attach:"
msgid "Attach"
msgstr "Afegir"
msgctxt "wizard_button:aeat.sii.add_invoices.wizard,start,add:"
msgid "Add"
msgstr "Afegeix"
msgctxt "wizard_button:aeat.sii.search_invoices.wizard,start,end:"
msgctxt "wizard_button:aeat.sii.add_invoices.wizard,start,end:"
msgid "Cancel"
msgstr "Cancel·lar"
msgstr "Cancel·la"

36
locale/es_ES.po
View file

@ -374,15 +374,15 @@ msgctxt "field:aeat.sii.report.lines,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
msgctxt "field:aeat.sii.search_invoices.start,company:"
msgctxt "field:aeat.sii.add_invoices.start,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:aeat.sii.search_invoices.start,id:"
msgctxt "field:aeat.sii.add_invoices.start,id:"
msgid "ID"
msgstr "Identificador"
msgstr "ID"
msgctxt "field:aeat.sii.search_invoices.start,invoices:"
msgctxt "field:aeat.sii.add_invoices.start,invoices:"
msgid "Invoices"
msgstr "Facturas"
@ -426,9 +426,9 @@ msgctxt "model:aeat.sii.report.lines,name:"
msgid "AEAT SII Issued"
msgstr "Emitidas"
msgctxt "model:aeat.sii.search_invoices.start,name:"
msgid "Search Invoices Start View"
msgstr "Vista Inicial Buscar Facturas"
msgctxt "model:aeat.sii.add_invoices.start,name:"
msgid "Add Invoices Start View"
msgstr "Vista inicial añadir facturas"
msgctxt "model:ir.action,name:act_aeat_sii_intra_report"
msgid "SII Report Intracommunity"
@ -466,9 +466,9 @@ msgctxt "model:ir.action,name:act_aeat_sii_report_lines"
msgid "SII Report Lines"
msgstr "Líneas informe SII"
msgctxt "model:ir.action,name:search_invoices_act_wizard"
msgid "Search Invoices"
msgstr "Buscar Facturas"
msgctxt "model:ir.action,name:add_invoices_act_wizard"
msgid "Add Invoices"
msgstr "Añadir facturas"
msgctxt "model:ir.ui.menu,name:"
msgid "AEAT SII Report"
@ -1635,16 +1635,16 @@ msgid "Load Invoices"
msgstr "Cargar facturas"
msgctxt "view:aeat.sii.report:"
msgid "Manual Search"
msgstr "Búsqueda Manual"
msgid "Add Invoices"
msgstr "Añadir facturas"
msgctxt "view:aeat.sii.report:"
msgid "Send"
msgstr "Enviar"
msgctxt "view:aeat.sii.search_invoices.start:"
msgid "Search Invoices"
msgstr "Buscar Facturas"
msgctxt "view:aeat.sii.add_invoices.start:"
msgid "Add Invoices"
msgstr "Añadir facturas"
msgctxt "view:company.company:"
msgid "Certificate"
@ -1658,10 +1658,10 @@ msgctxt "wizard_button:aeat.sii.load_pkcs12,start,load:"
msgid "Load"
msgstr "Cargar"
msgctxt "wizard_button:aeat.sii.search_invoices.wizard,start,attach:"
msgid "Attach"
msgctxt "wizard_button:aeat.sii.add_invoices.wizard,start,add:"
msgid "Add"
msgstr "Añadir"
msgctxt "wizard_button:aeat.sii.search_invoices.wizard,start,end:"
msgctxt "wizard_button:aeat.sii.add_invoices.wizard,start,end:"
msgid "Cancel"
msgstr "Cancelar"

42
search_invoices.py
View file

@ -13,18 +13,15 @@ from .aeat import BOOK_KEY, COMMUNICATION_TYPE
__all__ = [
'StartView',
'SearchInvoicesWizard',
'AddInvoicesWizard',
]
_logger = getLogger(__name__)
# TODO: fix account.invoice `sii_state` searcher performance
# and uncomment all code blocks regarding `operation_type`
class StartView(ModelView):
'Search Invoices Start View'
__name__ = 'aeat.sii.search_invoices.start'
'Add Invoices Start View'
__name__ = 'aeat.sii.add_invoices.start'
company = fields.Many2One('company.company', 'Company')
period = fields.Many2One('account.period', 'Period')
@ -40,43 +37,34 @@ class StartView(ModelView):
If(
Equal(Eval('book'), 'R'), # recieved
('type', 'in', ['in_invoice', 'in_credit_note']),
('id', '!=', None) # dummy clause
()
)
),
('state', 'in', ['posted', 'paid']),
('company', '=', Eval('company')),
('move.period', '=', Eval('period')),
# If(
# Equal(Eval('operation_type'), 'A0'), # create
# ('sii_state', 'in', [None, 'Incorrecto']),
# If(
# In(Eval('operation_type'), ['A1', 'D0']), # edit/delete
# ('sii_state', 'in', [
# 'Correcto', 'Correcta',
# 'AceptadoConErrores', 'AceptadaConErrores']),
# ('id', '!=', None) # dummy clause
# )
# ),
# TODO: fix account.invoice `sii_state` searcher performance and
# add a clause filtering by `sii_state` for each operation_type
],
depends=[
'company', 'period', 'book', # 'operation_type',
'company', 'period', 'book',
],
)
class SearchInvoicesWizard(Wizard):
'Search Invoices Wizard'
__name__ = 'aeat.sii.search_invoices.wizard'
class AddInvoicesWizard(Wizard):
'Add Invoices Wizard'
__name__ = 'aeat.sii.add_invoices.wizard'
start = StateView(
'aeat.sii.search_invoices.start',
'aeat_sii.search_invoices_start_view_form',
'aeat.sii.add_invoices.start',
'aeat_sii.add_invoices_start_view_form',
[
Button('Cancel', 'end', 'tryton-cancel'),
Button('Attach', 'attach', 'tryton-ok', default=True),
Button('Add', 'add', 'tryton-ok', default=True),
]
)
attach = StateTransition()
add = StateTransition()
def default_start(self, fields):
SIIReport = Pool().get('aeat.sii.report')
@ -90,7 +78,7 @@ class SearchInvoicesWizard(Wizard):
'operation_type': sii_report.operation_type,
}
def transition_attach(self):
def transition_add(self):
SIIReportLine = Pool().get('aeat.sii.report.lines')
report_id = Transaction().context['active_id']
SIIReportLine.create([

10
search_invoices.xml
View file

@ -4,15 +4,15 @@
<tryton>
<data>
<record model="ir.ui.view" id="search_invoices_start_view_form">
<field name="model">aeat.sii.search_invoices.start</field>
<record model="ir.ui.view" id="add_invoices_start_view_form">
<field name="model">aeat.sii.add_invoices.start</field>
<field name="type">form</field>
<field name="name">search_invoices_start</field>
</record>
<record model="ir.action.wizard" id="search_invoices_act_wizard">
<field name="name">Search Invoices</field>
<field name="wiz_name">aeat.sii.search_invoices.wizard</field>
<record model="ir.action.wizard" id="add_invoices_act_wizard">
<field name="name">Add Invoices</field>
<field name="wiz_name">aeat.sii.add_invoices.wizard</field>
</record>
</data>

4
view/sii_report_form.xml
View file

@ -20,8 +20,8 @@
<field name="period"/>
<label name="send_date"/>
<field name="send_date"/>
<button string="Load Invoices" name="load_invoices" colspan="2"/>
<button string="Manual Search" name="search_invoices" colspan="2"/>
<button string="Load Invoices" name="load_invoices" colspan="2"/>
<button string="Add Invoices" name="add_invoices" colspan="2"/>
<field name="lines" colspan="6"
mode="tree"
view_ids="aeat_sii.aeat_sii_report_line_tree_seq_view"/>