diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index c8ebafd4be8..0691f91b592 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -64,7 +64,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
-
+$help_url = '';
llxHeader('', $langs->trans("BOMsSetup"), $help_url);
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 2f272cd986f..8e80a13673e 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -295,7 +295,7 @@ print '';
if (!empty($conf->loghandlers['mod_syslog_file']) && !empty($conf->cron->enabled)) {
print '
| '.$langs->trans("SyslogFileNumberOfSaves").' | ';
- print '';
+ print ' | ';
print ' ('.$langs->trans('ConfigureCleaningCronjobToSetFrequencyOfSaves').') |
';
}
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 72e8db6bb4e..457d71d98d9 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -106,6 +106,14 @@ if (!$base) {
print 'Collation | ';
print "\n";
+ $arrayoffilesrich = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, '\.sql$');
+ $arrayoffiles = array();
+ foreach ($arrayoffilesrich as $value) {
+ //print $shortsqlfilename.' ';
+ $shortsqlfilename = preg_replace('/\-[a-z]+\./', '.', $value['name']);
+ $arrayoffiles[] = $shortsqlfilename;
+ }
+
$sql = "SHOW TABLE STATUS";
$resql = $db->query($sql);
@@ -119,7 +127,8 @@ if (!$base) {
print ''.($i+1).' | ';
print ''.$obj->Name.'';
$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
- if (dol_is_file(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql')) {
+
+ if (in_array($tablename.'.sql', $arrayoffiles)) {
$img = "info";
//print img_picto($langs->trans("ExternalModule"), $img);
} else {
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index c55d78b0caf..9a330c7aba5 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -952,7 +952,7 @@ class Utils
dol_include_once('/core/lib/files.lib.php');
- $nbSaves = empty($conf->global->SYSLOG_FILE_SAVES) ? 10 : intval($conf->global->SYSLOG_FILE_SAVES);
+ $nbSaves = intval(getDolGlobalString('SYSLOG_FILE_SAVES', 10));
if (empty($conf->global->SYSLOG_FILE)) {
$mainlogdir = DOL_DATA_ROOT;
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index b4c728fd611..7078d7488ad 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -100,13 +100,22 @@ function dol_print_cron_urls()
print '';
print $langs->trans("URLToLaunchCronJobs").': ';
$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
- print img_picto('', 'globe').' '.$url."\n";
- print ' '.$langs->trans("OrToLaunchASpecificJob").' ';
+ print ' ';
+ print ' '.$langs->trans("OrToLaunchASpecificJob").' ';
$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
- print img_picto('', 'globe').' '.$url."\n";
+ print ' ';
print ' ';
print ' ';
+ print ajax_autoselect("publicurlmember");
+ print ajax_autoselect("publicurlmemberall");
+
$logintouse = 'firstadmin';
if ($user->admin) {
$logintouse = $user->login;
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 369f60ea201..da1d2d58558 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -38,7 +38,7 @@ $langs->load("modulebuilder");
'.$langs->trans("DefineHereComplementaryAttributes", $textobject).' '."\n";
+print ''.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '': $textobject).' '."\n";
print ' ';
// Load $extrafields->attributes
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 8e2b004efda..0e2bde5c784 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -137,6 +137,10 @@ ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
-- v16
+DROP TABLE llx_payment_salary_extrafields;
+DROP TABLE llx_asset_model_extrafields;
+DROP TABLE llx_asset_type_extrafields;
+
ALTER TABLE llx_projet_task_time ADD COLUMN intervention_id integer DEFAULT NULL;
ALTER TABLE llx_projet_task_time ADD COLUMN intervention_line_id integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det_rec.extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_det_rec.extrafields.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.sql
|