lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23764 from frederic34/patch-12

Browse Source 
colspan
This commit is contained in:
Laurent Destailleur 2023-02-04 15:25:08 +01:00 committed by GitHub
commit 4fba571a12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/product/admin/dynamic_prices.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2015 Ion Agorria <ion@agorria.com> /* Copyright (C) 2015 Ion Agorria <ion@agorria.com>
* Copyright (C) 2023 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -183,7 +184,7 @@ if ($action != 'create_updater' && $action != 'edit_updater') {
print '</tr>'; print '</tr>';
} }
} else { } else {
print '<tr colspan="7"><td><span class="opacitymedium">'; print '<tr><td colspan="4"><span class="opacitymedium">';
print $langs->trans("None"); print $langs->trans("None");
print '</span></td></tr>'; print '</span></td></tr>';
} }

2
htdocs/product/dynamic_price/editor.php
View File

@ -173,7 +173,7 @@ $help_text .= '<br><br>'.$langs->trans("PriceExpressionEditorHelp3");
$help_text .= '<br><br>'.$langs->trans("PriceExpressionEditorHelp4"); $help_text .= '<br><br>'.$langs->trans("PriceExpressionEditorHelp4");
$help_text .= '<br><br>'.$langs->trans("PriceExpressionEditorHelp5"); $help_text .= '<br><br>'.$langs->trans("PriceExpressionEditorHelp5");
foreach ($price_globals->listGlobalVariables() as $entry) { foreach ($price_globals->listGlobalVariables() as $entry) {
$help_text .= '<br><b>#globals_'.$entry->code.'#</b> '.$entry->description.' = '.$entry->value; $help_text .= '<br><b>#global_'.$entry->code.'#</b> '.$entry->description.' = '.$entry->value;
} }
//Price expression editor //Price expression editor