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

Fixed for loop and mass unlink

Browse Source
This commit is contained in:
Daniel Reis
2016-06-30 16:28:28 +01:00
committed by GitHub
parent c3bdff329b
commit 85942a1add
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contract_invoice_merge_by_partner/models/account_analytic_analysis.py
View File

@@ -15,14 +15,15 @@ class PurchaseOrderLine(models.Model):
super(PurchaseOrderLine, self)._recurring_create_invoice(automatic)) super(PurchaseOrderLine, self)._recurring_create_invoice(automatic))
res = [] res = []
unlink_list = [] unlink_list = []
for partner in set(invoices.mapped('partner_id')): for partner in invoices.mapped('partner_id'):
inv_to_merge = invoices.filtered(lambda x: x.partner_id == partner) inv_to_merge = invoices.filtered(
lambda x: x.partner_id.id == partner)
if partner.contract_invoice_merge: if partner.contract_invoice_merge:
invoices_merged = inv_to_merge.do_merge() invoices_merged = inv_to_merge.do_merge()
res.extend(invoices_merged) res.extend(invoices_merged)
unlink_list.extend(inv_to_merge) unlink_list.extend(inv_to_merge)
else: else:
res.extend(inv_to_merge) res.extend(inv_to_merge)
for inv in unlink_list: if unlink_list:
inv.unlink() invoice_obj.unlink([x.id for x in unlink_list])
return res return res