From 85942a1addaa5265305acb5149159d1b3878e5b2 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Thu, 30 Jun 2016 16:28:28 +0100 Subject: [PATCH] Fixed for loop and mass unlink --- .../models/account_analytic_analysis.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contract_invoice_merge_by_partner/models/account_analytic_analysis.py b/contract_invoice_merge_by_partner/models/account_analytic_analysis.py index 1fe7e1be..9ca946ea 100644 --- a/contract_invoice_merge_by_partner/models/account_analytic_analysis.py +++ b/contract_invoice_merge_by_partner/models/account_analytic_analysis.py @@ -15,14 +15,15 @@ class PurchaseOrderLine(models.Model): super(PurchaseOrderLine, self)._recurring_create_invoice(automatic)) res = [] unlink_list = [] - for partner in set(invoices.mapped('partner_id')): - inv_to_merge = invoices.filtered(lambda x: x.partner_id == partner) + for partner in invoices.mapped('partner_id'): + inv_to_merge = invoices.filtered( + lambda x: x.partner_id.id == partner) if partner.contract_invoice_merge: invoices_merged = inv_to_merge.do_merge() res.extend(invoices_merged) unlink_list.extend(inv_to_merge) else: res.extend(inv_to_merge) - for inv in unlink_list: - inv.unlink() + if unlink_list: + invoice_obj.unlink([x.id for x in unlink_list]) return res