Merge branch 'master' of dev.netforce.com:netforce-customized/clinic

netforce_clinic/layouts/clinic_hd_case_form.xml

@@ -43,9 +43,14 @@
         <field name="total"/>
     </list>
     </field>
-    <field name="fee" span="2" offset="7"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
-    <field name="total" span="2" offset="8"/>
-    <field name="amount" span="2" offset="8"/>
+    <group attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+        <field name="fee" span="2" offset="7"/>
+    </group>
+    <group attrs='{"readonly":[["state","not in",["canceled","approved","validate"]]]}'/>
+        <field name="fee" span="2" offset="9"/>
+    </group>
+    <field name="total" span="2" offset="9"/>
+    <field name="amount" span="2" offset="9"/>
     <foot>
         <button string="Confirm" type="success" method="confirmed" states="draft" />
         <button string="Approved" type="success" method="approved" states="confirmed"/>
@@ -53,6 +58,9 @@
         <button string="Canceled" type="danger" method="canceled"  confirm="You are sure to canceled hd case"/>
    </foot>
     <related>
+        <field name="invoices" click_action="view_invoice"/>
+        <field name="payments" click_action="view_payment"/>
+        <field name="pickings" click_action="view_picking"/>
         <field name="comments"/>
     </related>
 </form>

netforce_clinic/layouts/clinic_menu.xml

@@ -1,8 +1,8 @@
 <menu string="Clinic">
     <item string="Dashboard" action="clinic_board"/>
-    <item string="Patient" action="clinic_patient"/>
     <item string="Doctor" action="clinic_doctor"/>
     <item string="Nurse" action="clinic_nurse"/>
+    <item string="Patient" action="clinic_patient"/>
     <item string="Visit" action="clinic_visit"/>
     <item string="HD Case Treatment" action="clinic_hd_case"/>
     <item string="Dialyzer" action="clinic_dialyzer"/>

netforce_clinic/models/clinic_hd_case.py

@@ -4,7 +4,7 @@ import time
 from netforce.access import get_active_user,set_active_user
 from netforce.access import get_active_company
 
-class Hdcase(Model):
+class HDcase(Model):
     _name="clinic.hd.case"
     _string="HD Case Treatment"
     _audit_log=True
@@ -34,6 +34,9 @@ class Hdcase(Model):
         "amount": fields.Float("Amount",function="get_total",readonly=True,function_multi=True),
         "total": fields.Float("Total",function="get_total",readonly=True,function_multi=True),
         "reconcile_id": fields.Many2One("account.reconcile","Reconcile Id",readonly=True),
+        "invoices": fields.One2Many("account.invoice","related_id","Invoices"),
+        "pickings": fields.One2Many("stock.picking","related_id","Pickings"),
+        "payments": fields.One2Many("account.payment","related_id","Payments"),
     }
 
     def _get_number(self,context={}):
@@ -80,7 +83,6 @@ class Hdcase(Model):
         obj=self.browse(ids)[0]
         obj.write({"state":"canceled"})
 
-
     def confirmed(self,ids,context={}):
         obj=self.browse(ids)[0]
         obj.write({"state":"confirmed"})
@@ -193,9 +195,9 @@ class Hdcase(Model):
         for obj in self.browse(ids):
             total=0
             amt=0
-            fee=obj.fee
+            fee=obj.fee or 0
             for line in obj.lines_detail:
-                total+=line.total
+                total+=line.total or 0
             amt=total+fee
             vals[obj.id]={
                 "total": total,
@@ -203,4 +205,4 @@ class Hdcase(Model):
             }
         return vals
 
-Hdcase.register()
+HDcase.register()

netforce_clinic/models/clinic_patient.py

@@ -40,7 +40,7 @@ class Patient(Model):
         "card_type": fields.Selection([("iden_id","Identity Card"),("passport","Passport")],"Card Type",required=True),
         'iden_id' : fields.Char("Card No."),
         "app_no": fields.Char("Application No."),
-        "salary": fields.Selection([("20000","5,001-20,000"),("50000","20,001-50,000"),("100000","50,001-100,000"),("100001","100,000+")], "Salary"),
+        "salary": fields.Selection([["20000","5,001-20,000"],["50000","20,001-50,000"],["100000","50,001-100,000"],["100001","100,000+"]], "Salary"),
         'exp_id' : fields.Date("Expiry Date"),
         "state": fields.Selection([("draft","Draft"),("active","Active"),("deactive","Deactive")],"Status",required=False),
         "addresses": fields.One2Many("address","related_id","Addresses"),
@@ -144,10 +144,15 @@ class Patient(Model):
     }
     _order="date desc,number desc"
 
+    def name_get(self,ids,context={}):
+        vals=[]
+        for obj in self.browse(ids):
+            name='%s %s'%(obj.first_name or "", obj.last_name or "")
+            vals.append((obj.id,name))
+        return vals
 
     def void(self,ids,context={}):
         obj=self.browse(ids)[0]
         obj.write({"state":"voided"})
 
-
 Patient.register()