Commit Graph

1657 Commits

Author SHA1 Message Date
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 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 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 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 49d4110241 fix remove correct po item 2023-10-04 23:21:00 +08:00
edmondlang db2384a235 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-04 13:02:34 +08:00
Jia Sheng Lee a0f600037b import purchase order function 2023-10-03 22:35:37 +08:00
edmondlang c805ce1fd8 Merge branch 'steve/allow-revert-matched-transactions' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-03 15:50:55 +08:00
edmondlang 23c14b0e4f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into steve/fix-statement-module 2023-10-03 15:46:57 +08:00
Steve Ng 0882a4d91f enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:21:29 +08:00
Steve Ng 9938615fe4 enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:20:11 +08:00
JiaSheng 5445b7f0a6 update 2023-10-01 15:10:38 +08:00
edmondlang 5f7df8ab36 update account mapping - reference link 2023-09-30 20:02:52 +08:00
edmondlang 9308975c4a update bull number to 7 digits 2023-09-30 20:01:38 +08:00
Steve Ng 229a972787 fixing code in statement module 2023-09-30 19:37:49 +08:00
Steve Ng 67ea1c7de4 fixing code in statement module 2023-09-30 19:29:36 +08:00
edmondlang 52e6454716 deploy module download bulk invoice 2023-09-30 15:51:09 +08:00
edmondlang 287ef64d86 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-09-30 14:24:04 +08:00
JiaSheng ec83540a40 wallet pagination filters 2023-09-30 12:48:49 +08:00
edmondlang 9529823430 update generate bill number to random 10 digits 2023-09-29 11:21:36 +08:00
edmondlang 52851cee09 Merge branch 'steve/fix-view-statement-details' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-09-28 22:25:51 +08:00
edmondlang b0caccc0c1 update generate booking marking to 6 digits 2023-09-28 20:37:37 +08:00
edmondlang 4c972e63cf fix invoice number has decimals 2023-09-28 19:20:11 +08:00
Steve Ng 38b410a76d fix error in route statements.transactions.details 2023-09-27 23:55:13 +08:00
Steve Ng c87466723b fix error in route statements.transactions.details 2023-09-27 23:52:01 +08:00
edmondlang 8903743631 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-27 00:28:22 +08:00
edmondlang d740a0fac9 Merge branch 'company-wallet-transaction-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-09-27 00:15:51 +08:00
edmondlang bd33abb054 Merge branch 'company-wallet-transaction-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-26 20:40:50 +08:00
JiaSheng 0c2aa95bd4 fix mapping fail when more than one file is import 2023-09-21 17:37:57 +08:00
JiaSheng cc1229a27f company wallet transaction pagination 2023-09-19 00:09:09 +08:00
edmondlang 62c9b28bc4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-16 18:10:17 +08:00
edmondlang 6542710ba9 update ui for export Wallet Transaction History 2023-09-16 18:09:11 +08:00
edmondlang 823556b9b5 download wallet transaction history 2023-09-16 16:36:32 +08:00
edmondlang e80ae0f391 remove regenerate invoice at develeopment 2023-09-16 14:48:03 +08:00
edmondlang d041b08492 Merge branch 'regenerate-invoice-with-first-bill-no' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Console/Commands/RegenerateInvoice.php
2023-09-16 14:38:41 +08:00
edmondlang 9f2b431f21 regenerate-invoice-with-first-bill-no 2023-09-16 14:38:02 +08:00
edmondlang 1827f4b294 code clean up 2023-09-16 14:37:15 +08:00
edmondlang e7a708ef33 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-15 01:22:02 +08:00
JiaSheng 7596409d1e Merge branch 'get-transactions-from-production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-account-statement-issue
# Conflicts:
#	app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
2023-09-14 23:40:54 +08:00
JiaSheng a8a22ca1c3 fix error when getting transaction from shipping portal due to mistake in filters string 2023-09-14 15:01:30 +08:00
JiaSheng c374e46834 add functionality to get transactions from production when creating statement transactions owner 2023-09-13 22:03:32 +08:00