diff options
| author | pap (openerp) <pap@tinyerp.co.in> | 2010-07-15 13:05:17 +0530 |
|---|---|---|
| committer | pap (openerp) <pap@tinyerp.co.in> | 2010-07-15 13:05:17 +0530 |
| commit | 445daf3175f93317cb79f144e80d3062838e8e8d (patch) | |
| tree | 3d07544e6c2bf96cf54399edc8f41b782cffa9c4 /addons/project_issue_sheet | |
| parent | 9f8aa7716cb63d4bac626d8e543ca1d7350d2515 (diff) | |
[IMP]:renamed category_id to analytic_account_id in project and project_* modules
bzr revid: pap@tinyerp.co.in-20100715073517-je8i2a0dkht2z45k
Diffstat (limited to 'addons/project_issue_sheet')
| -rw-r--r-- | addons/project_issue_sheet/project_issue_sheet.py | 11 | ||||
| -rw-r--r-- | addons/project_issue_sheet/project_issue_sheet_view.xml | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py index d4c9240cae1..f5e7d776436 100644 --- a/addons/project_issue_sheet/project_issue_sheet.py +++ b/addons/project_issue_sheet/project_issue_sheet.py @@ -27,7 +27,7 @@ class project_issue(osv.osv): _description = 'project issue' _columns = { 'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'), - 'analytic_account_id': fields.related('project_id', 'category_id', string='Analytic Account') + 'analytic_account_id': fields.related('project_id', 'analytic_account_id', string='Analytic Account') } project_issue() @@ -48,15 +48,6 @@ class hr_analytic_issue(osv.osv): _columns = { 'issue_id' : fields.many2one('project.issue', 'Issue'), } - - def _get_analytic_account(self, cr, uid, context={}): - if context.get('account_id', False): - return context.get('account_id') - return False - - _defaults = { - 'account_id' : _get_analytic_account, - } hr_analytic_issue() diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 4e224ee0428..13aed4eb129 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -10,7 +10,7 @@ <notebook colspan="4"> <page string="Worklogs"> <field name="analytic_account_id" invisible="1"/> - <field name="timesheet_ids" colspan="4" nolabel="1" default_get="{'account_id':project_id}" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"> + <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"> <tree editable="top" string="Timesheet"> <field name="name"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/> |