Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons13-account-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-account-apa/+merge/128672
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-account-apa/+merge/128672
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons13-account-apa.
=== modified file 'account/project/wizard/account_analytic_journal_report.py'
--- account/project/wizard/account_analytic_journal_report.py 2012-09-28 12:19:22 +0000
+++ account/project/wizard/account_analytic_journal_report.py 2012-10-09 10:09:30 +0000
@@ -63,8 +63,13 @@
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')
+ print context
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()
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-09-17 10:03:06 +0000
+++ account_budget/account_budget_view.xml 2012-10-09 10:09:30 +0000
@@ -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
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
