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

Check for prefix before return EcritureNum (#15629)

Browse Source
This commit is contained in:
Charles-Henri Decultot 2018-10-11 13:21:29 +02:00 committed by Nabin Hait
parent 50447b195d
commit 6c743bebf2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
View File

@ -105,9 +105,12 @@ def get_result_as_list(data, filters):
for d in data:
JournalCode = re.split("-|/", d.get("voucher_no"))[0]
JournalCode = re.split("-|/|[0-9]", d.get("voucher_no"))[0]
EcritureNum = re.split("-|/", d.get("voucher_no"))[1]
if d.get("voucher_no").startswith("{0}-".format(JournalCode)) or d.get("voucher_no").startswith("{0}/".format(JournalCode)):
EcritureNum = re.split("-|/", d.get("voucher_no"))[1]
else:
EcritureNum = re.search("{0}(\d+)".format(JournalCode), d.get("voucher_no"), re.IGNORECASE).group(1)
EcritureDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")