update to 4.0

aeat.py

@@ -126,9 +126,9 @@ AEAT_COMMUNICATION_STATE = [
 
 AEAT_INVOICE_STATE = [
     (None, ''),
-    ('Correcto', 'Accepted'),
+    ('Correcto', 'Accepted '),
     ('Correcta', 'Accepted'),  # You guys are disgusting
-    ('AceptadoConErrores', 'Accepted with Errors'),
+    ('AceptadoConErrores', 'Accepted with Errors '),
     ('AceptadaConErrores', 'Accepted with Errors'),  # Shame on AEAT
     ('Anulada', 'Deleted'),
     ('Incorrecto', 'Rejected')
@@ -234,7 +234,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
             }, depends=['state'])
 
     period = fields.Many2One('account.period', 'Period', required=True,
-        domain = [('fiscalyear','=', Eval('fiscalyear'))],
+        domain=[('fiscalyear', '=', Eval('fiscalyear'))],
         states={
             'readonly': Eval('state') != 'draft',
             }, depends=['state'])
@@ -258,7 +258,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
             ('sent', 'Sent'),
         ], 'State', readonly=True)
 
-    communication_state = fields.Selection( AEAT_COMMUNICATION_STATE,
+    communication_state = fields.Selection(AEAT_COMMUNICATION_STATE,
         'Communication State', readonly=True)
 
     csv = fields.Char(
@@ -275,7 +275,6 @@ class SIIReport(Workflow, ModelSQL, ModelView):
             'readonly': ~Eval('state').in_(['draft']),
             }, depends=['state'])
 
-
     @classmethod
     def __setup__(cls):
         super(SIIReport, cls).__setup__()
@@ -299,7 +298,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
                     },
                 'load_invoices': {
                     'invisible': ~(Eval('state').in_(['draft']) &
-                         Eval('operation_type').in_(['A0','A1'])),
+                         Eval('operation_type').in_(['A0', 'A1'])),
                     }
                 })
 
@@ -313,7 +312,6 @@ class SIIReport(Workflow, ModelSQL, ModelView):
                 ))
 
 
-
     @staticmethod
     def default_company():
 
@@ -339,7 +337,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
     @fields.depends('company')
     def on_change_with_company_vat(self):
         if self.company:
-            return self.company.party.vat_number
+            return self.company.party.vat_code
 
     @classmethod
     @ModelView.button
@@ -418,7 +416,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
         _logger.info('Sending report %s to AEAT SII', self.id)
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
         pool = Pool()
         mapper = pool.get('aeat.sii.issued.invoice.mapper')(pool=pool)
@@ -445,7 +443,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
     def delete_issued_invoices(self):
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
         pool = Pool()
         mapper = pool.get('aeat.sii.issued.invoice.mapper')(pool=pool)
@@ -475,7 +473,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
         Invoice = pool.get('account.invoice')
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
 
         with self.company.tmp_ssl_credentials() as (crt, key):
@@ -522,7 +520,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
         _logger.info('Sending report %s to AEAT SII', self.id)
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
         pool = Pool()
         mapper = pool.get('aeat.sii.recieved.invoice.mapper')(pool=pool)
@@ -549,7 +547,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
     def delete_recieved_invoices(self):
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
         pool = Pool()
         mapper = pool.get('aeat.sii.recieved.invoice.mapper')(pool=pool)
@@ -579,7 +577,7 @@ class SIIReport(Workflow, ModelSQL, ModelView):
         Invoice = pool.get('account.invoice')
         headers = mapping.get_headers(
             name=self.company.party.name,
-            vat=self.company.party.vat_number,
+            vat=self.company.party.vat_code,
             comm_kind=self.operation_type)
 
         with self.company.tmp_ssl_credentials() as (crt, key):
@@ -632,14 +630,14 @@ class BaseTrytonInvoiceMapper(Model):
 
     year = attrgetter('move.period.fiscalyear.name')
     period = attrgetter('move.period.start_date.month')
-    nif = attrgetter('company.party.vat_number')
+    nif = attrgetter('company.party.vat_code')
     issue_date = attrgetter('invoice_date')
     invoice_kind = attrgetter('sii_operation_key')
     rectified_invoice_kind = mapping.hardcode('I')
     description = attrgetter('description')
     not_exempt_kind = attrgetter('sii_subjected')
     counterpart_name = attrgetter('party.name')
-    counterpart_nif = attrgetter('party.vat_number')
+    counterpart_nif = attrgetter('party.vat_code')
     counterpart_id_type = attrgetter('party.identifier_type')
     counterpart_country = attrgetter('party.vat_country')
     counterpart_id = counterpart_nif

