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

fix invoice due_date

conv_bal
watcha.h@almacom.co.th 2015-07-23 08:25:44 +07:00
parent 0fec2f8db2
commit a2de551f12
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netforce_clinic/models/hd_case.py
View File

@ -599,7 +599,7 @@ class HDCase(Model):
if obj.invoices: if obj.invoices:
for inv in obj.invoices: for inv in obj.invoices:
inv.void() inv.void()
due_date=obj.date[1:10] # XXX due_date=obj.date[0:10]
# cash, credit # cash, credit
is_credit=context.get('is_credit') or False is_credit=context.get('is_credit') or False
context['type']='out' context['type']='out'

7
netforce_clinic/models/matching_payment.py
View File

@ -175,9 +175,8 @@ class MatchingPayment(Model):
if invoice.related_id: if invoice.related_id:
hdcase=invoice.related_id hdcase=invoice.related_id
patient=hdcase.patient_id patient=hdcase.patient_id
#pname=patient.name_check or "" #XXX
pname='%s%s'%(patient.first_name or "",patient.last_name or "") pname='%s%s'%(patient.first_name or "",patient.last_name or "")
#XXX #XXX partner name should be the same patient name
if patient_names.get(pname): if patient_names.get(pname):
pname=patient_names[pname] pname=patient_names[pname]
pname2='%s %s'%(patient.first_name or "",patient.last_name or "") pname2='%s %s'%(patient.first_name or "",patient.last_name or "")
@ -185,7 +184,6 @@ class MatchingPayment(Model):
hn=patient.hn_no or "" hn=patient.hn_no or ""
elif invoice.ref: elif invoice.ref:
pname=invoice.ref or '' pname=invoice.ref or ''
#XXX
if patient_names.get(pname): if patient_names.get(pname):
pname=patient_names[pname] pname=patient_names[pname]
pname2=pname pname2=pname
@ -278,8 +276,7 @@ class MatchingPayment(Model):
'invoice_id': None, 'invoice_id': None,
'state': 'unmatch', 'state': 'unmatch',
} }
#if hn=='100794':
#import pdb; pdb.set_trace()
if matches1.get(key1): if matches1.get(key1):
print("found ", key1) print("found ", key1)
record.update({ record.update({

1
netforce_clinic/models/matching_payment_line.py
View File

@ -11,6 +11,7 @@ class MatchingPaymentLine(Model):
'amount': (obj.fee or 0)+(obj.epo or 0)+(obj.srv or 0), 'amount': (obj.fee or 0)+(obj.epo or 0)+(obj.srv or 0),
} }
return res return res
_fields={ _fields={
'match_id': fields.Many2One("clinic.matching.payment","Match",required=True,on_delete="cascade"), 'match_id': fields.Many2One("clinic.matching.payment","Match",required=True,on_delete="cascade"),
'invoice_id': fields.Many2One("account.invoice","Invoice (Waiting Payment)"), 'invoice_id': fields.Many2One("account.invoice","Invoice (Waiting Payment)"),