Merge lp:~camptocamp/sale-financial/7.0-port-sale_markup into lp:~sale-core-editors/sale-financial/7.0

[Yannick Vaucher @ Camptocamp]

Portage to v7 of module sale_markup

Portage of module sale_markup

On changes were rewritten to use web_context_tunnel and ensure there are no infinite chained on_change calls as in V7 returned values of on change will trigger next on_change and with rounding this can go wild.

Requires sale_line_watcher ported in

https://code.launchpad.net/~camptocamp/sale-financial/7.0-port-sale_line_watcher/+merge/214058

[lp:~camptocamp/sale-financial/7.0-port-sale_markup]

31. By Yannick Vaucher @ Camptocamp on 2014-04-15

Fix markup computation method on product

32. By Yannick Vaucher @ Camptocamp on 2014-04-15

improve view inheritance by using more specific paths and add more context to product_id_change

33. By Yannick Vaucher @ Camptocamp on 2014-04-15

fix onchange margin, use new_discount instead of discount rate

34. By Yannick Vaucher @ Camptocamp on 2014-05-01

[FIX] imports of decimal_precision

35. By Yannick Vaucher @ Camptocamp on 2014-05-01

Improve check on super returned values as it can be an empty dict

36. By Yannick Vaucher @ Camptocamp on 2014-05-01

Fix using sums multi group fails as the registred function for amount totals is the super one. Here I separate the computationto ensure it will be triggered.

37. By Yannick Vaucher @ Camptocamp on 2014-05-05

add tests

38. By Guewen Baconnier @ Camptocamp on 2014-06-10

Creation of a sale.order.line must trigger the sale_order.markup_rate function field

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello,

The management of the project has moved to Github: https://github.com/OCA/sale-financial

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

[Vincent Renaville@camptocamp (vrenaville-c2c)]

PR submit on LP:

https://github.com/OCA/sale-financial/pull/2

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Resubmit due to conflicts :

https://github.com/OCA/sale-financial/pull/3

Unmerged revisions

38. By Guewen Baconnier @ Camptocamp on 2014-06-10

Creation of a sale.order.line must trigger the sale_order.markup_rate function field

37. By Yannick Vaucher @ Camptocamp on 2014-05-05

add tests

36. By Yannick Vaucher @ Camptocamp on 2014-05-01

Fix using sums multi group fails as the registred function for amount totals is the super one. Here I separate the computationto ensure it will be triggered.

35. By Yannick Vaucher @ Camptocamp on 2014-05-01

Improve check on super returned values as it can be an empty dict

34. By Yannick Vaucher @ Camptocamp on 2014-05-01

[FIX] imports of decimal_precision

33. By Yannick Vaucher @ Camptocamp on 2014-04-15

fix onchange margin, use new_discount instead of discount rate

32. By Yannick Vaucher @ Camptocamp on 2014-04-15

improve view inheritance by using more specific paths and add more context to product_id_change

31. By Yannick Vaucher @ Camptocamp on 2014-04-15

Fix markup computation method on product

30. By Yannick Vaucher @ Camptocamp on 2014-04-11

hide break on change fields

29. By Yannick Vaucher @ Camptocamp on 2014-04-11

fixes missing on change context on discount and add checks to not break on_changes which won't be triggered as same value is set

=== modified file 'sale_markup/__openerp__.py'
--- sale_markup/__openerp__.py	2013-11-14 08:16:22 +0000
+++ sale_markup/__openerp__.py	2014-06-10 15:19:47 +0000
@@ -23,19 +23,28 @@
  'author' : 'Camptocamp',
  'maintainer': 'Camptocamp',
  'category': 'version',
- 'complexity': "normal",  # easy, normal, expert
- 'depends' : ['base',
-              'product_get_cost_field',
-              'mrp',
-              'sale',
-              'sale_floor_price'],
- 'description': """display the product and sale markup in the appropriate views""",
+ 'complexity': "normal",
+ 'depends' : [
+     'base',
+     'product_get_cost_field',
+     'mrp',
+     'sale',
+     'web_context_tunnel',
+     'sale_line_watcher',
+     ],
+ 'description': """
+Markup rate on product and sales
+================================
+
+Display the product and sale markup in the appropriate views
+""",
  'website': 'http://www.camptocamp.com/',
- 'init_xml': [],
- 'update_xml': ['sale_view.xml', 'product_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': False,
+ 'data': [
+     'sale_view.xml',
+     'product_view.xml',
+     ],
+ 'test': [],
+ 'installable': True,
  'auto_install': False,
  'license': 'AGPL-3',
  'application': True}
 
=== added file 'sale_markup/i18n/fr.po'
--- sale_markup/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ sale_markup/i18n/fr.po	2014-06-10 15:19:47 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_markup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-03 14:11+0000\n"
+"PO-Revision-Date: 2014-04-03 16:32+0100\n"
+"Last-Translator: Yannick Vaucher <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: sale_markup
+#: field:product.product,cost_price:0
+msgid "Cost Price"
+msgstr "Coût de revient"
+
+#. module: sale_markup
+#: field:sale.order.line,cost_price:0
+msgid "Historical Cost Price"
+msgstr "Coût de revient historique"
+
+#. module: sale_markup
+#: field:product.product,commercial_margin:0
+#: field:sale.order.line,commercial_margin:0
+msgid "Margin"
+msgstr "Marge"
+
+#. module: sale_markup
+#: help:product.product,commercial_margin:0
+msgid "Margin is [ sale_price - cost_price ] (not based on historical values)"
+msgstr "La marge est calculée ainsi [ prix_vente - prix_achat ] (n'est pas basé sur l'historique des valeurs)"
+
+#. module: sale_markup
+#: help:sale.order.line,commercial_margin:0
+msgid "Margin is [ sale_price - cost_price ], changing it will update the discount"
+msgstr "La marge est calculée ainsi [ prix_vente - prix_achat ], changer la marge adapte la remise."
+
+#. module: sale_markup
+#: help:sale.order.line,markup_rate:0
+msgid "Markup is [ margin / sale_price ], changing it will update the discount"
+msgstr "Le taux de marque est calculé ainsi [ marge / prix_vente ], changer le taux de marque adapte la remise."
+
+#. module: sale_markup
+#: view:sale.order:0
+#: field:sale.order,markup_rate:0
+#: field:sale.order.line,markup_rate:0
+#: field:product.product,markup_rate:0
+msgid "Markup"
+msgstr "Taux de marque"
+
+#. module: sale_markup
+#: help:product.product,markup_rate:0
+msgid "Markup is [ margin / sale_price ] (not based on historical values)"
+msgstr "Le taux de marque est [ marge / prix_vente ] (n'est pas basé sur l'historique des valeurs)"
+
+#. module: sale_markup
+#: help:product.product,cost_price:0
+msgid "The cost price is the standard price unless you install the product_cost_incl_bom module."
+msgstr "Le coût de revient est le prix standard à moins que le module product_cost_incl_bom ne soit installé."
+
+#. module: sale_markup
+#: help:sale.order.line,cost_price:0
+msgid "The cost price of the product at the time of the creation of the sale order"
+msgstr "Le coût de revient du produit au moment de la création de la commande client."
+
+#. module: sale_markup
+#: view:sale.order:0
+msgid "product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id,False,True,parent.date_order,product_packaging,parent.fiscal_position,False,price_unit,discount,context)"
+msgstr "product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id,False,True,parent.date_order,product_packaging,parent.fiscal_position,False,price_unit,discount,context)"
+
 
