2
0
forked from Wavyzz/dolibarr

1039 Commits

Author SHA1 Message Date
Alexandre R
edda95d07f fixed rate conversion to int rather than float on supplier's invoices (#35696)
Co-authored-by: A.R <alexandre.rivas69@gmail.com>
2025-10-09 18:23:14 +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
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
f9cd8367ad Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-20 16:23:22 +02:00
PsyCrow
3a8f36d185 FIX: #35407 After updating to version 22, local taxes were no longer applied (#35408)
FIX: #35407
$tva_tx could be string so should not be casted to float
2025-09-20 16:02:20 +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
078da229c8 clean code (#35352)
* 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

* 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
2025-09-17 14:11:32 +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
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
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
ldestailleur
d7204bbb19 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-04 17:32:58 +02:00
ldestailleur
f82283a22e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 17:32:04 +02:00
ldestailleur
5832cfc198 Fix CI 2025-09-04 15:36:54 +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
84db848491 Fix name of option for supplier 2025-07-10 14:54:59 +02:00
ldestailleur
d5db68430c Fix name of option for supplier 2025-07-10 14:49:45 +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
ldestailleur
9868eadafd CSS 2025-04-25 15:57:41 +02:00
Jyhere
16cd7c5b17 FIX: add missing createFrom hook when creating a supplier invoice (#33708)
* FIX: add missing createFrom hook when creating a supplier invoice

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-04 15:16:21 +02:00
Alexandre SPANGARO
67dff53958 Fix some problem on new category/tag (#33632)
* FIX Supplier Invoice category - Wrong function on view/edit card

* FIX Invoice category - Wrong link for manage category

* FiIX Translation problem on category

* FIX wrong cat

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-28 23:18:57 +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
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
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
ldestailleur
a0ec0002f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 13:47:25 +01:00
ldestailleur
e9e5a39b79 Fix deletion when draft. 2025-03-18 18:10:05 +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
ldestailleur
34ecda6994 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-25 02:47:26 +01:00
tnegre
9c52eaa4bf FIX invoice creation : use dol_include_once instead of require_once to allow external modules 2025-02-24 17:04:18 +01:00
Laurent Destailleur
52bbbcde8a Merge pull request #32901 from mdeweerd/qual/phan.2025.1.31
Qual: Fix notices, update baseline, enable PhanTypeMismatchArgument
2025-02-05 00:13:08 +01:00
Laurent Destailleur (aka Eldy)
c4f52d0484 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-04 22:51:31 +01:00
MDW
4af154c6d5 Qual: Fix phan notices
# Qual: Fix phan notices

Fix phan notices mostly in relation with supplier invoices,
Fix phan notices in relation with formquestion (phpdoc update, casts).
2025-02-03 16:05:57 +01:00
Laurent Destailleur
c5715f54a6 Debug v21 2025-02-03 15:49:50 +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
Regis Houssin
8623166d59 FIX remove from CRUD 2025-01-20 06:53:03 +01:00
Regis Houssin
d39ef7b752 NEW add creditnotelist var in fetch 2025-01-19 13:18:36 +01:00
Laurent Destailleur (aka Eldy)
802562a575 Fix regression after a fix 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
58e42656c0 Fix regression after a fix 2025-01-09 13:54:25 +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)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Laurent Destailleur
55f599ce4e Merge pull request #32506 from frederic34/fix_phpstan_2025_01_02
fix phpstan
2025-01-02 20:43:40 +01:00