Commit Graph

724 Commits

Author SHA1 Message Date
Francis
377a567e4b Add hidden input for socid in card.php
In creation mode from an origin order, the socid is not input
2025-12-18 17:09:30 +01:00
nateogroup-antoine
205251d4b9 If an item in the order is not managed in stock, the default quantity offered during shipping is 0 rather than the quantity ordered.
If an item in the order is not managed in stock, the default quantity offered during shipping is 0 rather than the quantity ordered.
2025-12-16 15:48:35 +01:00
Frédéric FRANCE
a560d4f886 clean code 2025-12-02 09:11:56 +01:00
Mélina JOUM
206e636756 FIX: reinstate shipment with origin 2025-11-28 14:41:53 +01:00
Frédéric FRANCE
bca2fbdf3b Merge branch 'develop' into patch-8 2025-11-26 17:00:53 +01:00
Laurent Destailleur
f0f2afd7a3 Fix action type for button action Email 2025-11-26 13:41:16 +01:00
Frédéric FRANCE
9dee0f2fd6 fix 2025-11-26 11:13:32 +01:00
Frédéric FRANCE
5f8729b553 weight and size are float 2025-11-26 10:56:37 +01:00
Laurent Destailleur
dfbf173b17 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-07 19:25:42 +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
sonikf
88241b30de NEW Add option to create simple standalone shipment of non origin (#35651)
* NEW Add option to create simple shipment of non origin

* Enable create menu for shipment

* Enable create menu for shipment

* Update sendings.lang

* fix phpstan

* fix syntax

* fix missing line

* Add validation for socid and update note display

* fix project

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-06 13:13:36 +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
Regis Houssin
210328dd33 FIX avoid php warnings (#35967) 2025-10-28 01:07:22 +01:00
Laurent Destailleur
0346d901be Clean code 2025-10-23 14:31:45 +02:00
Frédéric FRANCE
29b3880e6c add dolBuildUrl (#35664)
* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* clean baseline

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-17 02:31:07 +02:00
ldestailleur
54dc4452aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-10-01 17:27:12 +02:00
ldestailleur
5c14e454ad FIX #35573 FIX #35241 2025-10-01 16:13:01 +02:00
Frédéric FRANCE
164f2c4414 clean code (#35539)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-28 23:19:33 +02:00
ldestailleur
4bc5892544 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-24 17:00:53 +02:00
Regis Houssin
b0e0c9d17e FIX wrong extrafield template in create mode (#35241) (#35470) 2025-09-24 17:00:31 +02:00
ldestailleur
ad830a346e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-09-23 16:50:17 +02:00
ldestailleur
6ead2839d0 Fix missing several test on permission on actions 2025-09-23 16:41:53 +02:00
ldestailleur
42edd8f22d Clean code 2025-09-18 12:19:29 +02:00
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
ldestailleur
97d5025c08 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-07 18:51:58 +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
ldestailleur
0255512c1c The signature of the Sale order ->cancel() method and shipment
->cancel() has been modified to introduce the $user param like for other
methods that modify a status.
2025-09-03 16:08:09 +02:00
Frédéric FRANCE
568c65568a clean code (#35175)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-02 22:51:34 +02:00
ldestailleur
62f761ac71 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-02 12:07:15 +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
Laurent Destailleur
336c3bce3f Debug Fix CI 2025-08-26 04:12:51 +02:00
sonikf
481e3108a1 remove duplicate (#35000) 2025-08-19 11:44:18 +02:00
sonikf
8682fe81af fix typo (#34999) 2025-08-19 11:43:47 +02:00
ldestailleur
273e82a566 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-16 22:14:23 +02:00
ldestailleur
feeaf19e6d Debug the signature feature (broken) for shipment 2025-08-14 16:24:53 +02:00
ldestailleur
4b9ebb0e6a Fix #26682 and complete #34396 2025-08-14 15:26:13 +02:00
ldestailleur
c339254a6b Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-14 00:54:22 +02:00
ldestailleur
2c2f085b5c FIX #34936 2025-08-14 00:49:56 +02:00
ldestailleur
c7edb6af2f Fix CI warnings 2025-08-07 14:38:30 +02:00
Pichinov-Valentin
49a6995fa1 NEW(propal): Add messaging and agenda features to proposals (#34883) 2025-08-07 12:28:09 +02:00
Pichinov-Valentin
db1552e27d NEW Added Messaging and agenda tabs on order and shipments (#34859)
* feat: Messaging and agenda core modifications

* feat: Core modifications for messaging and agenda

* fix(expedition): Décris ici la correction ou l'ajout fait à card.php

* Update company.lib.php

---------

Co-authored-by: Lou31 <valentingrimal2@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-04 13:12:22 +02:00
Charlène Benke
dbd5912658 NEW Add Sign feature on shipments (#34640)
* Add Sign feature on shipping

* Update card.php

* Update sendings.lang

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 02:29:54 +02:00
Noé Cendrier
6608e972ab FIX: Trigger should be the same for same action (#34698) 2025-07-04 20:05:34 +03: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
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
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