[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20101124054321-yiflew26iq311v3h

diff --cc addons/account/report/common_report_header.py
index 35d0c13,809cb38..68c976c
--- 1/addons/account/report/common_report_header.py
--- 2/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@@ -136,7 -137,7 +136,7 @@@ class common_report_header(object)
  
      def _get_currency(self, data):
          if data.get('form', False) and data['form'].get('chart_account_id', False):
-             return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.code
-         return '' 
+             return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
+         return ''
  
 -#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 +#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/product/product.py
Simple merge