diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index ac09a70a988..5a2b34772a1 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -51,7 +51,7 @@ if ($action == 'set') $res = dolibarr_del_const($db,"SYSLOG_FILE_ON",0); $res = dolibarr_del_const($db,"SYSLOG_SYSLOG_ON",0); $res = dolibarr_del_const($db,"SYSLOG_FIREPHP_ON",0); - $res = dolibarr_del_const($db,"SYSLOG_CHROMEPHP_ON",0); + $res = dolibarr_del_const($db,"SYSLOG_CHROMEPHP_ON",0); $syslog_file_on=0; $syslog_syslog_on=0; diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php index 98d6aa00561..5f0a2fe73d3 100644 --- a/htdocs/cashdesk/index_verif.php +++ b/htdocs/cashdesk/index_verif.php @@ -32,9 +32,9 @@ $username = GETPOST("txtUsername"); $password = GETPOST("pwdPassword"); $thirdpartyid = (GETPOST('socid','int')!='')?GETPOST('socid','int'):$conf->global->CASHDESK_ID_THIRDPARTY; $warehouseid = (GETPOST("warehouseid")!='')?GETPOST("warehouseid"):$conf->global->CASHDESK_ID_WAREHOUSE; -$bankid_cash = (GETPOST("CASHDESK_ID_BANKACCOUNT_CASH")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CASH"):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH; -$bankid_cheque = (GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE"):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; -$bankid_cb = (GETPOST("CASHDESK_ID_BANKACCOUNT_CB")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CB"):$conf->global->CASHDESK_ID_BANKACCOUNT_CB; +$bankid_cash = (GETPOST("CASHDESK_ID_BANKACCOUNT_CASH")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CASH"):$conf->global->CASHDESK_ID_BANKACCOUNT_CASH; +$bankid_cheque = (GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE"):$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; +$bankid_cb = (GETPOST("CASHDESK_ID_BANKACCOUNT_CB")!='')?GETPOST("CASHDESK_ID_BANKACCOUNT_CB"):$conf->global->CASHDESK_ID_BANKACCOUNT_CB; // Check username if (empty($username)) diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index ade62360036..acb900e8905 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -195,7 +195,7 @@ $langs->load("cashdesk"); if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0) { $langs->load("errors"); - print ''; + print ''; } else print ''; print ''; @@ -203,7 +203,7 @@ $langs->load("cashdesk"); if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) { $langs->load("errors"); - print ''; + print ''; } else print ''; print ''; diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index e5b23d8c41e..b2af65fcfb4 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -25,8 +25,8 @@ */ -/** - * Class to parse ICal calendars +/** + * Class to parse ICal calendars */ class ICal { diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index e760ff7c393..b17b15d3ff9 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -778,7 +778,7 @@ if ($id > 0) { $langs->load("bills"); - if($orders2invoice > 0) print ''.$langs->trans("CreateInvoiceForThisCustomer").''; + if($orders2invoice > 0) print ''.$langs->trans("CreateInvoiceForThisCustomer").''; else print ''.$langs->trans("CreateInvoiceForThisCustomer").''; if ($object->client != 0) print ''.$langs->trans("AddBill").''; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index c8c6198e154..89641178ab4 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -221,8 +221,8 @@ if ($resql) $title.=' - '.$langs->trans('StatusOrderCanceledShort'); if ($viewstatut == -2) $title.=' - '.$langs->trans('StatusOrderToProcessShort'); - if ($viewstatut == -3) - $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill'); + if ($viewstatut == -3) + $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill'); $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($ordermonth) $param.='&ordermonth='.$ordermonth; @@ -331,9 +331,9 @@ if ($resql) print ' '; // If module invoices enabled and user with invoice creation permissions - if (! empty($conf->facture->enabled)) - { - if ($user->rights->facture->creer) + if (! empty($conf->facture->enabled)) + { + if ($user->rights->facture->creer) { if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0)) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 90a6fcd04bf..7beb9e56799 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -438,10 +438,10 @@ else print ''; $rowspan=3; - if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++; + if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++; print ''; - if ($conf->use_javascript_ajax && $socid) print ''.$langs->trans('CopyAddressFromSoc').''; + if ($conf->use_javascript_ajax && $socid) print ''.$langs->trans('CopyAddressFromSoc').''; print ''; print ''; @@ -657,7 +657,7 @@ else print ''; if ($conf->use_javascript_ajax) print ''.$langs->trans('CopyAddressFromSoc').''; - print ''; + print ''; // Zip / Town print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php index 3a3f628b67c..05305d582af 100755 --- a/htdocs/core/class/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -41,7 +41,7 @@ class CSMSFile var $deferred; var $priority; var $class; - var $message; + var $message; /** @@ -147,7 +147,7 @@ class CSMSFile $sms->deferred=$this->deferred; $sms->priority=$this->priority; $sms->class=$this->class; - $sms->message=$this->message; + $sms->message=$this->message; $res=$sms->SmsSend(); if ($res <= 0) diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index 07985bda263..a4357147732 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -96,8 +96,8 @@ function member_prepare_head($object) $head[$h][2] = 'info'; $h++; - - complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove'); + + complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove'); return $head; } diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 0d1295c8629..5bff4206e02 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -38,27 +38,27 @@ $langs->load("errors"); dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); -// You can force preselected values of the config step of Dolibarr by adding a file -// install.forced.php into directory htdocs/install (This is the case with some wizard -// installer like DoliWamp, DoliMamp or DoliBuntu). -// We first init "forced values" to nothing. -if (! isset($force_install_noedit)) $force_install_noedit=''; // 1=To block var specific to distrib, 2 to block all technical parameters -if (! isset($force_install_type)) $force_install_type=''; -if (! isset($force_install_dbserver)) $force_install_dbserver=''; -if (! isset($force_install_port)) $force_install_port=''; -if (! isset($force_install_database)) $force_install_database=''; -if (! isset($force_install_prefix)) $force_install_prefix=''; -if (! isset($force_install_createdatabase)) $force_install_createdatabase=''; -if (! isset($force_install_databaselogin)) $force_install_databaselogin=''; -if (! isset($force_install_databasepass)) $force_install_databasepass=''; -if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; -if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; -// Now we load forced value from install.forced.php file. -$useforcedwizard=false; -$forcedfile="./install.forced.php"; -if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; // Must be after inc.php -if (@file_exists($forcedfile)) { - $useforcedwizard=true; include_once $forcedfile; +// You can force preselected values of the config step of Dolibarr by adding a file +// install.forced.php into directory htdocs/install (This is the case with some wizard +// installer like DoliWamp, DoliMamp or DoliBuntu). +// We first init "forced values" to nothing. +if (! isset($force_install_noedit)) $force_install_noedit=''; // 1=To block var specific to distrib, 2 to block all technical parameters +if (! isset($force_install_type)) $force_install_type=''; +if (! isset($force_install_dbserver)) $force_install_dbserver=''; +if (! isset($force_install_port)) $force_install_port=''; +if (! isset($force_install_database)) $force_install_database=''; +if (! isset($force_install_prefix)) $force_install_prefix=''; +if (! isset($force_install_createdatabase)) $force_install_createdatabase=''; +if (! isset($force_install_databaselogin)) $force_install_databaselogin=''; +if (! isset($force_install_databasepass)) $force_install_databasepass=''; +if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; +if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; +// Now we load forced value from install.forced.php file. +$useforcedwizard=false; +$forcedfile="./install.forced.php"; +if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; // Must be after inc.php +if (@file_exists($forcedfile)) { + $useforcedwizard=true; include_once $forcedfile; } //$force_install_message='This is the message'; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 15913ef83ee..c3813538936 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -339,9 +339,9 @@ if ($id || $ref) $default_vat=''; // We don't have supplier, so we try to guess. - // For this we build a fictive supplier with same properties than user but using vat) - $mysoc2=dol_clone($mysoc); - $mysoc2->tva_assuj=1; + // For this we build a fictive supplier with same properties than user but using vat) + $mysoc2=dol_clone($mysoc); + $mysoc2->tva_assuj=1; $default_vat=get_default_tva($mysoc2, $mysoc, 0, $product->id); print ''.$langs->trans("VATRateForSupplierProduct").'';