diff --git a/addons/project_long_term/test/project_schedule_consecutive_day.yml b/addons/project_long_term/test/project_schedule_consecutive_day.yml index dd02539a9d8..9f4e1231d11 100644 --- a/addons/project_long_term/test/project_schedule_consecutive_day.yml +++ b/addons/project_long_term/test/project_schedule_consecutive_day.yml @@ -1,14 +1,14 @@ - Create a project 'Develop yaml Project Module'. - - !record {model: project.project, id: project_project_developyamlproject0}: + !record {model: project.project, id: project_project_developyamlproject123}: name: "Develop Yaml Project Module" date_start: !eval time.strftime('%Y-%m-%d') - I have set Working Time from Monday to Friday from 9am to 17pm. - - !record {model: resource.calendar, id: resource_calendar_hoursweeks0}: + !record {model: resource.calendar, id: resource_calendar_hoursweekstest2}: name: "from Monday to Friday, from 9am to 17pm" - @@ -19,53 +19,53 @@ hour_from : 09.00 hour_to : 17.00 dayofweek : "0" - calendar_id : resource_calendar_hoursweeks0 + calendar_id : resource_calendar_hoursweekstest2 - I have set Day2 Working Time for Monday to Friday from 9am to 17pm working hour - - !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}: + !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday2}: name: "Day2" hour_from : 09.00 hour_to : 17.00 dayofweek : "1" - calendar_id : resource_calendar_hoursweeks0 + calendar_id : resource_calendar_hoursweekstest2 - I have set Day3 Working Time for Monday to Friday from 9am to 17pm working hour - - !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}: + !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday3}: name: "Day3" hour_from : 09.00 hour_to : 17.00 dayofweek : "2" - calendar_id : resource_calendar_hoursweeks0 + calendar_id : resource_calendar_hoursweekstest2 - I have set Day4 Working Time for Monday to Friday from 9am to 17pm working hour - - !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}: + !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday4}: name: "Day4" hour_from : 09.00 hour_to : 17.00 dayofweek : "3" - calendar_id : resource_calendar_hoursweeks0 + calendar_id : resource_calendar_hoursweekstest2 - I have set Day5 Working Time for Monday to Friday from 9am to 17pm working hour - - !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday1}: + !record {model: resource.calendar.attendance, id: resource_calendar_atendanceday5}: name: "Day5" hour_from : 09.00 hour_to : 17.00 dayofweek : "4" - calendar_id : resource_calendar_hoursweeks0 + calendar_id : resource_calendar_hoursweekstest2 - Now Set working period to Project 'Develop yaml Project Module' - !python {model: project.project}: | - self.write(cr, uid, [ref("project_project_developyamlproject0")], {'resource_calendar_id': ref("resource_calendar_hoursweeks0")}) + self.write(cr, uid, [ref("project_project_developyamlproject123")], {'resource_calendar_id': ref("resource_calendar_hoursweekstest2")}) - Create 3 a project phase. @@ -76,8 +76,7 @@ duration: 5.0 name: "Analysis Flow for Yaml" product_uom: product.uom_day - project_id: project_project_developyamlproject0 - responsible_id: project.res_users_analyst + project_id: project_project_developyamlproject123 state: draft - @@ -87,7 +86,7 @@ duration: 5.0 name: Develop Yaml product_uom: product.uom_day - project_id: project_project_developyamlproject0 + project_id: project_project_developyamlproject123 previous_phase_ids: - project_phase_analysisflowforyaml0 @@ -98,7 +97,7 @@ duration: 5.0 name: Testing Yaml product_uom: product.uom_day - project_id: project_project_developyamlproject0 + project_id: project_project_developyamlproject123 previous_phase_ids: - project_phase_establishingprojectfeasibility0 @@ -106,20 +105,20 @@ Compute Schedule of phases For One project - !record {model: project.compute.phases, id: project_compute_phases_0}: - project_id: project_project_developyamlproject0 + project_id: project_project_developyamlproject123 target_project: one - Schedule project phases using Compute Phase Scheduling - !python {model: project.project}: | - self.schedule_phases(cr, uid, [ref("project_project_developyamlproject0")]) + self.schedule_phases(cr, uid, [ref("project_project_developyamlproject123")]) - After scheduling, Check that phases scheduled, check that either of phase's start_date, end_date not null. - !python {model: project.project}: | - proj=self.browse(cr, uid, [ref("project_project_developyamlproject0")])[0] + proj=self.browse(cr, uid, [ref("project_project_developyamlproject123")])[0] for phase in proj.phase_ids: if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end): raise AssertionError("Phases not scheduled") diff --git a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml index 19874702052..0c810227717 100644 --- a/addons/project_long_term/test/project_schedule_without_wroking_hour.yml +++ b/addons/project_long_term/test/project_schedule_without_wroking_hour.yml @@ -23,7 +23,7 @@ - !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}: duration: 6.0 - product_uom: product.uom_day + name: "Develop yaml" product_uom: product.uom_day project_id: project_project_developyamlproject0 previous_phase_ids: diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml index 3088a09e64f..829258eefc8 100644 --- a/addons/project_long_term/test/schedule_project_phases.yml +++ b/addons/project_long_term/test/schedule_project_phases.yml @@ -35,7 +35,7 @@ - Resource1 - - !record {model: project.resource.allocation, id: res_phase0}: + !record {model: project.resource.allocation, id: res_phase1}: resource_id: project_long_term.resource_project_manager phase_id: project_phase_definingclientsbasicideaofproject0 @@ -46,27 +46,12 @@ resource_id: project_long_term.resource_analyst phase_id: project_phase_definingclientsbasicideaofproject0 -- - Create project phase 'Preparation of Engineering Designs' -- - !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}: - date_start: '2010-06-02' - duration: 100.0 - name: Preparation of Engineering Designs - product_uom: product.uom_hour - project_id: project_project_worldbanksproject0 - - -- - Create project phase 'Procurement of Works and Goods' -- - !record {model: project.phase, id: project_phase_procurementofworksandgoods0}: - date_start: '2010-06-02' - duration: 24.0 - name: Procurement of Works and Goods - product_uom: product.uom_hour - project_id: project_project_worldbanksproject0 - +- + Resource3 +- + !record {model: project.resource.allocation, id: res_phase3}: + resource_id: project_long_term.resource_technical_leader + phase_id: project_phase_definingclientsbasicideaofproject0 - Create the phase task 'Develop GUI for Server Configuration' @@ -74,7 +59,6 @@ !record {model: project.task, id: project_task_t0}: name: Develop GUI for Server Configuration planned_hours: 20.0 - remaining_hours: 20.0 state: draft phase_id: project_phase_definingclientsbasicideaofproject0 project_id: project_project_worldbanksproject0 @@ -89,13 +73,70 @@ state: draft phase_id: project_phase_definingclientsbasicideaofproject0 project_id: project_project_worldbanksproject0 + +- + Create project phase 'Preparation of Engineering Designs' +- + !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}: + date_start: '2010-06-02' + duration: 100.0 + name: Preparation of Engineering Designs + product_uom: product.uom_hour + project_id: project_project_worldbanksproject0 +- + Resource4 +- + !record {model: project.resource.allocation, id: res_phase4}: + resource_id: project_long_term.resource_developer + phase_id: project_phase_preparationofengineeringdesigns0 + +- + Resource5 +- + !record {model: project.resource.allocation, id: res_phase5}: + resource_id: project_long_term.resource_designer + phase_id: project_phase_preparationofengineeringdesigns0 + +- + Create the phase task 'Develop GUI for Client Configuration' +- + !record {model: project.task, id: project_task_t2}: + name: Develop GUI for Server Configuration + planned_hours: 20.0 + remaining_hours: 20.0 + state: draft + phase_id: project_phase_preparationofengineeringdesigns0 + project_id: project_project_worldbanksproject0 + +- + Create the phase task 'Develop GUI for Client Module Configuration' +- + !record {model: project.task, id: project_task_t3}: + name: Develop GUI for Modules Configuration + planned_hours: 25.0 + remaining_hours: 25.0 + state: draft + phase_id: project_phase_preparationofengineeringdesigns0 + project_id: project_project_worldbanksproject0 + + +- + Create project phase 'Procurement of Works and Goods' +- + !record {model: project.phase, id: project_phase_procurementofworksandgoods0}: + date_start: '2010-06-02' + duration: 24.0 + name: Procurement of Works and Goods + product_uom: product.uom_hour + project_id: project_project_worldbanksproject0 + - Create project phase 'Project Construction' - !record {model: project.phase, id: project_phase_projectconstruction0}: date_start: '2010-06-02' - duration: 4320.0 + duration: 20.0 name: Project Construction product_uom: product.uom_hour project_id: project_project_worldbanksproject0