Conflict:

diff --cc addons/product/pricelist.py
index f695c64,0dd6b45..0000000
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@@ -302,7 -297,12 +302,16 @@@ class product_pricelist(osv.osv)
                              price = price * (1.0+(res['price_discount'] or 0.0))
                              if res['price_round']:
                                  price = tools.float_round(price, precision_rounding=res['price_round'])
++<<<<<<< HEAD
 +                            price += surcharge
++=======
+                             if context.get('uom'):
+                                 # compute price_surcharge based on reference uom
+                                 factor = product_uom_obj.browse(cr, uid, context.get('uom'), context=context).f
+                             else:
+                                 factor = 1.0
+                             price += (res['price_surcharge'] or 0.0) / factor
++>>>>>>> odoo/7.0
                              if res['price_min_margin']:
                                  price = max(price, price_limit+res['price_min_margin'])
                              if res['price_max_margin']:

Solution:

Revert github.com/OCA/OCB@c096d2e30b manually in favour of upstream fix of the same bug in github.com/odoo/odoo@79ebe1060d

Committed by @StefanRijnhart as https://github.com/OCA/OCB/commits/b98f9c997fb1dab28f5184dd7f88f619ace7215c

Back to Conflict resolutions OCB synchronization