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

[jftempo]

=== modified file 'bin/addons/import_data/import_data.py'
--- bin/addons/import_data/import_data.py	2016-05-24 08:44:23 +0000
+++ bin/addons/import_data/import_data.py	2018-02-02 16:33:38 +0000
@@ -243,42 +243,28 @@
                                    'product.asset.type': {'name': {}},
                                    'product.international.status': {'name': {}},
                                    }
-            # Product nomenclature
-            cr.execute('SELECT name, id FROM product_nomenclature;')
+            # Product nomenclature and complete name
+            temp_nomen_by_id = {}
+            current_lang = context.get('lang', 'en_MF')
+            cr.execute('''
+                SELECT n.id, coalesce(t.value,n.name), n.parent_id 
+                FROM product_nomenclature n 
+                LEFT JOIN ir_translation t ON t.lang='en_MF' AND t.name='product.nomenclature,name' AND t.res_id=n.id 
+                ORDER BY n.level;
+            ''')
             for nv in cr.dictfetchall():
-                self._cache[dbname]['product.nomenclature']['name'].update({nv['name']: nv['id']})
+                self._cache[dbname]['product.nomenclature']['name'].update({nv['coalesce']: nv['id']})
+                if nv['parent_id'] and temp_nomen_by_id.get(nv['parent_id'], False):
+                    temp_full_name = temp_nomen_by_id[nv['parent_id']] + ' | ' + nv['coalesce']
+                    temp_nomen_by_id.update({nv['id']: temp_full_name})
+                    self._cache[dbname]['product.nomenclature']['complete_name'].update({temp_full_name: nv['id']})
+                else:
+                    temp_nomen_by_id.update({nv['id']: nv['coalesce']})
+                    self._cache[dbname]['product.nomenclature']['complete_name'].update({nv['coalesce']: nv['id']})
             # Product category
             cr.execute('SELECT id, family_id FROM product_category;')
             for pc in cr.dictfetchall():
                 self.pool.get('product.nomenclature')._cache[dbname].update({pc['family_id']: pc['id']})
-            # Product nomenclature complete name
-            cr.execute('''SELECT id, name FROM
-(
-(SELECT
-    n0.id, n0.name AS name
-FROM product_nomenclature n0
-WHERE n0.level = 0)
-UNION
-(SELECT n1.id, n0.name ||' | '|| n1.name AS name
-FROM product_nomenclature n1
-  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
-WHERE n1.level = 1)
-UNION
-(SELECT n2.id, n0.name ||' | '|| n1.name ||' | '|| n2.name AS name
-FROM product_nomenclature n1
-  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
-  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
-WHERE n2.level = 2)
-UNION
-(SELECT n3.id, n0.name ||' | '|| n1.name ||' | '|| n2.name ||' | '|| n3.name AS name
-FROM product_nomenclature n1
-  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
-  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
-  LEFT JOIN product_nomenclature n3 ON n3.parent_id = n2.id
-WHERE n3.level = 3)
-) AS cn''')
-            for cnv in cr.dictfetchall():
-                self._cache[dbname]['product.nomenclature']['complete_name'].update({cnv['name']: cnv['id']})
             # Product UoM
             cr.execute('SELECT name, id FROM product_uom;')
             for uv in cr.dictfetchall():

=== modified file 'bin/addons/product_nomenclature/product_nomenclature.py'
--- bin/addons/product_nomenclature/product_nomenclature.py	2017-05-29 14:06:25 +0000
+++ bin/addons/product_nomenclature/product_nomenclature.py	2018-02-02 16:33:38 +0000
@@ -733,9 +733,14 @@
             if from_import_menu and nomen_obj._cache.get(cr.dbname, {}).get(vals['nomen_manda_2'], False):
                 vals['categ_id'] = nomen_obj._cache.get(cr.dbname, {}).get(vals['nomen_manda_2'], False)
             else:
-                vals['categ_id'] = self.pool.get('product.nomenclature').read(cr, uid, vals['nomen_manda_2'], ['category_id'], context=context)['category_id'][0]
-                if from_import_menu:
-                    nomen_obj._cache[cr.dbname][vals['nomen_manda_2']] = vals['categ_id']
+                categ_ids = self.pool.get('product.nomenclature').read(cr, uid, vals['nomen_manda_2'], ['category_id'], context=context)['category_id']
+                if categ_ids and len(categ_ids) > 0:
+                    vals['categ_id'] = categ_ids[0]
+                    if from_import_menu:
+                        nomen_obj._cache[cr.dbname][vals['nomen_manda_2']] = vals['categ_id']
+                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']))
         return super(product_template, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context=None):