Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

rearrange menu

revise1
SPP 2017-11-24 13:22:28 +07:00
parent a24f641b1a
commit a3e5bb7cf5
12 changed files with 132 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
View File

@ -1,8 +0,0 @@
<action>
<field name="string">Account HD Case Summary</field>
<field name="view_cls">report</field>
<field name="model">clinic.report.account.hd.case.summary</field>
<field name="report_template">report_account_hd_case_summary</field>
<field name="report_template_xls">report_account_hd_case_summary</field>
<field name="menu">account_menu</field>
</action>

5
netforce_clinic/actions/rdc_board.xml 100644
View File

@ -0,0 +1,5 @@
<action>
<field name="view">template_view</field>
<field name="template">rdc_page</field>
<field name="menu">account_menu</field>
</action>

8
netforce_clinic/actions/report_hdcase_expense_summary.xml 100644
View File

@ -0,0 +1,8 @@
<action>
<field name="string">HDCase Expense Summary</field>
<field name="view_cls">report</field>
<field name="model">report.hdcase.expense.summary</field>
<field name="report_template">report_hdcase_expense_summary</field>
<field name="report_template_xls">report_hdcase_expense_summary</field>
<field name="menu">account_menu</field>
</action>

36
netforce_clinic/layouts/clinic_account_menu.xml
View File

@ -1,40 +1,6 @@
<inherit inherit="account_menu">
<item string="Settings" position="before">
<item string="Ratchawat">
<header string="Accountant"/>
<divider/>
<item string="Account Product" action="clinic_setting_account_product"/>
<item string="Account Patient" action="clinic_setting_account_patient"/>
<!--<item string="HD Case Expense" action="clinic_report_account_hd_case_summary"/>-->
<!--<item string="HD Case Expense(2)" action="clinic_report_account_hd_case_detail"/>-->
<item string="Account HDCase Summary" action="clinic_report_account_hd_case_summary"/>
<item string="Account HDCase Detail" action="clinic_report_account_hd_case_detail"/>
<item string="RD Shop Expense" action="clinic_report_account_shop"/>
<item string="Payment Matching" action="clinic_matching_payment"/>
<item string="Payment Invoices" action="clinic_invoice_payment"/>
<divider/>
<header string="Doctor/Nurse Cost"/>
<item string="Recompute Cost" action="clinic_compute_labor_cost"/>
<item string="Print Labor Cost" action="clinic_print_labor_cost"/>
<item string="Labor Costs" action="clinic_report_labor_cost"/>
<item string="Labor Cost Summary" action="clinic_report_labor_cost_summary"/>
<item string="Labor Cost Detail" action="clinic_report_labor_cost_detail"/>
<item string="Labor Cost Sub Detail" action="clinic_report_labor_cost_sub_detail"/>
<item string="Labor Cost Daily" action="clinic_report_labor_cost_daily"/>
<item string="Labor Cost Overtime" action="clinic_report_labor_cost_overtime"/>
<!--<item string="Wizard Labor Cost" action="clinic_report_wizard_labor_cost"/>-->
</item>
<item string="Matching">
<item string="Payment Matching" action="clinic_payment_matching"/>
<item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
</item>
</item>
<item string="Financial Settings" position="after">
<item string="Ratchawat Settings" action="clinic_account_setting"/>
<item string="Labor Costs" action="clinic_labor_cost"/>
</item>
<item string="Conversion Balances" position="after">
<item string="Pay Period" action="clinic_period"/>
<item string="Ratchawat" action="rdc_board"/>
</item>
</inherit>

38
netforce_clinic/layouts/clinic_account_menu.xml.old 100644
View File

@ -0,0 +1,38 @@
<inherit inherit="account_menu">
<item string="Settings" position="before">
<item string="Ratchawat">
<header string="Accounting"/>
<divider/>
<!--<item string="Account Product" action="clinic_setting_account_product"/>-->
<!--<item string="Account Patient" action="clinic_setting_account_patient"/>-->
<!--<item string="HD Case Expense" action="clinic_report_account_hd_case_summary"/>-->
<!--<item string="HD Case Expense(2)" action="clinic_report_account_hd_case_detail"/>-->
<item string="HDCase Expense Summary" action="report_hdcase_expense_summary"/>
<!--<item string="HDCase Expense Detail" action="clinic_report_account_hd_case_detail"/>-->
<item string="RD Shop Expense" action="clinic_report_account_shop"/>
<!--<item string="Payment Matching" action="clinic_matching_payment"/>-->
<!--<item string="Payment Invoices" action="clinic_invoice_payment"/>-->
<divider/>
<header string="Doctor/Nurse Cost"/>
<item string="Labor Costs" action="clinic_report_labor_cost"/>
<item string="Labor Cost Summary" action="clinic_report_labor_cost_summary"/>
<item string="Labor Cost Detail" action="clinic_report_labor_cost_detail"/>
<item string="Labor Cost Sub Detail" action="clinic_report_labor_cost_sub_detail"/>
<item string="Labor Cost Daily" action="clinic_report_labor_cost_daily"/>
<item string="Labor Cost Overtime" action="clinic_report_labor_cost_overtime"/>
<item string="Recompute Cost" action="clinic_compute_labor_cost"/>
<!--<item string="Print Labor Cost" action="clinic_print_labor_cost"/>-->
<item string="Print All" color="red" action="clinic_report_wizard_labor_cost"/>
<divider/>
<header string="Matching"/>
<item string="Payment Matching" action="clinic_payment_matching"/>
<item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
<divider/>
<header string="Settings"/>
<item string="Ratchawat Settings" action="clinic_account_setting"/>
<item string="Labor Costs" action="clinic_labor_cost"/>
<item string="Pay Period" action="clinic_period"/>
</item>
</item>
</inherit>

