Commit Graph

115 Commits

Author SHA1 Message Date
omair saleh bf3c2d164c Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!137
2023-06-13 15:22:16 +00:00
Dillon ffe16baebc Merge branch 'dillon/voucherify-35' into development 2023-06-01 21:21:17 +08:00
Dillon f6cbb52bee Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35 2023-06-01 21:20:53 +08:00
Dillon cf09d3db9d Fix a problem based on logs: Illegal string offset 'message' 2023-06-01 21:20:27 +08:00
Dillon 455ce0fe08 Vourcherify manual merged conflict resolved 2023-05-30 22:33:26 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
Omair Saleh 1ede3edc08 fix bugs 2023-05-19 17:21:36 +08:00
Omair Saleh 93fd645bf6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
 Conflicts:
	routes/web.php
2023-05-16 12:17:43 +08:00
omair saleh 0129a9e11a Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!134
2023-05-16 03:34:26 +00:00
edmondlang 9edac99b97 test appprove group mapping transaction api 2023-04-29 00:43:46 +08:00
omair saleh ceb64a66a1 Merge branch 'development' into 'dillon/accounting-bank-mapping'
# Conflicts:
#   app/Http/Controllers/Accounting/BankStatementController.php
2023-04-18 04:10:13 +00:00
Omair Saleh 4a6ae598fa fix and update the functionality and the ui for accounting automation 2023-04-18 12:07:27 +08:00
Dillon 3e78b68ff2 Merge branch 'dillon/improvement-1' into development 2023-04-15 20:58:56 +08:00
Dillon c1b53973e5 Reduce flooding of logs from Perfex CRM 2023-04-15 20:58:21 +08:00
Dillon 1954cfa63c Mapping of bank statement records with exchange and shipping portal + UI to edit the details 2023-04-11 04:14:53 +08:00
edmondlang 2139a4ea0b change admin role type 2023-03-30 16:02:39 +08:00
edmondlang e29109b834 update honey trap with search 2023-03-20 23:14:56 +08:00
edmondlang 7cf7fdec54 honey trap 2023-03-17 18:40:48 +08:00
edmondlang 81cf90e4c0 update rate history 2023-02-12 19:50:28 +08:00
Omair Saleh fcbc55eabf fix update group rate, issue related to the logdata trait, it was trying to log pivot columns 2023-01-17 12:39:21 +08:00
Omair Saleh 8d2517ea40 fix update group rate, issue related to the logdata trait, it was trying to log pivot columns 2023-01-17 12:39:04 +08:00
Omair Saleh 0c80f1ead3 debug update group rate 2023-01-17 12:34:30 +08:00
Omair Saleh eebe07859b debug update group rate 2023-01-17 12:34:00 +08:00
Omair Saleh 544325ec3a debug update group rate 2023-01-17 12:28:30 +08:00
Omair Saleh bf599890fa fix log data for transactional tables 2022-12-18 15:14:11 +08:00
Omair Saleh dc1b0327ce log transactional data 2022-12-16 13:37:18 +08:00
omair saleh 12b226a828 hide smc and khc from incomplete po 2022-11-10 12:04:18 +08:00
omair saleh 4424fbd4e1 re categorize purchase order filters 2022-10-20 14:01:02 +08:00
Omair Saleh 52d67df968 fix create purchase order for 1688 processor 2022-09-30 05:16:33 +08:00
Omair Saleh 93560f841b show only purchase orders for bookings with confirmed payments 2022-09-30 04:41:22 +08:00
Omair Saleh f55384e205 show only purchase orders for bookings with confirmed payments 2022-09-30 04:38:50 +08:00
Omair Saleh 2945018f00 show only purchase orders for bookings with confirmed payments 2022-09-30 04:35:04 +08:00
Omair Saleh 6ad167f73e conditionally load wallet in company resource 2022-09-30 04:20:49 +08:00
Omair Saleh 6fde70cbc1 log list query exception 2022-09-30 04:11:33 +08:00
Omair Saleh a7e759b263 log list query exception 2022-09-30 04:08:51 +08:00
Omair Saleh e81f825323 log list query exception 2022-09-30 04:02:23 +08:00
Omair Saleh dadbbb60ba log list query exception 2022-09-30 03:58:32 +08:00
Omair Saleh 61b207b7b2 log list query exception 2022-09-30 03:55:18 +08:00
Omair Saleh 6986b2b09a add purchase orders list page 2022-09-30 03:51:19 +08:00
omair saleh c061af1a9e google recaptcha test 2022-08-16 16:21:47 +08:00
omair saleh eefbcbd6f8 google recaptcha test 2022-08-16 15:00:40 +08:00
omair saleh 7b2b4eccdb google recaptcha test 2022-08-16 14:49:56 +08:00
omair saleh e1ad965428 google recaptcha test 2022-08-14 17:29:15 +08:00
omair saleh 0a13fee091 google recaptcha test 2022-08-14 17:28:10 +08:00
omair saleh a5a36c72a1 google recaptcha test 2022-08-14 17:26:25 +08:00
omair saleh c50b47ce24 google recaptcha test 2022-08-14 17:21:34 +08:00
omair saleh b361d4c552 google recaptcha test 2022-08-14 17:13:47 +08:00
omair saleh 000dcd3c84 google recaptcha test 2022-08-14 17:11:22 +08:00
omair saleh 06c543198e google recaptcha test 2022-08-14 17:10:30 +08:00
omair saleh c56351589d google recaptcha test 2022-08-14 17:08:02 +08:00