diff options
Diffstat (limited to 'addons/project_long_term')
25 files changed, 10 insertions, 7 deletions
diff --git a/addons/project_long_term/__init__.py b/addons/project_long_term/__init__.py index 6b9b2613f3f..6b9b2613f3f 100644..100755 --- a/addons/project_long_term/__init__.py +++ b/addons/project_long_term/__init__.py diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 0d03b5f7315..0d03b5f7315 100644..100755 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po index 42aab552044..42aab552044 100644..100755 --- a/addons/project_long_term/i18n/de.po +++ b/addons/project_long_term/i18n/de.po diff --git a/addons/project_long_term/i18n/en_US.po b/addons/project_long_term/i18n/en_US.po index 00e0d982c1c..00e0d982c1c 100644..100755 --- a/addons/project_long_term/i18n/en_US.po +++ b/addons/project_long_term/i18n/en_US.po diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po index 0a4f1dbaf71..0a4f1dbaf71 100644..100755 --- a/addons/project_long_term/i18n/fr.po +++ b/addons/project_long_term/i18n/fr.po diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po index 1364eb70a97..1364eb70a97 100644..100755 --- a/addons/project_long_term/i18n/pl.po +++ b/addons/project_long_term/i18n/pl.po diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot index 1824bd1df22..1824bd1df22 100644..100755 --- a/addons/project_long_term/i18n/project_long_term.pot +++ b/addons/project_long_term/i18n/project_long_term.pot diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po index a6e00dbaf85..a6e00dbaf85 100644..100755 --- a/addons/project_long_term/i18n/pt.po +++ b/addons/project_long_term/i18n/pt.po diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 4640ea8fa48..d646e099f8b 100644..100755 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -282,10 +282,10 @@ class project_phase(osv.osv): res[phase.id] = resource_objs return res - def generate_schedule(self, cr, uid, ids, start_date, calendar_id=False, context=None): + def generate_schedule(self, cr, uid, ids, start_date=False, calendar_id=False, context=None): """ Schedule phase with the start date till all the next phases are completed. - @param: start_dsate : start date for the phase + @param: start_date (datetime.datetime) : start date for the phase. It would be either Start date of phase or start date of project or system current date @param: calendar_id : working calendar of the project """ if context is None: @@ -298,6 +298,9 @@ class project_phase(osv.osv): if not phase.responsible_id: raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,)) + if not start_date: + start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d") + start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context) avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) duration = str(avg_hours) + 'H' @@ -440,12 +443,9 @@ class project(osv.osv): ('state', 'in', ['draft', 'open', 'pending']), ('previous_phase_ids', '=', False) ]) - start_date = project.date_start - if not start_date: - start_date = datetime.now().strftime("%Y-%m-%d") - start_dt = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M") calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False - phase_pool.generate_schedule(cr, uid, phase_ids, start_dt, calendar_id, context=context) + start_date = False + phase_pool.generate_schedule(cr, uid, phase_ids, start_date, calendar_id, context=context) return True def schedule_tasks(self, cr, uid, ids, context=None): diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml index 8da591f1337..8da591f1337 100644..100755 --- a/addons/project_long_term/project_long_term_data.xml +++ b/addons/project_long_term/project_long_term_data.xml diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml index 8a37f4cc444..8a37f4cc444 100644..100755 --- a/addons/project_long_term/project_long_term_demo.xml +++ b/addons/project_long_term/project_long_term_demo.xml diff --git a/addons/project_long_term/project_long_term_report.xml b/addons/project_long_term/project_long_term_report.xml index d8fe2a4fa6e..d8fe2a4fa6e 100644..100755 --- a/addons/project_long_term/project_long_term_report.xml +++ b/addons/project_long_term/project_long_term_report.xml diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 6b5c826eae3..37813f84946 100644..100755 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -219,6 +219,8 @@ <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="state"/> </tree> </field> @@ -268,6 +270,7 @@ </field> <field name="responsible_id"/> <field name="date_start"/> + <field name="date_end"/> </group> <newline/> <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml index 3a821ddd274..3a821ddd274 100644..100755 --- a/addons/project_long_term/project_long_term_workflow.xml +++ b/addons/project_long_term/project_long_term_workflow.xml diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv index 6d4961f2cfe..6d4961f2cfe 100644..100755 --- a/addons/project_long_term/security/ir.model.access.csv +++ b/addons/project_long_term/security/ir.model.access.csv diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml index aa54fa1ac57..aa54fa1ac57 100644..100755 --- a/addons/project_long_term/test/schedule_phase_tasks.yml +++ b/addons/project_long_term/test/schedule_phase_tasks.yml diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml index e06feaaa4ca..e06feaaa4ca 100644..100755 --- a/addons/project_long_term/test/schedule_project_phases.yml +++ b/addons/project_long_term/test/schedule_project_phases.yml diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml index 04a05437487..04a05437487 100644..100755 --- a/addons/project_long_term/test/schedule_project_tasks.yml +++ b/addons/project_long_term/test/schedule_project_tasks.yml diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py index c1e6d838111..c1e6d838111 100644..100755 --- a/addons/project_long_term/wizard/__init__.py +++ b/addons/project_long_term/wizard/__init__.py diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 351297384fd..351297384fd 100644..100755 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py 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 9d5754af09c..9d5754af09c 100644..100755 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index 0d5fa22e6a8..0d5fa22e6a8 100644..100755 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py 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 e6540fafff9..e6540fafff9 100644..100755 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 1a9081b1f5d..1a9081b1f5d 100644..100755 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py 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 f8e2f2d828b..f8e2f2d828b 100644..100755 --- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml +++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml |