cycle item

netforce_clinic/layouts/clinic_cycle_item_form.xml

@@ -4,7 +4,6 @@
         <button string="Options" dropdown="1">
             <item string="Load Nurses" method="load_nurse_from_schedule" states='draft'/>
             <item string="View Schedule" method="view_schedule"/>
-            <item string="View Cycle Daily" method="view_cycle_daily"/>
             <item string="To Draft" method="to_draft" states="validated" />
         </button>
     </head>

netforce_clinic/layouts/clinic_labor_cost_entry_form.xml

@@ -11,12 +11,14 @@
             <field name="lines" nolabel="1">
                 <list>
                     <field name="staff_id"/>
+                    <field name="type"/>
                     <field name="qty" onchange="onchange_line"/>
                     <field name="rate" onchange="onchange_line"/>
                     <field name="amount"/>
                 </list>
                 <form>
                     <field name="staff_id"/>
+                    <field name="type"/>
                     <field name="qty"/>
                     <field name="rate"/>
                     <field name="amount"/>

netforce_clinic/models/cycle_item.py

@@ -138,10 +138,22 @@ class CycleItem(Model):
         if schd_ids:
             schedule_id=schd_ids[0]
         if not schedule_id:
+            lines=[]
+            for lnurse in obj.nurses:
+                nurse=lnurse.nurse_id
+                level=nurse.level_id
+                lines.append(('create',{
+                    'cycle_id': obj.cycle_id.id,
+                    'cycle_item_id': obj.id,
+                    'nurse_id': nurse.id,
+                    'level_id': level.id ,
+                    'note': '',
+                }))
             schedule_id=get_model('clinic.schedule').create({
                 'date': date,
                 'time_start': '%s 08:00:00'%date, #XXX
                 'time_stop': '%s 21:00:00'%date, #XXX
+                'lines': lines,
             })
         return {
             'next': {

netforce_clinic/models/labor_cost_entry_line.py

@@ -11,17 +11,26 @@ class LaborCostEntryLine(Model):
 
     _fields={
         'entry_id': fields.Many2One("clinic.labor.cost.entry","Entry",required=True),
+        'staff_id': fields.Many2One("clinic.staff","Staff",required=True),
         'date': fields.Date("Date"),
-        'staff_id': fields.Many2One("clinic.staff","Staff"),
         'qty': fields.Integer("Qty"),
         'rate': fields.Float("Rate Avg."),
         'amount': fields.Float("Amount"),
         'company_id': fields.Many2One("company","Company"),
+        "type": fields.Selection([['staff','Staff'],["doctor","Doctor"],["nurse","Nurse"]],"Type"),
     }
     
+    _order="type"
+
     _defaults={
         'date': lambda *a: time.strftime("%Y-%m-%d"),
         'company_id': lambda *a: get_active_company(),
     }
 
+    def create(self,vals,**kw):
+        staff=get_model('clinic.staff').browse(vals['staff_id'])
+        vals['type']=staff.type
+        new_id=super().create(vals,**kw)
+        return new_id
+
 LaborCostEntryLine.register()