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 #455 into 12.0

Browse Source 
Signed-off-by sbidoul
This commit is contained in:
OCA-git-bot
2020-01-09 15:53:49 +00:00
parent 73d076b505 acd45545fa
commit 6762569f97
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contract/models/contract.py
View File

@@ -281,7 +281,9 @@ class ContractContract(models.Model):
invoice_type = 'out_invoice'
if self.contract_type == 'purchase':
invoice_type = 'in_invoice'
vinvoice = self.env['account.invoice'].new({
vinvoice = self.env['account.invoice'].with_context(
force_company=self.company_id.id,
).new({
'partner_id': self.invoice_partner_id.id,
'type': invoice_type,
})
@@ -343,7 +345,9 @@ class ContractContract(models.Model):
# taken from the invoice's journal in _onchange_product_id
# This code is not in finalize_creation_from_contract because it's
# not possible to create an invoice line with no account
new_invoice = self.env['account.invoice'].new(invoice_values)
new_invoice = self.env['account.invoice'].with_context(
force_company=invoice_values['company_id'],
).new(invoice_values)
for invoice_line in new_invoice.invoice_line_ids:
name = invoice_line.name
account_analytic_id = invoice_line.account_analytic_id

4
contract/models/contract_line.py
View File

@@ -658,7 +658,9 @@ class ContractLine(models.Model):
}
if invoice_id:
invoice_line_vals['invoice_id'] = invoice_id.id
invoice_line = self.env['account.invoice.line'].new(invoice_line_vals)
invoice_line = self.env['account.invoice.line'].with_context(
force_company=self.contract_id.company_id.id,
).new(invoice_line_vals)
# Get other invoice line values from product onchange
invoice_line._onchange_product_id()
invoice_line_vals = invoice_line._convert_to_write(invoice_line._cache)