diff --git a/netforce_clinic/actions/clinic_cycle_item.xml b/netforce_clinic/actions/clinic_cycle_item.xml index 7e152bd..405d100 100644 --- a/netforce_clinic/actions/clinic_cycle_item.xml +++ b/netforce_clinic/actions/clinic_cycle_item.xml @@ -3,7 +3,7 @@ multi_view clinic.cycle.item list,form - [["All",[]],["Draft",[["state","=","draft"]]],["Done",[["state","=","done"]]]] + [["All",[]],["Draft",[["state","=","draft"]]],["Validated",[["state","=","validated"]]]] clinic_menu 25 diff --git a/netforce_clinic/actions/clinic_labor_cost.xml b/netforce_clinic/actions/clinic_labor_cost.xml new file mode 100644 index 0000000..87b84e9 --- /dev/null +++ b/netforce_clinic/actions/clinic_labor_cost.xml @@ -0,0 +1,6 @@ + + Labor Costs + multi_view + clinic.labor.cost + account_menu + diff --git a/netforce_clinic/actions/clinic_report_nurse_fee_detail.xml b/netforce_clinic/actions/clinic_report_nurse_fee_detail.xml index aa1611b..f61c684 100644 --- a/netforce_clinic/actions/clinic_report_nurse_fee_detail.xml +++ b/netforce_clinic/actions/clinic_report_nurse_fee_detail.xml @@ -4,5 +4,5 @@ clinic.report.nurse.fee.detail report_nurse_fee_detail report_nurse_fee_detail - clinic_menu + account_menu diff --git a/netforce_clinic/actions/clinic_report_nurse_fee_sum.xml b/netforce_clinic/actions/clinic_report_nurse_fee_sum.xml index ec363ee..c3c44da 100644 --- a/netforce_clinic/actions/clinic_report_nurse_fee_sum.xml +++ b/netforce_clinic/actions/clinic_report_nurse_fee_sum.xml @@ -4,5 +4,5 @@ clinic.report.nurse.fee.sum report_nurse_fee_sum report_nurse_fee_sum - clinic_menu + account_menu diff --git a/netforce_clinic/actions/import_clinic_payment.xml b/netforce_clinic/actions/import_clinic_payment.xml index 11ee46d..377464a 100644 --- a/netforce_clinic/actions/import_clinic_payment.xml +++ b/netforce_clinic/actions/import_clinic_payment.xml @@ -2,5 +2,5 @@ Import Payment multi_view import.clinic.payment - clinic_menu + account_menu diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml index 11b39d2..b3b3796 100644 --- a/netforce_clinic/layouts/clinic_cycle_item_form.xml +++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml @@ -1,12 +1,11 @@ -
+ @@ -21,36 +20,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - diff --git a/netforce_clinic/layouts/clinic_cycle_item_list.xml b/netforce_clinic/layouts/clinic_cycle_item_list.xml index 01a154d..c320e5b 100644 --- a/netforce_clinic/layouts/clinic_cycle_item_list.xml +++ b/netforce_clinic/layouts/clinic_cycle_item_list.xml @@ -1,7 +1,5 @@ - - + - diff --git a/netforce_clinic/layouts/clinic_hospital_form.xml b/netforce_clinic/layouts/clinic_hospital_form.xml index 658ea78..27e80dd 100644 --- a/netforce_clinic/layouts/clinic_hospital_form.xml +++ b/netforce_clinic/layouts/clinic_hospital_form.xml @@ -1,4 +1,7 @@ + + + diff --git a/netforce_clinic/layouts/clinic_labor_cost_form.xml b/netforce_clinic/layouts/clinic_labor_cost_form.xml new file mode 100644 index 0000000..9fc3ff8 --- /dev/null +++ b/netforce_clinic/layouts/clinic_labor_cost_form.xml @@ -0,0 +1,54 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +