diff --git a/netforce_clinic/layouts/clinic_schedule_form.xml b/netforce_clinic/layouts/clinic_schedule_form.xml index 7a7cce9..826604d 100644 --- a/netforce_clinic/layouts/clinic_schedule_form.xml +++ b/netforce_clinic/layouts/clinic_schedule_form.xml @@ -18,8 +18,8 @@ - - + + diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py index 016fad4..aadb156 100644 --- a/netforce_clinic/models/cycle_item.py +++ b/netforce_clinic/models/cycle_item.py @@ -176,11 +176,13 @@ class CycleItem(Model): for line in obj.lines: nurse=line.nurse_id level=nurse.level_id + categ=nurse.categ_id lines.append(('create',{ 'cycle_id': cycle.id, 'cycle_item_id': obj.id, 'nurse_id': nurse.id, 'level_id': level.id , + 'categ_id': categ.id , 'note': '', })) schedule_id=get_model('clinic.schedule').create({ diff --git a/netforce_clinic/models/schedule_line.py b/netforce_clinic/models/schedule_line.py index d94bd7e..d89e31d 100644 --- a/netforce_clinic/models/schedule_line.py +++ b/netforce_clinic/models/schedule_line.py @@ -21,6 +21,7 @@ class ScheduleLine(Model): 'cycle_item_id': fields.Many2One("clinic.cycle.item","Cycle Item"), "nurse_id": fields.Many2One("clinic.staff","Nurse",domain=[['type','=','nurse']]), 'level_id': fields.Many2One("clinic.staff.level","Level",function="_get_level"), + 'categ_id': fields.Many2One("clinic.staff.categ","Category"), 'note': fields.Text("Note"), "state": fields.Selection([["part_time","Part Time"],["full_time","Full Time"]],"Working Status",search=True), }