Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons13-account-apa-account_issue-rma
into lp:~openerp-dev/openobject-addons/trunk-addons13-account-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-account-apa-account_issue-rma/+merge/128450
Hello Sir,
I have make changes into the account module.
Thank you..
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-account-apa-account_issue-rma/+merge/128450
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-08 09:39:30 +0000
@@ -65,6 +65,10 @@
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
if 'analytic_account_journal_id' in fields:
res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+ journal = self.pool.get('account.analytic.journal')
+ cr.execute('SELECT * FROM account_analytic_journal')
+ for record in cr.fetchall():
+ res['analytic_account_journal_id'].append(record[0])
return res
account_analytic_journal_report()
=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py 2012-05-04 12:59:11 +0000
+++ account_budget/account_budget.py 2012-10-08 09:39:30 +0000
@@ -37,6 +37,8 @@
_name = "account.budget.post"
_description = "Budgetary Position"
_columns = {
+ 'parent_id': fields.many2one('account.budget.post','ID', readonly=True),
+ 'child_ids': fields.one2many('account.budget.post', 'parent_id', 'Children Post'),
'code': fields.char('Code', size=64, required=True),
'name': fields.char('Name', size=256, required=True),
'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-10-08 06:59:09 +0000
+++ account_budget/account_budget_view.xml 2012-10-08 09:39:30 +0000
@@ -1,8 +1,15 @@
<?xml version="1.0" ?>
<openerp>
<data>
-
- <menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
+ <!-- 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>
+ <field name="domain">[('parent_id','=',False)]</field>
+ <field name="view_id" ref="view_budget_post_tree"/>
+ </record>
+ <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
<!--
Budgets
@@ -21,8 +28,10 @@
<record id="view_budget_post_tree" model="ir.ui.view">
<field name="name">account.budget.post.tree</field>
<field name="model">account.budget.post</field>
+ <field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Budgetary Position">
+ <field name="crossovered_budget_line"/>
<field name="code"/>
<field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
_______________________________________________
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
