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

change layout

conv_bal
watcha.h@almacom.co.th 2015-04-02 13:39:34 +07:00
parent 65e0f3b1bc
commit 5387c9029e
9 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
View File

@ -1,5 +1,5 @@
<action>
<field name="string">Report Claim Expense</field>
<field name="string">HD Case Expense</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>

2
netforce_clinic/actions/clinic_report_account_shop.xml
View File

@ -1,5 +1,5 @@
<action>
<field name="string">Report Shop</field>
<field name="string">RD Shop Expense</field>
<field name="view_cls">report</field>
<field name="model">clinic.report.shop</field>
<field name="report_template">report_shop</field>

2
netforce_clinic/actions/clinic_report_claim.xml
View File

@ -1,5 +1,5 @@
<action>
<field name="string">Report Claim Expense</field>
<field name="string">HD Case Expense</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>

2
netforce_clinic/actions/clinic_report_shop.xml
View File

@ -1,5 +1,5 @@
<action>
<field name="string">Report Shop</field>
<field name="string">RD Shop Expense</field>
<field name="view_cls">report</field>
<field name="model">clinic.report.shop</field>
<field name="report_template">report_shop</field>

4
netforce_clinic/layouts/clinic_account_menu.xml
View File

@ -7,8 +7,8 @@
<item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
<divider/>
<header string="REPORTS"/>
<item string="Report Claim Expense" action="clinic_report_account_hd_case_summary"/>
<item string="Report RD Shop" action="clinic_report_account_shop"/>
<item string="HD Case Expense" action="clinic_report_account_hd_case_summary"/>
<item string="RD Shop Expense" action="clinic_report_account_shop"/>
<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"/>-->

4
netforce_clinic/layouts/clinic_menu.xml
View File

@ -45,8 +45,8 @@
<item string="Sickbed" action="clinic_sickbed"/>
</item>
<item string="Reporting" perm="clinic_report">
<item string="Claim Expense" action="clinic_report_claim"/>
<item string="RD Shop Summary" action="clinic_report_shop"/>
<item string="HD Case Expense" action="clinic_report_claim"/>
<item string="RD Shop Expense" action="clinic_report_shop"/>
<item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
<item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
<!--<item string="Medical Detail" action="clinic_report_medical_detail"/>-->

10
netforce_clinic/models/report_hd_case_summary.py
View File

@ -60,6 +60,8 @@ class ReportHDCaseSummary(Model):
crr_month=int(date[5:7])
weekday, crr_total_day=monthrange(year, crr_month)
defaults=self.default_get(context=context)
date_from=defaults.get('date_from',date)
date_to=defaults.get('date_to',date)
branch_id=defaults.get("branch_id",None)
if branch_id:
branch_id=branch_id[0]
@ -77,6 +79,8 @@ class ReportHDCaseSummary(Model):
time_start='%s 00:00:00'%obj.date_from
time_stop='%s 23:59:59'%obj.date_to
year=int(date[0:4])
date_from=obj.date_from
date_to=obj.date_to
prev_year=year
next_year=year
@ -262,9 +266,10 @@ class ReportHDCaseSummary(Model):
line['unit']=unit
lines.append(line)
index+=1
context['defaults']={
'date': date,
'date_from': date_from,
'date_to': date_to,
'branch_id': branch_id,
'department_id': department_id,
}
@ -278,9 +283,12 @@ class ReportHDCaseSummary(Model):
elif branch_id:
branch=get_model("clinic.branch").browse(branch_id)
sub_name="(%s)" % branch.name or ""
print('>> ', context.get('defaults'))
data={
'branch_id': branch_id,
'department_id': department_id,
'date_from': date_from,
'date_to': date_to,
'date': date,
'month': month_str,
'year': year,

6
netforce_clinic/templates/report_hd_case_summary.hbs
View File

@ -42,14 +42,14 @@
<thead>
<th>
<center>
<a href="/ui#name=clinic_report_recent_patient&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
<a href="/ui#name=clinic_report_recent_patient&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
รายชื่อผู้ป่วยรับใหม่
</a>
</center>
</th>
<th>
<center>
<a href="/ui#name=clinic_report_discontinue_patient&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
<a href="/ui#name=clinic_report_discontinue_patient&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
รายชื่อผู้ป่วยจำหน่าย
</a>
</center>
@ -122,7 +122,7 @@
<span>
<center>
<b>
<a href="/ui#name=clinic_report_medical_summary&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">รวมจำนวนยาที่ใช้ประจำเดือน</a>
<a href="/ui#name=clinic_report_medical_summary&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">รวมจำนวนยาที่ใช้ประจำเดือน</a>
</b>
</center>
</span>

14
netforce_clinic/templates/report_shop.hbs
View File

@ -19,7 +19,9 @@
<th>Lab</th>
<th>Misc.</th>
<th>Dlz</th>
<!--
<th>Ref.Inv#</th>
-->
<th>Picking#</th>
</tr>
</thead>
@ -40,9 +42,11 @@
<td>{{currency lab zero=""}}</td>
<td>{{currency misc zero=""}}</td>
<td>{{currency dlz zero=""}}</td>
<!--
<td>
{{view "link" string=inv_ref action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
</td>
-->
<td>
{{#if pick_id}}
{{view "link" string=pick_ref action="pick_out" action_options="mode=form" active_id=pick_id}}
@ -59,11 +63,11 @@
<th></th>
<th></th>
<th></th>
<th>{{currency total_fee zero=""}}</th>
<th>{{currency total_mdc zero=""}}</th>
<th>{{currency total_lab zero=""}}</th>
<th>{{currency total_misc zero=""}}</th>
<th>{{currency total_dlz zero=""}}</th>
<th>{{currency total_fee}}</th>
<th>{{currency total_mdc}}</th>
<th>{{currency total_lab}}</th>
<th>{{currency total_misc}}</th>
<th>{{currency total_dlz}}</th>
<th></th>
<th></th>
</tfoot>