=== added file 'sale_markup/i18n/sale_markup.pot'
--- sale_markup/i18n/sale_markup.pot	1970-01-01 00:00:00 +0000
+++ sale_markup/i18n/sale_markup.pot	2014-06-10 15:19:47 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_markup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-03 14:11+0000\n"
+"PO-Revision-Date: 2014-04-03 14:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_markup
+#: field:product.product,cost_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: sale_markup
+#: field:sale.order.line,cost_price:0
+msgid "Historical Cost Price"
+msgstr ""
+
+#. module: sale_markup
+#: field:product.product,commercial_margin:0
+#: field:sale.order.line,commercial_margin:0
+msgid "Margin"
+msgstr ""
+
+#. module: sale_markup
+#: help:product.product,commercial_margin:0
+msgid "Margin is [ sale_price - cost_price ] (not based on historical values)"
+msgstr ""
+
+#. module: sale_markup
+#: help:sale.order.line,commercial_margin:0
+msgid "Margin is [ sale_price - cost_price ], changing it will update the discount"
+msgstr ""
+
+#. module: sale_markup
+#: help:sale.order.line,markup_rate:0
+msgid "Markup is [ margin / sale_price ], changing it will update the discount"
+msgstr ""
+
+#. module: sale_markup
+#: view:sale.order:0
+#: field:sale.order,markup_rate:0
+#: field:sale.order.line,markup_rate:0
+#: field:product.product,markup_rate:0
+msgid "Markup"
+msgstr ""
+
+#. module: sale_markup
+#: help:product.product,markup_rate:0
+msgid "Markup is [ margin / sale_price ] (not based on historical values)"
+msgstr ""
+
+#. module: sale_markup
+#: help:product.product,cost_price:0
+msgid "The cost price is the standard price unless you install the product_cost_incl_bom module."
+msgstr ""
+
+#. module: sale_markup
+#: help:sale.order.line,cost_price:0
+msgid "The cost price of the product at the time of the creation of the sale order"
+msgstr ""
+
+#. module: sale_markup
+#: view:sale.order:0
+msgid "product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id,False,True,parent.date_order,product_packaging,parent.fiscal_position,False,price_unit,discount,context)"
+msgstr ""
+
 
=== modified file 'sale_markup/product_markup.py'
--- sale_markup/product_markup.py	2013-04-30 12:33:48 +0000
+++ sale_markup/product_markup.py	2014-06-10 15:19:47 +0000
@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#    All Right Reserved
-#
-#    Author : Yannick Vaucher, Joel Grand-Guillaume
+#    Author: Yannick Vaucher, Joel Grand-Guillaume
+#    Copyright 2011 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,80 +19,98 @@
 #
 ##############################################################################
 
-from osv import fields
-from osv.orm import Model
-import decimal_precision as dp
-
-
-class Product(Model):
+from openerp.osv import orm, fields
+from openerp.addons import decimal_precision as dp
+
+
+class Product(orm.Model):
     _inherit = 'product.product'
 
-    def _convert_to_foreign_currency(self, cursor, user, pricelist, amount_dict, context=None):
-        if context is None:
-            context = {}
+    def _convert_to_foreign_currency(self, cr, uid, pricelist,
+                                     amount_dict, context=None):
+        """
+        Apply purchase pricelist
+        """
         if not pricelist:
             return amount_dict
-        pricelist_obj = self.pool.get('product.pricelist')
-        currency_obj = self.pool.get('res.currency')
-        user_obj = self.pool.get('res.users')
-        pricelist = pricelist_obj.browse(cursor, user, pricelist)
-        company_currency_id = user_obj.browse(cursor, user, user).company_id.currency_id.id
-        converted_price = {}
+        pricelist_obj = self.pool['product.pricelist']
+        currency_obj = self.pool['res.currency']
+        user_obj = self.pool['res.users']
+        pricelist = pricelist_obj.browse(cr, uid, pricelist, context=context)
+        user = user_obj.browse(cr, uid, uid, context=context)
+        company_currency_id = user.company_id.currency_id.id
+        converted_prices = {}
         for product_id, amount in amount_dict.iteritems():
-            converted_price[product_id] = currency_obj.compute(cursor, user,
-                                                               company_currency_id,
-                                                               pricelist.currency_id.id,
-                                                               amount,
-                                                               round=False)
-        return converted_price
-
-    def compute_markup(self, cursor, user, ids,
-                       product_uom = None,
-                       pricelist   = None,
-                       sale_price  = None,
-                       properties  = None,
-                       context     = None):
-        '''
+            converted_prices[product_id] = currency_obj.compute(
+                cr, uid, company_currency_id, pricelist.currency_id.id, amount,
+                round=False)
+        return converted_prices
+
+    @staticmethod
+    def _compute_markup(sale_price, purchase_price):
+        """
+        Return markup as a rate
+
+        Markup = SP - PP / SP
+
+        Where SP = Sale price
+              PP = Purchase price
+        """
+        if not sale_price:
+            return 0.0
+        return (sale_price - purchase_price) / sale_price * 100
+
+    def compute_markup(self, cr, uid, ids,
+                       product_uom=None, pricelist=None, sale_price=None,
+                       properties=None, context=None):
+        """
         compute markup
 
         If properties, pricelist and sale_price arguments are set, it
         will be used to compute all results
-        '''
+        """
         properties = properties or []
         pricelist = pricelist or []
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
-            ids =  [ids]
+            ids = [ids]
         res = {}
 
-        # cost_price_context will be used by product_get_cost_field if it is installed
-        cost_price_context = context.copy().update({'produc_uom': product_uom,
-                                                    'properties': properties})
-        purchase_prices = self.get_cost_field(cursor, user, ids, cost_price_context)
+        # cost_price_context will be used by product_get_cost_field if it is
+        # installed
+        cost_price_context = context.copy()
+        cost_price_context.update({
+            'product_uom': product_uom,
+            'properties': properties})
+        purchase_prices = self.get_cost_field(cr, uid, ids, cost_price_context)
         # if purchase prices failed returned a dict of default values
-        if not purchase_prices: return dict([(id, {'commercial_margin': 0.0,
-                                                   'markup_rate': 0.0,
-                                                   'cost_price': 0.0,}) for id in ids])
+        if not purchase_prices:
+            return dict([(id, {'commercial_margin': 0.0,
+                               'markup_rate': 0.0,
+                               'cost_price': 0.0,
+                               }) for id in ids])
 
-        purchase_price = self._convert_to_foreign_currency(cursor, user, pricelist, purchase_prices)
-        for pr in self.browse(cursor, user, ids):
+        purchase_prices = self._convert_to_foreign_currency(cr, uid, pricelist,
+                                                            purchase_prices,
+                                                            context=context)
+        for pr in self.browse(cr, uid, ids, context=context):
             res[pr.id] = {}
             if sale_price is None:
                 catalog_price = pr.list_price
             else:
                 catalog_price = sale_price
 
-            res[pr.id]['commercial_margin'] = catalog_price - purchase_prices[pr.id]
-
-            res[pr.id]['markup_rate'] = (catalog_price and
-                                         (catalog_price - purchase_prices[pr.id]) / catalog_price * 100 or 0.0)
-
-            res[pr.id]['cost_price'] = purchase_prices[pr.id]
+            res[pr.id].update({
+                'commercial_margin': catalog_price - purchase_prices[pr.id],
+                'markup_rate': self._compute_markup(catalog_price,
+                                                    purchase_prices[pr.id]),
+                'cost_price': purchase_prices[pr.id]
+            })
 
         return res
 
-    def _get_bom_product(self,cursor, user, ids, context=None):
+    def _get_bom_product(self, cr, uid, ids, context=None):
         """return ids of modified product and ids of all product that use
         as sub-product one of this ids. Ex:
         BoM :
