Recover mapping classes as tryton model, fix translations, on_change_currency

This commit is contained in:
Sergio Morillo 2017-06-12 11:51:54 +02:00
parent a29993fce7
commit b28d464265
3 changed files with 14 additions and 10 deletions

View File

@ -20,6 +20,8 @@ def register():
load_pkcs12.LoadPKCS12Start,
aeat.SIIReport,
aeat.SIIReportLine,
aeat.IssuedTrytonInvoiceMapper,
aeat.RecievedTrytonInvoiceMapper,
module='aeat_sii', type_='model')
Pool.register(
load_pkcs12.LoadPKCS12,

16
aeat.py
View File

@ -18,7 +18,7 @@ from pyAEATsii import service
from pyAEATsii import mapping
from pyAEATsii import callback_utils
from trytond.model import ModelSQL, ModelView, fields, Workflow
from trytond.model import ModelSQL, ModelView, Model, fields, Workflow
from trytond.model import Model
from trytond.pyson import Eval
from trytond.pool import Pool
@ -449,7 +449,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
vat=self.company_vat,
comm_kind=self.operation_type)
pool = Pool()
mapper = IssuedTrytonInvoiceMapper(pool=pool)
mapper = pool.get('aeat.sii.issued.invoice.mapper')(pool=pool)
res = None
with self.company.tmp_ssl_credentials() as (crt, key):
srv = service.bind_issued_invoices_service(crt, key, test=True)
@ -476,7 +476,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
vat=self.company_vat,
comm_kind=self.operation_type)
pool = Pool()
mapper = IssuedTrytonInvoiceMapper(pool=pool)
mapper = pool.get('aeat.sii.issued.invoice.mapper')(pool=pool)
res = None
with self.company.tmp_ssl_credentials() as (crt, key):
srv = service.bind_issued_invoices_service(crt, key, test=True)
@ -553,7 +553,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
vat=self.company_vat,
comm_kind=self.operation_type)
pool = Pool()
mapper = RecievedTrytonInvoiceMapper(pool=pool)
mapper = pool.get('aeat.sii.recieved.invoice.mapper')(pool=pool)
res = None
with self.company.tmp_ssl_credentials() as (crt, key):
srv = service.bind_recieved_invoices_service(crt, key, test=True)
@ -580,7 +580,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
vat=self.company_vat,
comm_kind=self.operation_type)
pool = Pool()
mapper = RecievedTrytonInvoiceMapper(pool=pool)
mapper = pool.get('aeat.sii.recieved.invoice.mapper')(pool=pool)
res = None
with self.company.tmp_ssl_credentials() as (crt, key):
srv = service.bind_recieved_invoices_service(crt, key, test=True)
@ -652,10 +652,10 @@ class SIIReport(Workflow, ModelSQL, ModelView):
})
class BaseTrytonInvoiceMapper(object):
class BaseTrytonInvoiceMapper(Model):
def __init__(self, *args, **kwargs):
super(BaseTrytonInvoiceMapper, self).__init__()
super(BaseTrytonInvoiceMapper, self).__init__(*args, **kwargs)
self.pool = Pool()
year = attrgetter('move.period.fiscalyear.name')
@ -703,6 +703,7 @@ class IssuedTrytonInvoiceMapper(
"""
Tryton Issued Invoice to AEAT mapper
"""
__name__ = 'aeat.sii.issued.invoice.mapper'
serial_number = attrgetter('number')
specialkey_or_trascendence = attrgetter('sii_issued_key')
@ -713,6 +714,7 @@ class RecievedTrytonInvoiceMapper(
"""
Tryton Recieved Invoice to AEAT mapper
"""
__name__ = 'aeat.sii.recieved.invoice.mapper'
serial_number = attrgetter('reference')
specialkey_or_trascendence = attrgetter('sii_received_key')
move_date = attrgetter('move.date')

View File

@ -36,7 +36,7 @@ msgstr "Clave operación"
msgctxt "field:account.invoice,sii_received_key:"
msgid "SII Recived Key"
msgstr "SII Clave recividas"
msgstr "SII Clave recibidas"
msgctxt "field:account.invoice,sii_records:"
msgid "Sii Report Lines"
@ -216,7 +216,7 @@ msgstr "Cargar PKCS12"
msgctxt "model:aeat.sii.recieved.invoice.mapper,name:"
msgid "Tryton Recieved Invoice to AEAT mapper"
msgstr "Correspondencia tryton - AEAT facturas recividas"
msgstr "Correspondencia tryton - AEAT facturas recibidas"
msgctxt "model:aeat.sii.report,name:"
msgid "SII Report"
@ -244,7 +244,7 @@ msgstr "Cargar PKCS12"
msgctxt "model:ir.action,name:act_aeat_sii_received_report"
msgid "SII Report Received"
msgstr "Informe Recividas"
msgstr "Informe Recibidas"
msgctxt "model:ir.action,name:act_aeat_sii_report"
msgid "SII Report"