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

FIX travis errors

Browse Source
This commit is contained in:
VESSILLER 2020-03-12 18:31:43 +01:00
parent 1379b2ce87
commit 04c0332bee
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/modules/takepos/mod_takepos_ref_universal.php
View File

@ -156,4 +156,3 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
return $this->getNextValue($objsoc, $objforref); return $this->getNextValue($objsoc, $objforref);
} }
} }

14
htdocs/takepos/admin/setup.php
View File

@ -57,7 +57,7 @@ if ($resql) {
} }
} }
$action = GETPOST('action','alpha'); $action = GETPOST('action', 'alpha');
/* /*
* Actions * Actions
@ -146,7 +146,7 @@ print '<br>';
$now = dol_now(); $now = dol_now();
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'),'',''); print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', '');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -194,7 +194,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module // Show example of numbering module
print '<td class="nowrap">'; print '<td class="nowrap">';
$tmp=$module->getExample(); $tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp); elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp; else print $tmp;
print '</td>'."\n"; print '</td>'."\n";
@ -202,12 +202,12 @@ foreach ($dirmodels as $reldir)
print '<td align="center">'; print '<td align="center">';
if ($conf->global->TAKEPOS_REF_ADDON == "$file") if ($conf->global->TAKEPOS_REF_ADDON == "$file")
{ {
print img_picto($langs->trans("Activated"),'switch_on'); print img_picto($langs->trans("Activated"), 'switch_on');
} }
else else
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">';
print img_picto($langs->trans("Disabled"),'switch_off'); print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a>'; print '</a>';
} }
print '</td>'; print '</td>';
@ -225,7 +225,7 @@ foreach ($dirmodels as $reldir)
if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': '; $htmltooltip.=''.$langs->trans("NextValue").': ';
if ($nextval) { if ($nextval) {
if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured') if (preg_match('/^Error/', $nextval) || $nextval=='NotConfigured')
$nextval = $langs->trans($nextval); $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'<br>'; $htmltooltip.=$nextval.'<br>';
} else { } else {
@ -234,7 +234,7 @@ foreach ($dirmodels as $reldir)
} }
print '<td align="center">'; print '<td align="center">';
print $form->textwithpicto('',$htmltooltip,1,0); print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";

20
htdocs/takepos/invoice.php
View File

@ -168,12 +168,12 @@ if ($action == 'valid' && $user->rights->facture->creer)
$invoice->update($user); $invoice->update($user);
} }
// $sav_FACTURE_ADDON = ''; //$sav_FACTURE_ADDON = '';
// if (!empty($conf->global->TAKEPOS_ADDON)) { //if (!empty($conf->global->TAKEPOS_ADDON)) {
// $sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON; // $sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
// if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]}; // 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; // else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON;
// } //}
$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]; $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
if ($invoice->statut != Facture::STATUS_DRAFT) { if ($invoice->statut != Facture::STATUS_DRAFT) {
@ -211,10 +211,10 @@ if ($action == 'valid' && $user->rights->facture->creer)
} }
// Restore save values // Restore save values
// if (!empty($sav_FACTURE_ADDON)) //if (!empty($sav_FACTURE_ADDON))
// { //{
// $conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON; // $conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
// } //}
$remaintopay = $invoice->getRemainToPay(); $remaintopay = $invoice->getRemainToPay();