Commit Graph

127841 Commits

Author SHA1 Message Date
ldestailleur
acf84cec9b Better log 2025-03-12 15:55:11 +01:00
ldestailleur
2538baa4dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 17:31:51 +01:00
ldestailleur
f42b80794f FIX #33405 - Try a better fix including the billed flag 2025-03-11 17:31:41 +01:00
Alexandre SPANGARO
1d19cbfe1a Fix supplier order tags (#33402) 2025-03-11 17:23:33 +01:00
ldestailleur
89037af953 Fix phpunit 2025-03-11 17:22:39 +01:00
ldestailleur
f4bee4810e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 10:45:36 +01:00
ldestailleur
63dd269dfa SEC FIX Reflected XSS reported by 柏天浩 2025-03-11 10:43:25 +01:00
ldestailleur
a65f699528 FIX Reflected XSS reported by 柏天浩 2025-03-11 10:38:26 +01:00
ldestailleur
620cb5c90a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 10:22:05 +01:00
ldestailleur
b45a1c21ee NEW introduce method dolSetCookie 2025-03-11 10:21:45 +01:00
Vincent Maury
68818a451c Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:27:08 +01:00
Vincent Maury
4d26130212 Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:26:45 +01:00
Vincent Maury
fcaf26c253 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:25:12 +01:00
Vincent Maury
a93ca347c3 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:24:52 +01:00
Alexandre SPANGARO
4cb4be3774 NEW Supplier orders - Add tags/categories (#33386)
* NEW Supplier orders - Add tags/categories

* Fix CI

* Fix CI

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:20:26 +01:00
ldestailleur
7e40249364 Fix phan 2025-03-11 03:19:09 +01:00
ldestailleur
6a8e737187 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 02:59:52 +01:00
ldestailleur
9a77553e44 Clean code for #33351 - Remove useless distinct, aggregate and join. 2025-03-11 02:59:32 +01:00
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
MDW
a0f71fbe76 Qual: Fix phan notices (core/lib) (#33379)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)
2025-03-11 01:43:54 +01:00
Frédéric FRANCE
87ccfff7ce update session in db with user id (#33391) 2025-03-11 01:43:36 +01:00
MDW
c0f533865f Fix CI: Do not require some fields in the 'title' definition of $cols (#33399)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols
2025-03-11 01:42:49 +01:00
ldestailleur
ec904bd1db Look and feel v22 2025-03-11 01:40:09 +01:00
ldestailleur
9c0276fd38 NEW Can define a different PDF for concatenation for proposal, order and
invoices
2025-03-11 01:35:18 +01:00
ldestailleur
3ee40b748e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 00:40:31 +01:00
ldestailleur
a5a82bbb6e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 00:40:20 +01:00
ldestailleur
718ef9401a FIX #33360 2025-03-11 00:38:20 +01:00
Frédéric FRANCE
e980b46b0c clean missing translations (#33388) 2025-03-11 00:23:17 +01:00
ldestailleur
141288c1f0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 23:59:19 +01:00
ldestailleur
3de6ed0331 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:57:15 +01:00
ldestailleur
0b921141b8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:56:40 +01:00
ldestailleur
03cbf05f0f FIX Loading of deiveries in shipping card was loading everything 2025-03-10 23:56:04 +01:00
ldestailleur
b129c97363 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:55:29 +01:00
ldestailleur
ae0da2bf6d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:54:10 +01:00
ldestailleur
cfef1b9f53 FIX Loading of deliveries from a shipment was loading everything 2025-03-10 23:53:31 +01:00
ldestailleur
e7c05f744b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-10 22:59:51 +01:00
ldestailleur
200fa88e1d FIX Duplicate load of extrafield ->fetch_optionals() 2025-03-10 22:59:35 +01:00
ldestailleur
f7fa2ddf13 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 19:48:59 +01:00
ldestailleur
e362f99aa0 Fix serious regression 2025-03-10 19:24:21 +01:00
ldestailleur
f70f623466 Add missing authentication "NONE" into setup. 2025-03-10 18:26:01 +01:00
ldestailleur
a9439d5b99 Add option DELIVERY_PDF_HIDE_SHIPPED and DELIVERY_PDF_HIDE_QTYTOSHIP for
storm template.
2025-03-10 16:28:37 +01:00
ldestailleur
9907a87829 Clean duplicate const 2025-03-10 16:19:45 +01:00
ldestailleur
8bfda88aa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 16:17:39 +01:00
ldestailleur
c9f985f2f9 Clean code 2025-03-10 16:17:29 +01:00
ldestailleur
1bef5ba9b2 Option SHIPPING_PDF_HIDE_QTYTOSHIP supported in merou and espadon
module.
2025-03-10 16:17:18 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
ThomasNgr-OpenDSI
c9a27ae21d NEW : allow stock management by product (#32326)
* Code part

* Code part 2

* Fix : invert a const

* Fix : invert disable/enable stock values

* Fix

* Fix missing column from select inside sql request

* Fix input hidden missing name

* ajout d'un commentaire

* small fixes

* remove unrelated lines

* phpcs

* stickler fix

* pre-commit fixes

* pre-commit fixes

* pre-commit fix

* fix missing translation

* Fix phpstan

* fix winCI

* fix travis

* fix phpstan

* fix travis (hopefully)

* remove useless lines

* relaunch tests

* change stockable_product type from bool to int

* change test in Expeditin::addline() to allow adding a line for product with disabled stock management

* make stock management mandatory for products with batch number

* try to remove PHAN errors

* fix phpstan

* fix phpstan

---------

Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: mrozniecki <mrozniecki@easya.solutions>
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2025-03-10 10:49:53 +01:00
ldestailleur
6ac206e4e8 Fix regression on auth login. 2025-03-10 01:13:08 +01:00
ldestailleur
45877c8b6d Fix click on alert checkbox in project list 2025-03-10 00:46:07 +01:00
ldestailleur
cffc478b26 FIX Show the default duration of a membership type. 2025-03-10 00:37:54 +01:00