Merge lp:~openerp-dev/openobject-server/trunk-opw-575181-port-mma into lp:openobject-server

Proposed by Mayur Maheshwari(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-opw-575181-port-mma
Merge into: lp:openobject-server
Diff against target: 15 lines (+0/-5)
1 file modified
openerp/addons/base/res/res_lang.py (+0/-5)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-opw-575181-port-mma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+135591@code.launchpad.net

Description of the change

Hello,

Reports were not printed with white space when we define ' ' as thousand operator in the language.

Suppose we have grouping as [3,2,-1] and value is 1234.0 and thousand separator as ' ',
then it should be printed as, '1 234.0' on reports.

code is forward port from 6.1

Thanks,
Mayur

To post a comment you must log in.

Unmerged revisions

4581. By Rifakat (OpenERP)

[FIX]base: User defined filters name does not get traslated in the user language while we check them through filter dropdown list.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_lang.py'
2--- openerp/addons/base/res/res_lang.py 2012-11-02 09:47:05 +0000
3+++ openerp/addons/base/res/res_lang.py 2012-11-22 06:28:50 +0000
4@@ -211,11 +211,6 @@
5 parts[0], seps = intersperse(parts[0], eval_lang_grouping, thousands_sep)
6
7 formatted = decimal_point.join(parts)
8- while seps:
9- sp = formatted.find(' ')
10- if sp == -1: break
11- formatted = formatted[:sp] + formatted[sp+1:]
12- seps -= 1
13 elif percent[-1] in 'diu':
14 if grouping:
15 formatted = intersperse(formatted, eval_lang_grouping, thousands_sep)[0]