diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index 209faf0..4933970 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -17,8 +17,7 @@ - - + diff --git a/netforce_clinic/layouts/clinic_sickbed_form.xml b/netforce_clinic/layouts/clinic_sickbed_form.xml index e9906f4..893361f 100644 --- a/netforce_clinic/layouts/clinic_sickbed_form.xml +++ b/netforce_clinic/layouts/clinic_sickbed_form.xml @@ -1,5 +1,6 @@
+ diff --git a/netforce_clinic/layouts/clinic_sickbed_list.xml b/netforce_clinic/layouts/clinic_sickbed_list.xml index 85d9818..4fb1605 100644 --- a/netforce_clinic/layouts/clinic_sickbed_list.xml +++ b/netforce_clinic/layouts/clinic_sickbed_list.xml @@ -3,6 +3,7 @@ - + + diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index 3933351..8b39370 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -69,7 +69,7 @@ class HDCase(Model): _fields={ "number": fields.Char("Number",required=True,search=True), - 'sickbed_id': fields.Many2One("clinic.sickbed",'Sickbed'), + 'sickbed_id': fields.Many2One("clinic.sickbed",'Sickbed (Available)'), "ref": fields.Char("Ref",search=True), "time_start": fields.DateTime("Start Time",required=True,search=True), "time_stop": fields.DateTime("Finish Time",required=True,search=True), @@ -110,7 +110,7 @@ class HDCase(Model): 'note': fields.Text("Note"), 'complication': fields.Text("Complication"), "cycle_id": fields.Many2One("clinic.cycle","Cycle"), - 'cycle_item_id': fields.Many2One("clinic.cycle.item","Cycle Item (Team)"), # on_delete="cascade" -> will rm visit from cycle item + 'cycle_item_id': fields.Many2One("clinic.cycle.item","Cycle Item (Nurses)"), # on_delete="cascade" -> will rm visit from cycle item 'pay_amount': fields.Float("Amount",function="_get_pay_amount"), 'pay_date': fields.Date("Pay Date"), 'pay_account_id': fields.Many2One("account.account","Account"), @@ -163,6 +163,7 @@ class HDCase(Model): 'invoice_option': 'fee', 'invoice_policy': 'fee', 'req_fee': 0, + 'hct_include': False, } _order="date desc,number desc" @@ -212,14 +213,18 @@ class HDCase(Model): branch=patient.branch_id cycle=patient.cycle_id partner=patient.type_id.contact_id - data['department_id']=department.id - data['branch_id']=branch.id - data['cycle_id']=cycle.id - data['patient_type_id']=patient.type_id.id if partner: data['fee_partner_id']=partner.id else: data['fee_partner_id']=None + data['department_id']=department.id + data['branch_id']=branch.id + data['cycle_id']=cycle.id + data['patient_type_id']=patient.type_id.id + if patient.type_id.hct_include: + data['hct_include']=True + else: + data['hct_include']=False data['dialyzers']=[] doctor=patient.doctor_id data['staffs']=[] # XXX @@ -1064,7 +1069,6 @@ class HDCase(Model): }, 'flash': '%s has been approval'%obj.number, } - HDCase.register() diff --git a/netforce_clinic/models/sickbed.py b/netforce_clinic/models/sickbed.py index ef7f7b6..bae99fc 100644 --- a/netforce_clinic/models/sickbed.py +++ b/netforce_clinic/models/sickbed.py @@ -31,7 +31,7 @@ class SickBed(Model): 'company_id': fields.Many2One("company","Company"), 'patient_id': fields.Many2One("clinic.patient","Lasted Patient",function="_get_all",function_multi=True), 'image': fields.File("Image",function="_get_all",function_multi=True), - 'date': fields.Date("Date",function="_get_all",function_multi=True), + 'date': fields.Date("Lasted Date",function="_get_all",function_multi=True), "state": fields.Selection([("available","Available"),("not_available","Not Available")],"Status"), 'sequence': fields.Integer("Sequence"), 'note': fields.Text("Note"), @@ -59,5 +59,13 @@ class SickBed(Model): }, 'flash': 'Copy succesfully', } + + def write(self,ids,vals,**kw): + if 'available' in vals.keys(): + if vals['available']: + vals['state']='available' + else: + vals['state']='not_available' + super().write(ids,vals,**kw) SickBed.register()