| commit | 6c743bebf27e094c05943fe5a73a63377787ae46 | [log] [tgz] |
|---|---|---|
| author | Charles-Henri Decultot <chdecultot@dokos.io> | Thu Oct 11 13:21:29 2018 +0200 |
| committer | Nabin Hait <nabinhait@gmail.com> | Thu Oct 11 16:51:29 2018 +0530 |
| tree | a07256017f745d8bf33b9c1a95470fdab27521e7 | |
| parent | 50447b195d0d39c86dc6872b0ed2794b818cca11 [diff] |
Check for prefix before return EcritureNum (#15629)
diff --git "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py" "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py" index a072ed0..5fbf700 100644 --- "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py" +++ "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
@@ -105,9 +105,12 @@ 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")