Merge lp:~openerp-dev/openobject-addons/trunk-opw-577044-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

     I have Fixed the issue of month translation, here month field in report is defined as a char, so just changed it to selection so that name of the month are automatically translated from the server itself in fields_get.

Otherwise it will show the month name in English in any language.

Step :- Document -> Dashboard -> In Graph view X-axis, you will see the name of the month in English in any language.

code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

not good for the order, you should use '01' instead of '1' for the month of january otherwise the order of the data is incorrect.

[lp:~openerp-dev/openobject-addons/trunk-opw-577044-port-mma]

8143. By Mayur Maheshwari(OpenERP) on 2012-12-20

[IMP]document: improve code for the order arrangement

Unmerged revisions

8143. By Mayur Maheshwari(OpenERP) on 2012-12-20

[IMP]document: improve code for the order arrangement

8142. By Mohammed Shekha(Open ERP) on 2012-11-27

[FIX]document: Fixed the issue of month translation, here month field in report is defined as a char, so just changed it to selection so that name of the month are automatically translated from the server itself in fields_get

=== modified file 'document/report/document_report.py'
--- document/report/document_report.py	2012-09-14 05:15:25 +0000
+++ document/report/document_report.py	2012-11-27 12:56:25 +0000
@@ -71,7 +71,9 @@
     _columns = {
         'file_size': fields.integer('File Size', readonly=True),
         'nbr':fields.integer('# of Files', readonly=True),
-        'month': fields.char('Month', size=24,readonly=True),
+        'month': fields.selection([('1','January'), ('2','February'), ('3','March'), ('4','April'),
+                ('5','May'), ('6','June'), ('7','July'), ('8','August'), ('9','September'),
+                ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
      }
     _order = "month"
     def init(self, cr):
@@ -80,7 +82,7 @@
             create or replace view report_document_file as (
                 select min(f.id) as id,
                        count(*) as nbr,
-                       min(EXTRACT(MONTH FROM f.create_date)||'-'||to_char(f.create_date,'Month')) as month,
+                       CAST(min(EXTRACT(MONTH FROM f.create_date)) AS text) as month,
                        sum(f.file_size) as file_size
                 from ir_attachment f
                 group by EXTRACT(MONTH FROM f.create_date)