Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v20 - fix cond to show dict, several fix in public ticket gui

Browse Source
This commit is contained in:
Laurent Destailleur
2024-07-28 14:54:06 +02:00
parent d0216a4922
commit 75d1fbc49f
14 changed files with 88 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/admin/dict.php
View File

@@ -656,7 +656,7 @@ foreach ($tabcomplete as $key => $value) {
continue;
}
$tabcomplete[$key]['id'] = $i;
// TODO Comment the line when data is stored into the tabcomplete array
// TODO Comment this lines when data is stored into the tabcomplete array
$tabcomplete[$key]['cond'] = $tabcond[$i];
$tabcomplete[$key]['rowid'] = $tabrowid[$i];
$tabcomplete[$key]['fieldinsert'] = $tabfieldinsert[$i];
@@ -2243,8 +2243,8 @@ if ($id > 0) {
if (!is_null($withentity)) {
print '<input type="hidden" name="entity" value="'.$withentity.'">';
}
print '<input type="submit" class="button button-edit small" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '<input type="submit" class="button button-cancel small" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '<input type="submit" class="button button-edit smallpaddingimp" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '<input type="submit" class="button button-cancel smallpaddingimp" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
} else {
$tmpaction = 'view';
@@ -2297,8 +2297,10 @@ if ($id > 0) {
} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
$valuetoshow = price($valuetoshow);
}
if ($value == 'private') {
$valuetoshow = yn($valuetoshow);
if (in_array($value, array('private', 'joinfile', 'use_default'))) {
if ($valuetoshow) {
$valuetoshow = yn($valuetoshow);
}
} elseif ($value == 'libelle_facture') {
$langs->load("bills");
$key = $langs->trans("PaymentCondition".strtoupper($obj->code));