diff options
| author | PAP(OpenERP) <> | 2010-08-12 13:01:45 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-08-12 13:01:45 +0530 |
| commit | c75affcd1c21ea5191dd57ade5ab045ff8e6de6f (patch) | |
| tree | 4f01b08339a61a4aec5ea58da9ce0cffa8153676 /addons/project | |
| parent | 279d41f156ee676cae9373e27b6354b7f07c9a9a (diff) | |
[IMP] project & its related module with removing of mx.datetime dependancy
bzr revid: mra@mra-laptop-20100812073145-h57aft3vbcxsmvu7
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/board_project_manager_view.xml | 8 | ||||
| -rw-r--r-- | addons/project/project.py | 12 | ||||
| -rw-r--r-- | addons/project/project_data.xml | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml index f62c292e779..76c40324d31 100644 --- a/addons/project/board_project_manager_view.xml +++ b/addons/project/board_project_manager_view.xml @@ -13,14 +13,6 @@ <act_window domain="[('user_id','=',uid),('state','<>','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/> -<!-- <record id="action_project_pipeline_user" model="ir.actions.act_window">--> -<!-- <field name="name">Pipeline of tasks</field>--> -<!-- <field name="res_model">report.task.user.pipeline.open</field>--> -<!-- <field name="view_type">form</field>--> -<!-- <field name="view_mode">graph,tree</field>--> -<!-- <field name="domain">[('user_id','in',department_users_get())]</field>--> -<!-- </record>--> - <record id="board_project_manager_form" model="ir.ui.view"> <field name="name">board.project.manager.form</field> <field name="model">board.board</field> diff --git a/addons/project/project.py b/addons/project/project.py index fbc1f8ddf6a..6fe0ad82c11 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -21,7 +21,7 @@ from lxml import etree import time -from datetime import date, datetime +from datetime import datetime, date from tools.translate import _ from osv import fields, osv @@ -257,11 +257,19 @@ class project(osv.osv): task_obj = self.pool.get('project.task') result = [] for proj in self.browse(cr, uid, ids, context=context): - parent_id = context.get('parent_id', False) # check me where to pass context for parent id ?? + parent_id = context.get('parent_id', False) context.update({'analytic_project_copy': True}) + new_date_start = time.strftime('%Y-%m-%d') + new_date_end = False + if proj.date_start and proj.date: + start_date = date(*time.strptime(proj.date_start,'%Y-%m-%d')[:3]) + end_date = date(*time.strptime(proj.date,'%Y-%m-%d')[:3]) + new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d') new_id = project_obj.copy(cr, uid, proj.id, default = { 'name': proj.name +_(' (copy)'), 'state':'open', + 'date_start':new_date_start, + 'date':new_date_end, 'parent_id':parent_id}, context=context) result.append(new_id) cr.execute('select id from project_task where project_id=%s', (proj.id,)) diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index dd6708337e8..b54576ff391 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -15,9 +15,9 @@ <field name="object">project.task</field> </record> - <!-- - Resource: project.project - --> + <!-- + Resource: project.project + --> <record id="all_projects_account" model="account.analytic.account"> <field name="name">Projects</field> <field name="code">3</field> |