github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,130 Commits
3 Branches
68 Tags
143 MiB
Commit Graph

1130 Commits (2c0dc9d8054e34bf7dbc12a45fa2799ae27c8a73)

Author SHA1 Message Date
Qiuyi LI 2c0dc9d805 Update version: release 1.9.3 2024-01-12 16:29:28 +01:00
Qiuyi LI 382eb3e65d
Merge pull request #54 from LQYBill/dev 
Release 1.9.3
 2024-01-12 16:23:35 +01:00
Qiuyi LI fdd5159032
Merge pull request #53 from LQYBill/fix/breakdownInvoice 
fix : reintroduce PDF in breakdownInvoice + conditional balance update
 2024-01-12 16:17:45 +01:00
Gauthier LO c64bed04ee fix : reintroduce PDF in breakdownInvoice + conditional balance update 
feature : SkuAssociationToClientJob
 2024-01-12 16:10:00 +01:00
Qiuyi LI d8ab00463b
Merge pull request #52 from LQYBill/release 
Release
 2024-01-11 16:55:34 +01:00
Qiuyi LI 2b5635e8ec Update version: release 1.9.2 2024-01-11 16:54:49 +01:00
Qiuyi LI ad0994b84e
Merge pull request #51 from LQYBill/dev 
Release 1.9.2
 2024-01-11 15:42:18 +01:00
Qiuyi LI d2cad68020
Merge pull request #50 from LQYBill/fix/InitBalanceError 
fix : handle not initialized balance error and uninvoiced purchase fe…
 2024-01-11 15:08:43 +01:00
Gauthier LO 7c02621910 fix : typo 2024-01-11 15:02:09 +01:00
Gauthier LO 3fdf1d27eb fix : handle not initialized balance error and uninvoiced purchase fees orders 2024-01-11 11:41:01 +01:00
Qiuyi LI 323d22935c
Merge pull request #49 from LQYBill/fix/clientInvoice 
fix : display shipping invoiced orders with invoiceable purchase fees…
 2024-01-10 14:34:28 +01:00
Gauthier LO f6518e327e
Update InvoiceController.java 
notification dest
 2024-01-10 12:10:47 +01:00
Gauthier LO 0795f245c2 fix : added enum to describe invoice status and product availability 2024-01-10 11:57:59 +01:00
Gauthier LO be558d5c9a fix : display shipping invoiced orders with invoiceable purchase fees + replace purchaseOrder status with paidAmount 2024-01-10 11:38:16 +01:00
Qiuyi LI 4ef217249e
Merge pull request #48 from LQYBill/dev 
Merge new feature into release
 2024-01-08 16:20:21 +01:00
Qiuyi LI 52969ecd7c
Merge pull request #47 from LQYBill/fix/PurchaseOrder 
fix : better purchase status + better job name display
 2024-01-08 14:43:13 +01:00
Gauthier LO 6f05d8c1bb fix : better purchase status + better job name display 
feature :client invoicing internal use
 2024-01-08 12:23:09 +01:00
Qiuyi LI 79d610ce5f Update version: release 1.9.0 2024-01-05 12:32:50 +01:00
Qiuyi LI 1c73c09305
Merge pull request #46 from LQYBill/dev 
Merge new feature into release
 2024-01-05 12:20:48 +01:00
Qiuyi LI 5b0e4afe42
Merge pull request #45 from LQYBill/release 
Merge hotfix 1.8.2 to dev
 2024-01-05 12:10:31 +01:00
Qiuyi LI 5930515a90
Merge pull request #44 from LQYBill/feature/creditPage 
Feature/credit page
 2024-01-05 11:22:43 +01:00
Gauthier LO bbbf298825
Update ShippingInvoiceController.java 
cleanup convertToPdf function not deleted during merge
 2024-01-05 09:41:57 +01:00
