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

[jftempo]

[jftempo (jfb-tempo-consulting)]

(diff not generated by launchpad ...)

Does not work if default_code contains a comma, please retrieve xmlid_code from ir.model.data only in sync context.

In update_existing_translations, could you test this to prevent the iteration on all fields ?
trans_ids = trans_obj.search(cr, uid, [
                            ('res_id', '=', 0),
                            ('xml_id', '=', xmlid),
                            ('type', '=', 'model'),
                            ('name', '=like', '%s,%%' % (model,)),
                        ], context=context)

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-09-28 08:24:48 +0000
+++ bin/addons/product_attributes/product_attributes.py	2016-11-21 14:09:07 +0000
@@ -1217,10 +1217,26 @@
         :return: The ID of the new product.template record
         """
         sptc_obj = self.pool.get('standard.price.track.changes')
+        trans_obj = self.pool.get('ir.translation')
+        data_obj = self.pool.get('ir.model.data')
 
         if context is None:
             context = {}
 
+        def update_existing_translations(model, res_id, xmlid):
+            # If we are in the creation of product by sync. engine, attach the already existing translations to this product
+            if context.get('sync_update_execution'):
+                trans_ids = trans_obj.search(cr, uid, [
+                    ('res_id', '=', 0),
+                    ('xml_id', '=', xmlid),
+                    ('type', '=', 'model'),
+                    ('name', '=like', '%s,%%' % model),
+                ], context=context)
+                if trans_ids:
+                    trans_obj.write(cr, uid, trans_ids, {
+                        'res_id': res_id,
+                    }, context=context)
+
         if 'default_code' in vals:
             vals['default_code'] = vals['default_code'].strip()
             if not context.get('sync_update_execution') and ' ' in vals['default_code']:
@@ -1252,6 +1268,16 @@
         res = super(product_attributes, self).create(cr, uid, vals,
                                                      context=context)
 
+        # Update existing translations for product.product and product.template
+        product_tmpl_id = self.read(cr, uid, [res], ['product_tmpl_id'])[0]['product_tmpl_id'][0]
+        prd_data_ids = data_obj.search(cr, uid, [
+            ('res_id', '=', res),
+            ('model', '=', 'product.product'),
+        ], context=context)
+        for prd_data in data_obj.browse(cr, uid, prd_data_ids, context=context):
+            update_existing_translations('product.product', res, prd_data.name)
+            update_existing_translations('product.template', product_tmpl_id, prd_data.name)
+
         sptc_obj.track_change(cr, uid, res, _('Product creation'), vals,
                               context=context)