Fix merge with 5.2
This commit is contained in:
parent
ad142c97df
commit
26dfab1d4c
14
invoice.py
14
invoice.py
|
@ -72,13 +72,6 @@ class Invoice(metaclass=PoolMeta):
|
|||
if hasattr(cls, '_intercompany_excluded_fields'):
|
||||
cls._intercompany_excluded_fields += sii_fields
|
||||
cls._intercompany_excluded_fields += ['sii_records']
|
||||
cls._buttons.update({
|
||||
'reset_sii_keys': {
|
||||
'readonly': ~Eval('sii_state').in_(['Correcto', 'Correcta']),
|
||||
'invisible': Eval('sii_state').in_(['Correcto', 'Correcta']),
|
||||
'depends': ['sii_state']
|
||||
}
|
||||
})
|
||||
|
||||
@staticmethod
|
||||
def default_sii_pending_sending():
|
||||
|
@ -479,13 +472,6 @@ class Invoice(metaclass=PoolMeta):
|
|||
|
||||
super(Invoice, cls).post(invoices)
|
||||
|
||||
invoices2checksii = []
|
||||
for invoice in invoices:
|
||||
if not invoice.move:
|
||||
invoices2checksii.append(invoice)
|
||||
|
||||
super(Invoice, cls).post(invoices)
|
||||
|
||||
for invoice in invoices2checksii:
|
||||
values = {}
|
||||
if invoice.sii_book_key:
|
||||
|
|
|
@ -41,10 +41,5 @@
|
|||
<field name="group" ref="group_aeat_sii_admin"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.model.button" id="invoice_button_reset_sii_keys">
|
||||
<field name="name">reset_sii_keys</field>
|
||||
<field name="string">Reset SII keys</field>
|
||||
<field name="model" search="[('model', '=', 'account.invoice')]"/>
|
||||
</record>
|
||||
</data>
|
||||
</tryton>
|
||||
|
|
Loading…
Reference in New Issue