diff --git a/netforce_clinic/actions/clinic_patient.xml b/netforce_clinic/actions/clinic_patient.xml index edb3dfb..9ee98a8 100644 --- a/netforce_clinic/actions/clinic_patient.xml +++ b/netforce_clinic/actions/clinic_patient.xml @@ -2,6 +2,6 @@ Patients multi_view clinic.patient - [["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]]] + [["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]],["Archived",[["active","=","False"]]]] clinic_menu diff --git a/netforce_clinic/layouts/clinic_report_hd_detail.xml b/netforce_clinic/layouts/clinic_report_hd_detail.xml index a16cb78..778daa9 100644 --- a/netforce_clinic/layouts/clinic_report_hd_detail.xml +++ b/netforce_clinic/layouts/clinic_report_hd_detail.xml @@ -1,7 +1,7 @@
- + diff --git a/netforce_clinic/reports/report_hd_detail.xlsx b/netforce_clinic/reports/report_hd_detail.xlsx index 1e67ae7..b518d6b 100644 Binary files a/netforce_clinic/reports/report_hd_detail.xlsx and b/netforce_clinic/reports/report_hd_detail.xlsx differ diff --git a/netforce_clinic/templates/report_hd_medical.hbs b/netforce_clinic/templates/report_hd_medical.hbs index 7a9890f..99b8800 100644 --- a/netforce_clinic/templates/report_hd_medical.hbs +++ b/netforce_clinic/templates/report_hd_medical.hbs @@ -14,9 +14,7 @@ Product ID Product Name - MG UC - NHSO (30B) Pay Total @@ -26,9 +24,7 @@ {{product_code}} {{medical}} - {{mg}} {{uc}} - {{sc}} {{buy}} {{amount}} @@ -40,8 +36,6 @@ - - - - - - 32