Commit Graph

1750 Commits

Author SHA1 Message Date
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng b6162f5355 update 2023-12-23 16:29:06 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang b759be4264 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-20 17:57:31 +08:00
edmondlang 89eaa78ee9 update logging 2023-12-20 17:57:03 +08:00
JiaSheng bf278e438e update group command 2023-12-20 17:41:10 +08:00
JiaSheng 603f29c9d0 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 19:17:32 +08:00
JiaSheng 4d057d0f5f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
update import cief lite
2023-12-18 19:15:34 +08:00
edmondlang 5da5902ba4 Merge branch 'fix-register-issue-with-autofill-credentials' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-13 20:03:45 +08:00
Omair Saleh 1ddf7923a5 show all active services for suppliers when not in segment 2023-12-13 13:38:54 +08:00
Omair Saleh 04da6d2107 Merge remote-tracking branch 'origin/master' 2023-12-13 13:37:13 +08:00
Omair Saleh 7aedaa3c17 show all active services for suppliers when not in segment 2023-12-13 13:36:54 +08:00
Steve Ng 44fbb14b36 change where condition for import receipts 2023-12-12 16:25:52 +08:00
Steve Ng 7ab1cd47e5 change where condition for import receipts 2023-12-12 16:24:36 +08:00
JiaSheng ae94a03a65 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-08 19:56:14 +08:00
JiaSheng a6c4a0350d -Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
-update import ambank statement logic
2023-12-08 19:53:09 +08:00
edmondlang 780bbe7333 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-07 10:09:36 +08:00
JiaSheng cbc3fb56d4 fix pay booking by wallet bug 2023-12-07 01:05:17 +08:00
Steve Ng 7b936b2ce5 fix bug in import invoice 2023-12-06 21:54:15 +08:00
Steve Ng a1e5d11739 fix bug in import invoice 2023-12-06 21:52:09 +08:00
Dillon Ngo 120ea642c5 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-06 13:38:03 +08:00
Dillon Ngo 1212ec37b8 Fix a decimal problem reported by kexin 2023-12-06 13:37:45 +08:00
Dillon Ngo 864a0a7faf Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-04 12:59:09 +08:00
Dillon Ngo c7c7ee8c0c Fix a problem on voucher expiration date inaccurate 2023-12-04 12:58:18 +08:00
Steve Ng cad933ed59 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:59:49 +08:00
Steve Ng 1c29e45744 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:58:55 +08:00
JiaSheng 6c0d0be3eb import ambank and cief lite statement 2023-11-30 18:04:00 +08:00
JiaSheng 7ab938ebee Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
2023-11-24 17:28:22 +08:00
JiaSheng fbd94f01b8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into centralize-izyim-exchange 2023-11-24 17:14:34 +08:00
Steve Ng db4e9e6e95 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:06:37 +08:00
Steve Ng f2cc75a898 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:04:38 +08:00
JiaSheng 8f20c0e8a8 updates for dev environment 2023-11-22 16:18:02 +08:00
JiaSheng 1f057e464e updates 2023-11-19 18:05:52 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Steve Ng 84d5af39f5 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:50:59 +08:00
Steve Ng d8a4510fc4 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:49:51 +08:00
edmondlang 960f0b71a4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-09 10:21:22 +08:00
edmondlang 6fe1ca3e0e update regenerate invoice 2023-11-09 10:21:04 +08:00
edmondlang 51766b6caa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into regenerate-invoice-with-first-bill-no 2023-11-08 00:11:44 +08:00
edmondlang 1990a843d5 Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-05 17:35:25 +08:00
edmondlang 46f802109e update template 2023-11-05 17:35:06 +08:00
edmondlang 29ca393a7f update template 2023-11-05 17:07:36 +08:00
edmondlang b7a800dee7 update template 2023-11-05 16:58:13 +08:00
edmondlang 4d23e0cb9c Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-04 23:18:03 +08:00
JiaSheng 7d94776543 fix bcmath function bug 2023-11-04 22:28:16 +08:00
JiaSheng f98607bc32 filters update 2023-11-04 11:52:34 +08:00
Steve Ng b3a6a9cdcc fix bug unmapped invoice 2023-11-04 10:48:11 +08:00
Steve Ng db88edabfe fix bug unmapped invoice 2023-11-04 10:45:41 +08:00
JiaSheng c11f6dab7a fix account statement transaction not tally issue 2023-11-04 09:59:16 +08:00
JiaSheng d6754014aa account-statement-pagination 2023-11-04 00:00:58 +08:00