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 pull request #1 from dreispt/patch-1

Browse Source 
Improvements on the implementation
This commit is contained in:
Pedro M. Baeza
2016-07-21 21:27:30 +02:00
committed by GitHub
parent 7a3b4df8e1 26f984a773
commit 09e4c65db4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contract_invoice_merge_by_partner/models/account_analytic_analysis.py
View File

@@ -12,19 +12,19 @@ class PurchaseOrderLine(models.Model):
def _recurring_create_invoice(self, automatic=False):
invoice_obj = self.env['account.invoice']
invoices = invoice_obj.browse(
super(PurchaseOrderLine, self)._recurring_create_invoice(automatic)
)
super(PurchaseOrderLine, self)._recurring_create_invoice(
automatic))
res = []
unlink_list = []
for partner in invoices.mapped('partner_id'):
inv_to_merge = invoices.filtered(lambda x: x.partner_id == partner)
if partner.contract_invoice_merge and (len(inv_to_merge) > 1):
invoices_info = inv_to_merge.do_merge()
res.extend(invoices_info.keys())
for inv_ids_list in invoices_info.values():
unlink_list.extend(inv_ids_list)
inv_to_merge = invoices.filtered(
lambda x: x.partner_id.id == partner)
if partner.contract_invoice_merge and len(inv_to_merge) > 1:
invoices_merged = inv_to_merge.do_merge()
res.extend(invoices_merged)
unlink_list.extend(inv_to_merge)
else:
res.extend(inv_to_merge.ids)
res.extend(inv_to_merge)
if unlink_list:
invoice_obj.browse(unlink_list).unlink()
return res