Merge lp:~openerp-dev/openobject-addons/6.1-opw-574787-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Note :- traceback only comes in web.

Fixed the issue of graph view, in web when you open Accounting -> Reporting -> Statistic Report -> Entries Analysis, now go to graph view and clear all the filters and just select the group by "Int.Type" field.

This will raise an error, the issue is that we haven't added 'liquidity' in type field of account_entries_report object, and when init method of account_entries_report is called it will get record from account_account as it is in left join, and record may have 'liquidity' as a type field value, but here liquidity is not as a item in selection field in account_entries_report.

So just added the item liquidity.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6816. By Mohammed Shekha(Open ERP) on 2012-05-28

[FIX]Fixed the issue of graph view in web which raising an error, but the issue is that we haven't added 'liquidity' in type field of account_entries_report object, and when init method of account_entries_report is called it will get record from account_account as it is in left join, and record may have 'liquidity' as a type field value, but here liquidity is not as a item in selection field.

=== modified file 'account/report/account_entries_report.py'
--- account/report/account_entries_report.py	2011-12-19 16:54:40 +0000
+++ account/report/account_entries_report.py	2012-05-28 11:48:18 +0000
@@ -61,6 +61,7 @@
         'type': fields.selection([
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
+            ('liquidity','Liquidity'),
             ('cash', 'Cash'),
             ('view', 'View'),
             ('consolidation', 'Consolidation'),