2
0
forked from Wavyzz/dolibarr
Commit Graph

2407 Commits

Author SHA1 Message Date
ldestailleur
9763762ce8 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-27 03:35:47 +02:00
Günter Lukas
ee0dd8b672 fix #35503 - Wrong format of buying price in dispatch.php / reception.php (#35504)
* Change price calculation method in dispatch.php

In output field price should be used instead of price2num, other formatting does not work (esp. when you use German langugae settings)

* Format cost price before displaying in input field

In output field price should be used, otherwise formatting does not work (esp. when you use German langugae settings)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-26 23:50:57 +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
hermans
7f64095048 Bug fix on fourniseur commande kanban view (#34945)
* bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939

* Bug fix for: Dolibarr Issue #34939

* Revert "bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939"

This reverts commit bd4c1ccc41.

* Revert "Bug fix for: Dolibarr Issue #34939"

This reverts commit 8e46f863b9.
2025-08-14 13:52:32 +02:00
ldestailleur
90439d3cfb Debug v22 2025-07-21 16:07:37 +02:00
ldestailleur
270caf0dcb Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
423b302a2b Debug v22 2025-07-17 19:30:58 +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
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
Yannis Hoareau
8ec897bd83 fix: php warning for status field in list of purchase orders (#34003) 2025-04-29 06:44:29 +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
omogenot
5d55d75c8e FIX Extend late search option for open and awaiting supplier orders (#33810)
* Create two alert levels

Make search_status be 1,2 for regular late orders and 3,4 for order to be received late state.

* Fix url late target

On main screen, choosing late awaiting orders does not lead to a list of awaiting orders that are in alert.

* Missing space
2025-04-10 12:50:24 +02:00
ldestailleur
74a0841ff7 Fix css 2025-03-26 02:04:49 +01: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
0cc1aa6d80 Qual: Fix phan notices (asset..compta/paiement) (#33484)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

* Qual: Fix phan notices (asset..compta/paiement)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:04 +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
Laurent Destailleur
e219484634 Merge pull request #31829 from Hystepik/New-status-for-webhook
New status for webhook Target
2025-02-22 17:24:31 +01:00
Frédéric FRANCE
c8e1b80ec3 clean code 2025-02-21 09:49:14 +01:00
Frédéric FRANCE
57a725e6c0 clean code 2025-02-21 09:45:57 +01:00
Frédéric FRANCE
d67816aa18 clean code 2025-02-21 08:57:42 +01:00
Laurent Destailleur
8cbe5ae54f Merge pull request #33133 from ibuiv/patch-11
FIX Avoid remove supplier order with dispateched lines
2025-02-19 14:14:24 +01:00
ldestailleur
881b9fd5ee FIX Bad picto of user 2025-02-19 14:13:15 +01:00
antonin_tdj
ab939f79ae Update card.php 2025-02-19 12:52:06 +01:00
antonin_tdj
20e2553864 Avoid remove supplier order with dispateched lines 2025-02-19 12:41:18 +01:00
Lucas Marcouiller
550f9ffbea Merge branch 'develop' into New-status-for-webhook 2025-02-18 15:50:05 +01:00
ldestailleur
33b915abbe NEW Better presentation of list of user approver. 2025-02-17 13:18:20 +01:00
Lucas Marcouiller
16e2a120ad Merge branch 'develop' into New-status-for-webhook 2025-02-12 08:59:04 +01:00
Laurent Destailleur (aka Eldy)
9bc2a3a6bd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 22:24:47 +01:00
Laurent Destailleur (aka Eldy)
dd9655c22c Debug v21 2025-02-11 18:49:30 +01:00
Lucas Marcouiller
00482b7e3d Merge branch 'develop' into New-status-for-webhook 2025-02-11 14:25:30 +01:00
MDW
23ff8b378c Qual: Fix phan: dol_mktime GETPOST args to GETPOSTINT 2025-02-08 14:06:14 +01:00
MDW
f66e9553d5 Qual: Fix phan notices
# Qual: Fix phan notices

Fix phan notices in fourn/commande (+form class)
2025-02-03 16:05:55 +01:00
Laurent Destailleur
adae4f0fb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:37:52 +01:00
Laurent Destailleur
940e42c1e4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-27 01:30:34 +01:00
Lucas Marcouiller
1b8a9c2431 Merge branch 'develop' into New-status-for-webhook 2025-01-09 10:48:18 +01:00
Regis Houssin
a3193a08bc FIX merge problem 2025-01-06 13:56:32 +01:00
Regis Houssin
d443446838 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into
fix_20_wrong_value_of_socid
2025-01-06 13:53:22 +01:00
Laurent Destailleur (aka Eldy)
2c2ac2a48f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:38:48 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Laurent Destailleur (aka Eldy)
4253fa54ec Standardize name of field. 2025-01-05 14:05:50 +01:00
Laurent Destailleur (aka Eldy)
d832961311 Debug v21 2025-01-05 13:39:30 +01:00
Laurent Destailleur (aka Eldy)
9236a9899f Debug v21 2025-01-05 13:38:02 +01:00