Datalife
/
trytond-aeat_sii
mirror of https://gitlab.com/datalifeit/trytond-aeat_sii
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge upstream changes

This commit is contained in:
Daniel Möller 2017-05-25 10:53:43 +02:00
parent 619e5a3139 adeb18f00e
commit b04cce4e11
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
invoice.py
View File

@ -55,9 +55,8 @@ class Invoice:
def __setup__(cls):
super(Invoice, cls).__setup__()
cls._check_modify_exclude += ['sii_book_key', 'sii_operation_key',
'sii_received_key', 'sii_subjected', 'sii_subjected',
'sii_excemption_cause', 'sii_intracomunity_key',
'sii_intracomunity_key']
'sii_received_key', 'sii_issued_key', 'sii_subjected',
'sii_excemption_cause', 'sii_intracomunity_key']
@staticmethod
def default_sii_book_key():
@ -81,14 +80,14 @@ class Invoice:
@staticmethod
def default_sii_received_key():
type_ = Transaction().context.get('type', 'ou_invoice')
type_ = Transaction().context.get('type', 'out_invoice')
if type_ == 'in_invoice':
return '01'
return 'None'
@staticmethod
def default_sii_operation_key():
type_ = Transaction().context.get('type', 'ou_invoice')
type_ = Transaction().context.get('type', 'out_invoice')
if type_ in ('in_credit_note', 'out_credit_note'):
return 'R1'
return 'F1'
@ -146,4 +145,12 @@ class Invoice:
return result
def _credit(self):
res = super(Invoice, self)._credit()
for field in ('sii_book_key', 'sii_issued_key', 'sii_received_key',
'sii_subjected', 'sii_excemption_cause',
'sii_intracomunity_key'):
res[field] = getattr(self, field)
res['sii_operation_key'] = 'R4'
return res

26
invoice.xml
View File

@ -14,32 +14,6 @@
<field name="inherit" ref="account_invoice.invoice_view_tree"/>
<field name="name">account_invoice_list</field>
</record>
<!-- <record model="ir.ui.view" id="aeat_sii_reasign_start_view">
<field name="model">aeat.sii.reasign.records.start</field>
<field name="type">form</field>
<field name="name">reasign_start</field>
</record>
<record model="ir.ui.view" id="aeat_sii_reasign_end_view">
<field name="model">aeat.sii.reasign.records.end</field>
<field name="type">form</field>
<field name="name">reasign_end</field>
</record>
<record model="ir.action.wizard" id="act_aeat_sii_reasign">
<field name="name">Reasign AEAT SII Records</field>
<field name="wiz_name">aeat.sii.reasign.records</field>
</record>
<record model="ir.action.keyword" id="act_aeat_sii_reasign_keyword1">
<field name="action" ref="act_aeat_sii_reasign"/>
<field name="keyword">form_action</field>
<field name="model">account.invoice,-1</field>
</record>
<record model="ir.action-res.group"
id="act_reasign-group_aeatsii">
<field name="action" ref="act_aeat_sii_reasign"/>
<field name="group" ref="group_aeat_sii_admin"/>
</record> -->
</data>
</tryton>