Merge lp:~openerp-dev/openobject-addons/trunk-bug-707359-amp into lp:openobject-addons

[Amit Parik]

Hello,

Improved the Analytic Account 's copy method. Name will be add a 'copy' after this fix.

Thank you!

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2012-09-12 15:14:18 +0000
+++ analytic/analytic.py	2012-09-21 13:45:31 +0000
@@ -140,7 +140,7 @@
         'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Reference', size=24, select=True),
-        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
                                   "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
@@ -168,7 +168,7 @@
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         if not template_id:
             return {}
@@ -179,7 +179,7 @@
         res['value']['quantity_max'] = template.quantity_max
         res['value']['description'] = template.description
         return res
-    
+
     def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
@@ -222,8 +222,10 @@
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
+        analytic = self.browse(cr, uid, id, context=context)
         default['code'] = False
         default['line_ids'] = []
+        default['name'] = analytic['name'] + ' (' + _('copy') + ')'
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
     def on_change_company(self, cr, uid, id, company_id):

=== modified file 'product/product.py'
--- product/product.py	2012-09-21 07:49:05 +0000
+++ product/product.py	2012-09-21 13:45:31 +0000
@@ -511,7 +511,7 @@
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
@@ -727,7 +727,7 @@
         context_wo_lang.pop('lang', None)
         product = self.read(cr, uid, id, ['name'], context=context_wo_lang)
         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',