Qiuyi LI daecbead81
Update ShippingInvoiceController.java 2024-01-04 17:12:32 +01:00
Gauthier LO fdec4d77f1 Merge remote-tracking branch 'origin/feature/creditPage' into feature/creditPage 2024-01-04 17:02:55 +01:00
Gauthier LO b59b2ba00c feature : transaction.sql updated 2024-01-04 17:02:32 +01:00
Gauthier LO b426e836ed
Merge branch 'dev' into feature/creditPage 2024-01-04 16:29:23 +01:00
Gauthier LO 67cb86e25b feature : feature : Self-service invoicing rework + Purchase Order Registration Page + ShippingFeeBillableNotificationJob 2024-01-04 15:57:15 +01:00
Gauthier LO b2a8e88559 feature : feature : (WIP)Self-service invoicing rework + Purchase Order Registration Page + SkuShippingQtyJob 2023-12-08 17:39:59 +01:00
Qiuyi LI a986295eb4 Hotfix : Update project version 2023-11-27 14:56:15 +01:00
Qiuyi LI ca7be03720 Add parcel trace translation for HL 2023-11-27 14:55:53 +01:00
Qiuyi LI be5a9694f2
Merge pull request #43 from LQYBill/release 
Release 1.8.1
 2023-11-21 15:28:22 +01:00
Qiuyi LI c494a9cd02 Update project version 2023-11-21 15:27:25 +01:00
Qiuyi LI 33b450ba28
Merge pull request #42 from LQYBill/dev 
Release 1.8.1
 2023-11-21 15:26:16 +01:00
Qiuyi LI 15d01493f2
Merge pull request #41 from LQYBill/hl_job_adaptation 
Hl job adaptation
 2023-11-21 15:23:55 +01:00
Qiuyi LI 6ac3ce6bf6 Create YPJob 2023-11-21 15:22:21 +01:00
Qiuyi LI 09bcd7938c Refactor HLJob to make it possible to change request URL 2023-11-21 15:22:01 +01:00
Gauthier LO b718a23b9c feature : confirmed clients invoicing job 2023-11-15 15:31:26 +01:00
Qiuyi LI 0419db4f72
Merge pull request #40 from LQYBill/release 
Release
 2023-11-14 15:56:31 +01:00
Qiuyi LI 171baab56e Release 1.8.0: Improve tube adding algo and 30cm tubes 2023-11-14 15:27:25 +01:00
Qiuyi LI c97b95f4e5
Merge pull request #39 from LQYBill/dev 
Merge 30cm tubes feature to release
 2023-11-14 15:13:27 +01:00
Qiuyi LI 1c0403fcf8
Merge pull request #38 from LQYBill/release 
Merge release to dev
 2023-11-14 15:12:16 +01:00
Qiuyi LI 48d783c7ba
Merge pull request #37 from LQYBill/feature/30cmPortraitTubes 
Feature/30cm portrait tubes
 2023-11-14 15:10:15 +01:00
Qiuyi LI 140997994a Replace old algo by new algo 2023-11-14 14:26:05 +01:00
Qiuyi LI 0c57d68a12 Validate tests with improvement in case of two 40cm canvases and 50cm canvases 2023-11-14 14:20:23 +01:00
Qiuyi LI a2f27094c3 Create a new method for finding adequate tubes and a main to test for regression 2023-11-13 16:10:22 +01:00
Gauthier LO 6978554075 fix2 : credit editing now correctly updates balance + allow only editing of last credit per currency 2023-10-31 14:29:19 +01:00
Gauthier LO 1efb88c7a1 feature : VipInvoicingJob + (WIP) client category 2023-10-30 15:26:36 +01:00
Qiuyi LI b05fd4445e Update project version 2023-10-25 11:40:41 +02:00
Qiuyi LI 43b31e5e9a Hotfix: Update CWJob API key and secret to retrieve parcel traces of another YDH account 2023-10-25 11:40:04 +02:00
Gauthier LO cd924ce2d1 feature : (WÏP) credit Page + balance + invoicing 2023-10-13 14:38:36 +02:00