@@ -103,63 +119,61 @@
                 -   Product C
         => If we change standard_price of product B, we want to update Product
         A as well..."""
-        if context is None:
-            context = {}
         def _get_parent_bom(bom_record):
             """Recursvely find the parent bom"""
-            result=[]
+            result = []
             if bom_record.bom_id:
                 result.append(bom_record.bom_id.id)
                 result.extend(_get_parent_bom(bom_record.bom_id))
             return result
         res = []
-        bom_obj = self.pool.get('mrp.bom')
-        bom_ids = bom_obj.search(cursor, user, [('product_id','in',ids)])
-        for bom in bom_obj.browse(cursor, user, bom_ids):
+        bom_obj = self.pool['mrp.bom']
+        bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)],
+                                 context=context)
+        for bom in bom_obj.browse(cr, uid, bom_ids, context=context):
             res += _get_parent_bom(bom)
         final_bom_ids = list(set(res + bom_ids))
-        return list(set(ids + self._get_product(cursor, user, final_bom_ids, context)))
+        return list(set(ids + self._get_product(cr, uid, final_bom_ids,
+                                                context=context)))
 
-    def _get_product(self, cursor, user, ids, context = None):
-        if context is None:
-            context = {}
-        bom_obj = self.pool.get('mrp.bom')
+    def _get_product(self, cr, uid, ids, context=None):
+        bom_obj = self.pool['mrp.bom']
 
         res = {}
-        for bom in bom_obj.browse(cursor, user, ids, context=context):
+        for bom in bom_obj.browse(cr, uid, ids, context=context):
             res[bom.product_id.id] = True
         return res.keys()
 
-    def _compute_all_markup(self, cursor, user, ids, field_name, arg, context = None):
-        '''
+    def _compute_all_markup(self, cr, uid, ids, field_name, arg,
+                            context=None):
+        """
         method for product function field on multi 'markup'