aeat.xml

@@ -107,7 +107,7 @@
           <field name="global_p" eval="True"/>
       </record>
       <record model="ir.rule" id="rule_sii_report1">
-          <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+          <field name="domain" eval="[('company', '=', Eval('user' ,{}).get('company', None))]" pyson="1" />
           <field name="rule_group" ref="rule_group_sii_report"/>
       </record>
 
@@ -116,7 +116,7 @@
           <field name="global_p" eval="True"/>
       </record>
       <record model="ir.rule" id="rule_sii_report_line1">
-          <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+          <field name="domain" eval="[('company', '=',Eval('user', {}).get('company', None))]" pyson="1"/>
           <field name="rule_group" ref="rule_group_sii_report_line"/>
       </record>
 
@@ -144,7 +144,7 @@
       <record model="ir.action.act_window" id="act_aeat_sii_issued_report">
           <field name="name">SII Report Issued</field>
           <field name="res_model">aeat.sii.report</field>
-          <field name="domain">[('book', '=', 'E')]</field>
+          <field name="domain" eval="[('book', '=', 'E')]" pyson="1"/>
           <field name="search_value"></field>
       </record>
       <menuitem action="act_aeat_sii_issued_report"
@@ -155,7 +155,7 @@
       <record model="ir.action.act_window" id="act_aeat_sii_invest_report">
           <field name="name">SII Report Invest</field>
           <field name="res_model">aeat.sii.report</field>
-          <field name="domain">[('book', '=', 'I')]</field>
+          <field name="domain" eval="[('book', '=', 'I')]" pyson="1"/>
           <field name="search_value"></field>
       </record>
       <menuitem action="act_aeat_sii_invest_report"
@@ -166,7 +166,8 @@
       <record model="ir.action.act_window" id="act_aeat_sii_received_report">
           <field name="name">SII Report Received</field>
           <field name="res_model">aeat.sii.report</field>
-          <field name="domain">[('book', '=', 'R')]</field>
+          <field name="domain" eval="[('book', '=', 'R')]" pyson="1"/>
+
           <field name="search_value"></field>
       </record>
       <menuitem action="act_aeat_sii_received_report"
@@ -177,7 +178,7 @@
       <record model="ir.action.act_window" id="act_aeat_sii_intra_report">
           <field name="name">SII Report Intracommunity</field>
           <field name="res_model">aeat.sii.report</field>
-          <field name="domain">[('book', '=', 'U')]</field>
+          <field name="domain" eval="[('book', '=', 'U')]" pyson="1"/>
           <field name="search_value"></field>
       </record>
       <menuitem action="act_aeat_sii_intra_report"

invoice.py

@@ -96,7 +96,7 @@ class Invoice:
 
         table = SIILines.__table__()
 
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         cursor.execute(*table.select(Max(table.id), table.invoice,
             group_by=table.invoice))
 
@@ -126,7 +126,7 @@ class Invoice:
             result[name] = dict((i.id, '') for i in invoices)
 
         table = SIILines.__table__()
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         cursor.execute(*table.select(Max(table.id), table.invoice,
             where=table.invoice.in_([x.id for x in invoices]),
             group_by=table.invoice))

invoice.xml

@@ -3,14 +3,12 @@
     <data>
       <record model="ir.ui.view" id="aeat_sii_invoice_form_view">
           <field name="model">account.invoice</field>
-          <field name="type">form</field>
           <field name="inherit" ref="account_invoice.invoice_view_form"/>
           <field name="name">account_invoice_form</field>
       </record>
 
       <record model="ir.ui.view" id="aeat_sii_invoice_list_view">
           <field name="model">account.invoice</field>
-          <field name="type">tree</field>
           <field name="inherit" ref="account_invoice.invoice_view_tree"/>
           <field name="name">account_invoice_list</field>
       </record>

party.py

@@ -7,11 +7,10 @@ from . import aeat
 
 __all__ = ['Party']
 
-
 class Party:
     __name__ = 'party.party'
     __metaclass__ = PoolMeta
 
     # TODO: v4 change to party.identifier module
-    identifier_type = fields.Selection( [('','')] + aeat.PARTY_IDENTIFIER_TYPE,
+    identifier_type = fields.Selection([('', '')] + aeat.PARTY_IDENTIFIER_TYPE,
         'Identifier Type', )

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=4.0
 depends:
   account_invoice
 xml: