OLD 7.0 2015 02 14

Conflict:

diff --cc openerp/addons/base/res/res_partner.py
index 601f270,4f2dcaf..0000000
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@@ -66,18 -66,12 +66,25 @@@ class format_address(object)
          for k,v in layouts.items():
              if fmt and (k in fmt):
                  doc = etree.fromstring(arch)
 +                view_has_field_use_parent_address = (
 +                    doc.find('.//field[@name="use_parent_address"]') is not None)
                  for node in doc.xpath("//div[@class='address_format']"):
                      tree = etree.fromstring(v)
++<<<<<<< HEAD
 +                    # needs to apply modifiers
 +                    for childnode in tree.getchildren():
 +                        if view_has_field_use_parent_address and childnode.tag == 'field':
 +                            childnode.set(
 +                                'attrs', "{'readonly': [('use_parent_address','=',True)]}")
 +                        modifiers = {}
 +                        orm.transfer_node_to_modifiers(childnode, modifiers)
 +                        orm.transfer_modifiers_to_node(modifiers, childnode)
++=======
+                     for child in node.xpath("//field"):
+                         if child.attrib.get('modifiers'):
+                             for field in tree.xpath("//field[@name='%s']" % child.attrib.get('name')):
+                                 field.attrib['modifiers'] = child.attrib.get('modifiers')
++>>>>>>> odoo/7.0
                      node.getparent().replace(node, tree)
                  arch = etree.tostring(doc)
                  break

resolved by

git checkout --theirs openerp/addons/base/res/res_partner.py

Committed as https://github.com/OCA/OCB/commit/559645b by @hbrunn