[MERGE] lp:~openerp-dev/openobject-addons/trunk-contract_expense_link-nco

bzr revid: nco@tinyerp.com-20121119085613-ui7o6horgyo0jnmv
2012-11-19 14:26:13 +05:30
parent 66afff1b52 10e3cfe72c
commit 668997b8fe
2 changed files with 2 additions and 1 deletions
@@ -136,6 +136,7 @@ class account_analytic_account(osv.osv):
            'name': name,
            'view_type': 'form',
            'view_mode': 'tree,form',
+            'context':{'analytic_account':ids[0]},
            'domain' : domain,
            'res_model': 'hr.expense.expense',
            'nodestroy': True,
@@ -85,7 +85,7 @@
                    </group>
                    <notebook>
                        <page string="Description">
-                            <field name="line_ids" context="{'currency_id': currency_id}">
+                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account')}">
                                <form string="Expense Lines" version="7.0">
                                    <group>
                                        <group>