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

fix : Payment Reco Issue and chart of account importer (#38321)

Browse Source 
fix : Payment Reco Issue and chart of account importer
This commit is contained in:
NandhiniDevi 2023-11-26 18:40:31 +05:30 committed by GitHub
parent 5426b93387
commit d9b3b95854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ def generate_data_from_csv(file_doc, as_dict=False):
if as_dict: if as_dict:
data.append({frappe.scrub(header): row[index] for index, header in enumerate(headers)}) data.append({frappe.scrub(header): row[index] for index, header in enumerate(headers)})
else: else:
if not row[1]: if not row[1] and len(row) > 1:
row[1] = row[0] row[1] = row[0]
row[3] = row[2] row[3] = row[2]
data.append(row) data.append(row)

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

@ -508,7 +508,7 @@ class JournalEntry(AccountsController):
).format(d.reference_name, d.account) ).format(d.reference_name, d.account)
) )
else: else:
dr_or_cr = "debit" if d.credit > 0 else "credit" dr_or_cr = "debit" if flt(d.credit) > 0 else "credit"
valid = False valid = False
for jvd in against_entries: for jvd in against_entries:
if flt(jvd[dr_or_cr]) > 0: if flt(jvd[dr_or_cr]) > 0: