diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
index 4061fb9f4cf..e619c2c8fda 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
@@ -2056,7 +2056,7 @@ CREATE TABLE `llx_c_holiday_types` (
`label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`affect` int(11) NOT NULL,
`delay` int(11) NOT NULL,
- `newByMonth` double(8,5) NOT NULL DEFAULT 0.00000,
+ `newbymonth` double(8,5) NOT NULL DEFAULT 0.00000,
`fk_country` int(11) DEFAULT NULL,
`active` int(11) DEFAULT 1,
PRIMARY KEY (`rowid`),
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index dd96ff7dbbd..0cdecb3645f 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1012,7 +1012,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if (count($listetype)) {
print $form->selectarray("typeid", $listetype, (GETPOST('typeid', 'int') ? GETPOST('typeid', 'int') : $typeid), (count($listetype) > 1 ? 1 : 0), 0, 0, '', 0, 0, 0, '', '', 1);
} else {
- print ''.$langs->trans("NoTypeDefinedGoToSetup").'';
+ print ''.$langs->trans("NoTypeDefinedGoToSetup").'';
}
print "\n";
@@ -1997,7 +1997,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
if ($isinspip == -1) {
- print '
'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'';
+ print '
'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'';
}
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index d714e3d9a32..983e6d9aada 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -190,7 +190,7 @@ if ($result > 0) {
if (empty($dn)) {
$langs->load("errors");
- print '
| '.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).' |
';
+ print '| '.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).' |
';
} else {
$records = $ldap->getAttribute($dn, $search);
@@ -199,7 +199,7 @@ if ($result > 0) {
// Show tree
if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
if (!is_array($records)) {
- print '| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
+ print '| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
} else {
$result = show_ldap_content($records, 0, $records['count'], true);
}
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index a695f84bb81..f932b65e98c 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -161,7 +161,7 @@ if ($result > 0) {
// Show tree
if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
if (!is_array($records)) {
- print '| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
+ print '| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
} else {
$result = show_ldap_content($records, 0, $records['count'], true);
}
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index c7bd40efa37..5be2b3d6eea 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -91,7 +91,7 @@ $form = new Form($db);
$formother = new FormOther($db);
$formcompany = new FormCompany($db);
-$countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
print ''.$langs->trans("AccountantDesc")."
\n";
print "
\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 5b48301c30d..c370c07b73b 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -302,7 +302,7 @@ if (!isset($_SERVER['WINDIR'])) {
print '';
if (!empty($conf->global->GENBARCODE_LOCATION) && !@file_exists($conf->global->GENBARCODE_LOCATION)) {
$langs->load("errors");
- print '
'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'';
+ print '
'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'';
}
print '';
}
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 5e0ab61c3ee..5cffc0257e1 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -369,7 +369,7 @@ $form = new Form($db);
$formother = new FormOther($db);
$formcompany = new FormCompany($db);
-$countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c51875b43a6..d0a699ef979 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -223,7 +223,7 @@ $tabsql[24] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFI
$tabsql[25] = "SELECT rowid as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity IN (".getEntity('c_type_container').")";
//$tabsql[26]= "SELECT rowid as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
$tabsql[27] = "SELECT id as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcomm";
-$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newByMonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
+$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
$tabsql[29] = "SELECT rowid as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
$tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
//$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s";
@@ -315,7 +315,7 @@ $tabfield[24] = "code,label";
$tabfield[25] = "code,label";
//$tabfield[26]= "code,label,short_label";
$tabfield[27] = "code,libelle,picto";
-$tabfield[28] = "code,label,affect,delay,newByMonth,country_id,country";
+$tabfield[28] = "code,label,affect,delay,newbymonth,country_id,country";
$tabfield[29] = "code,label,percent,position";
$tabfield[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
//$tabfield[31]= "pcg_version,label";
@@ -361,7 +361,7 @@ $tabfieldvalue[24] = "code,label";
$tabfieldvalue[25] = "code,label";
//$tabfieldvalue[26]= "code,label,short_label";
$tabfieldvalue[27] = "code,libelle,picto";
-$tabfieldvalue[28] = "code,label,affect,delay,newByMonth,country";
+$tabfieldvalue[28] = "code,label,affect,delay,newbymonth,country";
$tabfieldvalue[29] = "code,label,percent,position";
$tabfieldvalue[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
//$tabfieldvalue[31]= "pcg_version,label";
@@ -407,7 +407,7 @@ $tabfieldinsert[24] = "code,label";
$tabfieldinsert[25] = "code,label";
//$tabfieldinsert[26]= "code,label,short_label";
$tabfieldinsert[27] = "code,libelle,picto";
-$tabfieldinsert[28] = "code,label,affect,delay,newByMonth,fk_country";
+$tabfieldinsert[28] = "code,label,affect,delay,newbymonth,fk_country";
$tabfieldinsert[29] = "code,label,percent,position";
$tabfieldinsert[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
//$tabfieldinsert[31]= "pcg_version,label";
@@ -548,7 +548,7 @@ $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
//$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
-$tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newByMonth'=>$langs->trans("NbAddedAutomatically"));
+$tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
$tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
$tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
//$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
@@ -1394,7 +1394,7 @@ if ($id) {
if ($value == 'delay') {
$valuetoshow = $langs->trans("NoticePeriod");
}
- if ($value == 'newByMonth') {
+ if ($value == 'newbymonth') {
$valuetoshow = $langs->trans("NewByMonth");
}
if ($value == 'fk_tva') {
@@ -1739,7 +1739,7 @@ if ($id) {
if ($value == 'delay') {
$valuetoshow = $langs->trans("NoticePeriod");
}
- if ($value == 'newByMonth') {
+ if ($value == 'newbymonth') {
$valuetoshow = $langs->trans("NewByMonth");
}
if ($value == 'fk_tva') {
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 85cd419d9ee..d0f08783e22 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -275,9 +275,9 @@ if ($resql) {
print "".$langs->trans("Status")." | ";
print "";
if ($result > 0 && empty($rss->error)) {
- print ''.$langs->trans("Online").'';
+ print ''.$langs->trans("Online").'';
} else {
- print ''.$langs->trans("Offline");
+ print ''.$langs->trans("Offline");
$langs->load("errors");
if ($rssparser->error) {
print ' - '.$langs->trans($rssparser->error);
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 2317d63ab7f..4010d724c1a 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -1,10 +1,10 @@
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2005-2017 Regis Houssin
- * Copyright (C) 2006-2020 Laurent Destailleur
- * Copyright (C) 2011-2013 Juanjo Menent
+/* Copyright (C) 2004 Rodolphe Quiedeville
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2005-2017 Regis Houssin
+ * Copyright (C) 2006-2020 Laurent Destailleur
+ * Copyright (C) 2011-2013 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -153,7 +153,7 @@ $arraylist['dolibarr2ldap'] = $langs->trans("DolibarrToLDAP");
print $form->selectarray('activesynchro', $arraylist, $conf->global->LDAP_SYNCHRO_ACTIVE);
print ' | '.$langs->trans("LDAPDnSynchroActiveExample").'';
if ($conf->global->LDAP_SYNCHRO_ACTIVE && !$conf->global->LDAP_USER_DN) {
- print ' '.$langs->trans("LDAPSetupNotComplete").'';
+ print ' '.$langs->trans("LDAPSetupNotComplete").'';
}
print ' | ';
@@ -297,24 +297,24 @@ if (function_exists("ldap_connect")) {
if ($result > 0) {
// Test ldap connect and bind
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPTCPConnectOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'';
+ print ''.$langs->trans("LDAPTCPConnectOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'';
print '
';
if ($conf->global->LDAP_ADMIN_DN && !empty($conf->global->LDAP_ADMIN_PASS)) {
if ($result == 2) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'';
+ print ''.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'';
print '
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'';
+ print ''.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'';
print '
';
print $langs->trans("Error").' '.$ldap->error;
print '
';
}
} else {
print img_picto('', 'warning').' ';
- print ''.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'';
+ print ''.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'';
print '
';
}
@@ -322,18 +322,18 @@ if (function_exists("ldap_connect")) {
// Test ldap_getversion
if (($ldap->getVersion() == 3)) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSetupForVersion3").'';
+ print ''.$langs->trans("LDAPSetupForVersion3").'';
print '
';
} else {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSetupForVersion2").'';
+ print ''.$langs->trans("LDAPSetupForVersion2").'';
print '
';
}
$unbind = $ldap->unbind();
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'';
+ print ''.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'';
print '
';
print $langs->trans("Error").' '.$ldap->error;
print '
';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 3be7d63759b..fef3882d2ff 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -321,12 +321,12 @@ if (function_exists("ldap_connect")) {
if ($result2 > 0) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSynchroOK").'
';
+ print ''.$langs->trans("LDAPSynchroOK").'
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
+ print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
@@ -336,9 +336,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 7ba47fb8e3d..82ee85b9a20 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -260,12 +260,12 @@ if (function_exists("ldap_connect")) {
if ($result2 > 0) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSynchroOK").'
';
+ print ''.$langs->trans("LDAPSynchroOK").'
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
+ print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
@@ -275,9 +275,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
@@ -331,9 +331,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index cda1700299c..876c31d79b1 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -472,12 +472,12 @@ if (function_exists("ldap_connect")) {
if ($result2 > 0) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSynchroOK").'
';
+ print ''.$langs->trans("LDAPSynchroOK").'
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
+ print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
@@ -487,9 +487,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 1fde587f21e..05572dc8bbf 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -223,12 +223,12 @@ if (function_exists("ldap_connect")) {
if ($result2 > 0) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSynchroOK").'
';
+ print ''.$langs->trans("LDAPSynchroOK").'
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
+ print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
@@ -238,9 +238,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index ffb1e2ca90b..e6041650d63 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -444,12 +444,12 @@ if (function_exists("ldap_connect")) {
if ($result2 > 0) {
print img_picto('', 'info').' ';
- print ''.$langs->trans("LDAPSynchroOK").'
';
+ print ''.$langs->trans("LDAPSynchroOK").'
';
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
+ print ''.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
@@ -459,9 +459,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
@@ -530,9 +530,9 @@ if (function_exists("ldap_connect")) {
print "\n
";
} else {
print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
+ print ''.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
- print '
';
+ print '
';
print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
}
}
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index c11d5023e27..be45a2101f5 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -307,7 +307,7 @@ for ($i = 1; $i <= 6; $i++) {
$pid = false;
}
} else {
- $pid = img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'';
+ $pid = img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'';
}
if ($pid) {
print '| '.$langs->trans("ShowProfIdInAddress").' - '.$pid.' | ';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index d6b6d6e428a..05abf8c3995 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -183,7 +183,7 @@ if ($action == 'edit') {
if (count($listofmethods)) {
print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
} else {
- print ''.$langs->trans("None").'';
+ print ''.$langs->trans("None").'';
}
print ' |
';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 4f6977ffb41..ec363ad112d 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -513,7 +513,7 @@ if (!empty($_SESSION["commandbackuplastdone"])) {
$_SESSION["commandbackupresult"] = '';
}
if (!empty($_SESSION["commandbackuptorun"])) {
- print '
'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser", $dolibarr_main_db_user, $dolibarr_main_db_user).':
'."\n";
+ print '
'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser", $dolibarr_main_db_user, $dolibarr_main_db_user).':
'."\n";
print '
'."\n";
print ajax_autoselect("commandbackuptoruntext", 0);
print '
';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 4ebbe832dc5..be76a00099c 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -274,7 +274,7 @@ if ($conf->product->enabled || $conf->product->service) {
} else {
$disabled = 1;
$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
- print ''.$langs->trans("NoBarcodeNumberingTemplateDefined").' ('.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").')
';
+ print ''.$langs->trans("NoBarcodeNumberingTemplateDefined").' ('.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").')
';
}
if (empty($nbno)) {
$disabled1 = 1;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index c9f422d78c8..c8ec0621394 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -351,7 +351,7 @@ if ($object->id > 0) {
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
$tmpcheck = $object->check_codeclient();
if ($tmpcheck != 0 && $tmpcheck != -5) {
- print ' ('.$langs->trans("WrongCustomerCode").')';
+ print ' ('.$langs->trans("WrongCustomerCode").')';
}
print '';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 2ed56683c02..614bedb8268 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -912,7 +912,7 @@ if ($action == 'create') {
}
}
if (empty($nbemail)) {
- $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
}
if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -1161,7 +1161,7 @@ if ($action == 'create') {
}
}
if (empty($nbemail)) {
- $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
}
if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index e3d151c6bbb..340ac1dfc8c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -284,7 +284,7 @@ if ($object->fetch($id) >= 0) {
}
}
if (empty($nbemail)) {
- $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
}
if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 9cb9bca667b..b0109d69fe5 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -711,7 +711,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
print "\n";
}
- print '| '.$langs->trans("Total").' ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') | ';
+ print '
| '.$langs->trans("Total").' ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') | ';
if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
print ''.price($tot_ht).' | ';
}
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 79696d12997..8babb849e7e 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -173,7 +173,7 @@ if ($result > 0) {
// Show tree
if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
if (!is_array($records)) {
- print '
| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
+ print '| '.$langs->trans("ErrorFailedToReadLDAP").' |
';
} else {
$result = show_ldap_content($records, 0, $records['count'], true);
}
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 810a23957fd..a3da2812067 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -334,7 +334,7 @@ if ($type == 'directory') {
$textifempty = $langs->trans('NoFileFound');
} elseif ($section === '0') {
if ($module == 'ecm') {
- $textifempty = '
'.$langs->trans("DirNotSynchronizedSyncFirst").'
';
+ $textifempty = '
'.$langs->trans("DirNotSynchronizedSyncFirst").'
';
} else {
$textifempty = $langs->trans('NoFileFound');
}
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 9a0a11f04d4..d63726dcea6 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -283,7 +283,7 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
print '';
print '';
if ($nbofsubdir && $nboffilesinsubdir) {
- print '+'.$nboffilesinsubdir.' ';
+ print '+'.$nboffilesinsubdir.' ';
}
print ' | ';
@@ -439,7 +439,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print '';
print '';
if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) {
- print '+'.$nboffilesinsubdir.' ';
+ print '+'.$nboffilesinsubdir.' ';
}
print ' | ';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6020e0b2723..f63081660d6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7808,7 +7808,7 @@ abstract class CommonObject
$out .= $labeltoshow;
}
if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
- $out .= ' *';
+ $out .= ' *';
}
} else {
if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f6c52b707a2..99b2c3521c6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5783,11 +5783,11 @@ class Form
return $num;
} else {
- $this->error = ''.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'';
+ $this->error = ''.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'';
return -1;
}
} else {
- $this->error = ''.$this->db->error().'';
+ $this->error = ''.$this->db->error().'';
return -2;
}
}
@@ -5838,9 +5838,9 @@ class Form
// Check parameters
if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {
if ($societe_vendeuse->id == $mysoc->id) {
- $return .= ''.$langs->trans("ErrorYourCountryIsNotDefined").'';
+ $return .= ''.$langs->trans("ErrorYourCountryIsNotDefined").'';
} else {
- $return .= ''.$langs->trans("ErrorSupplierCountryIsNotDefined").'';
+ $return .= ''.$langs->trans("ErrorSupplierCountryIsNotDefined").'';
}
return $return;
}
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 0ce9cae7b4e..60811956c32 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -178,7 +178,7 @@ function limitChars(textarea, limit, infodiv)
} else {
if ($this->fromtype) {
$langs->load("errors");
- print ' <'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'> ';
+ print ' <'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'> ';
}
}
print "\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cffd1f752f6..897b248824f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6156,7 +6156,7 @@ function yn($yesno, $case = 1, $color = 0)
}
}
if ($color) {
- return ''.$result.'';
+ return ''.$result.'';
}
return $result;
}
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 164840eceb7..e18ec3e3678 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -1226,7 +1226,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
print "\n";
}
- print '| '.$langs->trans("Total").' ('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).') | ';
+ print '
| '.$langs->trans("Total").' ('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).') | ';
print ' | ';
if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
print ''.price($total).' | ';
@@ -1391,7 +1391,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
print "
\n";
}
- print '| '.$langs->trans("Total").' ('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).') | ';
+ print '
| '.$langs->trans("Total").' ('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).') | ';
print ' | ';
if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
print ''.price($total).' | ';
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 4621e22d122..390961f5db2 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -224,7 +224,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
}
if ($type == 'free') {
- $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '' : '').$amount.($mode ? '' : '').'&tag='.($mode ? '' : '').$freetag.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '' : '').$amount.($mode ? '' : '').'&tag='.($mode ? '' : '').$freetag.($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
@@ -234,120 +234,120 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
}
//if ($mode) $out.='&noidempotency=1';
} elseif ($type == 'order') {
- $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'order_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
} else {
- $out .= '&securekey='.($mode ? '' : '');
+ $out .= '&securekey='.($mode ? '' : '');
if ($mode == 1) {
$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
}
if ($mode == 0) {
$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
}
}
} elseif ($type == 'invoice') {
- $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'invoice_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
} else {
- $out .= '&securekey='.($mode ? '' : '');
+ $out .= '&securekey='.($mode ? '' : '');
if ($mode == 1) {
$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
}
if ($mode == 0) {
$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
}
}
} elseif ($type == 'contractline') {
- $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'contractline_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
} else {
- $out .= '&securekey='.($mode ? '' : '');
+ $out .= '&securekey='.($mode ? '' : '');
if ($mode == 1) {
$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
}
if ($mode == 0) {
$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
}
}
} elseif ($type == 'member' || $type == 'membersubscription') {
$newtype = 'member';
- $out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'member_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
} else {
- $out .= '&securekey='.($mode ? '' : '');
+ $out .= '&securekey='.($mode ? '' : '');
if ($mode == 1) {
$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$newtype."' + member_ref)";
}
if ($mode == 0) {
$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$newtype.$ref, 2);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
}
}
}
if ($type == 'donation') {
- $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '' : '');
+ $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'donation_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
} else {
- $out .= '&securekey='.($mode ? '' : '');
+ $out .= '&securekey='.($mode ? '' : '');
if ($mode == 1) {
$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
}
if ($mode == 0) {
$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
}
}
}
@@ -450,7 +450,7 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
}
}
- print '
'."\n";
+ print '
'."\n";
print $fromcompany->name.'
';
print $line1;
if (strlen($line1.$line2) > 50) {
@@ -459,5 +459,5 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
print ' - ';
}
print $line2;
- print ''."\n";
+ print ''."\n";
}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c2257cd20fe..a2c08977b37 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -49,7 +49,7 @@ function pdf_admin_prepare_head()
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/admin/pdf.php';
- $head[$h][1] = $langs->trans("Common");
+ $head[$h][1] = $langs->trans("Parameters");
$head[$h][2] = 'general';
$h++;
@@ -2240,6 +2240,7 @@ function pdf_getTotalQty($object, $type, $outputlangs)
if (!empty($object->lines[$i]->fk_parent_line)) {
$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
}
+ $hidedetails = '';
$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
$action = '';
$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index da5d9388bd8..be804dc184c 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -853,7 +853,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
print $hookmanager->resPrint;
if (empty($reshook)) {
if ($user->login) {
- print $langs->trans("CurrentLogin").': '.$user->login.'
';
+ print $langs->trans("CurrentLogin").': '.$user->login.'
';
print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
} else {
print $langs->trans("ErrorForbidden3");
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 82f446f04c7..bcb430dac41 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -63,16 +63,16 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
$out = '';
if ($type == 'proposal') {
- $out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '' : '');
+ $out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '' : '');
if ($mode == 1) {
$out .= 'proposal_ref';
}
if ($mode == 0) {
$out .= urlencode($ref);
}
- $out .= ($mode ? '' : '');
+ $out .= ($mode ? '' : '');
if ($mode == 1) {
- $out .= '&hashp=hash_of_file';
+ $out .= '&hashp=hash_of_file';
} else {
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$propaltmp = new Propal($db);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index b191e24b117..6504cfa27a6 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -546,7 +546,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
print ''."\n";
$lastlevel0 = 'enabled';
} elseif ($showmenu) { // Not enabled but visible (so greyed)
- print ''."\n";
+ print ''."\n";
$lastlevel0 = 'greyed';
} else {
$lastlevel0 = 'hidden';
@@ -582,7 +582,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
}
print ''."\n";
} elseif ($showmenu && $lastlevel0 == 'enabled') { // Not enabled but visible (so greyed), except if parent was not enabled.
- print ''."\n";
+ print ''."\n";
}
}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 77725be2ae7..ebb5edc1c3b 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -309,7 +309,7 @@ class MenuManager
print '';
}
if ($val['enabled'] == 2) {
- print '';
+ print '';
}
print '';
print ''."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0f4aedcd2f9..1538d765014 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2081,7 +2081,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
print ''."\n";
$lastlevel0 = 'enabled';
} elseif ($showmenu) { // Not enabled but visible (so greyed)
- print ''."\n";
+ print ''."\n";
$lastlevel0 = 'greyed';
} else {
$lastlevel0 = 'hidden';
@@ -2122,7 +2122,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
// Not enabled but visible (so greyed), except if parent was not enabled.
print ''."\n";
+ print '
'."\n";
}
}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index a9817f3d1a5..35186e423ef 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -317,14 +317,14 @@ class MenuManager
print '';
}
if ($val['enabled'] == 2) {
- print '';
+ print '';
}
print '';
print ''."\n";
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index d1c222570cf..9a45a9b7fc2 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -320,7 +320,7 @@ class MenuManager
print '';
}
if ($val['enabled'] == 2) {
- print '';
+ print '';
}
print '';
print ''."\n";
@@ -407,7 +407,7 @@ class MenuManager
if ($menu_array[$i]['enabled']) {
print ''."\n";
} else {
- print ''."\n";
+ print ''."\n";
}
print ''."\n";
}
@@ -433,7 +433,7 @@ class MenuManager
print '';
}
} else {
- print $tabstring.'';
+ print $tabstring.'';
}
// If title is not pure text and contains a table, no carriage return added
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 7f460587248..0a4bb149986 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -310,7 +310,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
print ''.$langs->trans("LoginUsingOpenID").'';
} else {
$langs->load("errors");
- print ''.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'';
+ print ''.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'';
}
echo '';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 9cfb2fe475f..67ed2d4e741 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -212,7 +212,7 @@ if ($object->id > 0) {
print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
$tmpcheck = $object->check_codefournisseur();
if ($tmpcheck != 0 && $tmpcheck != -5) {
- print ' ('.$langs->trans("WrongSupplierCode").')';
+ print ' ('.$langs->trans("WrongSupplierCode").')';
}
print '';
print '
';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index e13d43c612d..55d92b7835b 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1447,7 +1447,7 @@ class Holiday extends CommonObject
// Update each user counter
foreach ($users as $userCounter) {
- $nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newByMonth']) ? $typeleaves[$userCounter['type']]['newByMonth'] : 0);
+ $nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newbymonth']) ? $typeleaves[$userCounter['type']]['newbymonth'] : 0);
if (empty($nbDaysToAdd)) {
continue;
}
@@ -2081,7 +2081,7 @@ class Holiday extends CommonObject
{
global $mysoc;
- $sql = "SELECT rowid, code, label, affect, delay, newByMonth";
+ $sql = "SELECT rowid, code, label, affect, delay, newbymonth";
$sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types";
$sql .= " WHERE (fk_country IS NULL OR fk_country = ".((int) $mysoc->country_id).')';
if ($active >= 0) {
@@ -2096,7 +2096,7 @@ class Holiday extends CommonObject
$num = $this->db->num_rows($result);
if ($num) {
while ($obj = $this->db->fetch_object($result)) {
- $types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
+ $types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newbymonth'=>$obj->newbymonth);
}
return $types;
diff --git a/htdocs/install/mysql/data/llx_c_holiday_type.sql b/htdocs/install/mysql/data/llx_c_holiday_type.sql
index addd7f9942e..65f9a51b037 100644
--- a/htdocs/install/mysql/data/llx_c_holiday_type.sql
+++ b/htdocs/install/mysql/data/llx_c_holiday_type.sql
@@ -25,12 +25,12 @@
--
-- Generic to all countries
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_SICK', 'Sick leave', 0, 0, 0, NULL, 1);
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_OTHER', 'Other leave', 0, 0, 0, NULL, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_SICK', 'Sick leave', 0, 0, 0, NULL, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_OTHER', 'Other leave', 0, 0, 0, NULL, 1);
-- Not enabled by default, we prefer to have an entrey dedicated to country
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_PAID', 'Paid vacation', 1, 7, 0, NULL, 0);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_PAID', 'Paid vacation', 1, 7, 0, NULL, 0);
-- Leaves specific to France
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_RTT_FR', 'RTT' , 1, 7, 0.83, 1, 1);
-insert into llx_c_holiday_types(code, label, affect, delay, newByMonth, fk_country, active) values ('LEAVE_PAID_FR', 'Paid vacation', 1, 30, 2.08334, 1, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_RTT_FR', 'RTT' , 1, 7, 0.83, 1, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_PAID_FR', 'Paid vacation', 1, 30, 2.08334, 1, 1);
diff --git a/htdocs/install/mysql/tables/llx_c_holiday_types.sql b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
index 9c09d486bec..b602ee1d330 100644
--- a/htdocs/install/mysql/tables/llx_c_holiday_types.sql
+++ b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_c_holiday_types (
label varchar(255) NOT NULL,
affect integer NOT NULL, -- a request will change sold or not
delay integer NOT NULL, -- Minimum delay to be allowed to make request
- newByMonth double(8,5) DEFAULT 0 NOT NULL, -- Amount of new days for each user each month
+ newbymonth double(8,5) DEFAULT 0 NOT NULL, -- Amount of new days for each user each month
fk_country integer DEFAULT NULL, -- This type is dedicated to a country
active integer DEFAULT 1
) ENGINE=innodb;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 129ee9d7827..b36914ad36b 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -283,7 +283,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
$db->free($resql);
} else {
if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE') {
- print '| '.dol_escape_htmltag($sql).' : '.dol_escape_htmltag($db->lasterror())." |
\n";
+ print '| '.dol_escape_htmltag($sql).' : '.dol_escape_htmltag($db->lasterror())." |
\n";
}
}
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a26954bbed5..7775071a55c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3081,7 +3081,7 @@ if (!function_exists("llxFooter")) {
*/
function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
{
- global $conf, $db, $langs, $user, $mysoc, $object;
+ global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager;
global $delayedhtmlcontent;
global $contextpage, $page, $limit;
global $dolibarr_distrib;
@@ -3304,6 +3304,11 @@ if (!function_exists("llxFooter")) {
}
}
+ $reshook = $hookmanager->executeHooks('beforeBodyClose'); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ print $hookmanager->resPrint;
+ }
+
print "