Odoo Addons (MOVED TO GITHUB)

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

  1. 6.1-1018516-SerpentCS
  2. Merge into 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/sale_margin.py (+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: mp+115036@code.launchpad.net
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
=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py 2011-11-11 08:28:08 +0000
+++ sale_margin/sale_margin.py 2012-07-15 19:41:19 +0000
@@ -70,7 +70,7 @@
70 return result70 return result
7171
72 def _get_order(self, cr, uid, ids, context=None):72 def _get_order(self, cr, uid, ids, context=None):
73 return super(self,sale_order)._get_order(cr, uid, ids, context=context)73 return super(sale_order, self)._get_order(cr, uid, ids, context=context)
7474
75 _columns = {75 _columns = {
76 'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={76 'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={