-        '''
-        if context is None:
-            context = {}
-        res = self.compute_markup(cursor, user, ids, context=context)
-        return res
+        """
+        return self.compute_markup(cr, uid, ids, context=context)
 
-    _store_cfg = {'product.product': (_get_bom_product, ['list_price' ,'standard_price'], 20),
+    _store_cfg = {'product.product': (_get_bom_product,
+                                      ['list_price', 'standard_price'], 20),
                   'mrp.bom': (_get_product,
-                             ['bom_id', 'bom_lines', 'product_id', 'product_uom',
-                             'product_qty', 'product_uos', 'product_uos_qty',
-                             'property_ids'], 20)}
-
-
+                              ['bom_id', 'bom_lines', 'product_id',
+                               'product_uom', 'product_qty', 'product_uos',
+                               'product_uos_qty', 'property_ids'], 20)
+                  }
 
     _columns = {
-        'commercial_margin' : fields.function(_compute_all_markup,
-                                              method=True,
-                                              string='Margin',
-                                              digits_compute=dp.get_precision('Sale Price'),
-                                              store =_store_cfg,
-                                              multi ='markup',
-                                              help='Margin is [ sale_price - cost_price ] (not based on historical values)'),
-        'markup_rate' : fields.function(_compute_all_markup,
-                                        method=True,
-                                        string='Markup rate (%)',
-                                        digits_compute=dp.get_precision('Sale Price'),
-                                        store=_store_cfg,
-                                        multi='markup',
-                                        help='Markup rate is [ margin / sale_price ] (not based on historical values)'),
-        }
+        'commercial_margin': fields.function(
+            _compute_all_markup,
+            string='Margin',
+            digits_compute=dp.get_precision('Sale Price'),
+            store=_store_cfg,
+            multi='markup',
+            help='Margin is [ sale_price - cost_price ] (not based on '
+                 'historical values)'),
+        'markup_rate': fields.function(
+            _compute_all_markup,
+            string='Markup',
+            digits_compute=dp.get_precision('Sale Price'),
+            store=_store_cfg,
+            multi='markup',
+            help='Markup is [ margin / sale_price ] (not based on '
+                 'historical values)'),
+    }
 
=== modified file 'sale_markup/product_view.xml'
--- sale_markup/product_view.xml	2012-05-15 15:56:19 +0000
+++ sale_markup/product_view.xml	2014-06-10 15:19:47 +0000
@@ -3,28 +3,26 @@
   <data>
     <record model="ir.ui.view" id="sale_markup_product_form">
       <field name="name">product.markup.view.form</field>
-      <field name="type">form</field>
       <field name="model">product.product</field>
       <field name="inherit_id" ref="product.product_normal_form_view" />
       <field name="arch" type="xml">
         <field name="list_price" position="after">
           <field name="markup_rate"
-                 groups="sale.group_sale_manager"/>
+                 groups="base.group_sale_manager"/>
           <field name="commercial_margin"
-                 groups="sale.group_sale_manager"/>
+                 groups="base.group_sale_manager"/>
         </field>
       </field>
     </record>
 
     <record model="ir.ui.view" id="sale_markup_product_tree">
       <field name="name">product.markup.view.tree</field>
-      <field name="type">tree</field>
       <field name="model">product.product</field>
       <field name="inherit_id" ref="product.product_product_tree_view" />
       <field name="arch" type="xml">
         <field name="standard_price" position="after">
           <field name="markup_rate"
-                 groups="sale.group_sale_manager"/>
+                 groups="base.group_sale_manager"/>
         </field>
       </field>
     </record>
 
=== modified file 'sale_markup/sale_markup.py'
--- sale_markup/sale_markup.py	2012-07-12 13:56:17 +0000
+++ sale_markup/sale_markup.py	2014-06-10 15:19:47 +0000
@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#    All Right Reserved
-#
-#    Author : Yannick Vaucher, Joel Grand-Guillaume
+#    Author: Yannick Vaucher, Joel Grand-Guillaume
+#    Copyright 2011 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,202 +20,383 @@
 ##############################################################################
 
 from openerp.osv.orm import Model, fields
-import decimal_precision as dp
+from openerp.addons import decimal_precision as dp
+from openerp.tools import float_compare
+
 
 def _prec(obj, cr, uid, mode=None):
     # This function use orm cache it should be efficient
     mode = mode or 'Sale Price'
-    return obj.pool.get('decimal.precision').precision_get(cr, uid, mode)
+    return obj.pool['decimal.precision'].precision_get(cr, uid, mode)
+
 
 class SaleOrder(Model):
     _inherit = 'sale.order'
 
-    def _amount_all(self, cursor, user, ids, field_name, arg, context = None):
-        '''Calculate the markup rate based on sums'''
-
-        if context is None:
-            context = {}
-        res = {}
-        res = super(SaleOrder, self)._amount_all(cursor, user, ids, field_name, arg, context)
-
-        for sale_order in self.browse(cursor, user, ids):
+    def _amount_markup(self, cr, user, ids, field_name, arg, context=None):
+        """Calculate the markup rate based on sums"""
+
+        res = dict.fromkeys(ids, {})
+
+        for sale_order in self.browse(cr, user, ids):
             cost_sum = 0.0
             sale_sum = 0.0
             for line in sale_order.order_line:
                 cost_sum += line.cost_price
                 sale_sum += line.price_unit * (100 - line.discount) / 100.0
-            res[sale_order.id]['markup_rate'] = sale_sum and (sale_sum - cost_sum) / sale_sum * 100 or 0.0
+            markup_rate = ((sale_sum - cost_sum) / sale_sum * 100 if sale_sum
+                           else 0.0)
+            res[sale_order.id]['markup_rate'] = markup_rate
         return res
 
-
     def _get_order(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        sale_order_line_obj = self.pool['sale.order.line']
+        sale_order_lines = sale_order_line_obj.browse(cr, uid, ids,
+                                                      context=context)
         result = set()
-        for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
+        for line in sale_order_lines:
             result.add(line.order_id.id)
         return list(result)
 
     _store_sums = {
-        'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
-        'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty',
-                'product_id','commercial_margin', 'markup_rate'], 10)}
-
-
-    _columns = {'markup_rate': fields.function(_amount_all,
-                                               method = True,
-                                               string = 'Markup Rate',
-                                               digits_compute=dp.get_precision('Sale Price'),
-                                               store = _store_sums,
-                                               multi='sums')}
+        'sale.order': (lambda self, cr, uid, ids, c=None: ids,
+                       ['order_line'], 10),
+        'sale.order.line': (_get_order,
+                            ['price_unit', 'tax_id', 'discount',
+                             'product_uom_qty', 'product_id', 'order_id',
+                             'commercial_margin', 'markup_rate'], 10)
+    }
+
+    _columns = {
+        'markup_rate': fields.function(
+            _amount_markup,
+            string='Markup',
+            digits_compute=dp.get_precision('Sale Price'),
+            store=_store_sums,
+            multi='sums_markup'),
+    }
 
 
 class SaleOrderLine(Model):
 
     _inherit = 'sale.order.line'
 
-    _columns = {'commercial_margin': fields.float('Margin',
-                                                digits_compute=dp.get_precision('Sale Price'),
-                                                help='Margin is [ sale_price - cost_price ],'
-                                                     ' changing it will update the discount'),
-                'markup_rate': fields.float('Markup Rate (%)',
-                                            digits_compute=dp.get_precision('Sale Price'),
-                                            help='Margin rate is [ margin / sale_price ],'
-                                                 'changing it will update the discount'),
-                'cost_price': fields.float('Historical Cost Price',
-                                              digits_compute=dp.get_precision('Sale Price'),
-                                              help="The cost price of the product at the time of the creation of the sale order"),
-                 }
-             
-
-
-    def onchange_price_unit(self, cursor, uid, ids, price_unit, product_id, discount,
-                            product_uom, pricelist, **kwargs):
-        '''
-        If price unit change, compute the new markup rate.
-        '''
-        res = super(SaleOrderLine,self).onchange_price_unit(cursor, uid, ids,
-                                                            price_unit,
-                                                            product_id,
-                                                            discount,
-                                                            product_uom,
-                                                            pricelist)
-
+    def _get_break(self, cr, uid, ids, field_name, arg, context=None):
+        return dict.fromkeys(ids, False)
+
+    _columns = {
+        'commercial_margin': fields.float(
+            'Margin',
+            digits_compute=dp.get_precision('Sale Price'),
+            help='Margin is [ sale_price - cost_price ], changing it will '
+                 'update the discount'),
+        'markup_rate': fields.float(
+            'Markup',
+            digits_compute=dp.get_precision('Sale Price'),
+            help='Markup is [ margin / sale_price ], changing it will '
+                 'update the discount'),
+        'cost_price': fields.float(
+            'Historical Cost Price',
+            digits_compute=dp.get_precision('Sale Price'),
+            help='The cost price of the product at the time of the creation '
+                 'of the sale order'),
+        # boolean fields to skip onchange loop
+        'break_onchange_discount': fields.function(
+            _get_break,
+            string='Break onchange', type='boolean'),
+        'break_onchange_markup_rate': fields.function(
+            _get_break,
+            string='Break onchange', type='boolean'),
+        'break_onchange_commercial_margin': fields.function(
+            _get_break,
+            string='Break onchange', type='boolean'),
+    }
+
+    def onchange_price_unit(self, cr, uid, ids, context=None, **kwargs):
+        """
+        If price unit changes, compute the new markup rate and
+        commercial margin
+
+        context arguments:
+            price_unit
+            product_id
+            discount
+            product_uom
+            pricelist
+            markup_rate
+            commercial_margin
+
+        Will change:
+            markup_rate
+            commercial_margin
+        """
+        if context is None:
+            context = {}
+        res = super(SaleOrderLine, self
+                    ).onchange_price_unit(cr, uid, ids, context=context)
+        product_id = context.get('product_id')
         if product_id:
-            product_obj = self.pool.get('product.product')
-            if res['value'].has_key('price_unit'):
+            price_unit = context.get('price_unit')
+            discount = context.get('discount')
+            product_uom = context.get('product_uom')
+            pricelist = context.get('pricelist')
+            product_obj = self.pool['product.product']
+            markup = context.get('markup_rate', 0.0)
+            margin = context.get('commercial_margin', 0.0)
+            if not 'value' in res:
+                res['value'] = {}
+            if 'price_unit' in res['value']:
                 price_unit = res['value']['price_unit']
             sale_price = price_unit * (100 - discount) / 100.0
-            markup_res = product_obj.compute_markup(cursor, uid,
+            markup_res = product_obj.compute_markup(cr, uid,
                                                     product_id,
                                                     product_uom,
                                                     pricelist,
                                                     sale_price)[product_id]
 
-
-            res['value']['commercial_margin'] = round(markup_res['commercial_margin'], _prec(self, cursor, uid))
-            res['value']['markup_rate'] = round(markup_res['markup_rate'],  _prec(self, cursor, uid))
+            new_margin = round(markup_res['commercial_margin'],
+                               _prec(self, cr, uid))
+            if not float_compare(margin, new_margin,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'commercial_margin': new_margin,
+                    'break_onchange_commercial_margin': True,
+                })
+            new_markup = round(markup_res['markup_rate'],
+                               _prec(self, cr, uid))
+            if not float_compare(markup, new_markup,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'markup_rate': new_markup,
+                    'break_onchange_markup_rate': True,
+                })
         return res
 
-
-
-    def onchange_discount(self, cursor, uid, ids,
-                          price_unit, product_id, discount, product_uom, pricelist, **kwargs):
-        '''
-        If discount change, compute the new markup rate
-        '''
-        res = super(SaleOrderLine,self).onchange_discount(cursor, uid, ids,
-                                                          price_unit,
-                                                          product_id,
-                                                          discount,
-                                                          product_uom,
-                                                          pricelist)
-        
-        if product_id:
-            product_obj = self.pool.get('product.product')
-            if res['value'].has_key('price_unit'):
+    def onchange_discount(self, cr, uid, ids, context=None, **kwargs):
+        """
+        If discount changes, compute the new markup rate and commercial margin.
+
+        context arguments:
+            product_id
+            price_unit
+            discount
+            product_uom
+            pricelist
+            markup_rate
+            commercial_margin
+            break_onchange
+
+        Will change:
+            markup_rate
+            commercial_margin
+        """
+        if context is None:
+            context = {}
+        res = super(SaleOrderLine, self
+                    ).onchange_discount(cr, uid, ids, context=context)
+        product_id = context.get('product_id')
+        if context.get('break_onchange'):
+            res['value']['break_onchange_discount'] = False
+        elif product_id:
+            price_unit = context.get('price_unit')
+            discount = context.get('discount')
+            product_uom = context.get('product_uom')
+            pricelist = context.get('pricelist')
+            markup = context.get('markup_rate', 0.0)
+            margin = context.get('commercial_margin', 0.0)
+
+            product_obj = self.pool['product.product']
+            if not 'value' in res:
+                res['value'] = {}
+            if 'price_unit' in res['value']:
                 price_unit = res['value']['price_unit']
-            if res['value'].has_key('discount'):
+            if 'discount' in res['value']:
                 discount = res['value']['discount']
             sale_price = price_unit * (100 - discount) / 100.0
-            markup_res = product_obj.compute_markup(cursor, uid,
+            markup_res = product_obj.compute_markup(cr, uid,
                                                     product_id,
                                                     product_uom,
                                                     pricelist,
                                                     sale_price)[product_id]
 
-
-            res['value']['commercial_margin'] = round(markup_res['commercial_margin'] , _prec(self, cursor, uid))
-            res['value']['markup_rate'] = round(markup_res['markup_rate'],  _prec(self, cursor, uid))
+            new_margin = round(markup_res['commercial_margin'],
+                               _prec(self, cr, uid))
+            if not float_compare(margin, new_margin,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'commercial_margin': new_margin,
+                    'break_onchange_commercial_margin': True,
+                })
+            new_markup = round(markup_res['markup_rate'],
+                               _prec(self, cr, uid))
+            if not float_compare(markup, new_markup,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'markup_rate': new_markup,
+                    'break_onchange_markup_rate': True,
+                })
         return res
 
-
-    def product_id_change(self, cursor, uid, ids, pricelist, product, qty=0,
-                          uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-                          lang=False, update_tax=True, date_order=False, packaging=False,
-                          fiscal_position=False, flag=False, discount=None, price_unit=None, context=None):
-        '''
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+                          uom=False, qty_uos=0, uos=False, name='',
+                          partner_id=False, lang=False, update_tax=True,
+                          date_order=False, packaging=False,
+                          fiscal_position=False, flag=False,
+                          context=None):
+        """
         Overload method
-        If product change, compute the new markup.
-        Added params : - price_unit,
+        If product changes, compute the new markup, cost_price and
+        commercial_margin.
+        Added params : - price_unit
                        - discount
-                       - properties
-        '''
+                       - markup_rate
+                       - commercial_margin
+
+        Will change:
+            markup_rate
+            commercial_margin
+        """
         if context is None:
             context = {}
