Merge lp:~openerp-community-committers/openobject-addons/5.0-bugfix_671172 into lp:~openerp-community-committers/openobject-addons/5.0

[Jan Verlaan]

As of version 5.0.8 the returnpacking number contains the hardcoded part in it's number "(return)
See addons/stock/wizard/wizard_return.py line 83
            new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
                    'move_lines':[], 'state':'draft', 'type':new_type,
                    'date':date_cur, 'invoice_state':data['form']['invoice_state'],})

This does greatly enhance the visibility, but has a side effect when the number is used for internal barcode (EAN13) generation.
The "(" and ")" signs are used for start/end char in the barcode generation, hence the generations fails.

Fix is to rename the part of {'name':'%s (return)' to {'name':'%s -return'

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

review: Approve

[Omar (Pexego) (omar7r)]

Approve. But, Could we translate this statement with _(%s -return)?

[Jan Verlaan (jan-verlaan)]

> Approve. But, Could we translate this statement with _(%s -return)?
Hmmm, good question as it popup a general question about translations for this community branch. As far I can oversee we are not able to sync translations with openerp's MC branch. So how could we deal with eventually needed translations in general?
If that question can be answered we can also answer your question.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Do the merge from MC branch will not update the translation ? We'll need to merge the MC branch to forbid too much differences, so IMHO we'll probably won't have to care about that for a first step.

[Albert Cervera i Areny - http://www.NaN-tic.com (albert-nan)]

I think marking it as translatable won't hurt. Even if we eventually don't translate it in our language.

[Jan Verlaan (jan-verlaan)]

> I think marking it as translatable won't hurt. Even if we eventually don't
> translate it in our language.
Agree, I will make the change so we can merge it at once.

review: Needs Fixing

[lp:~openerp-community-committers/openobject-addons/5.0-bugfix_671172]

2882. By Jan Verlaan on 2010-11-20

[FIX] stock module: barcode generation with return pickings corrected and make return name translatable

[Jan Verlaan (jan-verlaan)]

Ok, maked it translatable too. Line reads now;

new_picking = pick_obj.copy(cr, uid, pick.id, {'name':_('%s -return') % pick.name,

review: Approve

Unmerged revisions

2882. By Jan Verlaan on 2010-11-20

[FIX] stock module: barcode generation with return pickings corrected and make return name translatable

2881. By Jan Verlaan on 2010-11-18

[FIX] stock module: barcode generation with return pickings corrected

=== modified file 'stock/wizard/wizard_return.py'
--- stock/wizard/wizard_return.py	2010-07-30 12:15:44 +0000
+++ stock/wizard/wizard_return.py	2010-11-20 10:14:13 +0000
@@ -80,7 +80,7 @@
                 new_type='out'
             else:
                 new_type='internal'
-            new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
+            new_picking = pick_obj.copy(cr, uid, pick.id, {'name':_('%s -return') % pick.name,
                     'move_lines':[], 'state':'draft', 'type':new_type, 
                     'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
         new_location = move.location_dest_id.id