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

[REF] Contract: invoice in prepare_invoice_line is optional

Browse Source
This commit is contained in:
Thomas Binsfeld
2018-12-18 14:04:08 +01:00
committed by Víctor Martínez
parent 7e15f88d1c
commit 3dd086fb38
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contract_variable_quantity/models/contract_line.py
View File

@@ -12,9 +12,9 @@ class AccountAnalyticInvoiceLine(models.Model):
_inherit = 'account.analytic.invoice.line' _inherit = 'account.analytic.invoice.line'
@api.multi @api.multi
def _prepare_invoice_line(self, invoice_id): def _prepare_invoice_line(self, invoice_id=False):
vals = super(AccountAnalyticInvoiceLine, self)._prepare_invoice_line( vals = super(AccountAnalyticInvoiceLine, self)._prepare_invoice_line(
invoice_id) invoice_id=invoice_id)
if self.qty_type == 'variable': if self.qty_type == 'variable':
eval_context = { eval_context = {
'env': self.env, 'env': self.env,
@@ -22,8 +22,10 @@ class AccountAnalyticInvoiceLine(models.Model):
'user': self.env.user, 'user': self.env.user,
'line': self, 'line': self,
'contract': self.contract_id, 'contract': self.contract_id,
'invoice': self.env['account.invoice'].browse(invoice_id),
} }
if invoice_id:
eval_context['invoice'] = self.env['account.invoice'].browse(
invoice_id),
safe_eval(self.qty_formula_id.code.strip(), eval_context, safe_eval(self.qty_formula_id.code.strip(), eval_context,
mode="exec", nocopy=True) # nocopy for returning result mode="exec", nocopy=True) # nocopy for returning result
qty = eval_context.get('result', 0) qty = eval_context.get('result', 0)