-        discount = discount or 0.0
-        price_unit = price_unit or 0.0
-        res = {}
-        res = super(SaleOrderLine, self).product_id_change(cursor, uid, ids, pricelist, product, qty,
-                                                           uom, qty_uos, uos, name, partner_id,
-                                                           lang, update_tax, date_order, packaging,
-                                                           fiscal_position, flag, context)
+        res = super(SaleOrderLine, self
+                    ).product_id_change(cr, uid, ids, pricelist, product, qty,
+                                        uom, qty_uos, uos, name, partner_id,
+                                        lang, update_tax, date_order,
+                                        packaging, fiscal_position, flag,
+                                        context=context)
 
         if product:
-            if res['value'].has_key('price_unit'):
+            price_unit = context.get('price_unit', 0.0)
+            discount = context.get('discount', 0.0)
+            markup = context.get('markup_rate', 0.0)
+            margin = context.get('commercial_margin', 0.0)
+
+            if not 'value' in res:
+                res['value'] = {}
+            if 'price_unit' in res['value']:
                 price_unit = res['value']['price_unit']
             sale_price = price_unit * (100 - discount) / 100.0
 
-            product_obj = self.pool.get('product.product')
-            markup_res = product_obj.compute_markup(cursor, uid,
+            product_obj = self.pool['product.product']
+            markup_res = product_obj.compute_markup(cr, uid,
                                                     product,
                                                     uom,
                                                     pricelist,
                                                     sale_price)[product]
 
-            res['value']['commercial_margin'] = round(markup_res['commercial_margin'],  _prec(self, cursor, uid))
-            res['value']['markup_rate'] = round(int(markup_res['markup_rate'] * 100) / 100.0, _prec(self, cursor, uid))
-            res['value']['cost_price'] = round(markup_res['cost_price'],  _prec(self, cursor, uid))
+            res['value']['cost_price'] = round(markup_res['cost_price'],
+                                               _prec(self, cr, uid))
+            new_margin = round(markup_res['commercial_margin'],
+                               _prec(self, cr, uid))
+            if not float_compare(margin, new_margin,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'commercial_margin': new_margin,
+                    'break_onchange_commercial_margin': True,
+                })
+            new_markup = round(int(markup_res['markup_rate'] * 100) / 100.0,
+                               _prec(self, cr, uid))
+            if not float_compare(markup, new_markup,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'markup_rate': new_markup,
+                    'break_onchange_markup_rate': True,
+                })
 
         return res
 
