Merge lp:~openerp-dev/openobject-addons/6.0-opw_bug-734191-ach into lp:openobject-addons/6.0

[Anup(SerpentCS)]

Hello,

   The issue has been fixed by this solution. Due to context the German was being copied in the orignal data or as an english translation. It's fixed.
   The translations were not also being copied properly and that was also the reason for not having the correct results in different languages.

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw_bug-734191-ach]

4503. By Jay Vora (Serpent Consulting Services) on 2011-04-04

[FIX] Stock : Removed the buttons which could confuse the users (Ref : Case 4970)

4504. By Jay Vora (Serpent Consulting Services) on 2011-04-04

[MERGE] Merged Dhruti's branch for the bugfix of lp:739172

4505. By Jay Vora (Serpent Consulting Services) on 2011-04-04

[FIX] Backported the fix from trunk for the bug lp:740047

4506. By Jay Vora (Serpent Consulting Services) on 2011-04-04

[FIX] product : Copying product now reflecting with proper translations

[Jay Vora (Serpent Consulting Services) (jayvora)]

Anup,

Thanks for the merge, this looks good.Let us wait for odo's approval as this belongs to server as well.

Thanks again.

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

This looks good but I don't think it works properly when the product_template.id and product_product.id are different.

This is a situation that happens very often, as soon as you use product variants, or even without that (it used to be that deleting a product would not delete the template, even if there was only one).

You can simulate this easily: insert an additional template or product manually in the database, and see if this still works.

I think this might even need to be fixed in the orm's copy_translation method, because it does not seem to take it into account.

Minor other things:
- why the funky indentation in copy_translation()? ;-)
- as a good practice, do not alter the original context, please use a copy, otherwise you might create side-effects when you modify/remove the language, for example if the RPC call does something else afterwards.

review: Needs Information

[Jay Vora (Serpent Consulting Services) (jayvora)]

Olivier,

Thanks for the review.

Please don't get confused with the 'name' of ir_translation record.

Here is a clear distinction:
trans_ids = trans_obj.search(cr, uid, [('res_id','=',new_id), ('name','=','product.template,name')])

-- The new_id will be the ID of the table product_product only(disregard to whatever is the ID of product_template).
-- Name of the record will be 'product_template,name' because we have a convention that this name be designed as 'model which has this field in, field name'. Here the translatable field 'name' resides into the columns of product.template.

This would work very normal when we dont overide copy() for product_product().
But, in case of translation, its if we have overridden copy(),we should override copy_translations() too.

Correct me if I missed anything.

I am investigating more.

[Jacques-Etienne Baudoux (jbaudoux)]

I don't think it will work. If you have 'variant' in the context (line 639), it's calling only create and never calling copy_translations.

The minor other things Olivier told you are still remaining:
- why the funky indentation in copy_translation()? ;-)
- as a good practice, do not alter the original context, please use a copy, otherwise you might create side-effects when you modify/remove the language, for example if the RPC call does something else afterwards.
630 context_without_lang = context.copy()
631 if 'lang' in context_without_lang:
632 del context_without_lang['lang']
633 product = self.read(cr, uid, id, ['name'], context=context_without_lang)

651 return super(product_product, self).copy(cr, uid, id, default=default,
652 context=context)

review: Disapprove

Unmerged revisions

4506. By Jay Vora (Serpent Consulting Services) on 2011-04-04

[FIX] product : Copying product now reflecting with proper translations

=== modified file 'product/product.py'
--- product/product.py	2011-03-10 09:52:25 +0000
+++ product/product.py	2011-04-04 13:48:55 +0000
@@ -607,15 +607,34 @@
 
         return res
 
+    def copy_translations(self, cr, uid, old_id, new_id, context=None):
+        # Copying valid values for the ir_translation records 
+            if context is None:
+                context = {}
+            super(product_product,self).copy_translations(cr, uid, old_id, new_id, context=context)
+            trans_obj = self.pool.get('ir.translation')
+            trans_ids = trans_obj.search(cr, uid, [('res_id','=',new_id), ('name','=','product.template,name')])
+            trans_records = trans_obj.read(cr, uid, trans_ids, ['src','value','lang'])
+            for trans_rec in trans_records:
+                context['lang'] = trans_rec['lang']
+                trans_rec['src'] += ' (copy)'
+                trans_rec['value'] += _(' (copy)')
+                tr_id = trans_rec['id']
+                del trans_rec['id']
+                trans_obj.write(cr, uid, [tr_id], trans_rec)
+                
     def copy(self, cr, uid, id, default=None, context=None):
         if context is None:
             context={}
-
+        #In order to fetch the name of the record stored in DB, we need to remove the contextual langauge.
+        context_with_lang = context.copy()
+        if 'lang' in context:
+            del context['lang'] 
         product = self.read(cr, uid, id, ['name'], context=context)
         if not default:
             default = {}
         default = default.copy()
-        default['name'] = product['name'] + _(' (copy)')
+        default['name'] = product['name'] + ' (copy)'
 
         if context.get('variant',False):
             fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
@@ -630,7 +649,7 @@
             return self.create(cr, uid, data)
         else:
             return super(product_product, self).copy(cr, uid, id, default=default,
-                    context=context)
+                    context=context_with_lang)
 product_product()
 
 class product_packaging(osv.osv):