xxxx

netforce_clinic/actions/clinic_staff_rotate.xml

@@ -1,6 +1,6 @@
 <action>
-    <field name="string">Staff Moves</field>
+    <field name="string">Staff Rotation</field>
     <field name="view_cls">multi_view</field>
-    <field name="model">clinic.staff.move</field>
+    <field name="model">clinic.staff.rotation</field>
     <field name="menu">clinic_menu</field>
 </action>

netforce_clinic/layouts/clinic_menu.xml

@@ -5,12 +5,12 @@
         <item string="Doctors" action="clinic_staff" action_options="tab_no=2"/>
         <item string="Nurses" action="clinic_staff" action_options="tab_no=3"/>
         <divider/>
-        <header string="MOVEMENT"/>
+        <header string="ROTATION"/>
-        <item string="Staff Movement" action="clinic_staff_move"/>
+        <item string="Staff Rotation" action="clinic_staff_rotate"/>
         <divider/>
         <header string="SETTINGS"/>
-        <item string="Categories" action="clinic_staff_categ"/>
         <item string="Levels" action="clinic_staff_level"/>
+        <item string="Categories" action="clinic_staff_categ"/>
     </item>
     <item string="Patients">
         <item string="New Patient" action="clinic_patient" action_options="mode=form"/>

netforce_clinic/layouts/clinic_staff_rotate_form.xml

@@ -1,4 +1,4 @@
-<form model="clinic.staff.move">
+<form model="clinic.staff.rotation">
     <field name="staff_id"/>
     <field name="level_id"/>
     <field name="from_company_id"/>

netforce_clinic/layouts/clinic_staff_rotate_list.xml

@@ -1,4 +1,4 @@
-<list model="clinic.staff.move">
+<list model="clinic.staff.rotation">
     <field name="staff_id"/>
     <field name="level_id"/>
     <field name="from_company_id"/>

netforce_clinic/models/__init__.py

@@ -44,7 +44,7 @@ from . import account_invoice
 from . import staff
 from . import staff_categ
 from . import staff_level
-from . import staff_move
+from . import staff_rotation
 from . import staff_cycle
 from . import schedule
 from . import schedule_line

netforce_clinic/models/staff_categ.py

@@ -14,6 +14,7 @@ class StaffCategory(Model):
 
     _defaults={
         "company_id": lambda *a: get_active_company(),
+        'type': 'nurse',
     }
 
 StaffCategory.register()

netforce_clinic/models/staff_rotation.py

@@ -1,9 +1,9 @@
 from netforce.model import Model, fields
 from netforce.access import get_active_company
 
-class StaffMove(Model):
+class StaffRotation(Model):
-    _name="clinic.staff.move"
+    _name="clinic.staff.rotation"
-    _string="Staff Move"
+    _string="Staff Rotation"
 
     _fields={
         "staff_id": fields.Many2One("clinic.staff","Staff", search=True),
@@ -21,4 +21,4 @@ class StaffMove(Model):
         "company_id": lambda *a: get_active_company(),
     }
 
-StaffMove.register()
+StaffRotation.register()