Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Label must not be copied in desc (#28377)

Browse Source 
Co-authored-by: Noé <noe@scopen.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
noec764 2024-02-23 17:07:38 +01:00 committed by GitHub
parent 25617ab982
commit 141d2d2aa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/card.php
View File

@ -561,7 +561,7 @@ if (empty($reshook)) {
$num = count($lines);
for ($i = 0; $i < $num; $i++) {
$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->label);
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
// Positive line
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);

1
htdocs/compta/facture/card.php
View File

@ -1690,6 +1690,7 @@ if (empty($reshook)) {
$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
if ($object->situation_counter == 1) {
$lines[$i]->situation_percent = 0;
}

2
htdocs/fourn/commande/card.php
View File

@ -1315,7 +1315,7 @@ if (empty($reshook)) {
}
$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->product_desc);
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
$product_type = (!empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
// Reset fk_parent_line for no child products and special product

2
htdocs/supplier_proposal/card.php
View File

@ -383,7 +383,7 @@ if (empty($reshook)) {
$num = count($lines);
for ($i = 0; $i < $num; $i++) {
$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
// Positive line
$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);