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

menu

conv_bal
watcha.h 2015-02-10 23:27:24 +07:00
parent 7a979d17bd
commit 7321ab3d01
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netforce_clinic/actions/clinic_matching_hdcase.xml
View File

@ -1,5 +1,5 @@
<action> <action>
<field name="string">Matching HDCase</field> <field name="string">HD Cases Matching</field>
<field name="view_cls">report</field> <field name="view_cls">report</field>
<field name="model">clinic.matching.hdcase</field> <field name="model">clinic.matching.hdcase</field>
<field name="report_template">matching_hdcase</field> <field name="report_template">matching_hdcase</field>

8
netforce_clinic/actions/clinic_matching_hdcase_acc.xml 100644
View File

@ -0,0 +1,8 @@
<action>
<field name="string">HD Cases Matching</field>
<field name="view_cls">report</field>
<field name="model">clinic.matching.hdcase</field>
<field name="report_template">matching_hdcase</field>
<field name="report_template_xls">matching_hdcase</field>
<field name="menu">account_menu</field>
</action>

3
netforce_clinic/layouts/clinic_account_menu.xml
View File

@ -3,7 +3,8 @@
<item string="Ratchawat"> <item string="Ratchawat">
<item string="Labor Costs" action="clinic_labor_cost"/> <item string="Labor Costs" action="clinic_labor_cost"/>
<item string="Labor Cost Entries" action="clinic_labor_cost_entry"/> <item string="Labor Cost Entries" action="clinic_labor_cost_entry"/>
<item string="Matching Payments" action="clinic_matching_payment"/> <item string="Payments Matching" action="clinic_matching_payment"/>
<item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
<item string="HD Case Expenses" action="clinic_hd_case_expense"/> <item string="HD Case Expenses" action="clinic_hd_case_expense"/>
<divider/> <divider/>
<header string="REPORTS"/> <header string="REPORTS"/>

4
netforce_clinic/layouts/clinic_menu.xml
View File

@ -44,11 +44,9 @@
</item> </item>
<item string="HD Cases" perm="clinic_hdcase"> <item string="HD Cases" perm="clinic_hdcase">
<item string="HD Cases" action="clinic_hd_case"/> <item string="HD Cases" action="clinic_hd_case"/>
<item string="HD Cases Matching" action="clinic_matching_hdcase"/>
<item string="RD Shop" action="clinic_shop" perm="clinic_shop"/> <item string="RD Shop" action="clinic_shop" perm="clinic_shop"/>
<item string="Sickbed" action="clinic_sickbed"/> <item string="Sickbed" action="clinic_sickbed"/>
<divider/>
<header string="OTHERS"/>
<item string="Matching HD Case" action="clinic_matching_hdcase"/>
</item> </item>
<item string="Reporting" perm="clinic_report"> <item string="Reporting" perm="clinic_report">
<item string="Visit Summary" action="clinic_report_visit"/> <item string="Visit Summary" action="clinic_report_visit"/>

2
netforce_clinic/models/matching_hdcase.py
View File

@ -57,6 +57,7 @@ class MatchingHDCase(Model):
def get_report_data(self,ids,context={}): def get_report_data(self,ids,context={}):
hdcases={} hdcases={}
date=time.strftime("%Y-%m-%d") date=time.strftime("%Y-%m-%d")
lines=[]
if ids: if ids:
obj=self.browse(ids)[0] obj=self.browse(ids)[0]
date=obj.date date=obj.date
@ -135,7 +136,6 @@ class MatchingHDCase(Model):
'note': '%s, %s, %s, %s, %s'%(date,hn,hct,prod_name,fee_amt), 'note': '%s, %s, %s, %s, %s'%(date,hn,hct,prod_name,fee_amt),
} }
lines=[]
for row in rows: for row in rows:
vals=list(row.values()) vals=list(row.values())
date,_time=(vals[5] or "").split() date,_time=(vals[5] or "").split()

6
netforce_clinic/templates/clinic_page.hbs
View File

@ -92,15 +92,15 @@
<div> <div>
<a href="#name=clinic_hd_case">{{t "HD Cases"}}</a> <a href="#name=clinic_hd_case">{{t "HD Cases"}}</a>
</div> </div>
<div>
<a href="#name=clinic_matching_hdcase">{{t "HD Cases Matching"}}</a>
</div>
<div> <div>
<a href="#name=clinic_shop">{{t "RD Shop"}}</a> <a href="#name=clinic_shop">{{t "RD Shop"}}</a>
</div> </div>
<div> <div>
<a href="#name=clinic_sickbed">{{t "Sickbed"}}</a> <a href="#name=clinic_sickbed">{{t "Sickbed"}}</a>
</div> </div>
<div>
<a href="#name=clinic_matching_hdcase">{{t "Matching HD Cases"}}</a>
</div>
</div> </div>
</div> </div>
</div> </div>