Merge lp:~openerp-dev/openobject-addons/6.1-opw-574372-ksa into lp:openobject-addons/6.1

Proposed by Kirti Savalia(OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6781
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574372-ksa
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
account/account_analytic_line.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574372-ksa
Reviewer Review Type Date Requested Status
Michael (OpenERP) (community) Approve
Naresh(OpenERP) (community) Approve
Review via email: mp+104372@code.launchpad.net

Description of the change

Hello,

Fixed the issue when add the task work details and save the task.

Thanks

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Michael (OpenERP) (mva-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-574372-port-mma/+merge/132294 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6781. By Kirti Savalia(OpenERP)

[FIX]:add data in task works then save the data for task problem for context

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_analytic_line.py'
2--- account/account_analytic_line.py 2012-02-13 18:07:41 +0000
3+++ account/account_analytic_line.py 2012-05-02 12:03:21 +0000
4@@ -108,7 +108,7 @@
5 if journal_id:
6 journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
7 if journal.type == 'sale':
8- product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
9+ product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context=context)
10 if product_price_type_ids:
11 pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
12 # Take the company currency as the reference one