This commit is contained in:
Laurent Destailleur 2018-04-22 20:08:29 +02:00
parent c5a3890526
commit 32511422ab
7 changed files with 8 additions and 8 deletions

View File

@ -87,7 +87,7 @@ if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signa
// Test if remote test is ok // Test if remote test is ok
$enableremotecheck = true; $enableremotecheck = true;
if (preg_match('/beta|alpha|rc/i', DOL_VERSION) || ! empty($conf->global->MAIN_ALLOW_INTEGRITY_CHECK_ON_UNSTABLE)) $enableremotecheck=False; if (preg_match('/beta|alpha|rc/i', DOL_VERSION) || ! empty($conf->global->MAIN_ALLOW_INTEGRITY_CHECK_ON_UNSTABLE)) $enableremotecheck=false;
$enableremotecheck = true; $enableremotecheck = true;
print '<form name="check" action="'.$_SERVER["PHP_SELF"].'">'; print '<form name="check" action="'.$_SERVER["PHP_SELF"].'">';

View File

@ -912,7 +912,7 @@ if ($resql)
if (! empty($arrayfields['b.conciliated']['checked'])) if (! empty($arrayfields['b.conciliated']['checked']))
{ {
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre" align="center">';
print $form->selectyesno('search_conciliated', $search_conciliated, 1, False, 1); print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
print '</td>'; print '</td>';
} }
print '<td class="liste_titre" align="middle">'; print '<td class="liste_titre" align="middle">';

View File

@ -108,7 +108,7 @@ class FactureRec extends CommonInvoice
if (empty($this->frequency)) if (empty($this->frequency))
{ {
$this->frequency=0; $this->frequency=0;
$this->date_when=NULL; $this->date_when=null;
} }

View File

@ -31,13 +31,13 @@ if ($action == 'update' && is_array($arrayofparameters))
{ {
$db->begin(); $db->begin();
$ok=True; $ok=true;
foreach($arrayofparameters as $key => $val) foreach($arrayofparameters as $key => $val)
{ {
$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity); $result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
if ($result < 0) if ($result < 0)
{ {
$ok=False; $ok=false;
break; break;
} }
} }

View File

@ -153,7 +153,7 @@ class DolEditor
{ {
global $conf,$langs; global $conf,$langs;
$fullpage=False; $fullpage=false;
if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
{ {
$disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all

View File

@ -182,7 +182,7 @@ class pdf_crabe extends ModelePDFFactures
$this->localtax2=array(); $this->localtax2=array();
$this->atleastoneratenotnull=0; $this->atleastoneratenotnull=0;
$this->atleastonediscount=0; $this->atleastonediscount=0;
$this->situationinvoice=False; $this->situationinvoice=false;
} }

View File

@ -222,7 +222,7 @@ if (! empty($conf->paypal->enabled))
$TAXAMT=urldecode($resArray["TAXAMT"]); $TAXAMT=urldecode($resArray["TAXAMT"]);
$NOTE=urldecode($resArray["NOTE"]); $NOTE=urldecode($resArray["NOTE"]);
$ispaymentok=True; $ispaymentok=true;
} }
else else
{ {