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

merge hdcase summary report old -> new

fix1
SPP 2018-06-07 17:11:34 +07:00
parent 21ad40d97d
commit 02184b877b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netforce_clinic/actions/report_hdcase_summary.xml
View File

@ -1,5 +1,5 @@
<action> <action>
<field name="string">HD Case Summary (New)</field> <field name="string">HD Case Summary</field>
<field name="view_cls">report</field> <field name="view_cls">report</field>
<field name="model">report.hdcase.summary</field> <field name="model">report.hdcase.summary</field>
<field name="report_template">report_hdcase_summary</field> <field name="report_template">report_hdcase_summary</field>

4
netforce_clinic/layouts/clinic_menu.xml
View File

@ -42,10 +42,10 @@
<item string="Sickbed" action="clinic_sickbed"/> <item string="Sickbed" action="clinic_sickbed"/>
</item> </item>
<item string="Reports" perm="clinic_report"> <item string="Reports" perm="clinic_report">
<item string="HD Case Summary (new)" action="report_hdcase_summary"/> <item string="HD Case Summary" action="report_hdcase_summary"/>
<item string="Report Cycle Setting" action="clinic_report_cycle_setting"/> <item string="Report Cycle Setting" action="clinic_report_cycle_setting"/>
<item string="Cycle Item Summary" action="clinic_report_cycle_item"/> <item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
<item string="HD Case Summary (old)" action="clinic_report_hd_case_summary"/> <!--<item string="HD Case Summary (old)" action="clinic_report_hd_case_summary"/>-->
<item string="HD Case Expense" action="report_hdcase_expense_summary"/> <item string="HD Case Expense" action="report_hdcase_expense_summary"/>
<item string="RD Shop Expense" action="clinic_report_shop"/> <item string="RD Shop Expense" action="clinic_report_shop"/>
<divider/> <divider/>

4
netforce_clinic/templates/report_hdcase_summary.hbs
View File

@ -71,11 +71,13 @@
{{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}} {{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}}
</td> </td>
<!--button delete ##TODO--> <!--button delete ##TODO-->
<!--
<td> <td>
<button type="button" class="btn btn-danger btn-xs"> <button type="button" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</button> </button>
</td> </td>
-->
</tr> </tr>
{{/each}} {{/each}}
{{else}} {{else}}
@ -107,11 +109,13 @@
{{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}} {{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}}
</td> </td>
<!--button delete ##TODO--> <!--button delete ##TODO-->
<!--
<td> <td>
<button type="button" class="btn btn-danger btn-xs"> <button type="button" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</button> </button>
</td> </td>
-->
</tr> </tr>
{{/each}} {{/each}}
{{else}} {{else}}