2
netforce_clinic/layouts/clinic_report_account_hd_case_summary.xml → netforce_clinic/layouts/report_hdcase_expense_summary.xml
View File

@ -1,4 +1,4 @@
<form model="clinic.report.account.hd.case.summary">
<form model="report.hdcase.expense.summary">
<field name="date" span="2" mode="month" onchange="onchange_date"/>
<field name="date_from" onchange="onchange_datefrom" span="2"/>
<field name="date_to" span="2"/>

2
netforce_clinic/models/__init__.py
View File

@ -67,7 +67,7 @@ from . import report_clinic
from . import report_visit
from . import report_cycle_item
from . import report_hd_case_summary
from . import report_account_hd_case_summary
from . import report_hdcase_expense_summary
from . import report_account_hd_case_detail
from . import report_hd_case_detail
from . import report_medical_summary

8
netforce_clinic/models/report_account_hd_case_summary.py → netforce_clinic/models/report_hdcase_expense_summary.py
View File

@ -4,9 +4,9 @@ from calendar import monthrange
from netforce.model import Model, fields, get_model
from netforce.access import get_active_company
class ReportAccountHDCaseSummary(Model):
_name="clinic.report.account.hd.case.summary"
_string="HD Case Report Summary"
class ReportHDCaseExpenseSummary(Model):
_name="report.hdcase.expense.summary"
_string="HDCase Expense Summary"
_transient=True
_fields={
@ -377,4 +377,4 @@ class ReportAccountHDCaseSummary(Model):
data['date_to']=data['date_from']
return data
ReportAccountHDCaseSummary.register()
ReportHDCaseExpenseSummary.register()

0
netforce_clinic/reports/report_account_hd_case_summary.xlsx → netforce_clinic/reports/report_hdcase_expense_summary.xlsx
View File

2
netforce_clinic/templates/clinic_page.hbs
View File

@ -1,4 +1,4 @@
{{#view "page" title="Clinic Board"}}
{{#view "page" title="Nurse Board"}}
<div class="row">
<div class="col-sm-6">
<div class="nf-board-title">

73
netforce_clinic/templates/rdc_page.hbs 100644
View File

@ -0,0 +1,73 @@
{{#view "page" title="Ratchawat Board"}}
<div class="row">
<div class="col-sm-6">
<div class="nf-board-title">
<h3>{{t "Accounting"}}</h3>
</div>
<div style="margin-bottom:20px">
<div>
<a href="#name=report_hdcase_expense_summary">{{t "HDCase Expense Summary"}}</a>
</div>
<div>
<a href="#name=clinic_report_account_shop">{{t "RD Shop Expense"}}</a>
</div>
</div>
<div class="nf-board-title">
<h3>{{t "Matching"}}</h3>
</div>
<div style="margin-bottom:20px">
<div>
<a href="#name=clinic_payment_matching">{{t "Payment Matching"}}</a>
</div>
<div>
<a href="#name=clinic_matching_hdcase_acc">{{t "HD Cases Matching"}}</a>
</div>
</div>
<div class="nf-board-title">
<h3>{{t "Settings"}}</h3>
</div>
<div style="margin-bottom:20px">
<div>
<a href="#name=clinic_account_setting">{{t "Ratchawat Settings"}}</a>
</div>
<div>
<a href="#name=clinic_labor_cost">{{t "Labor Costs"}}</a>
</div>
<div>
<a href="#name=clinic_period">{{t "Pay Period"}}</a>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="nf-board-title">
<h3>{{t "Doctor/Nurse Cost"}}</h3>
</div>
<div style="margin-bottom:20px">
<div>
<a href="#name=clinic_report_labor_cost">{{t "Labor Costs"}}</a>
</div>
<div>
<a href="#name=clinic_report_labor_cost_summary">{{t "Labor Cost Summary"}}</a>
</div>
<div>
<a href="#name=clinic_report_labor_cost_detail">{{t "Labor Cost Detail"}}</a>
</div>
<div>
<a href="#name=clinic_report_labor_cost_sub_detail">{{t "Labor Cost Sub Detail"}}</a>
</div>
<div>
<a href="#name=clinic_report_labor_cost_daily">{{t "Labor Cost Daily"}}</a>
</div>
<div>
<a href="#name=clinic_report_labor_cost_overtime">{{t "Labor Cost Overtime"}}</a>
</div>
<div>
<a href="#name=clinic_compute_labor_cost">{{t "Recompute Cost"}}</a>
</div>
<div>
<a href="#name=clinic_report_wizard_labor_cost">{{t "Print All"}}</a>
</div>
</div>
</div>
</div>
{{/view}}

0
netforce_clinic/templates/report_account_hd_case_summary.hbs → netforce_clinic/templates/report_hdcase_expense_summary.hbs
View File