audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #432 into 12.0

Browse Source 
Signed-off-by sbejaoui
This commit is contained in:
OCA-git-bot
2019-12-03 09:25:23 +00:00
parent cd1d7a4fdc d415e44ff7
commit 34ec17d968
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
contract/models/contract.py
View File

@@ -280,19 +280,26 @@ class ContractContract(models.Model):
invoice_type = 'out_invoice' invoice_type = 'out_invoice'
if self.contract_type == 'purchase': if self.contract_type == 'purchase':
invoice_type = 'in_invoice' invoice_type = 'in_invoice'
return { vinvoice = self.env['account.invoice'].new({
'name': self.code,
'type': invoice_type,
'partner_id': self.invoice_partner_id.id, 'partner_id': self.invoice_partner_id.id,
'type': invoice_type,
})
vinvoice._onchange_partner_id()
invoice_vals = vinvoice._convert_to_write(vinvoice._cache)
invoice_vals.update({
'name': self.code,
'currency_id': currency.id, 'currency_id': currency.id,
'date_invoice': date_invoice, 'date_invoice': date_invoice,
'journal_id': journal.id, 'journal_id': journal.id,
'origin': self.name, 'origin': self.name,
'company_id': self.company_id.id, 'company_id': self.company_id.id,
'user_id': self.user_id.id, 'user_id': self.user_id.id,
'payment_term_id': self.payment_term_id.id, })
'fiscal_position_id': self.fiscal_position_id.id, if self.payment_term_id:
} invoice_vals['payment_term_id'] = self.payment_term_id.id
if self.fiscal_position_id:
invoice_vals['fiscal_position_id'] = self.fiscal_position_id.id
return invoice_vals
@api.multi @api.multi
def action_contract_send(self): def action_contract_send(self):
@@ -353,12 +360,6 @@ class ContractContract(models.Model):
@api.model @api.model
def _finalize_invoice_creation(self, invoices): def _finalize_invoice_creation(self, invoices):
for invoice in invoices:
payment_term = invoice.payment_term_id
fiscal_position = invoice.fiscal_position_id
invoice._onchange_partner_id()
invoice.payment_term_id = payment_term
invoice.fiscal_position_id = fiscal_position
invoices.compute_taxes() invoices.compute_taxes()
@api.model @api.model