diff options
Diffstat (limited to 'addons/project_long_term')
16 files changed, 195 insertions, 191 deletions
diff --git a/addons/project_long_term/__init__.py b/addons/project_long_term/__init__.py index 8efcc1a0007..6b9b2613f3f 100644 --- a/addons/project_long_term/__init__.py +++ b/addons/project_long_term/__init__.py @@ -22,4 +22,4 @@ import project_long_term import wizard -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 7bc0e3c9984..dfcddb75b48 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -18,13 +18,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + { - "name" : "Long Term Project Management", + "name": "Long Term Project Management", "version": "1.1", - "author" : "Tiny", - "website" : "http://www.openerp.com", - "category" : "Generic Modules/Projects & Services", - "depends" : ["project", "resource"], + "author": "Tiny", + "website": "http://www.openerp.com", + "category": "Generic Modules/Projects & Services", + "depends": ["project", "resource"], "description": """ Long Term Project management module that tracks planning, scheduling, resources allocation. @@ -36,9 +37,9 @@ - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date """, - "init_xml" : [], - "demo_xml" : ["project_long_term_demo.xml"], - "test" : [ + "init_xml": [], + "demo_xml": ["project_long_term_demo.xml"], + "test": [ 'test/schedule_project_phases.yml', 'test/schedule_project_tasks.yml', 'test/schedule_phase_tasks.yml' diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f1c40a4c8ba..4520e798f4e 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -29,7 +29,10 @@ class project_phase(osv.osv): _name = "project.phase" _description = "Project Phase" - def _check_recursion(self, cr, uid, ids, context={}): + def _check_recursion(self, cr, uid, ids, context=None): + if context is None: + context = {} + data_phase = self.browse(cr, uid, ids[0], context=context) prev_ids = data_phase.previous_phase_ids next_ids = data_phase.next_phase_ids @@ -45,7 +48,7 @@ class project_phase(osv.osv): next_ids = [rec.id for rec in next_ids] # iter prev_ids while prev_ids: - cr.execute('select distinct prv_phase_id from project_phase_rel where next_phase_id IN %s',(tuple(prev_ids),)) + cr.execute('SELECT distinct prv_phase_id FROM project_phase_rel WHERE next_phase_id IN %s', (tuple(prev_ids),)) prv_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall())) if data_phase.id in prv_phase_ids: return False @@ -55,7 +58,7 @@ class project_phase(osv.osv): prev_ids = prv_phase_ids # iter next_ids while next_ids: - cr.execute('select distinct next_phase_id from project_phase_rel where prv_phase_id IN %s',(tuple(next_ids),)) + cr.execute('SELECT distinct next_phase_id FROM project_phase_rel WHERE prv_phase_id IN %s', (tuple(next_ids),)) next_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall())) if data_phase.id in next_phase_ids: return False @@ -65,19 +68,19 @@ class project_phase(osv.osv): next_ids = next_phase_ids return True - def _check_dates(self, cr, uid, ids, context={}): + def _check_dates(self, cr, uid, ids, context=None): for phase in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context): if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']: return False return True - def _check_constraint_start(self, cr, uid, ids, context={}): + def _check_constraint_start(self, cr, uid, ids, context=None): phase = self.read(cr, uid, ids[0], ['date_start', 'constraint_date_start'], context=context) if phase['date_start'] and phase['constraint_date_start'] and phase['date_start'] < phase['constraint_date_start']: return False return True - def _check_constraint_end(self, cr, uid, ids, context={}): + def _check_constraint_end(self, cr, uid, ids, context=None): phase = self.read(cr, uid, ids[0], ['date_end', 'constraint_date_end'], context=context) if phase['date_end'] and phase['constraint_date_end'] and phase['date_end'] > phase['constraint_date_end']: return False @@ -97,7 +100,7 @@ class project_phase(osv.osv): 'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"), 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"), 'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"), - 'responsible_id':fields.many2one('res.users', 'Responsible'), + 'responsible_id': fields.many2one('res.users', 'Responsible'), 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ \n If the phase is over, the states is set to \'Done\'.') @@ -116,7 +119,7 @@ class project_phase(osv.osv): #(_check_constraint_end, 'Phase must end-before constraint end Date.', ['date_end', 'constraint_date_end']), ] - def onchange_project(self, cr, uid, ids, project, context={}): + def onchange_project(self, cr, uid, ids, project, context=None): result = {} project_obj = self.pool.get('project.project') if project: @@ -126,7 +129,9 @@ class project_phase(osv.osv): return {'value': result} return {'value': {'date_start': []}} - def _check_date_start(self, cr, uid, phase, date_end, context={}): + def _check_date_start(self, cr, uid, phase, date_end, context=None): + if context is None: + context = {} """ Check And Compute date_end of phase if change in date_start < older time. """ @@ -147,7 +152,9 @@ class project_phase(osv.osv): dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d %H:%M:%S')}, context=context) - def _check_date_end(self, cr, uid, phase, date_start, context={}): + def _check_date_end(self, cr, uid, phase, date_start, context=None): + if context is None: + context = {} """ Check And Compute date_end of phase if change in date_end > older time. """ @@ -168,11 +175,11 @@ class project_phase(osv.osv): dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'), 'date_end': dt_end}, context=context) - def write(self, cr, uid, ids, vals, context={}): + def write(self, cr, uid, ids, vals, context=None): resource_calendar_obj = self.pool.get('resource.calendar') resource_obj = self.pool.get('resource.resource') uom_obj = self.pool.get('product.uom') - if not context: + if context is None: context = {} if context.get('scheduler',False): return super(project_phase, self).write(cr, uid, ids, vals, context=context) @@ -191,7 +198,7 @@ class project_phase(osv.osv): # Change the date_start and date_end # for previous and next phases respectively based on valid condition if vals.get('date_start', False) and vals['date_start'] < phase.date_start: - dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S') + dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False) if work_times: vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') @@ -214,7 +221,7 @@ class project_phase(osv.osv): self.write(cr, uid, ids, {'state': 'open'}) return True - def set_pending(self, cr, uid, ids,*args): + def set_pending(self, cr, uid, ids, *args): self.write(cr, uid, ids, {'state': 'pending'}) return True diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml index 32d041544cc..8da591f1337 100644 --- a/addons/project_long_term/project_long_term_data.xml +++ b/addons/project_long_term/project_long_term_data.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <!-- Requests Links --> <record id="req_link_project" model="res.request.link"> <field name="name">Project</field> @@ -10,5 +11,6 @@ <field name="name">Project task</field> <field name="object">project.task</field> </record> + </data> </openerp> diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml index 657658eba46..fd965e4c792 100644 --- a/addons/project_long_term/project_long_term_demo.xml +++ b/addons/project_long_term/project_long_term_demo.xml @@ -8,151 +8,151 @@ <field name="address_id" ref="base.main_address"/> <field name="context_lang">en_US</field> <field name="name">Demo User1</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="signature">Mr Demo</field> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Setup')]"/> <field name="login">demo1</field> <field name="password">demo1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_manager0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">Manager1</field> - <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_manager')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">manager1</field> <field name="password">manager1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_manager1" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">Manager2</field> - <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_manager')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">manager2</field> <field name="password">manager2</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_user0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user1</field> - <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user1</field> <field name="password">USER1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_user1" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user2</field> - <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user2</field> <field name="password">user2</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_userfinance0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_finance</field> - <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_finance')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_finance</field> <field name="password">user_finance</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_userdesign0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_design1</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_design1</field> <field name="password">user_design1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_userdesign1" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_design2</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_design2</field> <field name="password">user_design2</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_userdeveloper0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_developer1</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_developer1</field> <field name="password">user_developer1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_userdeveloper1" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_developer2</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_developer2</field> <field name="password">user_developer1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_usertester0" model="res.users"> @@ -161,43 +161,43 @@ <field name="name">user_tester1</field> <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_tester1</field> <field name="password">user_tester1</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_usertester1" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_tester2</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_tester2</field> <field name="password">user_tester2</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <record id="res_users_useranalyst0" model="res.users"> <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/> <field name="context_lang">en_US</field> <field name="name">user_analyst</field> - <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/> + <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/> <field name="company_id" ref="base.main_company"/> - <field eval="[(6,0,[])]" name="roles_id"/> - <field eval="[(6,0,[])]" name="rules_id"/> + <field eval="[(6, 0, [])]" name="roles_id"/> + <field eval="[(6, 0, [])]" name="rules_id"/> <field eval="1" name="active"/> <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/> <field name="login">user_analyst</field> <field name="password">user_analyst</field> - <field eval="[(6,0,[])]" name="company_ids"/> + <field eval="[(6, 0, [])]" name="company_ids"/> </record> <!-- Resources --> @@ -255,17 +255,17 @@ <field name="state">open</field> <field name="type">normal</field> <field name="description">Develop an OpenERP Website.</field> - <field eval="[(6,0,[ref('res_users_manager0'),ref('res_users_user0'),ref('res_users_userfinance0'),ref('res_users_userdesign0'),ref('res_users_userdeveloper0'),ref('res_users_usertester0'),ref('res_users_useranalyst0')])]" name="members"/> + <field eval="[(6, 0, [ref('res_users_manager0'), ref('res_users_user0'), ref('res_users_userfinance0'), ref('res_users_userdesign0'), ref('res_users_userdeveloper0'), ref('res_users_usertester0'), ref('res_users_useranalyst0')])]" name="members"/> <field name="date">2010-04-30</field> <field name="user_id" ref="base.user_root"/> <field name="currency_id" ref="base.EUR"/> - <field eval="[(6,0,[])]" name="type_ids"/> + <field eval="[(6, 0, [])]" name="type_ids"/> <field name="name">OpenERP Website Development</field> </record> <!-- Project Phases --> <record id="project_phase_informationgatheringandunderstanding0" model="project.phase"> - <field eval="[(6,0,[])]" name="previous_phase_ids"/> + <field eval="[(6, 0, [])]" name="previous_phase_ids"/> <field name="name">Information Gathering and Understanding</field> <field name="product_uom" ref="product.uom_day"/> <field eval="10" name="sequence"/> @@ -280,7 +280,7 @@ </record> <record id="project_phase_planning0" model="project.phase"> - <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0')])]" name="previous_phase_ids"/> + <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0')])]" name="previous_phase_ids"/> <field name="name">Planning</field> <field name="product_uom" ref="product.uom_day"/> <field eval="10" name="sequence"/> @@ -295,7 +295,7 @@ </record> <record id="project_phase_webdesign0" model="project.phase"> - <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0')])]" name="previous_phase_ids"/> + <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0')])]" name="previous_phase_ids"/> <field name="name">Web Design </field> <field name="product_uom" ref="product.uom_day"/> <field eval="10" name="sequence"/> @@ -310,7 +310,7 @@ </record> <record id="project_phase_developmentintegrationandtesting0" model="project.phase"> - <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0'),ref('project_phase_webdesign0')])]" name="previous_phase_ids"/> + <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0')])]" name="previous_phase_ids"/> <field name="name">Development, Integration and Testing</field> <field name="product_uom" ref="product.uom_day"/> <field eval="10" name="sequence"/> @@ -325,7 +325,7 @@ </record> <record id="project_phase_websitedeployment0" model="project.phase"> - <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0'),ref('project_phase_webdesign0'),ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/> + <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0'), ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/> <field name="name">Website Deployment</field> <field name="product_uom" ref="product.uom_day"/> <field eval="10" name="sequence"/> @@ -403,10 +403,9 @@ <field name="date_start">2010-02-24 05:00:00</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Prepare Requirements Document</field> <field name="date_deadline">2010-03-08</field> @@ -422,10 +421,9 @@ <field name="date_start">2010-02-25 15:38:08</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Define Website Goals, Purposes and Target Audience</field> <field name="date_deadline">2010-03-04</field> @@ -441,10 +439,9 @@ <field name="date_start">2010-02-25 15:42:42</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Use Cases</field> <field name="date_deadline">2010-03-10</field> @@ -460,10 +457,9 @@ <field name="date_start">2010-02-25 15:51:00</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Budget Planning</field> <field name="date_deadline">2010-03-31</field> @@ -479,10 +475,9 @@ <field name="date_start">2010-02-25 15:54:42</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Quality Planning</field> <field name="date_deadline">2010-03-31</field> @@ -498,10 +493,9 @@ <field name="date_start">2010-02-25 15:55:11</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Risk Management Planning</field> <field name="date_deadline">2010-03-31</field> @@ -517,10 +511,9 @@ <field name="date_start">2010-02-25 15:57:48</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Create Project Schedules</field> <field name="date_deadline">2010-03-31</field> @@ -536,10 +529,9 @@ <field name="date_start">2010-02-25 16:04:16</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Dataflow Design</field> <field name="date_deadline">2010-04-02</field> @@ -555,10 +547,9 @@ <field name="date_start">2010-02-25 16:05:43</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">User Interface Design</field> <field name="date_deadline">2010-04-10</field> @@ -574,10 +565,9 @@ <field name="date_start">2010-02-25 16:06:52</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Task Level WBS</field> <field name="date_deadline">2010-04-07</field> @@ -593,10 +583,9 @@ <field name="date_start">2010-02-25 16:11:40</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Modular Programming</field> <field name="date_deadline">2010-04-22</field> @@ -611,10 +600,9 @@ <field name="date_start">2010-02-25 16:13:10</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Integrate Modules</field> <field name="date_deadline">2010-04-24</field> @@ -629,10 +617,9 @@ <field name="date_start">2010-02-25 16:14:32</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Unit Testing</field> <field name="date_deadline">2010-04-24</field> @@ -647,10 +634,9 @@ <field name="date_start">2010-02-25 16:15:38</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Regression Test</field> <field name="date_deadline">2010-04-24</field> @@ -665,10 +651,9 @@ <field name="date_start">2010-02-25 16:17:04</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Documentation</field> <field name="date_deadline">2010-04-24</field> @@ -683,10 +668,9 @@ <field name="date_start">2010-02-25 16:17:42</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Performance Tuning</field> <field name="date_deadline">2010-04-24</field> @@ -701,10 +685,9 @@ <field name="date_start">2010-02-25 16:21:15</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Deploy Website</field> <field name="date_deadline">2010-04-26</field> @@ -719,10 +702,9 @@ <field name="date_start">2010-02-25 16:22:09</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Presentation</field> <field name="date_deadline">2010-04-28</field> @@ -737,10 +719,9 @@ <field name="date_start">2010-02-25 16:36:02</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Deployment</field> <field name="date_deadline">2010-04-28</field> @@ -756,10 +737,9 @@ <field name="date_start">2010-02-25 16:36:43</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Presentation</field> <field name="date_deadline">2010-04-29</field> @@ -775,10 +755,9 @@ <field name="date_start">2010-02-25 17:22:46</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Modules Integration</field> <field name="date_deadline">2010-04-24</field> @@ -794,10 +773,9 @@ <field name="date_start">2010-02-25 17:34:32</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Unit Testing</field> <field name="date_deadline">2010-04-24</field> @@ -813,10 +791,9 @@ <field name="date_start">2010-02-25 17:35:46</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Modular Testing</field> <field name="date_deadline">2010-04-24</field> @@ -832,10 +809,9 @@ <field name="date_start">2010-02-25 17:36:27</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Documentation</field> <field name="date_deadline">2010-04-28</field> @@ -851,10 +827,9 @@ <field name="date_start">2010-02-25 17:37:03</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Performance Tuning</field> <field name="date_deadline">2010-04-27</field> @@ -871,10 +846,9 @@ <field name="date_start">2010-03-01 12:00:00</field> <field name="company_id" ref="base.main_company"/> <field name="priority">2</field> - <field name="state">draft</field> <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/> - <field eval="[(6,0,[])]" name="child_ids"/> - <field eval="[(6,0,[])]" name="parent_ids"/> + <field eval="[(6, 0, [])]" name="child_ids"/> + <field eval="[(6, 0, [])]" name="parent_ids"/> <field eval="1" name="active"/> <field name="name">Modular Programming</field> <field name="date_deadline">2010-04-22</field> @@ -882,5 +856,6 @@ <field eval="100.0" name="remaining_hours"/> <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/> </record> + </data> </openerp> diff --git a/addons/project_long_term/project_long_term_report.xml b/addons/project_long_term/project_long_term_report.xml index 3bbbce1874c..d8fe2a4fa6e 100644 --- a/addons/project_long_term/project_long_term_report.xml +++ b/addons/project_long_term/project_long_term_report.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <report auto="False" id="report_project_task_gantt" model="project.task" name="project.tasks.gantt" string="Gantt Representation"/> <report auto="False" id="report_project_project_gantt" model="project.project" name="project.project.gantt" string="Gantt Representation"/> + </data> </openerp> diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml index ea43762653c..7f3668c6b1a 100644 --- a/addons/project_long_term/project_long_term_wizard.xml +++ b/addons/project_long_term/project_long_term_wizard.xml @@ -6,7 +6,7 @@ <!--<wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>--> <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>--> -<!-- <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>--> + <!--<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>--> <!--<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>--> <!-- <menuitem action="wizard_compute_phase" diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml index f476ac16cd6..3a821ddd274 100644 --- a/addons/project_long_term/project_long_term_workflow.xml +++ b/addons/project_long_term/project_long_term_workflow.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <record id="wkf_phase" model="workflow"> <field name="name">project.phase.wkf</field> <field name="osv">project.phase</field> @@ -104,5 +105,6 @@ <field name="act_to" ref="act_draft"/> <field name="signal">set_draft</field> </record> + </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py index fb8a29449f7..5056cad3b77 100644 --- a/addons/project_long_term/wizard/__init__.py +++ b/addons/project_long_term/wizard/__init__.py @@ -25,4 +25,3 @@ import project_schedule_tasks import working_calendar # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index ce2e2c0bbb1..3b4ac2d7b23 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import datetime from resource.faces import * from new import classobj @@ -48,6 +49,8 @@ class project_compute_phases(osv.osv_memory): return self.compute_date(cr, uid, ids, context=context) def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None): + if context is None: + context = {} """Schedule phase with the start date till all the next phases are completed. Arguements: start_dsate -- start date for the phase @@ -118,7 +121,7 @@ class project_compute_phases(osv.osv_memory): context=ctx) # Recursive call till all the next phases scheduled for phase in phase.next_phase_ids: - if phase.state in ['draft','open','pending']: + if phase.state in ['draft', 'open', 'pending']: id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False self._phase_schedule(cr, uid, phase, date_start, id_cal, context=context) else: diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml index 6bbb01ca7e4..8a9ce15e772 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -9,20 +9,20 @@ <field name="arch" type="xml"> <form string="Compute Scheduling of Phases"> <group width="380" height="180"> - <group colspan="4" col="4"> - <label colspan="4" string="This wizard will schedule phases for all or specified project" /> - <newline /> - <field name="target_project" colspan="4"/> - </group> - <newline /> - <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}"> - <field name="project_id"/> - </group> - <separator colspan="4"/> - <group colspan="4" col="6"> <!-- Improve me --> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/> - </group> + <group colspan="4" col="4"> + <label colspan="4" string="This wizard will schedule phases for all or specified project" /> + <newline /> + <field name="target_project" colspan="4"/> + </group> + <newline /> + <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}"> + <field name="project_id"/> + </group> + <separator colspan="4"/> + <group colspan="4" col="6"> <!-- Improve me --> + <button icon="gtk-cancel" special="cancel" string="_Cancel"/> + <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/> + </group> </group> </form> </field> @@ -35,7 +35,7 @@ <field name="view_type">form</field> <field name="view_mode">form</field> <field name="view_id" ref="view_project_compute_phases_select"/> - <field name="context">{'record_id' : active_id}</field> + <field name="context">{'record_id': active_id}</field> <field name="target">new</field> </record> @@ -43,4 +43,4 @@ parent="menu_phase_schedule" action="action_project_compute_phases"/> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index bd569abf90e..f7f1c9dc613 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -69,7 +69,7 @@ class project_compute_tasks(osv.osv_memory): resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)], context=context) if resource_id: # resource = resource_obj.browse(cr, uid, resource_id, context=context)[0] - resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0] + resource = resource_obj.read(cr, uid, resource_id, ['calendar_id', 'time_efficiency'], context=context)[0] if resource.get('calendar_id', False): leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False) time_efficiency = resource.get('time_efficiency') @@ -126,7 +126,7 @@ class project_compute_tasks(osv.osv_memory): s_date = t.start.to_datetime() e_date = t.end.to_datetime() if loop_no == 0: - project_obj.write(cr, uid, [project_id], {'date' : e_date}, context=context) + project_obj.write(cr, uid, [project_id], {'date': e_date}, context=context) else: ctx = context.copy() ctx.update({'scheduler': True}) diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml index eff475b4f11..bf6fe379048 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -34,4 +34,4 @@ parent="menu_phase_schedule" action="action_project_compute_tasks"/> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 78ad2166698..f0ad7c51dae 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -40,6 +40,8 @@ class project_schedule_task(osv.osv_memory): } def default_get(self, cr, uid, fields_list, context=None): + if context is None: + context = {} res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context) self.compute_date(cr, uid, context=context) return res @@ -70,6 +72,8 @@ class project_schedule_task(osv.osv_memory): return resource_objs def compute_date(self, cr, uid, context=None): + if context is None: + context = {} """ Schedule the tasks according to resource available and priority. """ @@ -152,7 +156,7 @@ class project_schedule_task(osv.osv_memory): 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'), 'user_id': user_id[0]}, context=ctx) - loop_no +=1 + loop_no += 1 return {} project_schedule_task() diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml index b62a3c107d9..f8e2f2d828b 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml +++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml @@ -25,9 +25,9 @@ <field name="view_type">form</field> <field name="view_mode">form</field> <field name="view_id" ref="view_project_schedule_tasks"/> - <field name="context">{'record_id' : active_id}</field> + <field name="context">{'record_id': active_id}</field> <field name="target">new</field> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py index ba8ec7db150..d52bd54b437 100644 --- a/addons/project_long_term/wizard/working_calendar.py +++ b/addons/project_long_term/wizard/working_calendar.py @@ -18,21 +18,27 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import datetime import pooler -def convert_timeformat(cr, uid, time_string, context={}): +def convert_timeformat(cr, uid, time_string, context=None): + if context is None: + context = {} """ Convert input time string: 8.5 to output time string 8:30.""" split_list = str(time_string).split('.') hour_part = split_list[0] mins_part = split_list[1] - round_mins = int(round(float(mins_part) * 60,-2)) + round_mins = int(round(float(mins_part) * 60,-2)) converted_string = hour_part + ':' + str(round_mins)[0:2] return converted_string -def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=False, context={}): +def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None): + + if context is None: + context = {} """Compute the leaves from the working calendar of the resource. @@ -63,7 +69,10 @@ def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=Fa leave_list.sort() return leave_list -def compute_working_calendar(cr, uid, calendar_id, context={}): +def compute_working_calendar(cr, uid, calendar_id, context=None): + + if context is None: + context = {} """Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format. @@ -103,7 +112,7 @@ def compute_working_calendar(cr, uid, calendar_id, context={}): for k,v in wk_time.items(): wktime_cal.append(tuple(v)) # Add for the non-working days like: [('sat, sun', '8:00-8:00')] - for k,v in wk_days.items(): + for k, v in wk_days.items(): if week_days.has_key(k): week_days.pop(k) for v in week_days.itervalues(): @@ -111,4 +120,4 @@ def compute_working_calendar(cr, uid, calendar_id, context={}): if non_working: wktime_cal.append((non_working[:-1], time_range)) return wktime_cal -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |