odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] analytic journals and budgets 

bzr revid: fp@tinyerp.com-20121013111553-bu3j3rdxptunzytz
This commit is contained in:
Fabien Pinckaers 2012-10-13 13:15:53 +02:00
parent f4835acacc 38a2a95351
commit 18e9a26087
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/project/wizard/account_analytic_journal_report.py
View File

@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory):
if context is None:
context = {}
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
if not context.has_key('active_ids'):
journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
else:
journal_ids = context.get('active_ids')
if 'analytic_account_journal_id' in fields:
res.update({'analytic_account_journal_id': context.get('active_ids',[])})
res.update({'analytic_account_journal_id': journal_ids})
return res
account_analytic_journal_report()

9
addons/account_budget/account_budget_view.xml
View File

@ -1,13 +1,8 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!-- budget form and tree view from account module *********************************** -->
<record id="action_account_budget_post_tree" model="ir.actions.act_window">
<field name="name">Budgets</field>
<field name="res_model">account.budget.post</field>
<field name="view_type">tree</field>
</record>
<menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
<menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
<!--
Budgets