Commit Graph

39081 Commits

Author SHA1 Message Date
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
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
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
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
cfef1b9f53 FIX Loading of deliveries from a shipment was loading everything 2025-03-10 23:53:31 +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
a9439d5b99 Add option DELIVERY_PDF_HIDE_SHIPPED and DELIVERY_PDF_HIDE_QTYTOSHIP for
storm template.
2025-03-10 16:28:37 +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
8c3b05d607 Clean code 2025-03-09 22:42:59 +01:00
ldestailleur
3658bc20b6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-09 22:29:21 +01:00
ldestailleur
1b2522d385 Fix CSS 2025-03-09 22:05:36 +01:00
ldestailleur
f8bdab213c NEW Try to set the tooltip as ajax call by default. 2025-03-09 21:49:30 +01:00
ldestailleur
401ae7b6c3 Fix css on smartphone 2025-03-09 21:42:07 +01:00
ldestailleur
202ffe732e Enhance phpunit tests 2025-03-09 21:26:51 +01:00
ldestailleur
af82f5f1eb Fix set of security option by default 2025-03-08 15:04:57 +01:00
ldestailleur
3e24bbd419 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-08 14:51:36 +01:00
ldestailleur
18a4224e5d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-08 14:51:04 +01:00
ldestailleur
02fed7d66f Better implementation for email setup. Close #33356 2025-03-08 14:40:52 +01:00
ldestailleur
c3401e5793 Fix typo in test
if class_exists('mysqli')
2025-03-08 14:17:34 +01:00
ldestailleur
e627c5b096 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-07 15:15:31 +01:00
ldestailleur
07177fab0a Fix join into implde 2025-03-07 13:15:01 +01:00
Faisal Azhar
b500efd6ff Update pgsql.class.php - function num_rows (#33358)
to avoid error when $resultset = null or false

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-06 18:14:50 +01:00
ldestailleur
948f041f46 Fix encoding space for scope must use %20according to OAUTH2 standard 2025-03-06 17:10:53 +01:00
ldestailleur
cee3d12305 Clean var 2025-03-06 16:31:26 +01:00
ldestailleur
48e6c70501 Fix urlencode 2025-03-06 16:31:05 +01:00
dolibarr95
781abe8615 code simplification (#33355)
see https://github.com/Dolibarr/dolibarr/pull/33347
2025-03-06 14:00:17 +01:00
Laurent Destailleur
7c0d2623c8 Merge pull request #33347 from dolibarr95/patch-77
FIX Variable $includemonday missing
2025-03-06 13:34:10 +01:00
Laurent Destailleur
e852019f31 Merge pull request #33348 from altairisfr/sign_pdf_internal_external
QUAL: Retrieves the name of external or internal PDF
2025-03-06 13:26:15 +01:00
Laurent Destailleur
201424d119 Update date.lib.php 2025-03-06 13:12:34 +01:00
Laurent Destailleur
524ef969e8 Update date.lib.php 2025-03-06 13:12:10 +01:00
ldestailleur
9276042264 Fix CI 2025-03-06 11:34:27 +01:00
Noé Cendrier
583c98f974 Merge pull request #30 from altairis-melina/sign_pdf_internal_external
FIX: Retrieves the name of external or internal PDF
2025-03-06 09:37:16 +01:00
dolibarr95
5d775dcb5d Add $includemonday var
Related to https://www.dolibarr.fr/forum/t/erreur-sur-calcul-de-conges/48690/43?u=dolibarr95
2025-03-06 08:44:39 +01:00
ldestailleur
d20e730c66 Clean code 2025-03-06 04:56:54 +01:00
ldestailleur
7a0e9d4dc1 Accept utf8 chars in the natural_search in mode 3. Close #32930 2025-03-06 04:00:42 +01:00