Commit Graph

3014 Commits

Author SHA1 Message Date
edmondlang dd9b20e824 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-18 15:37:18 +08:00
Steve Ng eaccb6a0cd fix store date conflict between different tabs 2023-10-18 14:39:33 +08:00
Jia Sheng Lee 02db4d7d5f fix download file name issue, and disable supplier selectable when data is fetching 2023-10-17 17:20:17 +08:00
Steve Ng d99f569d7c reduce queue job statement process qty 2023-10-16 20:07:33 +08:00
edmondlang 18ba789d44 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
#	app/Console/Kernel.php
#	routes/web.php
2023-10-16 12:14:18 +08:00
Steve Ng e18c1f39d0 enhance import invoice mapping conditions 2023-10-16 10:25:35 +08:00
Steve Ng f9c196a67c code for mapped report 2023-10-16 10:25:18 +08:00
Steve Ng 4ceeb6a317 code for import receipts 2023-10-16 10:25:02 +08:00
Steve Ng 72f4fee864 add edit at pending_export 2023-10-16 10:24:44 +08:00
Steve Ng 829ea9ad17 enhance import invoice mapping conditions 2023-10-15 22:42:47 +08:00
Steve Ng 521260d69f code for mapped report 2023-10-13 08:25:54 +08:00
edmondlang 5bd7a6104f delete all bulk download files 2023-10-12 19:12:52 +08:00
edmondlang 47ec38bb96 delete all bulk download files 2023-10-12 19:09:56 +08:00
edmondlang caff1ab5d5 show error message for bulk download 2023-10-12 18:57:14 +08:00
edmondlang 1eb227a63c show error message for bulk download 2023-10-12 18:53:26 +08:00
edmondlang 5b94b87448 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:48 +08:00
edmondlang 8dd0c3ee06 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:17 +08:00
edmondlang e4fcf8b392 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:11:24 +08:00
edmondlang 5ec7a4a61f update bulk download white form 2023-10-12 18:10:32 +08:00
edmondlang 843f36f1ba test bulk download white form 2023-10-12 16:28:39 +08:00
edmondlang c6747b24cd Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2023-10-12 16:15:10 +08:00
Jia Sheng Lee 3bbc4346c4 bulk download white form and supplier filter 2023-10-12 16:11:34 +08:00
edmondlang 549cd018fa Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Console/Kernel.php
2023-10-12 10:33:50 +08:00
edmondlang f17fe52011 enable upload csv for customer 2023-10-12 10:25:21 +08:00
Jia Sheng Lee 926397996d update invoice adjustment 2023-10-11 22:36:56 +08:00
Steve Ng 6599874d47 code for import receipts 2023-10-11 16:45:48 +08:00
edmondlang 56c8617920 remove cron job regenerate invoice - not using any more 2023-10-11 16:45:48 +08:00
edmondlang d58f24283e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into bulk-download-invoices
# Conflicts:
#	app/Console/Kernel.php
2023-10-11 00:51:49 +08:00
edmondlang 79150d4d84 remove cron job regenerate invoice - not using any more 2023-10-11 00:51:13 +08:00
edmondlang 2227139dd0 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
#	app/Console/Kernel.php
2023-10-11 00:29:05 +08:00
edmondlang 839dc28be2 update bulk download invoice 2023-10-11 00:26:26 +08:00
edmondlang 22c58eee95 update bulk download invoice pdf 2023-10-11 00:19:49 +08:00
edmondlang 2b9628a86f debug bulk generate invoice 2023-10-11 00:15:43 +08:00
edmondlang 2643109d45 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-10 23:32:24 +08:00
edmondlang b4a47ddf2d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into bulk-download-invoices 2023-10-10 23:31:08 +08:00
Steve Ng 841a6b0c66 add edit at pending_export 2023-10-10 10:49:18 +08:00
Steve Ng a32604cea1 this task for have a checkbox to selected which records want export invoices to autocount 2023-10-09 14:28:34 +08:00
Steve Ng d9d3c48e6d code for statement import invoice mapping 2023-10-09 14:28:11 +08:00
Steve Ng c610a1a99e Merge branch 'steve/checkbox-for-export-invoice' into development 2023-10-09 14:16:57 +08:00
Steve Ng f688ba972f this task for have a checkbox to selected which records want export invoices to autocount 2023-10-09 14:14:57 +08:00
Steve Ng 4e29145b50 Merge branch 'steve/mapping-import-invoice' into development 2023-10-06 11:00:59 +08:00
Steve Ng bc5d1eff88 code for statement import invoice mapping 2023-10-06 10:59:36 +08:00
edmondlang 6245b8783b Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-06 00:10:39 +08:00
edmondlang 70d9072e26 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-05 12:11:38 +08:00
edmondlang ddc1df0d6e Merge branch 'purchase_order_import' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-05 12:10:53 +08:00
edmondlang e83a1cc3aa update - only admin can upload po 2023-10-05 12:10:25 +08:00
Jia Sheng Lee 455a6fcc22 add sample template 2023-10-05 11:26:51 +08:00
edmondlang 49d4110241 fix remove correct po item 2023-10-04 23:21:00 +08:00
edmondlang ce86af5de5 Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-04 13:46:44 +08:00
edmondlang a3000e4d1a Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-04 13:03:00 +08:00