← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-782186-ara into lp:openobject-addons

 

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-782186-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #782186 in OpenERP Addons: "[PS] In the Sales Receipt view, the Tax field displays tax id instead of tax name"
  https://bugs.launchpad.net/openobject-addons/+bug/782186

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782186-ara/+merge/61113

Hello,

Fix: In the Sales Receipt view, the Tax field displays tax id instead of tax name

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782186-ara/+merge/61113
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-782186-ara.
=== modified file 'account/account.py'
--- account/account.py	2011-05-05 14:43:40 +0000
+++ account/account.py	2011-05-16 13:26:02 +0000
@@ -1561,7 +1561,7 @@
                        (parent_ids,) + where_params)
         res=dict(cr.fetchall())
         obj_precision = self.pool.get('decimal.precision')
-        res2 = {} 
+        res2 = {}
         for record in self.browse(cr, uid, ids, context=context):
             def _rec_get(record):
                 amount = res.get(record.id, 0.0)
@@ -1780,15 +1780,6 @@
 
         return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-            return []
-        res = []
-        for record in self.read(cr, uid, ids, ['description','name'], context=context):
-            name = record['description'] and record['description'] or record['name']
-            res.append((record['id'],name ))
-        return res
-
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if user.company_id: