Merge lp:~serpent-consulting-services/openobject-addons/6.1-1018516-SerpentCS into lp:openobject-addons/6.1

Proposed by Serpent Consulting Services
Status: Needs review
Proposed branch: lp:~serpent-consulting-services/openobject-addons/6.1-1018516-SerpentCS
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
sale_margin/ (+1/-1)
To merge this branch: bzr merge lp:~serpent-consulting-services/openobject-addons/6.1-1018516-SerpentCS
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email:
To post a comment you must log in.

Unmerged revisions

6888. By Serpent Consulting Services

[FIX] sale_margin : Fixed a regression which was a wrong way to call superclass method

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_margin/'
2--- sale_margin/ 2011-11-11 08:28:08 +0000
3+++ sale_margin/ 2012-07-15 19:41:19 +0000
4@@ -70,7 +70,7 @@
5 return result
7 def _get_order(self, cr, uid, ids, context=None):
8- return super(self,sale_order)._get_order(cr, uid, ids, context=context)
9+ return super(sale_order, self)._get_order(cr, uid, ids, context=context)
11 _columns = {
12 'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={