diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 70d644d6519..284dba83a39 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1829,10 +1829,10 @@ class res_partner(osv.osv):
'''
return partner.commercial_partner_id
- def copy(self, cr, uid, id, default=None, context=None):
+ def copy_data(self, cr, uid, id, default=None, context=None):
default = default or {}
default.update({'invoice_ids' : []})
- return super(res_partner, self).copy(cr, uid, id, default, context)
+ return super(res_partner, self).copy_data(cr, uid, id, default=default, context=context)
class mail_compose_message(osv.Model):
diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml
index 4eaffd3e27a..0dd246eb3e8 100644
--- a/addons/l10n_br/account_view.xml
+++ b/addons/l10n_br/account_view.xml
@@ -34,14 +34,14 @@
-
+
-
-
-
+
+
+
@@ -52,14 +52,14 @@
-
+
-
-
-
+
+
+
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 0a37f8aae0b..97289797e4d 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -40,7 +40,7 @@ The campaigns are dynamic and multi-channels. The process is as follows:
send, reports to print and send by email, custom actions
* Define input segments that will select the items that should enter the
campaign (e.g leads from certain countries.)
- * Run you campaign in simulation mode to test it real-time or accelerated,
+ * Run your campaign in simulation mode to test it real-time or accelerated,
and fine-tune it
* You may also start the real campaign in manual mode, where each action
requires manual validation
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e9e099b6df5..c5ede21144e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -330,7 +330,7 @@ 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)
result = result + res[0]
result2 = result2 + res[1]
diff --git a/addons/product/product.py b/addons/product/product.py
index f64529982a8..be92271a94b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -152,6 +152,7 @@ class product_uom(osv.osv):
_defaults = {
'active': 1,
'rounding': 0.01,
+ 'factor': 1,
'uom_type': 'reference',
}
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 666622f092d..35efd047fb0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -517,7 +517,7 @@
+ 'readonly':[('uom_type','=','bigger')]}"/>