Commit Graph

2728 Commits

Author SHA1 Message Date
atm-corentin
66ac556770 NEW|New - add drag-and-drop functionality for managing draft expedition lines (#36311)
* ticket progress nullable (#36178)

* ticket progress nullable

* ticket progress nullable

* clean code (#36180)

* clean code

* clean code

* clean code

* Fix update of color when using HTML5

* CSS

* css

* Fix date input on smartphone

* css

* css

* css

* Clean code

* Responsive

* NEW add hourly rate in list of users

* Fix reset of budget

* Clean code

* Debug v23

* Fix regression

* Debug v23

* CSS

* Qual: Update Phan baseline.txt (#36190)

#Qual: Update Phan baseline.txt

Update the Phan baseline.txt file to reflect changes in the number of occurrences of specific issues.

* clean code (#36179)

* clean code

* clean code

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* NEW Holiday - Allow to specify a specific mail address from (#36184)

* NEW Holiday - Allow to specify a specific mail address from

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Make $fields covariant, define type for $FIELDS in BankAccounts api (#36188)

* Qual: Make $fields covariant

* Qual: Update BankAccounts class phpDoc ($FIELDS)

# Qual: Update BankAccounts class phpDoc ($FIELDS)

Updated the documentation for the $FIELDS property.

* NEW Dashboard - Add option in ihm to disable MRP thumb (#36185)

* Fix CI

* Removed PROPALE_ADDON_NOTE_PUBLIC_DEFAULT. Must use the generic feature
"default value feature"

* Clean code

* css

* Fix CI

* Doc

* FIX Import/Export - Do not list imports or exports of Builder module backups of module descriptor files (#36192)

* FIX Import/Export - Do not list imports or exports of Builder module backups of module descriptor files

* FIX

* Add phone info in form public/members/new.php (#36119)

* Add phone info in form public/members/new.php

* Use GETPOST instead of GETPOSTISSET

* FIX wrong path of libraries (#36194)

* Updated PHPDoc (#36191)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Fix 35017 accounts for local taxes 2 (#36160)

* FIX#35017 add locattaxes accounts to accounting defaults

* corr. libellés localtax pour afficher le bon pourcentage

* assurer la cohérence de la structure def_tva

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* NEW stock API GET movement (#36193)

* Added stock movement GET method

* Updated PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* css

* Fix js not found

* Add sortorder parameter to selectForFormsList method (#36173)

there are a problem on many extrafields list : we can't sort list by decrease and sort from a specific fields since we have add an sql prevention on filter based on : separator (who is used to separate parameters)

@eldy  i propose to remplace on extrafields parameters the : in the sql injection prevention by another caracters, by exemple the ; or the § , and replace it after having explode all the parameters

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* css

* Removed duplicated code

* Debug v23

* Add property parent

* Debug v23

* Manage position of captcha modules. Fix responsive of setup page.

* Debug v23

* Try to fix phpstan

* Clean language files

* Debug v23

* Fix regression

* WIP LNE

* Drop a not used column to simplify

* Add test on data decryption

* PHPStan > Update baseline (#36208)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>

* FIX member photo and thirdparty logo not deleted in documents directory (#36197)

* FIX member photo with web portal don't need login

* FIX member photo not deleted

* FIX pre-commit

* FIX phan error and uniformize code

* FIX pfffffff pre-commit

* FIX uniformize code

* FIX remove TODO

* FIX change const name

* FIX missing add in ECM during creation

* FIX add user photo in ecm

* FIX phan error

* display member photo with hash (#36205)

* display member photo with hash

* display member photo with hash

* display member photo with hash

* display member photo with hash

* FIX adding tms and datec to email templates (#36189)

* NEW: adding tms and datec to email templates

* Escaping a timestamp string I just generated myself

* switching single and double quotes in escape line for tms and datec to make the build system happy?

* Add an id to the table

* showing better names than tms and datec

* Changing code to label to fix #29116

* using hregis advice to use idate not escape the string with date

* requested changes

* forgot to add my name to editors

* had to make class changes for API to work

* setting datec back to int|string

* removing unused code lines and using idate in the api file

* no tms in create or update, but select. No datec in update

* expanding hurl tests to prevent post with id or tms, put with id or datec

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>

* Update ticket.class.php (#34932)

* Update ticket.class.php

bad init in class

* Update ticket.class.php

* Update ticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* WIP LNE

* Debug v23

* fix stock display in replenish (#36209)

* [FEAT] Displaying the label instead of the id (#36210)

* Fix rename of function

* fix typo in interface_20_modWorkflow_WorkflowManager.class.php (#36212)

* add interventional feature on subtotal admin (#36207)

* Fi CI

* Fix CI

* Fix CI

* NEW Add Type, Description columns to Project Overview Expense Reports (#36214)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>

* Fix PHP Warning:  Undefined array key "nblinesnull" in /var/www/html/projet/element.php (#36198)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>

* FIX use $this->db instead $db (#36219)

* FIX use $this->db instead $db

* FIX use $db with static function

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add date_c update on project_task (#36217)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Trans

* Responsive

* Fix autogenerate login

* Update commondocgenerator.class.php (#36227)

* clean code (#36228)

* Fix typo in DLLMissing message for MyGerman.isl (#36223)

* Fix typo in DLLMissing message for MyGerman.isl

Typos:
- s/Mcrsoft/Microsoft/g
- s/credist_x86.exe/vc_redist.x86.exe/g
- dl link

* Fix DLLMissing message link for Visual C++ Redistributable

Updated the link for the Microsoft Visual C++ Redistributable installation instructions.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* harmonize fields orders between holiday and expensereport (#36222)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Update header_login.tpl.php (#36220)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* avoid changing object after call (#36159)

* avoid changing object after call

* avoid changing object after call

* avoid changing object after call

* avoid changing object after call

* avoid changing object after call

* avoid changing object after call

* avoid changing object after call

* clean code

* clean code

* clean code

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* clean code

* clean

* clean

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Implement setCategories method in task class (#36218)

Added setCategories method to manage task categories.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* check access doc for massfilesarea_stock (#36229)

* clean code (#36230)

* New : action to clone ticket (#36231)

* Clean permissions

* Debug v23

* Tipo

* clean code (#36233)

* clean code

* Update html_cerfafr.modules.php

* Update interface_50_modEventOrganization_EventOrganization.class.php

* Fix case

* add phone mobile of target (#36234)

* Debug v23

* WIP

* Short version of Go back

* Fix bad translation string

* Fix trans

* CSS

* css

* css

* Debug v23

* css

* Debug v23

* Doc

* Fix CI

* FIX add constant for the member photo width in web portal + avoid error (#36221)

* Close #35917

* Fix regression

* Fix type

* Fix GETPOST

* Fix GETPOST

* Fix SQL

* Fix error reporting

* Fix warning

* CSS

* Fix CI

* Fix CI

* Fix CI

* Fix CI

* Fix CI GETPOST -> GETPOSTINT

* Fix CI

* Fix CI

* Trans

* add gps position for files (#36240)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* clean code (#36241)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* PHPStan > Update baseline (#36242)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>

* New import profile for leave requests (#36244)

Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>

* WIP LNE

* WIP LNE

* add show and filter in fields public and private notes (#36255)

* NEW Add SQL table for expensereport line extrafields support (#36251)

* Fix: Correct unit comparison bug in webportal document download (#36256)

The file size check was comparing bytes (from dol_filesize) directly with
kilobytes (from MAIN_SECURITY_MAXFILESIZE_DOWNLOADED config), causing false
positives that blocked downloads of small files.

Example: A 94 KB file (96678 bytes) was rejected because 96678 > 20480,
even though the limit was actually 20480 KB (20 MB).

Changes:
- Convert KB limit to bytes before comparison: $fileSizeMax * 1024
- Improve error message to display file size in KB for consistency
- Add detailed logging with both bytes and KB values

Fixes: Files under the configured limit are now correctly allowed to download

* NEW - Add a new API "product lots" (#36243)

* Add new API product lots

* fix precommit

* CSS

* NEW Introduce getCurrency(). $conf is no more allowed into computed
formulae.

* Doc

* Doc

* Trans tooltip

* NEW Invert logic of default date in proposal/order/invoice creation:
Need option to NOT autofill instead of the opposite.

* WIP LNE

* Fight against optionflation.

* Trans

* Trans

* The script generate_filelist_xml.php can check integrity from command
line.

* Doc

* Doc

* Debug

* Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

* Simple way to trap error to Close #36292

* Clean code

* Fix CI

* Fix CI

* Bump mdeweerd/logToCheckStyle from 2025.1.1 to 2025.11.2 (#36284)

Bumps [mdeweerd/logToCheckStyle](https://github.com/mdeweerd/logtocheckstyle) from 2025.1.1 to 2025.11.2.
- [Commits](https://github.com/mdeweerd/logtocheckstyle/compare/v2025.1.1...v2025.11.2)

---
updated-dependencies:
- dependency-name: mdeweerd/logToCheckStyle
  dependency-version: 2025.11.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update admin.lang (#36293)

* Update loanschedule.class.php (#36272)

Solve Error when schedule loans : "ERROR: 55000: currval of sequence "llx_payment_loan_rowid_seq" is not yet defined in this session LOCATION: currval_oid, sequence.c:884"

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Fix phpunit

* Update SecurityTest.php (#36295)

* Update SecurityTest.php

* Update SecurityTest.php

* Update SecurityTest.php

* PHPStan > Update baseline (#36264)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Update pre-commit hooks (#36262)

* Qual: Update pre-commit hooks

# Qual: Update pre-commit hook

Updated several pre-commit hooks as long as the new ones are not alpha or beta versions

* Qual: Fix/ignore some shellcheck issues

* Qual: Enhance hurl test documentation and run script (#36291)

- Added detailed documentation for running specific tests, including options and exclusions
- Improved installation instructions with platform-specific guidance
- Enhanced error handling and user feedback
- Added support for GitHub-compatible messages
- Improved script structure and readability

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: (commonnumrefgenerator): Add abstract method getExample (#36271)

- `getExample()`: Returns an example of the numbering format

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* FIX: Fix version extraction in setup_conf.sh (#36281)

# FIX: Fix version extraction in setup_conf.sh

The version extraction regex was updated to handle both DOL_VERSION and DOL_MAJOR_VERSION constants in version.inc.php.
The version is now available as DOL_MAJOR_VERSION since 29b1e75

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* FIX QUAL intervention API close (#36278)

* Refactored close method

* Updated PHPDoc

* Updated PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* can edit color in dict.php (#36270)

* can edit color in dict.php

* Update html.form.class.php

* Update html.form.class.php

* New tooltip freeze from experimental to develop branch (#36266)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Look and feel Debug v23

* Debug v23

* Close #36298

* Qual: Change field name to let phan warn about argument order (#36261)

* FIX wrong $param parameter position

* FIX ok it's good ! ;-)

* Qual: Change field name to let phan warn about argument order

# Qual: Change field name to let phan warn about argument order

Most of the time print_liste_field_titre() is called with $param instead of $moreparam.
By changing the argument name, phan will warn if the position is likely incorrect.

* Fix: Fix parameter order in print_liste_field_titre calls

- Fixed parameter order in print_liste_field_titre calls to maintain consistency

---------

Co-authored-by: Regis Houssin <regis.houssin@inodbox.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* clean code (#36260)

* clean code

* clean code

* clean code

* clean code

* fix $val might not be defined

* fix phpstan errors reported

* fix phpstan errors reported

* fix phpstan errors reported

* fix phpstan errors reported

* fix phpstan errors reported

* fix phpstan errors reported

* ignore phpstan reported for later

* clean code

* clean code

* clean code

* clean

* test

* Clean code

* Clean code

* add drag-and-drop functionality for managing draft expedition lines

* WIP LNE

* Debug v23

* refactor expedition card: clean up unused code and improve table rendering logic

* fix expedition card: correct colspan increment for draft status

* fix expedition card: adjust colspan indentation for better readability

* fix expedition card: uncomment shipment creation code for standalone mode

* fix expedition card: adjust colspan indentation to match coding standards

* fix expedition card: correct indentation of colspan logic to follow standards

* NEW Add hook on calcula_price() and get_default_tva()

* Comment

* Clean code

* fix expedition: add permission check for expedition details and update fetch_lines ordering logic

* Secure the dol_eval

* NEW Add filter on agenda event progression on agenda page

* fix css login page patch 01 (#36313)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* FIX #36306 (#36307)

* NEW Disable by default obfuscation methods and function in extrafields
evaluable strings. Can re-enable with
MAIN_ALLOW_OBFUSCATION_METHODS_IN_DOL_EVAL=1

* Doc

* MAIN_DISALLOW_STRING_OBFUSCATION_IN_DOL_EVAL replaced with
MAIN_ALLOW_OBFUSCATION_METHODS_IN_DOL_EVAL

* Doc

* Add config param $dolibarr_main_restrict_eval_methods with whitelist of
functionsallowed in dol_eval. Advisory GHSA-x3w7-24rq-gvc5

* fix expedition: ensure expeditiondet rows remain in sync during drag-and-drop reorder operation

* fix expedition card: reindent colspan logic for consistency with coding standards

* Fix CI

* Qual: Update phan baseline (#36318)

# Qual: Update phan baseline

Remove fixed notices from exceptions.

* fix expedition: add phpcs annotations to suppress naming convention warnings around scope

* Doc

* Fix CI

* Fix CI

* Fix ci

* Fix CI

* Fix CI

* Fix ci

* Fix css login page patch 02 (#36320)

* fix css login page patch 01

* fix css login page patch 02

* fix css login page patch 02

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Clean code

* Fix CSS

* Fix CI

* Add product type check in line validation (#36319)

* Add product type check in line validation

needed by sous total plugins style which use line with type 9 for title, subtitle or free text. without the chek inb line validation, title, sub title or free text disappears

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Migrate holiday files

* FIX Move 'holiday' from old path array to new one (#36308)

* Remove 'supplier_invoice' from old path array

* Update module path in arrayforoldpath

Sorry Eldy, I was confused. You are absolutely right, it is already corrected.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix: PhanTypeMismatchProperty error in invoice creation (#36323)

* 🐛 Fix PhanTypeMismatchProperty error in invoice creation

The error occurred due to incorrect type handling in the invoice creation process. The changes fix this by properly handling the subtype field as an integer. This ensures type consistency and prevents potential runtime errors.

* FIX: Correct assignment to linkedObjectsIds  in card.php

# FIX: Correct assignment to linkedObjectsIds  in card.php

Modified the structure of linkedObjectsIds to include the rowid as a key to match the property type.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* PHPStan > Update baseline (#36305)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>

* Accountancy - Resolve some problem on new function "Discount in accountancy" (#36285)

* FIX Accountancy - Discount wrong function & problem HTML injection

* FIX Accountancy - Wrong base for already / not yet function - Piece_num is not enough strong et editable

* FIX Accountancy - Discount - Use closing date rather than the invoice date

* FIX

* PHPPhan

* Update accountingjournal.class.php

* Update accountingjournal.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Update expedition.class.php

* Update expedition.class.php

* Improve shipment line handling: fix origin/ID management, add extrafields display, and handle unchanged lines

* fix

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: MDW <mdeweerd@users.noreply.github.com>
Co-authored-by: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Co-authored-by: Aksanti Bahiga tacite <71480535+marcellintacite@users.noreply.github.com>
Co-authored-by: Regis Houssin <regis.houssin@inodbox.com>
Co-authored-by: William Mead <william@m34d.com>
Co-authored-by: Vincent de Grandpré <vincent@de-grandpre.quebec>
Co-authored-by: Charlène Benke <1179011+defrance@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Jon Bendtsen <github@jonb.dk>
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Norbert Penel <homer8173@gmail.com>
Co-authored-by: PierrickV <8960084+PierrickV@users.noreply.github.com>
Co-authored-by: Maxime Kohlhaas <maxime@atm-consulting.fr>
Co-authored-by: Eric - CAP-REL <1468823+rycks@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>
Co-authored-by: HeilDenDus <rafagledesma@gmail.com>
Co-authored-by: Rudi Herouard <rudi.herouard@gmail.com>
Co-authored-by: Gigarun ingénierie <thomas@gigarun.eu>
Co-authored-by: atm-lucas <121817516+atm-lucasmantegari@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sweetcorreze <76868896+sweetcorreze@users.noreply.github.com>
Co-authored-by: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Co-authored-by: Marc <99648320+emheyarssi@users.noreply.github.com>
Co-authored-by: iouston <4319513+iouston@users.noreply.github.com>
Co-authored-by: Yamil Esteban Garcia <120027058+developmentOYR@users.noreply.github.com>
Co-authored-by: Quentin VIAL--GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
2026-03-18 11:28:26 +01:00
minimexat
57812a1272 Fix PHP warnings for undefined property and array keys in purchasesjournal.php (#37505)
* Fix missing POST/Redirect/GET after proposal validation

After confirm_validate succeeds, redirect back to the card so the
page renders with the correct post-validation state. Without this,
the Validate button stays visible even though the proposal was
already validated in the database.

Fixes #37480

* Fix missing billed field in expedition INSERT causing DB error

The billed column has no default value in llx_expedition, but was
not included in the INSERT statement in Expedition::create().
This caused a strict SQL error when creating delivery notes.

- Initialize $this->billed = 0 on the property declaration
- Add billed to the INSERT column list with value 0

Fixes #37452

* Update expedition.class.php

* Refactor proposal closing and document generation logic

Reload the proposal object after closing and before generating the document. Removed the redundant fetch call and the header redirection.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-03-15 13:52:13 +01:00
Rikard Bosnjakovic
6f4c1ef972 Whitespace in the middle of a tracking number will break the link when (#37501)
the user tries to follow the shipping, so we remove all whitespace.
2026-03-15 12:24:15 +01:00
Laurent Destailleur
ffcbe0263d Look and feel v24 2026-03-12 16:11:26 +01:00
Laurent Destailleur
a9c85c78e2 Automated merge from 23.0 to develop 2026-02-28 12:17:11 +01:00
Laurent Destailleur
7acb0e0d4d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-02-27 14:36:22 +01:00
Laurent Destailleur
77ba059635 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-02-27 14:35:48 +01:00
HENRY Florian
125caf1d4b fix: filter on shipping list on mass action (#37281)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-02-23 20:06:13 +01:00
Francis Appels
7eae776e13 Fix #37089, still some checks on PRODUIT_SOUSPRODUITS_ALSO_ENABLE_PARENT_STOCK_MOVE (#37115) 2026-02-07 23:28:36 +01:00
Francis Appels
6ce11adba1 FIX: #36944 father kits with lot (#37089) 2026-02-04 21:22:59 +01:00
Lucas Marcouiller
aa33f7c155 Fix duplicate button for delivery reciept creation on shipment object (#36914)
Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>
2026-01-29 22:55:02 +01:00
Laurent Destailleur
b623ea1f57 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-01-26 19:22:43 +01:00
Laurent Destailleur
360718fa7b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2026-01-26 19:19:13 +01:00
noec764
c19e4e33cb FIX: Massaction Create Bills from expedition (#36958)
Co-authored-by: Noé <noe@scopen.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-01-23 18:29:12 +01:00
Laurent Destailleur
8354d0a361 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-25 20:57:53 +01:00
Laurent Destailleur
e920456149 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-11-25 20:57:22 +01:00
Florian Mortgat
7f27552a95 FIX: empty origin type passed to addline when creating invoices from expeditions using massaction (confirm_createbills) (#36413) 2025-11-25 14:18:12 +01:00
HENRY Florian
7855469d5f FIX: in shippement creation with SHIPMENT_SUPPORTS_SERVICES and/or STOCK_DISALLOW_NEGATIVE_TRANSFER and/or stockable_product there are inconsistancies (#36140)
* FIX: in shippement creation with SHIPMENT_SUPPORTS_SERVICES and/or STOCK_DISALLOW_NEGATIVE_TRANSFER and/or stockable_product there was inconsistancies

* FIX: in shippement creation with SHIPMENT_SUPPORTS_SERVICES and/or STOCK_DISALLOW_NEGATIVE_TRANSFER and/or stockable_product there was inconsistancies
2025-11-06 17:01:25 +01:00
HENRY Florian
93a0b1f0e2 FIX: In shipment creation process, if product is not manage in stock, Dolibarr should not display a "low stock warning" (#36139)
* fix: In shipment, if product is not stockable, Dolibarr should not display a warning

* fix: In shipment, if product is not stockable, Dolibarr should not display a warning

* fix: In shipment, if product is not stockable, Dolibarr should not display a warning
2025-11-06 16:59:19 +01:00
Regis Houssin
fa10fc0f94 FIX avoid NULL value (#36126) 2025-11-06 13:15:03 +01:00
HENRY Florian
e7b390bceb fix: php8 warning (#36088)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-04 14:15:18 +01:00
ldestailleur
a9c0a59d59 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-10-03 13:00:22 +02:00
ldestailleur
1eeee0ab80 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-10-03 12:58:31 +02:00
John BOTELLA
5031572102 Fix trigger (#35610) 2025-10-03 11:44:53 +02:00
ldestailleur
5c14e454ad FIX #35573 FIX #35241 2025-10-01 16:13:01 +02:00
Regis Houssin
bca094a6a8 FIX avoid php warnings (#35492)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-27 13:28:04 +02:00
Regis Houssin
b0e0c9d17e FIX wrong extrafield template in create mode (#35241) (#35470) 2025-09-24 17:00:31 +02:00
ldestailleur
6ead2839d0 Fix missing several test on permission on actions 2025-09-23 16:41:53 +02:00
ldestailleur
eca129a433 FIX Date planned of delivery is not propagated from order to shipment
when creating a new shipment from an order.
2025-09-05 16:27:06 +02:00
sonikf
b1fe717d1a fix #34872 (#35150)
* Remove fk_product check brakes addition of free product lines

* Handle potential null for detail_children array
2025-09-01 19:31:39 +02:00
sonikf
8682fe81af fix typo (#34999) 2025-08-19 11:43:47 +02:00
ldestailleur
feeaf19e6d Debug the signature feature (broken) for shipment 2025-08-14 16:24:53 +02:00
ldestailleur
2c2f085b5c FIX #34936 2025-08-14 00:49:56 +02:00
ldestailleur
e33ae1afef Fix look and feel v22 (must use formconsumeproduce for action form) 2025-08-09 13:14:48 +02:00
ldestailleur
270caf0dcb Debug v22 2025-07-17 19:30:58 +02:00
Noé Cendrier
6608e972ab FIX: Trigger should be the same for same action (#34698) 2025-07-04 20:05:34 +03:00
Jyhere
787bd1d278 CHANGE: ternary simplification (#34675) 2025-07-01 20:34:09 +02:00
ldestailleur
0ae1f2fb9d Fix CI 2025-06-18 16:53:20 +02:00
ldestailleur
65bb64e9cd Fix CI 2025-06-18 16:24:37 +02:00
Charlène Benke
9577731b3a qual/fix : rewriting query generating error in certains case (#34305)
* Update facturestats.class.php

* Update expeditionstats.class.php

* Update fichinterstats.class.php

* Update expeditionstats.class.php

* Update facturestats.class.php
2025-06-04 14:36:53 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
Yannis Hoareau
1301cd36a1 NEW Subtotal module (#33502)
* Changes to follow mvc logic

* Reworked admin page and form to add lines

* Reworked adding line logic

* Adding options when editing subtotal lines

* Fix translations

* Fixed errors/displays and started pdf

* Color for subtotals pdf lines

* FIX display of subtotal totht

* Added pdf azur for propal

* Fix duplicate translation

* Added subtotal support for facture pdf

* Added subtotal support for commande pdf

* Improve UI/translations

* Restored old pdf

* Info to warn user for unsupported pdf

* Added title lines VAT rate and discount support

This is meant for future feature wich is block mass changing vat rate
and discount percentage

* Working on block apply vat and discount

* Added buttons for block actions

* Handle editing vat and discount for subtotal lines

* Editing vat and discount for subtotal lines bloc working

* Added possibility to move by block

* Updated adding and updating a subtotal line

* Improved vat and discount block update

* Improvement for block vat/discount and line edition

Editing a title line edits the corresponding subtotal line

* Improvement for moving by block

* Bad tile or st line placement managing

* Improved bad title or st line placement managing

* Adding subtotal line improved

Adding a subtotal line adds it right under its corresponding title

* Improved deleting subtotal line

Added possibility to choose if you want to delete the corresponding
subtotal line when deleting a title line

* Preventing too high level titles to be created

* Create and update line errors managing

* Improved bad title or st line placement managing

* Improved st line creation

* improve headers

* fix bad block placement managing

* fix adding st line not working if duplicates titles

* fix translations

* Fix block update

* FIX special chars bug

If special char like " ' " was used in title it could be converted to
special char entity.

* Prepare for pdf options

Pdf options like page break befor title should be shown as a picto if activated on a subtotal line on a document

* Added option managing

* Improved subtotal options and PDF integration

* Code refactor

* Action name/Error managment/PDF refreshing

When adding or updating a subtotal line

* Reformat

* Reworked subtotal options database managment

* Changed access to special code

* Remove unecessary call to php trait

* Changed definition of subtotals special code constant

* Reworked align on PDF

* Removed unecessary function and improved error managment

* Typo fix and removed treated todos

* Post typo changed for to better match subtotals names

* Disabled edit if status is not draft

* Changed way subtotals options are stored

* Added view managing when creating a document form an other

* Improved creating document from an other

Can check subtotals lines with table head checkbox and removed highlight
class for better UI.

* Make include of subtotals tpl more clear

* Manage centered or justified case

If user chose to center or justify, we don't change nothing

* Improved pdf

* Removed unecessary code block

* optimisation

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix and added missing translation

* Fix php code sniffer

* Reload page when setup saved on subtotals admin page

* Fix php code sniffer

* pjan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* php warning fix

* php warning fix

* php phan fix

* php phan fix

* php phan fix

* Fix bug admin page not loading because of const not defined

* php phan fix

* php phan fix

* FIX subtotals admin page display

* php phan fix

* FIX php phan

* Fix bugs and langs

* Fix bug pdf align

* Replace include by require

* Add headers to avoid refreshing and adding unwanted lines

* Fix phan

* Add GETPOST check for security

* Fix phan

* Fix phan

* Fix phan

* Subtotal option when creating a document from another

* Fix phan

* Add field subtotal options for subtotal lines

* Fix phan

* Fix phan

* Fix phan

* Update to follow mvc

* Fix php phan

* Fix php phan

* Fix phpstan/phan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Update to switch to extraparams

* Update to switch to extraparams

* Retrieve extraparams from db to objectline

* Modified last things to switch to extraparams

* Cleaning unnecessary code lines

* Fix php-stan

* Section subtotal in extraparams to differentiate if needed for further devs

* Fix phan

* Keep extraparams when creating from another object

* Change default value to false when creating a subtotal line

* Fix clone would not keep extraparams in new object

* Fix dark subtotal line background color

Fix when a subtotal background color is too dark and edit pencil or
delete trash could not be seen

* Fix typo

* Fix typo

* Added subtotals for facturerec

* Fix precommit

* Added extraparams when creating rec from fac and other way

* Fix phan

* Fix objectline null

* Desactivating block vat / discount update for facturerec

* reformating code

* Added expeditions for subtotal

* Save extraparams for shipping lines

* Display of subtotals lines in shipments

* Display when creating facture from shipments

* Improve display of lines and invoice creation from shipments

* Fix error if missing line rang

* Deleted duplicate

* Added deletion of subtotal line in shipping documents

* Not including subtotal lines if there is no product line in between

* Update get subtotal lines in shipment docs to disable

* Delete possibility to edit subtotal lines in shipments

* Handle pdf for shipment

* Handle conf stock or shipment supporting services

* Fix precommit

* Fix duplicate name creating bug

* Fix bug where id could be changed by the line id and would create bug

* Deleted subtotal lines when STOCK_SUPPORTS_SERVICES is enabled and block would only have service lines

* Disable shipments in admin modules

Shimpements subtotals lines are only created from commands

* Fixing phan and stan

* Deleted unused template and phan fix

* Fix phan

* Fix phan

* Fix phan

* FIX: phan

* Fix template bug

If document was not in subtotal scope and would use a template used by
subtotal it would create an error.

* Fix php-stan

* Fix bad display when modules and confs were activated

* Fix php codesniffer

* Excluding subtotal lines when mass updating

* Fix shipments service lines exluded + showing subtotal line with specific configs

* Fix line display with situation invoices + bug block line update

* Added ODT managment

This works with invoices but has not been tested with other documents

* Fix bug when editing VAT/discount by block

* Fix error raised when subtotal line added

Subtotal line had no fk_product and raised the error but we want this
line to have no fk product

* Fix precommit

* Added ODT template for documents that uses subtotals

This template can be usefull to understand how to create an odt template
using subtotals module

* Fix phan

* Fix phan

* fix: buttons showing in bad document status

* clean: unwanted commited files

* add: table examples to use with subtotals on ODT templates

* fix: Unwanted print of value when creating a document from another

* feat: renaming for better understanding

* feat: Improved templates for documents related to subtotals

---------

Co-authored-by: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-10 02:44:31 +02:00
Frédéric FRANCE
ff3cec75d0 fix translations (#34055) 2025-05-05 20:13:55 +02:00
ldestailleur
6d89c2c033 Clean code. Merge/Close #33995 manually. 2025-05-05 02:04:55 +02:00
Clément
585577d667 FIX Bug (#33964) 2025-04-24 15:37:30 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +02:00
Frédéric FRANCE
387e3b1da7 shipping can manage its contacts (#33680)
* shipping can manage its contacts

* shipping can manage its contacts

* fix

* add contacts from origin

* clean code

* apply changes

* apply changes
2025-04-01 20:47:40 +02:00
Frédéric FRANCE
65388c0743 clean code (#33683)
* clean code

* Update expedition.class.php
2025-04-01 13:26:54 +02:00
Frédéric FRANCE
15fce79455 remove duplicate code (#33681)
* remove duplicate code

* Update card.php
2025-04-01 11:10:54 +02:00
Noé Cendrier
bbfd7a3eda QUAL: doActions should be able to redefine default actions (#33637)
* QUAL: doActions should be able to redefine default actions

* FIX: no blank line in opening if
2025-03-28 15:03:24 +01:00