-
-    def onchange_markup_rate(self, cursor, uid, ids,
-                             markup, cost_price, price_unit, context=None):
-        ''' If markup rate change compute the discount '''
+    def onchange_markup_rate(self, cr, uid, ids, context=None):
+        """ If markup rate changes compute the discount
+
+        context arguments:
+            markup_rate
+            commercial_margin
+            cost_price
+            price_unit
+            break_onchange
+
+        Will change:
+            discount
+            commercial_margin
+        """
         if context is None:
             context = {}
-        res = {}
-        res['value'] = {}
+        res = {'value': {}}
+        if context.get('break_onchange'):
+            res['value']['break_onchange_markup_rate'] = False
+            return res
+
+        markup = context.get('markup_rate')
+        price_unit = context.get('price_unit')
         markup = markup / 100.0
-        if not price_unit or markup == 1: return {'value': {}}
-        discount = 1 + cost_price / (markup - 1) / price_unit
-        sale_price = price_unit * (1 - discount)
-        res['value']['discount'] =  round(discount * 100,  _prec(self, cursor, uid))
-        res['value']['commercial_margin'] = round(sale_price - cost_price, _prec(self, cursor, uid))
+        if price_unit and not markup == 1:
+            cost_price = context.get('cost_price')
+            margin = context.get('commercial_margin')
+            discount = context.get('discount')
+
+            new_discount = 1 + cost_price / (markup - 1) / price_unit
+            sale_price = price_unit * (1 - new_discount)
+
+            new_discount = round(new_discount * 100,  _prec(self, cr, uid))
+            if not float_compare(discount, new_discount,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'discount': new_discount,
+                    'break_onchange_discount': True,
+                })
+
+            new_margin = round(sale_price - cost_price, _prec(self, cr, uid))
+            if not float_compare(margin, new_margin,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'commercial_margin': new_margin,
+                    'break_onchange_commercial_margin': True,
+                })
         return res
 
-
-    def onchange_commercial_margin(self, cursor, uid, ids,
-                                   margin, cost_price, price_unit, context=None):
-        ''' If markup rate change compute the discount '''
+    def onchange_commercial_margin(self, cr, uid, ids, context=None):
+        """ If commercial margin changes compute the discount
+
+        context arguments:
+            commercial_margin
+            markup_rate
+            discount
+            cost_price
+            price_unit
+            break_onchange
+
+        Will change:
+            discount
+            markup_rate
+        """
         if context is None:
             context = {}
-        res = {}
-        res['value'] = {}
-        if not price_unit: return {'value': {}}
-        discount = 1 - ((cost_price + margin) / price_unit)
-        sale_price = price_unit * (1 - discount)
-        res['value']['discount'] = round(discount * 100,  _prec(self, cursor, uid))
-        res['value']['markup_rate'] = round(margin / (sale_price or 1.0) * 100, _prec(self, cursor, uid))
+        res = {'value': {}}
+        price_unit = context.get('price_unit')
+        if context.get('break_onchange'):
+            res['value']['break_onchange_commercial_margin'] = False
+        elif price_unit:
+            margin = context.get('commercial_margin')
+            markup = context.get('markup_rate')
+            cost_price = context.get('cost_price')
+            discount = context.get('discount')
+
+            new_discount = 1 - ((cost_price + margin) / price_unit)
+            sale_price = price_unit * (1 - new_discount)
+
+            new_discount = round(new_discount * 100,  _prec(self, cr, uid))
+            if not float_compare(discount, new_discount,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'discount': new_discount,
+                    'break_onchange_discount': True,
+                })
+            new_markup = round(margin / (sale_price or 1.0) * 100,
+                               _prec(self, cr, uid))
+            if not float_compare(markup, new_markup,
+                                 precision_digits=_prec(self, cr, uid)) == 0:
+                res['value'].update({
+                    'markup_rate': new_markup,
+                    'break_onchange_markup_rate': True,
+                })
         return res
 
=== modified file 'sale_markup/sale_view.xml'
--- sale_markup/sale_view.xml	2012-07-23 12:01:18 +0000
+++ sale_markup/sale_view.xml	2014-06-10 15:19:47 +0000
@@ -7,13 +7,15 @@
     <!-- Add markup rate of the order in form view after Compute button -->
     <record model="ir.ui.view" id="sale_markup_sale_order_view">
       <field name="name">sale.order.markup.view.form</field>
-      <field name="type">form</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_form" />
       <field name="arch" type="xml">
-        <xpath expr="//button[@name='button_dummy']" position="before">
-          <field name="markup_rate"
-                 groups="base.group_sale_manager"/>
+        <xpath expr="//group[@name='sale_total']" position="after">
+          <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_markup"
+                 groups="base.group_sale_manager">
+            <field name="markup_rate"
+                   groups="base.group_sale_manager"/>
+          </group>
         </xpath>
       </field>
     </record>
@@ -21,7 +23,6 @@
     <!-- Add markup rate of the order in tree view after state field -->
     <record model="ir.ui.view" id="sale_markup_sale_order_tree">
       <field name="name">sale.order.markup.view.tree</field>
-      <field name="type">tree</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_tree" />
       <field name="arch" type="xml">
@@ -34,7 +35,6 @@
 
     <record model="ir.ui.view" id="sale_markup_sale_order_line_tree">
       <field name="name">sale.order.line.markup.view.tree</field>
-      <field name="type">tree</field>
       <field name="model">sale.order.line</field>
       <field name="inherit_id" ref="sale.view_order_line_tree" />
       <field name="arch" type="xml">
@@ -52,37 +52,41 @@
     <!-- Add onchanges on unit price and discount to update margin and markup -->
     <record model="ir.ui.view" id="sale_markup_sale_order_form_line_form">
       <field name="name">sale.order.markup.view.form2</field>
