Merge lp:~unifield-team/unifield-server/us-982 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_config_locations/stock_configuration.py'
--- bin/addons/msf_config_locations/stock_configuration.py	2015-11-20 10:30:30 +0000
+++ bin/addons/msf_config_locations/stock_configuration.py	2016-04-25 07:49:49 +0000
@@ -308,6 +308,35 @@
         'internal_dest': fields.function(_get_dummy, fnct_search=_dest_int, method=True, string='Internal Picking Dest. Loc.', type='boolean',
                                          help='Returns the available locations for destination location of an internal picking according to the product.'),
     }
+
+    def create(self, cr, uid, vals=None, context=None):
+        """
+        Remove the whitespaces before and after the name of the location
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param vals: Values to be put on the new location
+        :param context: Context of the call
+        :return: Result of the super() call
+        """
+        if vals and vals.get('name'):
+            vals['name'] = vals.get('name', '').strip()
+
+        return super(stock_location, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals=None, context=None):
+        """
+        Remove the whitespaces before and after the name of the location
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of stock.location ID to be updated
+        :param vals: Values to be put on the new location
+        :param context: Context of the call
+        :return: Result of the super() call
+        """
+        if vals and vals.get('name'):
+            vals['name'] = vals.get('name', '').strip()
+
+        return super(stock_location, self).write(cr, uid, ids, vals, context=context)
     
 stock_location()
 
 
=== modified file 'bin/addons/msf_doc_import/check_line.py'
--- bin/addons/msf_doc_import/check_line.py	2016-01-11 14:17:53 +0000
+++ bin/addons/msf_doc_import/check_line.py	2016-04-25 07:49:49 +0000
@@ -199,6 +199,7 @@
     product_id = kwargs.get('product_id')
     pick_type = kwargs.get('pick_type')
     pick_subtype = kwargs.get('pick_subtype')
+    context = kwargs.get('context', {})
     loc_id = None
     loc_name = None
     msg = ''
@@ -225,7 +226,7 @@
                     pack_loc_id = loc_obj.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_outgoing', 'stock_location_packing')[1]
                     domain.extend([('id', '=', pack_loc_id)])
 
-                loc_ids = loc_obj.search(cr, uid, domain)
+                loc_ids = loc_obj.search(cr, uid, domain, context=context)
                 if loc_ids:
                     loc_id = loc_ids[0]
                 elif loc_obj.search(cr, uid, [('name', '=ilike', loc_name)]):