2
0
forked from Wavyzz/dolibarr
Commit Graph

9102 Commits

Author SHA1 Message Date
ldestailleur
507262a1a8 Test fix CI 2025-03-25 22:27:52 +01:00
ldestailleur
7b9b32cb9e Debug pgsql DDLInfoTable 2025-03-25 21:32:28 +01:00
ldestailleur
c95f4a8e6a Fix phpunit 2025-03-25 20:22:02 +01:00
ldestailleur
d7ededc1b2 Fix phpunit 2025-03-25 20:21:03 +01:00
Christophe Battarel
71acce0afb NEW : add new permissions to read supplier prices (#33598)
* add new permissions to read supplier prices

* Update modProduct.class.php

* Update modProduct.class.php

* Update modService.class.php

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-25 19:33:30 +01:00
ldestailleur
d33866426c Clean code 2025-03-25 19:04:52 +01:00
ldestailleur
64690564fd Fix bad directory for sql files 2025-03-25 19:04:33 +01:00
Alexandre SPANGARO
1cd2783bd2 NEW Add tags / category on supplier invoice (#33490)
* NEW Add tags / category on supplier invoice

* CI

* Fix condition if constant MAIN_USE_NEW_SUPPLIERMOD is used

* Fix link

* Fix typo

* Fix element type on export

* Fix element type on export
2025-03-25 16:28:51 +01:00
ldestailleur
c73eec72d5 Disable spellcheck on textarea to define path of dirs 2025-03-25 14:10:53 +01:00
Mathieu Schiffmann
b9946cef4a NEW #33506 Add a constant to apply a ratio to resize images in ODT templates (#33543)
* CLOSE #33506 add a constant holding the ratio to resize images in ODT templates

A new Dolibarr constant 					MAIN_DOC_ODT_IMAGE_RATIO
is taken in consideration for ODT templates.
This constant holds a number that is multiplied when computing the size of images in ODT templates.
All doc_generic_*_odt_modules.php files have been updated to call the setImage Method with a new parameter $ratio
The method setImage in the file odt.php has been modified to have a new parameter $ratio and use it to compute the image size

* FIX #33506 wrong branch

some other files needed to be changed in the develop branch

* FIX #33506 PR errors fixed

* FIX #33506 codesniffer errors fixed

* QUAL #33506 completed method comment
2025-03-24 16:41:00 +01:00
Frédéric FRANCE
eaf2194bd2 fix directory url (#33592)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 16:37:26 +01:00
ldestailleur
bb3989c9a7 NEW The signature is on the good page even if another module add pages 2025-03-20 12:01:18 +01:00
ThomasNgr-OpenDSI
643564d45c add advanced right to reopen a propal (#33416)
* add advanced right to reopen a propal

* use NOT insetad of empty() for getDolGlobalBool()

* fix travis
2025-03-19 18:12:02 +01:00
omogenot
070072e660 Add extra import contact key fields (#33528)
During company contact import, to distinguish between two contacts with same name, use extra key fields such as Zip code or email, so that a new contact with same name can be inserted.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 18:02:45 +01:00
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
ldestailleur
d0242ad032 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:15:23 +01:00
Vincent Quintin
7c3aa76fc8 Fix: Correct search_fk_statut=openall (#33523) 2025-03-19 14:14:33 +01:00
ldestailleur
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
atm-irvine
80d90a96bc feat(expedition): added project ref on expedition PDF (#33442)
* feat(expedition): added project ref on expedition PDF

* feat(expedition): added project ref on expedition PDF

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:26 +01:00
MDW
c3104905b3 Qual: Fix phan notices (html/core) (#33474)
* FIX: Replace compromised tj-actions/changed-files

# FIX: Replace compromised tj-actions/changed-files

See https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised .

* Add changed php file for test

* Qual: Fix phan notices (html/core)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 16:34:35 +01:00
ldestailleur
8082c7bd96 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 10:57:53 +01:00
Mohamed DAOUD
83a0faaf41 add phpmax and dolibarrmax (#33448) 2025-03-14 17:15:55 +01:00
Laurent Destailleur
051a902f1f Revert "Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW…" (#33454)
This reverts commit e943c9c97f.
2025-03-13 23:22:40 +01:00
Laurent Destailleur
e943c9c97f Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIV…" (#33453)
This reverts commit d93e8e2978.
2025-03-13 23:17:02 +01:00
ThomasNgr-OpenDSI
d93e8e2978 Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIVE_TRANSFER (#33444) 2025-03-13 23:15:04 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
Ferran Marcet
82a598d60c Fix: Not loading langs correctly (#33441) 2025-03-13 23:03:26 +01:00
ldestailleur
8d4a3b602d Fix phpunit test export categories 2025-03-12 16:25:56 +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
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
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
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
ldestailleur
6ac206e4e8 Fix regression on auth login. 2025-03-10 01:13:08 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
MDW
cf7b7009ae Fix writeHTMLCell arguments 2025-03-05 21:17:57 +01:00
ldestailleur
b058a2c270 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-05 18:15:07 +01:00
ldestailleur
7a995646e1 Fix bad property name 2025-03-05 18:13:20 +01:00
Laurent Destailleur
e874529873 Merge pull request #33250 from aspangaro/22_catinvoice
NEW Add invoice tags
2025-03-05 14:29:55 +01:00
Laurent Destailleur
f5a387138e Merge pull request #33311 from mdeweerd/fix/qual/api
Qual: Fix phan notices in api classes
2025-03-05 14:12:29 +01:00
omogenot
c562c6ebab Add is_numeric condition to check empty values 2025-03-05 13:39:50 +01:00
omogenot
c0c49f53cb Update export_excel2007.modules.php
Fix Excel Export for zero values
2025-03-05 13:39:29 +01:00