-      <field name="type">form</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_form" />
       <field name="arch" type="xml">
-        <xpath expr="//field[@name='product_id']"
-               position="replace">
-            <field colspan="4"
-                   name="product_id"
-                   context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                   on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, price_unit, discount, context)" />
-            <newline/>
-        </xpath>
-        <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/group/field[@name='name']"
-               position="attributes">
-            <attribute name="colspan">5</attribute>
-        </xpath>
-        <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/group/field[@name='name']"
+        <xpath expr="//field[@name='order_line']/form//field[@name='product_id']"
+               position="attributes">
+          <attribute name="context_markup">{'discount': discount, 'price_unit': price_unit, 'markup_rate': markup_rate, 'commercial_margin': commercial_margin}</attribute>
+        </xpath>
+        <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']"
+               position="attributes">
+          <attribute name="context_markup">{'price_unit': price_unit, 'product_id': product_id, 'discount': discount, 'product_uom': product_uom, 'pricelist': parent.pricelist_id, 'markup_rate': markup_rate, 'commercial_margin': commercial_margin}</attribute>
+        </xpath>
+        <xpath expr="//field[@name='order_line']/form//field[@name='discount']"
+               position="attributes">
+          <attribute name="context_markup">{'product_id': product_id, 'price_unit': price_unit, 'discount': discount, 'product_uom': product_uom, 'pricelist': parent.pricelist_id, 'markup_rate': markup_rate, 'commercial_margin': commercial_margin, 'break_onchange': break_onchange_discount}</attribute>
+        </xpath>
+        <xpath expr="//field[@name='order_line']/form//field[@name='name']"
                position="after">
-            <separator string="Markup" colspan="5" groups="base.group_sale_manager"/>
+          <group string="Markup" groups="base.group_sale_manager">
             <field name="commercial_margin"
-                   on_change="onchange_commercial_margin(commercial_margin, cost_price, price_unit)"
+                   context="{'commercial_margin': commercial_margin, 'markup_rate': markup_rate, 'discount': discount, 'cost_price': cost_price, 'price_unit': price_unit, 'break_onchange': break_onchange_commercial_margin}"
+                   on_change="onchange_commercial_margin(context)"
                    groups="base.group_sale_manager"/>
             <field name="markup_rate"
-                   on_change="onchange_markup_rate(markup_rate, cost_price, price_unit)"
+                   context="{'markup_rate': markup_rate, 'commercial_margin': commercial_margin, 'discount': discount, 'cost_price': cost_price, 'price_unit': price_unit, 'break_onchange': break_onchange_markup_rate}"
+                   on_change="onchange_markup_rate(context)"
                    groups="base.group_sale_manager"/>
             <field name="cost_price"
                    groups="base.group_sale_manager" invisible="1"/>
-            <newline/>
+             <field name="break_onchange_commercial_margin" invisible="1"/>
+             <field name="break_onchange_markup_rate" invisible="1"/>
+             <field name="break_onchange_discount" invisible="1"/>
+          </group>
         </xpath>
-        <xpath expr="//field[@name='product_uom_qty']" position="attributes">
-            <attribute name="on_change">product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id,False,True,parent.date_order,product_packaging,parent.fiscal_position,False,price_unit,discount,context)</attribute>
+        <xpath expr="//field[@name='order_line']/form//field[@name='product_uom_qty']" position="attributes">
+          <attribute name="context_markup">{'discount': discount, 'price_unit': price_unit, 'markup_rate': markup_rate, 'commercial_margin': commercial_margin}</attribute>
         </xpath>
       </field>
     </record>
@@ -90,12 +94,11 @@
     <!-- Add Markup in Sales Orders form's Sale order lines tree -->
     <record model="ir.ui.view" id="sale_markup_sale_order_form_line_tree">
       <field name="name">sale.order.markup.view.form</field>
-      <field name="type">form</field>
       <field name="model">sale.order</field>
       <field name="inherit_id" ref="sale.view_order_form" />
       <field name="arch" type="xml">
         <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']"
-               position="after">
+          position="after">
           <field name="cost_price"
                  groups="base.group_sale_manager"/>
           <field name="markup_rate"
 
=== added directory 'sale_markup/tests'
=== added file 'sale_markup/tests/__init__.py'
--- sale_markup/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_markup/tests/__init__.py	2014-06-10 15:19:47 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_sale_markup
 
