From 69406b16b4bf90924751cb2596f8dece53e526c3 Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Sat, 20 Dec 2014 01:43:56 +0700
Subject: [PATCH] xxxx

---
 .../layouts/clinic_cycle_item_form.xml           |  6 ++----
 netforce_clinic/layouts/clinic_hd_case_form.xml  |  4 ++--
 netforce_clinic/layouts/clinic_sickbed_form.xml  |  2 +-
 netforce_clinic/models/cycle_item.py             |  1 +
 netforce_clinic/models/dialyzer.py               |  4 ++--
 netforce_clinic/models/hd_case.py                | 16 ++++++++++++----
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index 5d1a6e2..95893db 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -14,7 +14,7 @@
         <tab string="HDCase">
             <field name="hd_cases" nolabel="1" count="5">
                 <list model="clinic.hd.case" colors='{"#cfc":[["state","=","completed"]],"#f9e37d":[["state","=","in_progress"]],"#bcbbb9":[["state","=","cancelled"]],"#ACD1E9":[["state","=","waiting_payment"]],"#70DB93":[["state","=","paid"]]}'>
-                    <field name="sickbed_id" domain="[['available','=',True]]" span="2"/>
+                    <field name="sickbed_id" domain="[['available','=',true]]" span="2"/>
                     <field name="patient_id" span="2"/>
                     <field name="time_start" span="2"/>
                     <field name="wt_start" span="2"/>
@@ -38,15 +38,13 @@
                 </list>
             </field>
         </tab>
-        <tab string="Others">
-        </tab>
         <tab string="Validation">
             <field name="user_id" span="3"/>
             <button string="Validate" type="success" method="validate" icon="ok" size="small" states="draft" />
         </tab>
     </tabs>
     <related>
-        <field name="visits"/>
+    <!--<field name="visits"/>-->
         <field name="comments"/>
     </related>
 </form>
diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index 5c31818..d63915b 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -8,13 +8,13 @@
     </head>
     <group form_layout="stacked">
         <field name="number" span="2"/>
-        <field name="sickbed_id" domain="[['available','=',True]]" span="2"/>
+        <field name="sickbed_id" domain="[['available','=',true]]" required="1" span="2"/>
         <field name="patient_id" span="2" onchange="onchange_patient"/>
         <field name="patient_type_id" span="2"/>
         <field name="cycle_id" span="2" required="1" onchange="onchange_cycle"/>
         <field name="department_id" span="2"/>
-        <field name="visit_id" span="2"/>
         <field name="cycle_item_id" span="2" domain="[['cycle_id','=',cycle_id]]"/>
+        <field name="visit_id" span="2"/>
         <field name="req_fee" span="2" readonly="1" invisible="1"/>
     </group>
     <tabs>
diff --git a/netforce_clinic/layouts/clinic_sickbed_form.xml b/netforce_clinic/layouts/clinic_sickbed_form.xml
index edabb2c..b4b32bb 100644
--- a/netforce_clinic/layouts/clinic_sickbed_form.xml
+++ b/netforce_clinic/layouts/clinic_sickbed_form.xml
@@ -5,5 +5,5 @@
         </button>
     </head>
     <field name="name"/>
-    <field name="available"/>
+    <field name="available" readonly="1"/>
 </form>
diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py
index 50d7fdb..8dadc35 100644
--- a/netforce_clinic/models/cycle_item.py
+++ b/netforce_clinic/models/cycle_item.py
@@ -73,6 +73,7 @@ class CycleItem(Model):
         
 
     def create(self, vals,**kw):
+        print('kw ', kw)
         new_id=super().create(vals,**kw)
         self.function_store([new_id])
         return new_id
diff --git a/netforce_clinic/models/dialyzer.py b/netforce_clinic/models/dialyzer.py
index c55e437..6dd2a1f 100644
--- a/netforce_clinic/models/dialyzer.py
+++ b/netforce_clinic/models/dialyzer.py
@@ -71,7 +71,6 @@ class Dialyzer(Model):
         "company_id": lambda *a: get_active_company(),
         'product_id': _get_product,
         'dialyzer_type': 'low',
-        'member_type': 'unsub',
     }
     _order="date desc,number desc"
 
@@ -94,7 +93,8 @@ class Dialyzer(Model):
                 ship_address_id=address.id
                 break
         if not ship_address_id:
-            raise Exception("contact %s dont'have address with type shipping"%partner.name)
+            patient.simple_address()
+            #raise Exception("contact %s dont'have address with type shipping"%partner.name)
         st=get_model("clinic.setting").browse(1)
         journal=st.stock_journal_id
         if not journal:
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 6fad54f..49659a2 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -150,7 +150,8 @@ class HDCase(Model):
         "date": lambda *a: time.strftime("%Y-%m-%d"),
         "time_start": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
         "time_stop": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
-        "number": _get_number,
+        #"number": _get_number,
+        'number': '/',
         "company_id": lambda *a: get_active_company(),
         'wt_start': 0.0,
         'wt_stop': 0.0,
@@ -497,7 +498,8 @@ class HDCase(Model):
         if not obj.lines:
             return
 
-        partner=obj.patient_id.partner_id
+        patient=obj.patient_id
+        partner=patient.partner_id
         if not partner:
             raise Exception("Contact not for this patient")
         ship_address_id=None
@@ -506,7 +508,8 @@ class HDCase(Model):
                 ship_address_id=address.id
                 break
         if not ship_address_id:
-            raise Exception("contact %s dont'have address with type shipping"%partner.name)
+            patient.simple_address()
+            #raise Exception("contact %s dont'have address with type shipping"%partner.name)
         pick_vals={
             "type": "out",
             "ref": obj.number,
@@ -562,12 +565,17 @@ class HDCase(Model):
         #TODO  should find dlz when confirm visit
         if not obj.dialyzers:
             raise Exception("Please input dialyzer!")
-        obj.sickbed_id.write({
+        sickbed=obj.sickbed_id
+        sickbed.write({
             'available': False,
         })
+
         vals={
             'state': 'in_progress',
         }
+        if obj.number=='/':
+            number=self._get_number()
+            vals['number']=number
             
         # update start time
         st=get_model("clinic.setting").browse(1)