Merge remote-tracking branch 'odoo/7.0' into 7.0

Conflicts: addons/l10n_br/account_view.xml addons/mrp/mrp.py See https://github.com/OCA/OCB/wiki/7.0-2014-11-27
OCA · Nov 27, 2014 · c6ae23d · c6ae23d
2 parents 87c5703 + f0e331e
commit c6ae23d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml
@@ -39,7 +39,7 @@
 	    		<field name="tax_code_id" position="replace" >
 					<field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
 			    </field>
-   				<field position="after" name="tax_discount">
+				<field position="after" name="tax_discount">
 					<field name="base_reduction"/>
 					<field name="amount_mva"/>
 			    </field>

diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
@@ -40,7 +40,7 @@
       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
@@ -332,7 +332,7 @@ def _bom_explode(self, cr, uid, bom, factor, properties=None, addthis=False, lev
         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, context=context)
                 result = result + res[0]
                 result2 = result2 + res[1]

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
@@ -541,8 +541,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 self.records.remove(record);
                 return;
             }
-            _(_.keys(values)).each(function(key){
-                record.set(key, values[key], {silent: true});
+            _.each(values, function (value, key) {
+                record.set(key + '__display', false, {silent: true});
+                record.set(key, value, {silent: true});            
             });
             record.trigger('change', record);
         });