Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/6.1-analytic_rent_prod_lines_in_contract_products-dev_luis into lp:addons-vauxoo/6.1

  1. 6.1-analytic_rent_prod_lines_in_contract_products-dev_luis
  2. Merge into 6.1
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 631
Proposed branch: lp:~vauxoo/addons-vauxoo/6.1-analytic_rent_prod_lines_in_contract_products-dev_luis
Merge into: lp:addons-vauxoo/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
account_analytic_analysis_rent/wizard/lines_invoice_create.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/6.1-analytic_rent_prod_lines_in_contract_products-dev_luis
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Review via email: mp+217858@code.launchpad.net

Description of the change

Se resolvió que en la comparación de los productos del contrato y los productos de las lineas no verifique igualdad, sino que este dentro de los productos del contrato.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_analytic_analysis_rent/wizard/lines_invoice_create.py'
2--- account_analytic_analysis_rent/wizard/lines_invoice_create.py 2014-02-15 00:53:09 +0000
3+++ account_analytic_analysis_rent/wizard/lines_invoice_create.py 2014-05-01 00:16:44 +0000
4@@ -233,7 +233,7 @@
5 for prod in contract.product_ids:
6 lines_ids=[]
7 for line in data.line_ids:
8- if not line.invoice_id and line.to_invoice and line.product_id.id==prod.product_id.id and prod.type=='rent':
9+ if not line.invoice_id and line.to_invoice and line.product_id.id in [x.product_id.id for x in contract.product_ids] and prod.type=='rent':
10 lines_ids.append(line.id)
11 if not lines_ids and prod.type=='rent':
12 raise osv.except_osv(_('Warning !'), _("Invoice is already linked to some of the analytic line(s)!"))