diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index ade29ef6f83cf325c718a4a7252ed0038540a246..1cb1e3fab1fe1c50fc935f4e3533670a0e8aeb48 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -20,22 +20,22 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
- <record id="action_company_analysis_tree" model="ir.actions.act_window">
- <field name="name">Company Analysis</field>
- <field name="res_model">account.entries.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
- <field name="view_id" ref="account.view_company_analysis_tree"/>
- </record>
- <record id="action_treasory_graph" model="ir.actions.act_window">
- <field name="name">Treasory</field>
- <field name="res_model">account.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
+ <record id="action_company_analysis_tree" model="ir.actions.act_window">
+ <field name="name">Company Analysis</field>
+ <field name="res_model">account.entries.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+ <field name="view_id" ref="account.view_account_entries_report_tree"/>
+ </record>
+ <record id="action_treasory_graph" model="ir.actions.act_window">
+ <field name="name">Treasory</field>
+ <field name="res_model">account.account</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','liquidity')]</field>
<field name="view_id" ref="account.view_treasory_graph"/>
- </record>
+ </record>
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 942ca8c4fb85423b566f8cfcaa3e67d2c83bd71a..80065880ad90d71fb4b3b388c64356e9c72a1407 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -33,9 +33,9 @@ class account_entries_report(osv.osv):
'date_created': fields.date('Date Created', readonly=True),
'date_maturity': fields.date('Date Maturity', readonly=True),
'ref': fields.char('Reference', size=64, readonly=True),
- 'nbr':fields.integer('# of Items', readonly=True),
- 'debit':fields.float('Debit', readonly=True),
- 'credit':fields.float('Credit', readonly=True),
+ 'nbr': fields.integer('# of Items', readonly=True),
+ 'debit': fields.float('Debit', readonly=True),
+ 'credit': fields.float('Credit', readonly=True),
'balance': fields.float('Balance', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
@@ -77,14 +77,16 @@ class account_entries_report(osv.osv):
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+ period_obj = self.pool.get('account.period')
for arg in args:
if arg[0] == 'period_id' and arg[2] == 'current_period':
- current_period = self.pool.get('account.period').find(cr, uid)[0]
+ current_period = period_obj.find(cr, uid)[0]
args.append(['period_id','in',[current_period]])
break
elif arg[0] == 'period_id' and arg[2] == 'current_year':
- current_year = self.pool.get('account.fiscalyear').find(cr, uid)
- ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+ current_year = fiscalyear_obj.find(cr, uid)
+ ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
args.append(['period_id','in',ids])
for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
if a in args:
@@ -94,15 +96,17 @@ class account_entries_report(osv.osv):
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
todel=[]
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+ period_obj = self.pool.get('account.period')
for arg in domain:
if arg[0] == 'period_id' and arg[2] == 'current_period':
- current_period = self.pool.get('account.period').find(cr, uid)[0]
+ current_period = period_obj.find(cr, uid)[0]
domain.append(['period_id','in',[current_period]])
todel.append(arg)
break
elif arg[0] == 'period_id' and arg[2] == 'current_year':
- current_year = self.pool.get('account.fiscalyear').find(cr, uid)
- ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+ current_year = fiscalyear_obj.find(cr, uid)
+ ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
domain.append(['period_id','in',ids])
todel.append(arg)
for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index fc75a05e0290fcfb0721e0a9bbb6ef794a5e5256..cb3164088858f97d23b80f039a32b8695c7e472f 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -88,20 +88,7 @@
<field name="period_id"/>
</group>
<newline/>
- <group expand="0" string="Extended Filters..." groups="base.group_extended">
- <field name="fiscalyear_id"/>
- <separator orientation="vertical"/>
- <field name="product_id"/>
- <field name="partner_id"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
- <field name="company_id" groups="base.group_multi_company"/>
- <newline/>
- <field name="date_created"/>
- <field name="date"/>
- <field name="date_maturity"/>
- </group>
- <newline/>
- <group expand="1" string="Group By...">
+ <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
@@ -119,6 +106,19 @@
<filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
<filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
</group>
+ <newline/>
+ <group expand="0" string="Extended Filters..." groups="base.group_extended">
+ <field name="fiscalyear_id"/>
+ <separator orientation="vertical"/>
+ <field name="product_id"/>
+ <field name="partner_id"/>
+ <separator orientation="vertical" groups="base.group_multi_company"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <newline/>
+ <field name="date_created"/>
+ <field name="date"/>
+ <field name="date_maturity"/>
+ </group>
</search>
</field>
</record>
@@ -127,6 +127,8 @@
<field name="res_model">account.entries.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
+ <field name="search_view_id" ref="view_account_entries_report_search"/>
+ <field name="view_id" ref="view_account_entries_report_tree"/>
<field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
<field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
</record>