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 regression

Browse Source
This commit is contained in:
Laurent Destailleur 2024-06-22 19:46:11 +02:00
parent ded570e23a
commit 65c3e2c40e
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/admin/price_rules.php
View File

@ -168,7 +168,7 @@ for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
echo $langs->trans('SellingPrice').' '.$i;
// Label of price
$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
if (!empty(getDolGlobalString('$keyforlabel'))) {
if (getDolGlobalString($keyforlabel)) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
?>

2
htdocs/product/card.php
View File

@ -1673,8 +1673,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Note (private, no output on invoices, propales...)
//if (!empty(getDolGlobalString('MAIN_DISABLE_NOTES_TAB'))) available in create mode
//{
print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.

4
htdocs/product/list.php
View File

@ -296,8 +296,8 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
if (!empty(getDolGlobalString('$keyforlabel'))) {
$labelp = $i.' - '.$langs->transnoentitiesnoconv(getDolGlobalString('$keyforlabel'));
if (getDolGlobalString($keyforlabel)) {
$labelp = $i.' - '.$langs->transnoentitiesnoconv(getDolGlobalString($keyforlabel));
} else {
$labelp = $langs->transnoentitiesnoconv("SellingPrice")." ".$i;
}

4
htdocs/product/price.php
View File

@ -1089,7 +1089,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
print '</form>';
} else {
print $langs->trans("SellingPrice").' '.$i;
if (!empty(getDolGlobalString('$keyforlabel'))) {
if (getDolGlobalString($keyforlabel)) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
}
@ -1122,7 +1122,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
// Price by quantity
if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) { // TODO Fix the form included into a tr instead of a td
print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
if (!empty(getDolGlobalString('$keyforlabel'))) {
if (getDolGlobalString($keyforlabel)) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
print '</td><td colspan="2">';