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

gl control cleanup[

Browse Source
This commit is contained in:
Nabin Hait 2013-01-17 18:43:54 +05:30
parent 274de5462b
commit 16546d25e7
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/gl_control/gl_control.py
View File

@ -129,7 +129,6 @@ class DocType:
le = Document('GL Entry') le = Document('GL Entry')
for k in flist: for k in flist:
le.fields[k] = self.get_val(le_map[k], d, parent) le.fields[k] = self.get_val(le_map[k], d, parent)
# if there is already an entry in this account then just add it to that entry # if there is already an entry in this account then just add it to that entry
same_head = self.check_if_in_list(le) same_head = self.check_if_in_list(le)
if same_head and merge_entries: if same_head and merge_entries:
@ -162,7 +161,6 @@ class DocType:
# update total debit / credit # update total debit / credit
total_debit += flt(le.debit, 2) total_debit += flt(le.debit, 2)
total_credit += flt(le.credit, 2) total_credit += flt(le.credit, 2)
webnotes.errprint([le.account, le.debit, le.credit])
diff = flt(total_debit - total_credit, 2) diff = flt(total_debit - total_credit, 2)
if abs(diff)==0.01: if abs(diff)==0.01:
@ -196,7 +194,6 @@ class DocType:
for le_map in le_map_list: for le_map in le_map_list:
if le_map['table_field']: if le_map['table_field']:
for d in getlist(doclist,le_map['table_field']): for d in getlist(doclist,le_map['table_field']):
webnotes.errprint([d.fields])
# purchase_tax_details is the table of other charges in purchase cycle # purchase_tax_details is the table of other charges in purchase cycle
if le_map['table_field'] != 'purchase_tax_details' or \ if le_map['table_field'] != 'purchase_tax_details' or \
(le_map['table_field'] == 'purchase_tax_details' and \ (le_map['table_field'] == 'purchase_tax_details' and \
@ -208,8 +205,6 @@ class DocType:
# save entries # save entries
self.save_entries(cancel, adv_adj, update_outstanding) self.save_entries(cancel, adv_adj, update_outstanding)
# set as cancelled # set as cancelled
if cancel: if cancel:
vt = self.get_val(le_map['voucher_type'], doc, doc) vt = self.get_val(le_map['voucher_type'], doc, doc)
@ -334,7 +329,6 @@ class DocType:
d['against_fld'] = against_fld[d['against_voucher_type']] d['against_fld'] = against_fld[d['against_voucher_type']]
# cancel JV # cancel JV
webnotes.errprint("cancel")
jv_obj = get_obj('Journal Voucher', d['voucher_no'], with_children=1) jv_obj = get_obj('Journal Voucher', d['voucher_no'], with_children=1)
self.make_gl_entries(jv_obj.doc, jv_obj.doclist, cancel =1, adv_adj =1) self.make_gl_entries(jv_obj.doc, jv_obj.doclist, cancel =1, adv_adj =1)
@ -342,7 +336,6 @@ class DocType:
self.update_against_doc(d, jv_obj) self.update_against_doc(d, jv_obj)
# re-submit JV # re-submit JV
webnotes.errprint("resubmit")
jv_obj = get_obj('Journal Voucher', d['voucher_no'], with_children =1) jv_obj = get_obj('Journal Voucher', d['voucher_no'], with_children =1)
self.make_gl_entries(jv_obj.doc, jv_obj.doclist, cancel = 0, adv_adj =1) self.make_gl_entries(jv_obj.doc, jv_obj.doclist, cancel = 0, adv_adj =1)