=== added file 'sale_markup/tests/test_sale_markup.py'
--- sale_markup/tests/test_sale_markup.py	1970-01-01 00:00:00 +0000
+++ sale_markup/tests/test_sale_markup.py	2014-06-10 15:19:47 +0000
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Yannick Vaucher
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import openerp.tests.common as common
+from openerp.addons import get_module_resource
+
+
+def _trigger_on_changes(self, cr, uid, sale_order, view_values, changed_values):
+    triggered_on_changes = []
+    while [i for i in changed_values.keys() if i not in triggered_on_changes]:
+        res_values = {}
+        for field in view_values.keys():
+            if field in triggered_on_changes:
+                continue
+            triggered_on_changes.append(field)
+            if field == 'product_id':
+                res_values = self.SaleOrderLine.product_id_change(
+                    cr, uid, False,
+                    sale_order.pricelist_id.id,
+                    view_values.get('product_id'),
+                    qty=view_values.get('product_uom_qty'),
+                    uom=False,
+                    qty_uos=view_values.get('product_uos_qty'),
+                    uos=False,
+                    name='sol_test_1',
+                    partner_id=sale_order.partner_id.id,
+                    lang=False,
+                    update_tax=True,
+                    date_order=sale_order.date_order,
+                    packaging=False,
+                    fiscal_position=sale_order.fiscal_position.id,
+                    flag=False,
+                    context=view_values)
+                break
+            elif field == 'price_unit':
+                res_values = self.SaleOrderLine.onchange_price_unit(cr, uid, False, context=view_values)
+                break
+            elif field == 'discount':
+                res_values = self.SaleOrderLine.onchange_discount(cr, uid, False, context=view_values)
+                break
+            elif field == 'commercial_margin':
+                res_values = self.SaleOrderLine.onchange_commercial_margin(cr, uid, False, context=view_values)
+                break
+            elif field == 'markup_rate':
+                res_values = self.SaleOrderLine.onchange_markup_rate(cr, uid, False, context=view_values)
+                break
+        if res_values:
+            changed_values.update(res_values['value'])
+            view_values.update(res_values['value'])
+    return view_values
+
+class test_sale_markup(common.TransactionCase):
+    """ Test the wizard for delivery carrier label generation """
+
+    def setUp(self):
+        super(test_sale_markup, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        self.SaleOrder = self.registry('sale.order')
+        self.SaleOrderLine = self.registry('sale.order.line')
+        self.Product = self.registry('product.product')
+        self.product_33 = self.Product.browse(
+                cr, uid, self.ref('product.product_product_33'))
+        self.ResPartner = self.registry('res.partner')
+        self.partner_12 = self.ResPartner.browse(
+                cr, uid, self.ref('base.res_partner_12'))
+
+    def test_00_create_sale_order(self):
+        """ Check markup computing in sale order
+
+        And check each on_changes
+        """
+        cr, uid = self.cr, self.uid
+
+        so_data = {'partner_id': self.partner_12.id,
+                }
+        res = self.SaleOrder.onchange_partner_id(cr, uid, False, self.partner_12.id)
+        so_data.update(res['value'])
+
+        so_1_id = self.SaleOrder.create(cr, uid, so_data)
+        so_1 = self.SaleOrder.browse(cr, uid, so_1_id)
+
+        ctx = {'product_id': self.product_33.id,
+               'product_uom': self.ref('product.product_uom_unit'),
+               'discount': 0.0,
+               'product_uom_qty': 1,
+               'product_uos_qty': 1,
+               'sequence': 10,
+               'state': 'draft',
+               'type': 'make_to_stock',
+               'price_unit': 0.0,
+               'order_id': so_1_id,
+               }
+
+        # I set product A on sale order and trigger the on_change on product.
+        res = self.SaleOrderLine.product_id_change(
+            cr, uid, False,
+            so_1.pricelist_id.id,
+            ctx.get('product_id'),
+            qty=ctx.get('product_uom_qty'),
+            uom=False,
+            qty_uos=ctx.get('product_uos_qty'),
+            uos=False,
+            name='sol_test_1',
+            partner_id=so_1.partner_id.id,
+            lang=False,
+            update_tax=True,
+            date_order=so_1.date_order,
+            packaging=False,
+            fiscal_position=so_1.fiscal_position.id,
+            flag=False,
+            context=ctx)
+
+        ctx.update(res['value'])
+        res = _trigger_on_changes(self, cr, uid, so_1, ctx, res['value'])
+        # cost_price should be set and equal to product cost price.
+        assert abs(res.get('cost_price') - self.Product.get_cost_field(cr, uid, self.product_33.id)[self.product_33.id]) < 0.01
+
+        # commercial_margin should be updated and equal to price_unit * (1 - (discount / 100.0)) - cost_price
+        commercial_margin = (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0)) - ctx.get('cost_price'))
+        assert abs(ctx.get('commercial_margin') - commercial_margin) < 0.01, "Commercial margin is %s instead of %s after update of product_id" % (ctx.get('commercial_margin'), commercial_margin)
+        # markup_rate should be updated and equal to commercial_margin / (price_unit * (1 - (discount / 100.0)))
+        markup_rate = (ctx.get('commercial_margin') / (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0))) * 100.0)
+        assert abs(ctx.get('markup_rate') - markup_rate) < 0.01, "Markup rate is %s instead of %s after update of product_id" % (ctx.get('markup_rate'), markup_rate)
+
+        # I add 1 percent to discount and trigger the on_change on discount.
+        ctx['discount'] = 1.0
+        res = self.SaleOrderLine.onchange_discount(cr, uid, False, context=ctx)
+        ctx.update(res['value'])
+        ctx = _trigger_on_changes(self, cr, uid, so_1, ctx, res['value'])
+
+        # commercial_margin should be updated and equal to price_unit * (1 - (discount / 100.0)) - cost_price
+        commercial_margin = (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0)) - ctx.get('cost_price'))
+        assert abs(ctx.get('commercial_margin') - commercial_margin) < 0.01, "Commercial margin is %s instead of %s after update of discount" % (ctx.get('commercial_margin'), commercial_margin)
+
+        # markup_rate should be updated and equal to commercial_margin / (price_unit * (1 - (discount / 100.0)))
+        markup_rate = (ctx.get('commercial_margin') / (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0))) * 100.0)
+        assert abs(ctx.get('markup_rate') - markup_rate) < 0.01, "Markup rate is %s instead of %s after update of discount" % (ctx.get('markup_rate'), markup_rate)
+
+        # I change the markup rate to 20.0 and trigger the on_change on markup_rate.
+        ctx['markup_rate'] = 20.0
+        res = self.SaleOrderLine.onchange_markup_rate(cr, uid, False, context=ctx)
+        ctx.update(res['value'])
+        ctx = _trigger_on_changes(self, cr, uid, so_1, ctx, res['value'])
+
+        # commercial_margin should be updated and equal to price_unit * (1 - (discount / 100.0)) - cost_price
+        commercial_margin = (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0)) - ctx.get('cost_price'))
+        assert abs(ctx.get('commercial_margin') - commercial_margin) < 0.01, "Commercial margin is %s instead of %s after update of markup_rate" % (ctx.get('commercial_margin'), commercial_margin)
+
+        # markup_rate should be updated and equal to commercial_margin / (price_unit * (1 - (discount / 100.0)))
+        markup_rate = (ctx.get('commercial_margin') / (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0))) * 100.0)
+        assert abs(ctx.get('markup_rate') - markup_rate) < 0.01, "Markup rate is %s instead of %s after update of markup_rate" % (ctx.get('markup_rate'), markup_rate)
+
+
+        # I change the price unit to 2000.0 and trigger the on_change on price_unit.
+        ctx['price_unit'] = 2000.0
+        res = self.SaleOrderLine.onchange_price_unit(cr, uid, False, context=ctx)
+        ctx.update(res['value'])
+        ctx = _trigger_on_changes(self, cr, uid, so_1, ctx, res['value'])
+
+        # commercial_margin should be updated and equal to price_unit * (1 - (discount / 100.0)) - cost_price
+        commercial_margin = (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0)) - ctx.get('cost_price'))
+        assert abs(ctx.get('commercial_margin') - commercial_margin) < 0.01, "Commercial margin is %s instead of %s after update of price_unit" % (ctx.get('commercial_margin'), commercial_margin)
+
+        # markup_rate should be updated and equal to commercial_margin / (price_unit * (1 - (discount / 100.0)))
+        markup_rate = (ctx.get('commercial_margin') / (ctx.get('price_unit') * (1 - (ctx.get('discount') / 100.0))) * 100.0)
+        assert abs(ctx.get('markup_rate') - markup_rate) < 0.01, "Markup rate is %s instead of %s after update of price_unit" % (ctx.get('markup_rate'), markup_rate)
+
+        sol_data = ctx
+
+        # I create the sale order line for the sale order.
+        sol_1_id = self.SaleOrderLine.create(
+            cr, uid,
+            sol_data
+            )
+
+        so_1.refresh()
+        assert so_1.markup_rate
+        # as we have only one line it should be equal to our last line markup
+        assert abs(so_1.markup_rate - markup_rate) < 0.01