';
$obj = new stdClass();
// If data was already input, we define them in obj to populate input fields.
@@ -1632,10 +1639,10 @@ if ($id)
if ($obj->code == 'RECEP') $canbemodified=1;
if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified=1;
- // Url
+ // Build Url. The table is id=, the id of line is rowid=
$rowidcol=$tabrowid[$id];
// If rowidcol not defined
- if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27))) $rowidcol='rowid';
+ if (empty($rowidcol) || in_array($id, array(6,7,8,13,17,19,27,32))) $rowidcol='rowid';
$url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((! empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0')?$obj->{$rowidcol}:(! empty($obj->code)?urlencode($obj->code):'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
if (! empty($param)) $url .= '&'.$param;
if (! is_null($withentity)) $url .= '&entity='.$withentity;
@@ -1971,7 +1978,6 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
}
else
{
-
$fieldValue = isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'';
if ($fieldlist[$field]=='sortorder')
@@ -1981,11 +1987,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
$classtd=''; $class='';
if ($fieldlist[$field]=='code') $class='maxwidth100';
- if (in_array($fieldlist[$field], array('pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) $class='maxwidth50';
+ if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) $class='maxwidth50';
if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) $class='quatrevingtpercent';
print '| ';
$transfound=0;
- if (in_array($fieldlist[$field], array('label','libelle')))
+ if (in_array($fieldlist[$field], array('label','libelle'))) // For label
{
$transkey='';
// Special case for labels
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6635220cc23..cf5ab8dc7e0 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1094,6 +1094,8 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
{
global $db, $modules, $conf, $langs;
+ dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
+
// Search modules
$modulesdir = dolGetModulesDirs();
$i = 0; // is a sequencer of modules found
@@ -1191,6 +1193,8 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
}
}
+ dol_syslog("", LOG_DEBUG, -1);
+
return 1;
}
@@ -1259,7 +1263,7 @@ function activateModulesRequiredByCountry($country_code)
}
/**
- * Add external modules to list of contact element
+ * Search external modules to complete the list of contact element
*
* @param array $elementList elementList
* @return int 1
@@ -1278,6 +1282,8 @@ function complete_elementList_with_modules(&$elementList)
$i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined.
+ dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
+
$modulesdir = dolGetModulesDirs();
foreach ($modulesdir as $dir)
@@ -1355,6 +1361,8 @@ function complete_elementList_with_modules(&$elementList)
}
}
+ dol_syslog("", LOG_DEBUG, -1);
+
return 1;
}
diff --git a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
new file mode 100644
index 00000000000..5b6f4bf3f0c
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
@@ -0,0 +1,43 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville
+-- Copyright (C) 2003 Jean-Louis Bergamo
+-- Copyright (C) 2004-2010 Laurent Destailleur
+-- Copyright (C) 2004 Benoit Mortier
+-- Copyright (C) 2004 Guillaume Delecourt
+-- Copyright (C) 2005-2012 Regis Houssin
+-- Copyright (C) 2007 Patrick Raguin
+-- Copyright (C) 2019 Markus Welters
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+
+-- LIST ON https://fr.wikipedia.org/wiki/Jour_férié
+
+
+-- A lot of countries
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('NEWYEARDAY1', 0, 0, 0, 1, 1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('LABORDAY1', 0, 0, 0, 5, 1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('CHRISTMASDAY1', 0, 0, 0, 12, 25, 1);
+
+-- France only
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRVICTORYDAY', 0, 1, 0, 5, 8, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRNATIONALDAY', 0, 1, 0, 7, 14, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRASSOMPTION', 0, 1, 0, 8, 15, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRTOUSSAINT', 0, 1, 0, 11, 1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRARMISTICE', 0, 1, 0, 11, 11, 1);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 8efe44db103..64de0364139 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -89,5 +89,20 @@ ALTER TABLE llx_projet ADD COLUMN usage_organize_event integer DEFAULT 0;
UPDATE llx_projet set usage_opportunity = 1 WHERE fk_opp_status > 0;
-
+
+create table llx_c_hrm_public_holiday
+(
+ id integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer DEFAULT 0 NOT NULL, -- multi company id, 0 = all
+ fk_country integer,
+ code varchar(62),
+ dayrule varchar(255) DEFAULT 'date', -- 'date', 'xxx', ...
+ day integer,
+ month integer,
+ year integer, -- 0 for all years
+ active integer DEFAULT 1,
+ import_key varchar(14)
+)ENGINE=innodb;
+
+
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index 44b02c35248..fa528bec0ef 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -36,5 +36,4 @@ create table llx_c_field_list
visible tinyint DEFAULT 1 NOT NULL, -- visibility of field. 0=Never visible, 1=Visible on list and forms, 2=Visible on list only
enabled varchar(255) DEFAULT 1, -- Condition to show or hide
rang integer DEFAULT 0
-
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.key.sql b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.key.sql
new file mode 100644
index 00000000000..23dcbf355b4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.key.sql
@@ -0,0 +1,21 @@
+-- ========================================================================
+-- Copyright (C) 2019 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_hrm_public_holiday ADD UNIQUE INDEX uk_c_hrm_public_holiday(entity, code);
+ALTER TABLE llx_c_hrm_public_holiday ADD UNIQUE INDEX uk_c_hrm_public_holiday2(entity, day, month, year);
+
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
new file mode 100644
index 00000000000..7efbe314875
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
@@ -0,0 +1,31 @@
+-- ========================================================================
+-- Copyright (C) 2019 Laurent Destailleur
+--
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+--
+-- ========================================================================
+
+create table llx_c_hrm_public_holiday
+(
+ id integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer DEFAULT 0 NOT NULL, -- multi company id, 0 = all
+ fk_country integer,
+ code varchar(62),
+ dayrule varchar(255) DEFAULT 'date', -- 'date', 'xxx', ...
+ day integer,
+ month integer,
+ year integer, -- 0 for all years
+ active integer DEFAULT 1,
+ import_key varchar(14)
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 12bb1592cbc..3697c47e30d 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -9,6 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
OpenEtablishment=Open establishment
CloseEtablishment=Close establishment
# Dictionary
+DictionaryPublicHolidays=HRM - Public holidays
DictionaryDepartment=HRM - Department list
DictionaryFunction=HRM - Function list
# Module
|