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

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-24 22:48:37 +01:00
parent 9047f9638f
commit ce5bb5cd64
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/api/admin/index.php
View File

@ -148,7 +148,7 @@ print '<tr class="oddeven">';
print '<td>'.$langs->trans("RESTRICT_ON_IP"); print '<td>'.$langs->trans("RESTRICT_ON_IP");
print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample"); print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
print '</td>'; print '</td>';
print '<td><input type="text" name="API_RESTRICT_ON_IP" value="'.dol_escape_htmltag($conf->global->API_RESTRICT_ON_IP).'"></td>'; print '<td><input type="text" name="API_RESTRICT_ON_IP" value="'.dol_escape_htmltag(getDolGlobalString('API_RESTRICT_ON_IP')).'"></td>';
print '<td>'; print '<td>';
print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>'; print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>';
print '</td>'; print '</td>';

4
htdocs/commande/class/commande.class.php
View File

@ -3656,8 +3656,8 @@ class Commande extends CommonOrder
} }
$statusType = 'status4'; $statusType = 'status4';
} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) { } elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderToBill'); $labelStatus = $langs->transnoentitiesnoconv('StatusOrderToBill'); // translated into Delivered
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderToBillShort'); $labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderToBillShort'); // translated into Delivered
$statusType = 'status4'; $statusType = 'status4';
} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) { } elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderProcessed').$billedtext; $labelStatus = $langs->transnoentitiesnoconv('StatusOrderProcessed').$billedtext;