diff --git a/accounts/search_criteria/general_ledger/general_ledger.py b/accounts/search_criteria/general_ledger/general_ledger.py index 005038a1fc1..6cba6e44bc5 100644 --- a/accounts/search_criteria/general_ledger/general_ledger.py +++ b/accounts/search_criteria/general_ledger/general_ledger.py @@ -11,8 +11,8 @@ else: from_date = filter_values['posting_date'] to_date = filter_values['posting_date1'] -ysd, from_date_year = sql("select year_start_date, name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0] - +from_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0][0] +#to_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",to_date)[0][0] # define columns #--------------- @@ -49,13 +49,25 @@ total_diff = total_debit - total_credit # opening account = filter_values.get('account') -if account: - acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account) - closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] - if acc_det[0][0] == 'Credit': - closing_bal = -1*closing_bal +if not account: + msgprint('Select an account to proceed',raise_exception=0,small=1) + + +acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account) + +opening_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, from_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] +closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] +if acc_det[0][0] == 'Credit': + closing_bal = -1*closing_bal + opening_bal = -1*opening_bal out = [] + +t_row = ['' for i in range(len(colnames))] +t_row[1] = 'Opening as on '+formatdate(from_date) +t_row[col_idx['Debit']-1] = opening_bal +out.append(t_row) + count = 0 for r in res: count +=1 @@ -71,24 +83,24 @@ if total_debit != 0 or total_credit != 0: # Total debit/credit t_row = ['' for i in range(len(colnames))] t_row[1] = 'Total' - t_row[col_idx['Debit']-1] = total_debit - t_row[col_idx['Credit']-1] = total_credit + t_row[col_idx['Debit']-1] = total_debit + t_row[col_idx['Credit']-1] = total_credit out.append(t_row) - + # diffrence (dr-cr) t_row = ['' for i in range(len(colnames))] t_row[1] = 'Total(Dr-Cr)' - t_row[col_idx['Debit']-1] = total_diff + t_row[col_idx['Debit']-1] = total_diff out.append(t_row) # closing if account: t_row = ['' for i in range(len(colnames))] - t_row[1] = 'Closing Balance on ' + to_date + t_row[1] = 'Closing Balance on ' + formatdate(to_date) t_row[col_idx['Debit']-1] = flt(closing_bal) out.append(t_row) - + # Print Format myheader = """ @@ -99,5 +111,5 @@ myheader = """
"""+l_head+"""
""" % {'acc':account, 'fdt':from_date, 'tdt':to_date} - + page_template = myheader+"
%(table)s
" diff --git a/patches/patch.py b/patches/patch.py index a7c25118c34..d9834e254fa 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,8 +1,7 @@ # REMEMBER to update this # ======================== - -last_patch = 352 +last_patch = 354 #------------------------------------------- @@ -278,6 +277,20 @@ def execute(patch_no): elif patch_no == 351: reload_doc('home', 'page', 'dashboard') elif patch_no == 352: + reload_doc('stock','doctype','delivery_note') + reload_doc('stock','doctype','item') + reload_doc('selling','doctype','quotation') + reload_doc('stock','Print Format','Delivery Note Packing List Wise') + + if not sql("select format from `tabDocFormat` where name = 'Delivery Note Packing List Wise' and parent = 'Delivery Note'"): + from webnotes.model.doc import addchild + dt_obj = get_obj('DocType', 'Delivery Note', with_children = 1) + ch = addchild(dt_obj.doc, 'formats', 'DocFormat', 1) + ch.format = 'Delivery Note Packing List Wise' + ch.save(1) + elif patch_no == 353: + reload_doc('hr', 'doctype', 'salary_manager') + elif patch_no == 354: reload_doc('setup', 'doctype','feature_setup') reload_doc('stock','doctype','item') sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'") @@ -286,4 +299,4 @@ def execute(patch_no): m = Document('Features Setup') for d in rs: m.fields[d[0]] = 1 - m.save() \ No newline at end of file + m.save()
"""+l_head+"""