Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

voucher date removal issue fixed

Browse Source
This commit is contained in:
Nabin Hait 2012-03-01 17:31:51 +05:30
parent 7807c6f173
commit be0b090d27
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/gl_control/gl_control.py
View File

@ -536,7 +536,6 @@ def create_new_invoice(prev_rv):
# update new rv # update new rv
new_rv.doc.voucher_date = new_rv.doc.next_date
new_rv.doc.posting_date = new_rv.doc.next_date new_rv.doc.posting_date = new_rv.doc.next_date
new_rv.doc.aging_date = new_rv.doc.next_date new_rv.doc.aging_date = new_rv.doc.next_date
new_rv.doc.due_date = add_days(new_rv.doc.next_date, cint(date_diff(prev_rv.doc.due_date, prev_rv.doc.posting_date))) new_rv.doc.due_date = add_days(new_rv.doc.next_date, cint(date_diff(prev_rv.doc.due_date, prev_rv.doc.posting_date)))

2
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
View File

@ -533,7 +533,7 @@ class DocType(TransactionBase):
self.values.append({ self.values.append({
'item_code' : d.item_code, 'item_code' : d.item_code,
'warehouse' : wh, 'warehouse' : wh,
'transaction_date' : self.doc.voucher_date, 'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date, 'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time, 'posting_time' : self.doc.posting_time,
'voucher_type' : 'Receivable Voucher', 'voucher_type' : 'Receivable Voucher',

4
erpnext/accounts/search_criteria/collection_report/collection_report.py
View File

@ -66,7 +66,7 @@ for r in row_list:
for r in res: for r in res:
if r[col_idx['Against Receivable']]: if r[col_idx['Against Receivable']]:
dt=sql("select voucher_date, Aging_date from `tabReceivable Voucher` where name='%s'"%r[col_idx['Against Receivable']]) dt=sql("select date(modified), Aging_date from `tabReceivable Voucher` where name='%s'"%r[col_idx['Against Receivable']])
r.append('') r.append('')
r.append(dt and cstr(dt[0][0]) or '') r.append(dt and cstr(dt[0][0]) or '')
r.append(dt and cstr(dt[0][1]) or '') r.append(dt and cstr(dt[0][1]) or '')
@ -103,4 +103,4 @@ for r in res:
r.append(val_l2) r.append(val_l2)
r.append(val_l3) r.append(val_l3)
r.append(val_l4) r.append(val_l4)
r.append(val_l5_above) r.append(val_l5_above)

4
erpnext/accounts/search_criteria/payment_report/payment_report.py
View File

@ -66,7 +66,7 @@ for r in row_list:
for r in res: for r in res:
if r[col_idx['Against Payable']]: if r[col_idx['Against Payable']]:
dt=sql("select voucher_date, aging_date from `tabPayable Voucher` where name='%s'"%r[col_idx['Against Payable']]) dt=sql("select date(modified), aging_date from `tabPayable Voucher` where name='%s'"%r[col_idx['Against Payable']])
r.append('') r.append('')
r.append(dt and cstr(dt[0][0]) or '') r.append(dt and cstr(dt[0][0]) or '')
r.append(dt and cstr(dt[0][1]) or '') r.append(dt and cstr(dt[0][1]) or '')
@ -102,4 +102,4 @@ for r in res:
r.append(val_l2) r.append(val_l2)
r.append(val_l3) r.append(val_l3)
r.append(val_l4) r.append(val_l4)
r.append(val_l5_above) r.append(val_l5_above)

4
erpnext/selling/search_criteria/variance_report/variance_report.py
View File

@ -60,7 +60,7 @@ elif based_on == 'Sales Partner':
if under == 'Receivable Voucher': if under == 'Receivable Voucher':
under_detail = 'RV' under_detail = 'RV'
dt = 'voucher_date' dt = 'posting_date'
else: else:
under_detail = under under_detail = under
dt = "transaction_date" dt = "transaction_date"
@ -516,4 +516,4 @@ for r in res:
tot_target = 0 tot_target = 0
elif tl == 1: elif tl == 1:
out.append(r) out.append(r)