OLD 7.0 2014 11 27

Conflict:

diff --cc addons/l10n_br/account_view.xml
index 4b62ee0,0dd246e..0000000
--- a/addons/l10n_br/account_view.xml
+++ b/addons/l10n_br/account_view.xml
@@@ -39,7 -39,7 +39,11 @@@
  	    		<field name="tax_code_id" position="replace" >
  					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
  			    </field>
++<<<<<<< HEAD
 +   				<field position="after" name="tax_discount">
++=======
+ 				<field position="after" name="tax_discount">
++>>>>>>> odoo/7.0
  					<field name="base_reduction"/>
  					<field name="amount_mva"/>
  			    </field>
diff --cc addons/mrp/mrp.py
index 3b03146,67f3657..0000000
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@@ -332,8 -334,8 +332,13 @@@ class mrp_bom(osv.osv)
          if bom.type == 'phantom' and not bom.bom_lines:
              newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
  
++<<<<<<< HEAD
 +            if newbom:
 +                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10, context=context)
++=======
+             if newbom and newbom != bom.id:
+                 res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
++>>>>>>> odoo/7.0
                  result = result + res[0]
                  result2 = result2 + res[1]
                  phantom = True

Resolved as

diff --cc addons/l10n_br/account_view.xml
index 4b62ee0,0dd246e..0000000
--- a/addons/l10n_br/account_view.xml
+++ b/addons/l10n_br/account_view.xml
diff --cc addons/mrp/mrp.py
index 3b03146,67f3657..0000000
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@@ -332,8 -334,8 +332,8 @@@ class mrp_bom(osv.osv)
          if bom.type == 'phantom' and not bom.bom_lines:
              newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
  
-             if newbom:
+             if newbom and newbom != bom.id:
 -                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
 +                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10, context=context)
                  result = result + res[0]
                  result2 = result2 + res[1]
                  phantom = True

addons/mrp/mrp.py:

Whitespace difference in verbatim solution between https://github.com/OCA/OCB/commit/1a6e278f7d354ac9554fac6efc21a2a2b9de4837 and https://github.com/odoo/odoo/commit/e2dd18f1e7304040974a81cfacce96848eb89719 (yes, those are tabs and I felt I had to keep them).

addons/l10n_br/account_view.xml:

Conflict due to unrelated changes in adjacent lines between https://github.com/oca/ocb/commit/56c691d480c25cb0b2250c60d0aa3d523058b554 and https://github.com/odoo/odoo/commit/34da02e730f18b6f314001578bcbc0eb1be985ad

Committed as https://github.com/OCA/OCB/commit/c6ae23d6eef0cf015a442fc6469998e558d0a2eb by @StefanRijnhart