Commit Graph

876 Commits

Author SHA1 Message Date
Laurent Destailleur
125d97cf5d Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-02-16 21:23:48 +01:00
Laurent Destailleur
5433a5642d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-02-16 21:21:13 +01:00
Günter Lukas
917c2d6be8 Add check for empty delivery date before setting (#37254) 2026-02-16 20:12:21 +01:00
William Mead
feca86b812 FIX supplier order delivery date from order (#36860)
* Fixed delivery date from order

* Updated comment

* Fixed delivery date from order

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-02-05 12:35:53 +01:00
ThomasNgr-OpenDSI
079f0565d7 NEW : Manage discount for all lines for supplier elements. (#36954)
* NEW : Manage remise for all lines for supplier elements.

* Cast remise_percent to float in updateline call

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-02-02 00:23:40 +01:00
Laurent Destailleur
3ac710d260 Fix CI 2026-02-01 02:48:21 +01:00
Charlène Benke
d4f68f8986 warning error if no societe->id defined (#37039) 2026-01-31 20:29:22 +01:00
Frédéric FRANCE
73ec501b20 fix french doc (#36897)
* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix

* fix

* fix

* fix

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* Update html.form.class.php

* Update html.form.class.php

* Update index.php

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Update modules_facture.php

* Update phpstan.neon.dist

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-01-30 14:22:56 +01:00
Laurent Destailleur
5efcd7652f Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-01-26 19:35:29 +01:00
Laurent Destailleur
4224c9fc05 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-01-26 19:34:10 +01:00
NicolasL-SCOPEN
63fd9d326d Fix: subtotal lines from order to purchase order break lines on new document (#36973)
* Added a fix to prevent origin subtotal order lines from breaking purchase order lines

* Refactored code and fixed formating
2026-01-23 19:53:30 +01:00
atm-corentin
9c04379799 NEW : add support for label field in addline method In supplier order (#36544)
* add support for label field in addline method to set description when empty

* update
2026-01-16 11:12:47 +01:00
Laurent Destailleur
99e08613f1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-01-07 19:08:58 +01:00
Laurent Destailleur
8e5c5782bd Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2026-01-07 19:04:04 +01:00
Laurent Destailleur
61bd956fe0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2026-01-07 18:40:40 +01:00
Frédéric FRANCE
b369576a9d NEW add support of subtotals on more objects (#34125)
* add more subtotals

* add more subtotals

* class

* class

* wip

* wip

* wip

* wip

* doc

* 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

* clean code

* clean code

* clean code

* fix

* fix

* fix

* fix

* fix

* fix

* clean code

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* fix

* fix

* fix

* fix

* fix

* fetch extraparams

* add confirms

* add options

* add options

* add options

* add options

* add options

* add options

* add options

* fix

* wip

* wip

* fix

* fix

* fix

* fix

* fix

* fix
2026-01-06 15:58:06 +01:00
atm-lucas
70348f8c85 Supplier Proposal line option (#36753) 2025-12-30 11:09:38 +01:00
Laurent Destailleur
f0f2afd7a3 Fix action type for button action Email 2025-11-26 13:41:16 +01:00
Laurent Destailleur
e35028646e Debug v23 2025-11-23 16:33:38 +01:00
iouston
c4f1dbddbb 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>
2025-11-19 13:17:48 +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
Regis Houssin
fa10fc0f94 FIX avoid NULL value (#36126) 2025-11-06 13:15:03 +01:00
atm-adrien
d221d5eb6d FIX : Wrong cast on TVA rate when updating supplier order lines (#36106)
* FIX : Wrong cast on TVA rate when updating supplier order lines

* FIX : indent
2025-11-05 22:26:30 +01:00
Frédéric FRANCE
4ac3c3f8b6 clean phpstan baseline of supplier order class (#35942)
* clean phpstan baseline of supplier order class

* clean phpstan baseline of supplier order class

* clean phpstan baseline of supplier order class

* clean phpstan baseline of supplier order class

* clean phpstan baseline of supplier order class

* clean phpstan baseline of supplier order class
2025-10-25 22:55:06 +02:00
Laurent Destailleur
e7672cd9e5 Fix critical regression in cast 2025-10-19 18:47:20 +02:00
Laurent Destailleur
3aa920be4a Fix critical regression when casting vat rate 2025-10-19 18:40:26 +02:00
Frédéric FRANCE
18c29d0e40 fix tva can be sometimes string instead float (#35835) 2025-10-18 19:12:01 +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
kkhelifa-opendsi
a9cd1d2bb9 New : Copy support of the deposit percent of the payment mode found in customer proposal, customer order and customer invoice to supplier proposal, order and invoice (#35432)
* New : Copy support of the deposit percent of the payment mode found in customer proposal, customer order and customer invoice to supplier proposal, order and invoice

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI

* Correction pre-commit / travis CI
2025-09-26 23:59:51 +02:00
Charlène Benke
debdeb071d add current date link on Date Delivery Planned (#29876)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-25 12:24:09 +02:00
Vincent Maury
1abb76dc2e Fix 34301 Project selector on supplier proposal filters incorrectly by thirdparty, ignoring global constant (#34498)
* Fix 34301

* Fix issue #34301

* Fix issue #34301

* Update card.php

* Update card.php

---------

Co-authored-by: vmaury <vmaury@vmaury-ThinkPad-X240>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-21 23:49:46 +02:00
ldestailleur
42edd8f22d Clean code 2025-09-18 12:19:29 +02:00
ldestailleur
6ed764bedf Clean code 2025-09-18 11:40:56 +02:00
Frédéric FRANCE
4c4b344510 fix CI (#35359)
* fix CI

* Update card.php
2025-09-16 10:16:09 +02:00
Laurent Destailleur
7d7994aa1d Clean code 2025-09-15 23:28:18 +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
ldestailleur
93cc83ec4c Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-04 21:07:09 +02:00
Frédéric FRANCE
bcbcf30959 fix CI v22 (#35227)
* fix CI v22

* Update time.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php
2025-09-04 20:58:40 +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
Frédéric FRANCE
8e0b1eb606 fix object reference (#34928)
* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* merge

* fix doc

* fix doc

* fix doc

* fix doc

* fix doc

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-17 16:32:09 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
ThomasNgr-OpenDSI
a56a8e05f0 FIX : set default extrafield value for supplier order (#33971)
* fill extrafields default values in case THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_SUPPLIER_ORDER applies

* Fix: send param changecompany when changing company on a supplier order creation
2025-04-24 19:19:39 +02:00
ThomasNgr-OpenDSI
50fa68a389 New : Introduce const THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_SUPPLIER_ORDER (#33944)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 15:47:24 +02:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
Yannis Hoareau
1f15c35b15 Removed unnecessary tests (#33603) 2025-03-25 16:29:44 +01:00
atm-irvine
1e9b58dc9d feat(commandeFournisseur): new set reopen function (#33597)
* feat(commandeFournisseur): new set reopen function

* error : db begin instead of db prefix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 23:51:24 +01:00
Vaadasch
6e381671ff FIX: PRODUIT_AUTOFILL_DESC works even if line_desc is empty. Removing MAIN_NO_CONCAT_DESCRIPTION (#33489)
La variable MAIN_NO_CONCAT_DESCRIPTION est redondante avec PRODUIT_AUTOFILL_DESC.
Cette redondance créée une difficulté de compréhension et des effets de bord, principalement lorsqu'un utilisateur souhaite mettre une description à vide.

# Confirmation de la redondance de MAIN_NO_CONCAT_DESCRIPTION
Pour confirmation : Ajout de lignes de débug pour constatation.
Lignes 1116 à 1122 de DOL_ROOT/core/class/conf.class.php
```php
			print "<p>Before : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
            if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
                $this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
            } else {
                unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
            }
            print "<p>After : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
```
Application d'une valeur à MAIN_NO_CONCAT_DESCRIPTION = 4 depuis l'interface Configuration -> Divers.
Modification de la variable PRODUIT_AUTOFILL_DESC par l'interface d'admin du module Produit :
```
Before : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION =
```
```
Before : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```
```
Before : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```

# Conservation de la valeur dans conf.class.php
Pour des raisons de compatibilités, je pense qu'il vaut mieux laisser la partie de conf.class.php pour définir la valeur si jamais il y a des modules tiers qui l'utilisent.

En dehors de cet usage de rétrocompatibilité, je suis passé sur tous les autres fichiers pour la retirer. Je modifierai le wiki pour l'en retirer aussi une fois la PR intégrée.

# Modification des card.php
## Modification de $product_desc en $line_desc.
L'utilisation de $product_desc laissait supposer que le contenu de cette variable était récupérée de la description renseignée dans le produit, or elle est en réalité récupérée du formulaire envoyé.
Je l'ai donc modifiée pour correspondre davantage à la réalité.
## Comportement
Dans le cas où PRODUIT_AUTOFILL_DESC == 0, on concatene la $line_desc avec la description issue du produit, récupérée préalablement par $desc

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-03-19 15:50:07 +01:00
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
MDW
d362fbfe73 Qual: Fix phan notices (htdocs/fourn) (#33432)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:43:04 +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