Merge lp:~dorian-kemps/unifield-server/US-3015 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_profile/data/patches.xml	2018-05-16 09:13:40 +0000
@@ -20,6 +20,10 @@
             <field name="method">us_4430_set_puf_to_reversal</field>
         </record>
 
+        <record id="us_3015_remove_whitespaces_product_description" model="patch.scripts">
+            <field name="method">us_3015_remove_whitespaces_product_description</field>
+        </record>
+
         <!-- UF8.0 -->
         <record id="set_sequence_main_nomen" model="patch.scripts">
             <field name="method">set_sequence_main_nomen</field>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_profile/msf_profile.py	2018-05-16 09:13:40 +0000
@@ -296,7 +296,24 @@
             cr.execute(update_ji)
             self._logger.warn('%s JI updated.' % (cr.rowcount,))
 
-
+<<<<<<< TREE
+
+=======
+    def us_3015_remove_whitespaces_product_description(self, cr, uid, *a, **b):
+        # Checking product's description
+        cr.execute('''SELECT id, name FROM product_template WHERE name LIKE ' %' or name LIKE '% ' ''')
+        for x in cr.fetchall():
+            cr.execute('''UPDATE product_template SET name = %s WHERE id = %s''', (x[1].strip(), x[0]))
+
+        # Checking product's description in the translations
+        cr.execute('''SELECT id, value FROM ir_translation 
+            WHERE name = 'product.template,name' AND value LIKE ' %' or value LIKE '% ' ''')
+        for x in cr.fetchall():
+            cr.execute('''UPDATE ir_translation SET value = %s WHERE id = %s''', (x[1].strip(), x[0]))
+
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF8.0
     def set_sequence_main_nomen(self, cr, uid, *a, **b):
         nom = ['MED', 'LOG', 'LIB', 'SRV']

=== modified file 'bin/addons/product_nomenclature/product_nomenclature.py'
--- bin/addons/product_nomenclature/product_nomenclature.py	2018-03-05 13:48:00 +0000
+++ bin/addons/product_nomenclature/product_nomenclature.py	2018-05-16 09:13:40 +0000
@@ -750,6 +750,10 @@
                 else:
                     raise osv.except_osv(_('Error'), _('No Product Category found for %s. Please contact an accounting member to create a new one for this family.')
                                          % vals['nomenclature_description'])
+
+        if vals.get('name'):
+            vals['name'] = vals['name'].strip()
+
         return super(product_template, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -760,6 +764,9 @@
             return True
         if vals.get('nomen_manda_2'):
             vals['categ_id'] = self.pool.get('product.nomenclature').browse(cr, uid, vals['nomen_manda_2'], context=context).category_id.id
+        if vals.get('name'):
+            vals['name'] = vals['name'].strip()
+
         return super(product_template, self).write(cr, uid, ids, vals, context)
 
 product_template()