pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 72cb16865c

Browse Source
This commit is contained in:
Christophe Simonis
2018-08-14 16:57:21 +02:00
parent 71bba5e43d 72cb16865c
commit a487d7d397
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/models/account_invoice.py
+6 -5
View File
@@ -23,11 +23,12 @@ class AccountInvoice(models.Model):
purchase_line_ids = self.invoice_line_ids.mapped('purchase_line_id')
purchase_ids = self.invoice_line_ids.mapped('purchase_id').filtered(lambda r: r.order_line <= purchase_line_ids)
result['domain'] = {'purchase_id': [
('invoice_status', '=', 'to invoice'),
('partner_id', 'child_of', self.partner_id.id),
('id', 'not in', purchase_ids.ids),
]}
domain = [('invoice_status', '=', 'to invoice')]
if self.partner_id:
domain += [('partner_id', 'child_of', self.partner_id.id)]
if purchase_ids:
domain += [('id', 'not in', purchase_ids.ids)]
result['domain'] = {'purchase_id': domain}
return result
def _prepare_invoice_line_from_po_line(self, line):