From 04c0332bee350111b7adc3ff11701d021b6e2bb3 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Thu, 12 Mar 2020 18:31:43 +0100 Subject: [PATCH] FIX travis errors --- .../takepos/mod_takepos_ref_universal.php | 1 - htdocs/takepos/admin/setup.php | 14 ++++++------- htdocs/takepos/invoice.php | 20 +++++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php index a84f4b28125..7fdff4c1c6b 100644 --- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php +++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php @@ -156,4 +156,3 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos return $this->getNextValue($objsoc, $objforref); } } - diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 832417ffd30..20b62da4650 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -57,7 +57,7 @@ if ($resql) { } } -$action = GETPOST('action','alpha'); +$action = GETPOST('action', 'alpha'); /* * Actions @@ -146,7 +146,7 @@ print '
'; $now = dol_now(); $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); -print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'),'',''); +print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', ''); print ''; print ''; @@ -194,7 +194,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''."\n"; @@ -202,12 +202,12 @@ foreach ($dirmodels as $reldir) print ''; @@ -225,7 +225,7 @@ foreach ($dirmodels as $reldir) if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval $htmltooltip.=''.$langs->trans("NextValue").': '; if ($nextval) { - if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured') + if (preg_match('/^Error/', $nextval) || $nextval=='NotConfigured') $nextval = $langs->trans($nextval); $htmltooltip.=$nextval.'
'; } else { @@ -234,7 +234,7 @@ foreach ($dirmodels as $reldir) } print ''; print "\n"; diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 6ccc845d063..20054a52965 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -168,12 +168,12 @@ if ($action == 'valid' && $user->rights->facture->creer) $invoice->update($user); } -// $sav_FACTURE_ADDON = ''; -// if (!empty($conf->global->TAKEPOS_ADDON)) { -// $sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON; -// if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]}; -// else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON; -// } + //$sav_FACTURE_ADDON = ''; + //if (!empty($conf->global->TAKEPOS_ADDON)) { + // $sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON; + // if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]}; + // else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON; + //} $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]; if ($invoice->statut != Facture::STATUS_DRAFT) { @@ -211,10 +211,10 @@ if ($action == 'valid' && $user->rights->facture->creer) } // Restore save values -// if (!empty($sav_FACTURE_ADDON)) -// { -// $conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON; -// } + //if (!empty($sav_FACTURE_ADDON)) + //{ + // $conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON; + //} $remaintopay = $invoice->getRemainToPay();
'; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; + if (preg_match('/^Error/', $tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print '
'; if ($conf->global->TAKEPOS_REF_ADDON == "$file") { - print img_picto($langs->trans("Activated"),'switch_on'); + print img_picto($langs->trans("Activated"), 'switch_on'); } else { print ''; - print img_picto($langs->trans("Disabled"),'switch_off'); + print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; } print ''; - print $form->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('', $htmltooltip, 1, 0); print '