From d3b22ccb36c727afcdfbcda2877f81338a97a753 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Nov 2012 09:35:13 +0100
Subject: [PATCH 1/4] [FIX] incorrect handling of empty values in m2m listview
 display

bzr revid: xmo@openerp.com-20121109083513-mjpzd01hhuylll4j
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 03a48297eca..6779b6fe841 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -2217,7 +2217,7 @@ instance.web.list.Many2OneButton = instance.web.list.Column.extend({
 });
 instance.web.list.Many2Many = instance.web.list.Column.extend({
     _format: function (row_data, options) {
-        if (row_data[this.id].value) {
+        if (!_.isEmpty(row_data[this.id].value)) {
             // If value, use __display version for printing
             row_data[this.id] = row_data[this.id + '__display'];
         }

From 4a4fc38d5e9ee77e08be47b189a15dafc7c631d1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Nov 2012 12:39:51 +0100
Subject: [PATCH 2/4] [FIX] nuke ir.model.data caches before starting imports

Otherwise a previous validation (or 2) will poison the cache and the
import itself will fail even though the validation succeeeded (and
importing with no validation would have succeeded), as the orm cache
doesn't take DB rollbacks in account.

bzr revid: xmo@openerp.com-20121109113951-p3qgg6m5g7poay5e
---
 openerp/addons/base/ir/ir_model.py | 11 +++++++++--
 openerp/osv/orm.py                 |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 089eefbb6a0..4bb279f3beb 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -878,11 +878,18 @@ class ir_model_data(osv.osv):
             id = False
         return id
 
+    def clear_caches(self):
+        """ Clears all orm caches on the object's methods
+
+        :returns: itself
+        """
+        self._get_id.clear_cache(self)
+        self.get_object_reference.clear_cache(self)
+        return self
 
     def unlink(self, cr, uid, ids, context=None):
         """ Regular unlink method, but make sure to clear the caches. """
-        self._get_id.clear_cache(self)
-        self.get_object_reference.clear_cache(self)
+        self.clear_caches()
         return super(ir_model_data,self).unlink(cr, uid, ids, context=context)
 
     def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index ae0eb0f8bff..e7ad9cad65c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1325,7 +1325,8 @@ class BaseModel(object):
         messages = []
 
         fields = map(fix_import_export_id_paths, fields)
-        ModelData = self.pool['ir.model.data']
+        ModelData = self.pool['ir.model.data'].clear_caches()
+
         fg = self.fields_get(cr, uid, context=context)
 
         mode = 'init'

From c18686212af900045d86177b1b718a2dd74132d2 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 9 Nov 2012 12:57:20 +0100
Subject: [PATCH 3/4] [FIX] Removed module_stock_planning from config.

bzr revid: vta@openerp.com-20121109115720-dpwdqke5n1an857p
---
 addons/mrp/res_config.py       | 4 ----
 addons/mrp/res_config_view.xml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index c1712b81a26..ec3deb524a3 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,10 +28,6 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Manage master production shedule',
-            help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
-                which works automatically based on minimum stock rules.
-                This installs the module stock_planning."""),
         'module_mrp_repair': fields.boolean("Manage repairs of products ",
             help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 6b4058fb7b4..2c7047380a8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -56,10 +56,6 @@
                                 <field name="module_mrp_operations" class="oe_inline"/>
                                 <label for="module_mrp_operations" />
                             </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>
                         </div>
                     </group>
                     <separator string="Master Data"/>

From c5961309c424173953a67d873c79135a97856759 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 9 Nov 2012 13:48:54 +0100
Subject: [PATCH 4/4] [FIX] Fixed POS delete_payment_line triggering and
 processing.

bzr revid: vta@openerp.com-20121109124854-qray80vx77vlli4r
---
 addons/point_of_sale/static/src/js/screens.js | 6 ++++--
 addons/point_of_sale/static/src/js/widgets.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index c823350cdfd..0b8ab70a9c0 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -941,8 +941,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var self = this;
             var x = new module.PaymentlineWidget(null, {
                     payment_line: newPaymentLine
-                });
-            x.on('delete_payment_line', self, self.deleteLine);
+            });
+            x.on('delete_payment_line', self, function(r) {
+                self.deleteLine(r);
+            });
             x.appendTo(this.$('#paymentlines'));
         },
         renderElement: function() {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index fe86c9dc163..b555357baec 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -315,7 +315,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this._super();
             this.$('input').keyup(_.bind(this.changeAmount, this));
             this.$('.delete-payment-line').click(function() {
-                self.trigger('delete_payment_line');
+                self.trigger('delete_payment_line', self);
             });
         },
     });