merge

netforce_clinic/actions/clinic_patient.xml

@@ -2,6 +2,6 @@
     <field name="string">Patients</field>
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.patient</field>
-    <field name="tabs">[["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]]]</field>
+    <field name="tabs">[["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]],["Archived",[["active","=","False"]]]]</field>
     <field name="menu">clinic_menu</field>
 </action>

netforce_clinic/layouts/clinic_report_hd_detail.xml

@@ -1,7 +1,7 @@
 <form model="clinic.report.hd.detail">
     <group>
         <field name="patient_id" span="3"/>
-        <field name="type" span="3"/>
+        <!--<field name="type" span="3"/>-->
         <field name="doctor_id" span="3"/>
         <field name="nurse_id" span="3"/>
         <newline/>

netforce_clinic/templates/report_hd_medical.hbs

@@ -14,9 +14,7 @@
         <tr>
             <th>Product ID</th>
             <th>Product Name</th>
-            <th>MG</th>
             <th>UC</th>
-            <th>NHSO (30B)</th>
             <th>Pay</th>
             <th>Total</th>
         </tr>
@@ -26,9 +24,7 @@
             <tr> 
                 <td>{{product_code}}</td>
                 <td><a style="text-decoration: underline" href=ui#name=product&mode=form&active_id={{product_id}}>{{medical}}</a></td>
-                <td>{{mg}}</td>
                 <td>{{uc}}</td>
-                <td>{{sc}}</td>
                 <td style color="red"></style>{{buy}}</td>
                 <td style color="blue"></style>{{amount}}</td>
             </tr>
@@ -40,8 +36,6 @@
             <td></td>
             <td>-</td>
             <td>-</td>
-            <td>-</td>
-            <td>-</td>
             <td><b>32</b></td>
         </tr>
     </tfoot>