Commit Graph

187 Commits

Author SHA1 Message Date
Dillon def9682df3 Merge branch 'crm-changes' into dillon/development 2023-06-17 04:30:03 +08:00
Omair Saleh 2e9e7f9cc0 automatically complete tasks 2023-06-15 04:23:15 +08:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
Omair Saleh 6c03f97345 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 17:44:05 +08:00
Omair Saleh b954766e99 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 16:31:56 +08:00
edmondlang a98ac9b3ce Merge branch 'company-name-warning-text' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 14:43:00 +08:00
Omair Saleh 585ce66e3c xpo 03-2023 2023-06-01 23:52:18 +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
edmondlang 94b1b045c9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-30 19:06:47 +08:00
Omair Saleh b89b911f71 Merge remote-tracking branch 'origin/master' 2023-05-30 12:32:46 +08:00
Omair Saleh 1f105421a1 xpo 04-2023 2023-05-30 12:32:29 +08:00
edmondlang c79d9e916c Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-18 00:07:40 +08:00
edmondlang 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
omair saleh 591725daef Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!136
2023-05-16 04:38:49 +00:00
Omair Saleh e84f288d39 xpo jan & feb 2023-05-15 10:44:04 +08:00
Dillon 40641fb73f Merge branch 'dillon/crm-create-task-2' into development 2023-03-10 02:47:05 +08:00
Dillon 40e4aae185 CRM create all remaining tasks according to documentation 2023-03-10 02:42:00 +08:00
Dillon d3450a900a Merge branch 'dillon/crm-create-task' into development 2023-03-01 12:35:27 +08:00
Omair Saleh 764a4c4b84 Merge remote-tracking branch 'origin/master' 2023-02-23 15:59:41 +08:00
Omair Saleh 70cc33c776 update xpo 2023-02-23 15:59:28 +08:00
edmondlang bf3d1d0c23 remove text 2023-02-22 16:25:30 +08:00
edmondlang 83ee830022 Merge branch 'delete-1699-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-22 10:58:03 +08:00
edmondlang 0c21e6bd91 delete 1688 po 2023-02-22 10:47:28 +08:00
edmondlang 2d7aa54c8a Merge branch 'transfer-booking-owner' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-07 00:48:43 +08:00
edmondlang f4cc6113a7 transfer booking owner 2023-02-07 00:48:20 +08:00
Dillon 13ba4e5c12 Edit book recipient bank details 2023-01-20 01:23:03 +08:00
omair saleh f8ec4815a7 fix wallet insufficient balance when amount is below 0.01 2022-11-10 17:48:47 +08:00
omair saleh 62657e511c fix wallet insufficient balance when amount is below 0.01 2022-11-10 17:42:14 +08:00
omair saleh ca06fd03d5 delete 1688 purchase order for special customers 2022-11-03 12:23:49 +08:00
omair saleh 4f7f7bf7aa debug po upload 2022-10-28 10:05:22 +08:00
omair saleh 7892f37ed8 debug po upload 2022-10-28 10:03:23 +08:00
omair saleh a7d075dadf debug po upload 2022-10-28 10:01:52 +08:00
omair saleh b5acf80a29 fix regenerate invoice function to only include invoice documents 2022-10-11 17:48:30 +08:00
Omair Saleh bf18a18f1d update july xpo and pi 2022-09-27 11:31:44 +08:00
Omair Saleh ae4260dd15 update july xpo and pi 2022-09-27 11:24:19 +08:00
omair saleh 4555752218 generate invoices for 1688 orders 2022-09-08 20:22:30 +08:00
omair saleh fff77aee7f update june xpo 2022-09-01 17:50:22 +08:00
omair saleh b88bbc0eb7 xpo for may 2022-08-02 15:46:34 +08:00
omair saleh 409c53e9a0 fix upload purchase order 2022-07-27 13:21:03 +08:00
omair saleh b4b3fa33fd upload 1688 purchase order in pdf format 2022-07-21 14:56:29 +08:00
omair saleh 90461b172a Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderDocumentLogic.php
2022-07-11 23:56:40 +08:00
omair saleh 13068ef0c1 code clean up before merge to production 2022-07-11 19:59:50 +08:00
edmondlang 935eaa8fcd Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-07-11 14:59:40 +08:00
omair saleh 86707b3e91 update xpo 2022-06-28 13:57:27 +08:00
Leong Chee Siong 1d640e5d03 Merge branch 'debtor' into 'development'
no file error

See merge request CIEFWorldwideSdnBhd/exchange-2.0!106
2022-04-29 01:11:14 +00:00
glovetleong 7756726ea8 no file error 2022-04-29 09:09:58 +08:00
edmondlang 134868029a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Exports/Services/ExportsTransactions.php
2022-04-28 19:59:05 +08:00
omair saleh 058d994965 update xpo 2022-04-27 13:25:43 +08:00
glovetleong ac690be428 Invoice + PO + DO
Invoice + PO + DO + SDO
2022-04-24 12:24:01 +08:00