Commit Graph

15001 Commits

Author SHA1 Message Date
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
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
ldestailleur
a3f3f28362 Fix warnings 2025-03-19 14:42:04 +01:00
ldestailleur
66e14bb708 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:28:20 +01:00
ldestailleur
5c1f8b58c4 Merge 2025-03-19 14:23:19 +01:00
ldestailleur
bb719f73cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-19 14:19:01 +01:00
ldestailleur
1ab438d62e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-19 14:17:37 +01:00
kkhelifa-opendsi
f3b146a1ab FIX: Need missing translation file in result index page of accountancy repport (#33527) 2025-03-19 14:10:44 +01:00
ldestailleur
0a4f1ffc06 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-19 14:09:41 +01:00
atm-lucas
42a1cde41a useless product fetch on invoice create (#33505) 2025-03-19 14:00:03 +01:00
Vaadasch
8a8608fa91 Update paiement.class.php add $error++ if invoice not linked (#33500) 2025-03-19 13:55:13 +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
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
ldestailleur
e72299126c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
Signed-off-by: ldestailleur <eldy@destailleur.fr>
2025-03-18 16:39:04 +01:00
ldestailleur
b085145cc5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-18 16:37:50 +01:00
ldestailleur
7465d54335 Fix renaming dire must be at end outside of translation. 2025-03-18 16:36:18 +01:00
Laurent Destailleur
7ce3f23b21 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 20:36:32 +01:00
Laurent Destailleur
5443b7cc11 FIX Bad link to download tax vat document 2025-03-17 20:30:02 +01:00
Laurent Destailleur
395157d16c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 19:46:08 +01:00
ldestailleur
23244ddc9d Fix getCallerInfoString() return empty when only one function used 2025-03-17 11:33:06 +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
HENRY Florian
9266408dd5 NEW: new option in invoice setup to limit options of deposit invoice (#33468)
* NEW: new option in invoice seup to limit choice of deposit invoice

* Update card.php

* Update card.php

* Update invoice.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:44:39 +01:00
Alexandre SPANGARO
da9ef8ecde NEW On list, see complete ref customer/supplier with constant MAIN_SHOW_GLOBAL_REF_CUSTOMER_SUPPLIER (#33373)
* NEW On list, see complete ref customer/supplier with constant MAIN_SHOW_GLOBAL_REF_CUSTOMER_SUPPLIER

* Update PR title & css

* CSS

* Case
2025-03-16 15:23:55 +01:00
ldestailleur
9c6488d018 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:47:14 +01:00
ldestailleur
bb5f22264b Fix bad var name 2025-03-15 15:47:01 +01:00
Frédéric FRANCE
36c4676d99 display invoice model deleted (#33471) 2025-03-15 15:40:33 +01:00
Lenin Rivas
749ac40fa2 FIX Search date facture (#33476) 2025-03-15 15:28:30 +01:00
ldestailleur
781db766a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:05:33 +01:00
ldestailleur
f618ee5029 Look and feel v22 2025-03-15 15:05:02 +01:00
MDW
9dcf7fa0f5 Qual:Fix phan notices (multiple) (#33465) 2025-03-15 11:26:19 +01:00
Alexandre SPANGARO
1316263236 NEW Invoice - Add constant to prevent modification of an invoice (#33455)
* NEW Invoice - Add constant to prevent modification of an invoice

* CI
2025-03-15 11:13:57 +01:00
ldestailleur
8082c7bd96 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 10:57:53 +01:00
MDW
2cd6459d10 Qual: Fix phan notices (*card) (#33450) 2025-03-14 17:25:11 +01:00
ldestailleur
624e87bc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-14 17:24:52 +01:00
ldestailleur
3c4c5f1c75 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-14 12:33:40 +01:00
ldestailleur
681b20f09e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-14 12:32:56 +01:00
Laurent Destailleur
051a902f1f Revert "Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW…" (#33454)
This reverts commit e943c9c97f.
2025-03-13 23:22:40 +01:00
Laurent Destailleur
e943c9c97f Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIV…" (#33453)
This reverts commit d93e8e2978.
2025-03-13 23:17:02 +01:00
ThomasNgr-OpenDSI
d93e8e2978 Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIVE_TRANSFER (#33444) 2025-03-13 23:15:04 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
HENRY Florian
7a1fa20959 fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN (#33434)
* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN

* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN
2025-03-13 11:18:17 +01:00
atm-irvine
d38a985ac3 feat(invoice-rec): new rule_for_lines_dates field - Impl (#33252)
* feat(invoice-rec): new rule_for_lines_dates field - Impl

* fix(html-form-class): added type in phpdoc

* chore: renamed $object to $sourceInvoice for create action

* fix(card-rec): error naming variable $sourceInvoice

* fix phan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:37:58 +01:00
warnerbryce
2f36edef3b FIX : PAIEMENT Wrong field displayed for DateChequeReceived (#33390) 2025-03-12 19:29:04 +01:00
Alexandre SPANGARO
81b5771270 FIX Accountancy simplified - with multiple entities, amount of the entry is multiplied by the number of entities (#33370)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:02:50 +01:00
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
ldestailleur
d20e730c66 Clean code 2025-03-06 04:56:54 +01:00
ldestailleur
996770b8f2 Fix protect use of sanitize to make sql injection 2025-03-06 03:39:47 +01:00