diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-07-02 20:15:03 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-07-02 20:15:03 +0530 |
| commit | 2d63bd763496a9b7399d02ca2a4e1e9790442fcb (patch) | |
| tree | a8f1655a658bed949f044c723e43b952d812222b /addons/project_issue_sheet/project_issue_sheet.py | |
| parent | 8c8a9c4b92b7901d2871e3a50decca9689c0c96e (diff) | |
| parent | db470305838faecdf26e5535b890b86f7aab2931 (diff) | |
[MERGE] Merge Team3 work from addons3 branch
bzr revid: mra@mra-laptop-20100702144503-0yynbrlkxn0v76lt
Diffstat (limited to 'addons/project_issue_sheet/project_issue_sheet.py')
| -rw-r--r-- | addons/project_issue_sheet/project_issue_sheet.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py index 4027dab3572..99d08c51f2d 100644 --- a/addons/project_issue_sheet/project_issue_sheet.py +++ b/addons/project_issue_sheet/project_issue_sheet.py @@ -24,25 +24,30 @@ from tools.translate import _ class project_issue(osv.osv): _inherit = 'project.issue' + _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') + 'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'), + 'analytic_account_id': fields.related('project_id', 'category_id', string='Analytic Account') } project_issue() class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' - + _description = 'account analytic line' _columns = { 'create_date' : fields.datetime('Create Date', readonly=True), - } + } account_analytic_line() class hr_analytic_issue(osv.osv): + _inherit = 'hr.analytic.timesheet' + _description = 'hr analytic timesheet' _columns = { 'issue_id' : fields.many2one('project.issue', 'Issue'), } + hr_analytic_issue() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
