diff options
Diffstat (limited to 'addons/project_long_term')
7 files changed, 12 insertions, 39 deletions
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 0fb16cdc23d..f05d37e0181 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -46,7 +46,6 @@ ], "update_xml": [ "security/ir.model.access.csv", - "project_long_term_wizard.xml" , "wizard/project_schedule_tasks_view.xml", "project_long_term_view.xml", "project_long_term_workflow.xml", @@ -58,4 +57,5 @@ 'active': False, 'certificate': None, } + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f4ae126ee67..1bb2510064b 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -18,9 +18,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from lxml import etree -import mx.DateTime + import time +from datetime import date, datetime, timedelta from tools.translate import _ from osv import fields, osv @@ -126,13 +126,12 @@ class project_phase(osv.osv): def onchange_project(self, cr, uid, ids, project, context=None): result = {} + result['date_start'] = False project_obj = self.pool.get('project.project') if project: project_id = project_obj.browse(cr, uid, project, context=context) - if project_id.date_start: - result['date_start'] = mx.DateTime.strptime(project_id.date_start, "%Y-%m-%d").strftime('%Y-%m-%d') - return {'value': result} - return {'value': {'date_start': []}} + result['date_start'] = project_id.date_start + return {'value': result} def _check_date_start(self, cr, uid, phase, date_end, context=None): if context is None: @@ -201,18 +200,17 @@ class project_phase(osv.osv): calendar_id = cal_id default_uom_id = self._get_default_uom_id(cr, uid) avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) - # 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') + dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d') 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') for prv_phase in phase.previous_phase_ids: self._check_date_start(cr, uid, prv_phase, dt_start, context=context) if vals.get('date_end', False) and vals['date_end'] > phase.date_end: - dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d') + dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d') work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False) if work_times: vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d') diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index a7deca51d7c..842d475b9a3 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -189,9 +189,6 @@ <field name="project_id" on_change="onchange_project(project_id)"/> <field name="responsible_id"/> <field name="date_start"/> - <!--<field name="date_end"/> - <field name="duration"/> - <field name="product_uom"/>--> <field name="state"/> </tree> </field> diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml deleted file mode 100644 index 7f3668c6b1a..00000000000 --- a/addons/project_long_term/project_long_term_wizard.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data> - - <!--<wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>--> - <!--<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 id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>--> - <!-- <menuitem - action="wizard_compute_phase" - id="menu_wizard_compute_phase" - parent="base.menu_pm_planning" - type="wizard" - sequence="1"/> ---> -<!-- <menuitem - action="wizard_compute_task" - id="menu_wizard_compute_task" - parent="base.menu_pm_planning" - type="wizard" - sequence="1"/> ---> - </data> -</openerp> diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index f7f1c9dc613..0c1b6e2a650 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.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 @@ -139,4 +140,5 @@ class project_compute_tasks(osv.osv_memory): return {} project_compute_tasks() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index df9f1aae7d4..343b2536c6e 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.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 diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py index 1de7e717502..139875b6236 100644 --- a/addons/project_long_term/wizard/working_calendar.py +++ b/addons/project_long_term/wizard/working_calendar.py @@ -120,4 +120,5 @@ def compute_working_calendar(cr, uid, calendar_id, context=None): if non_working: wktime_cal.append((non_working[:-1], time_range)) return wktime_cal + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |