Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX stickler-ci errors

Browse Source
This commit is contained in:
lvessiller
2021-03-26 17:59:16 +01:00
parent 8a2e49d6e7
commit 05bf3cdab1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal/class/propal.class.php
View File

@@ -2508,7 +2508,7 @@ class Propal extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function signature($user, $statut, $note = '', $notrigger = 0) public function signature($user, $statut, $note = '', $notrigger = 0)
{ {
global $langs,$conf; global $langs,$conf;
@@ -2549,7 +2549,7 @@ class Propal extends CommonObject
$outputlangs = $langs; $outputlangs = $langs;
if (!empty($conf->global->MAIN_MULTILANGS)) { if (!empty($conf->global->MAIN_MULTILANGS)) {
$outputlangs = new Translate("", $conf); $outputlangs = new Translate("", $conf);
$newlang = (GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang); $newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
} }

2
htdocs/core/lib/functions2.lib.php
View File

@@ -553,7 +553,7 @@ function dol_print_object_info($object, $usetable = 0)
} }
print dol_print_date($object->date_signature, 'dayhour'); print dol_print_date($object->date_signature, 'dayhour');
if ($deltadateforuser) { if ($deltadateforuser) {
print ' '.$langs->trans('CurrentHour').' &nbsp; / &nbsp; '.dol_print_date($object->date_signature,'dayhour', 'tzuserrel').' &nbsp;'.$langs->trans('ClientHour'); print ' '.$langs->trans('CurrentHour').' &nbsp; / &nbsp; '.dol_print_date($object->date_signature, 'dayhour', 'tzuserrel').' &nbsp;'.$langs->trans('ClientHour');
} }
if ($usetable) { if ($usetable) {
print '</td></tr>'; print '</td></tr>';