';
- $canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && $user->rights->holiday->write_all));
+ $canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))));
if ($canedit)
{
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 4ff8238648c..7043f436e87 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -25,9 +25,16 @@
*/
require '../main.inc.php';
+
+// Security check (access forbidden for external user too)
+if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
+ accessforbidden();
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -39,15 +46,15 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ')
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$search_id = GETPOST('search_id', 'alpha');
-$search_prev_solde = GETPOST('search_prev_solde', 'alpha');
-$search_new_solde = GETPOST('search_new_solde', 'alpha');
-$year = GETPOST('year');
-if (empty($year))
-{
- $tmpdate = dol_getdate(dol_now());
- $year = $tmpdate['year'];
-}
+$search_id = GETPOST('search_id', 'alphanohtml');
+$search_month = GETPOST('search_month', 'int');
+$search_year = GETPOST('search_year', 'int');
+$search_employee = GETPOST('search_employee', 'int');
+$search_validator = GETPOST('search_validator', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
+$search_type = GETPOST('search_type', 'int');
+$search_prev_solde = GETPOST('search_prev_solde', 'alphanohtml');
+$search_new_solde = GETPOST('search_new_solde', 'alphanohtml');
// Load variable for pagination
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -61,10 +68,6 @@ $pagenext = $page + 1;
if (! $sortfield) $sortfield="cpl.rowid";
if (! $sortorder) $sortorder="DESC";
-
-// Protection if external user
-if ($user->socid > 0) accessforbidden();
-
// Si l'utilisateur n'a pas le droit de lire cette page
if (!$user->rights->holiday->read_all) accessforbidden();
@@ -92,81 +95,126 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-if (empty($reshook))
-{
- // Selection of new fields
- include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
- // Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
- {
- $search_id = '';
- $toselect = '';
- $search_array_options = array();
- }
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+ $search_id = '';
+ $search_month = '';
+ $search_year = '';
+ $search_employee = '';
+ $search_validator = '';
+ $search_description = '';
+ $search_type = '';
+ $search_prev_solde = '';
+ $search_new_solde = '';
+ $toselect = '';
+ $search_array_options = array();
+ }
- if (GETPOST('button_removefilter_x', 'alpha')
- || GETPOST('button_removefilter.x', 'alpha')
- || GETPOST('button_removefilter', 'alpha')
- || GETPOST('button_search_x', 'alpha')
- || GETPOST('button_search.x', 'alpha')
- || GETPOST('button_search', 'alpha'))
- {
- $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
- }
+ if (GETPOST('button_removefilter_x', 'alpha')
+ || GETPOST('button_removefilter.x', 'alpha')
+ || GETPOST('button_removefilter', 'alpha')
+ || GETPOST('button_search_x', 'alpha')
+ || GETPOST('button_search.x', 'alpha')
+ || GETPOST('button_search', 'alpha'))
+ {
+ $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+ }
- // Mass actions
- /*$objectclass='MyObject';
- $objectlabel='MyObject';
- $permissiontoread = $user->rights->mymodule->read;
- $permissiontodelete = $user->rights->mymodule->delete;
- $uploaddir = $conf->mymodule->dir_output;
- include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
- */
+ // Mass actions
+ /*$objectclass='MyObject';
+ $objectlabel='MyObject';
+ $permissiontoread = $user->rights->mymodule->read;
+ $permissiontodelete = $user->rights->mymodule->delete;
+ $uploaddir = $conf->mymodule->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+ */
}
// Definition of fields for lists
$arrayfields = array(
- 'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
- 'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
- 'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
- 'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
- 'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
- 'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
- 'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
- 'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
- 'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
+ 'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
+ 'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+ 'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
+ 'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
+ 'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+ 'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+ 'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
+ 'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
+ 'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
);
+
/*
* View
*/
$form = new Form($db);
-
+$formother = new FormOther($db);
+$holidaylogstatic = new stdClass();
$alltypeleaves = $object->getTypes(1, -1); // To have labels
-llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
+llxHeader('', $langs->trans('CPTitreMenu'));
-$sqlwhere = " AND date_action BETWEEN ".
-$sqlwhere.= "'".$db->idate(dol_get_first_day($year, 1, 1))."'";
-$sqlwhere.= " AND ";
-$sqlwhere.= "'".$db->idate(dol_get_last_day($year, 12, 1))."'";
+$sqlwhere = '';
-if ($search_id != '') $sqlwhere.= natural_search('rowid', $search_id, 1);
-if ($search_prev_solde != '') $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
-if ($search_new_solde != '') $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
+if (!empty($search_year) && $search_year > 0) {
+ if (!empty($search_month) && $search_month > 0) {
+ $from_date = dol_get_first_day($search_year, $search_month, 1);
+ $to_date = dol_get_last_day($search_year, $search_month, 1);
+ } else {
+ $from_date = dol_get_first_day($search_year, 1, 1);
+ $to_date = dol_get_last_day($search_year, 12, 1);
+ }
+
+ $sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
+}
+
+if (!empty($search_id) && $search_id > 0) $sqlwhere.= natural_search('rowid', $search_id, 1);
+if (!empty($search_validator) && $search_validator > 0) $sqlwhere.= natural_search('fk_user_action', $search_validator, 1);
+if (!empty($search_employee) && $search_employee > 0) $sqlwhere.= natural_search('fk_user_update', $search_employee, 1);
+if (!empty($search_description)) $sqlwhere.= natural_search('type_action', $search_description);
+if (!empty($search_type) && $search_type > 0) $sqlwhere.= natural_search('fk_type', $search_type, 1);
+if (!empty($search_prev_solde)) $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
+if (!empty($search_new_solde)) $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
$sqlorder = $db->order($sortfield, $sortorder);
// Recent changes are more important than old changes
$log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+ //TODO: $result = $db->query($sql);
+ //TODO: $nbtotalofrecords = $db->num_rows($result);
+ $nbtotalofrecords = is_array($object->logs) ? count($object->logs) : 0;
+
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ $page = 0;
+ $offset = 0;
+ }
+}
+
+// TODO: $num = $db->num_rows($resql);
+$num = is_array($object->logs) ? count($object->logs) : 0;
+
$param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_id) $param = '&search_id='.urlencode($search_id);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($search_id)) $param .= '&search_statut='.urlencode($search_statut);
+if (!empty($search_month) && $search_month > 0) $param .= '&search_month='.urlencode($search_month);
+if (!empty($search_year) && $search_year > 0) $param .= '&search_year='.urlencode($search_year);
+if (!empty($search_validator) && $search_validator > 0) $param .= '&search_validator='.urlencode($search_validator);
+if (!empty($search_employee) && $search_employee > 0) $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_description)) $param .= '&search_description='.urlencode($search_description);
+if (!empty($search_type) && $search_type > 0) $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_prev_solde)) $param .= '&search_prev_solde='.urlencode($search_prev_solde);
+if (!empty($search_new_solde)) $param .= '&search_new_solde='.urlencode($search_new_solde);
print '
';
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 71fad9dee9b..6c93d96619f 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -361,7 +361,7 @@ if ($step == 1 || !$datatoimport)
print '
';
if ($objimport->array_import_perms[$key])
{
- print ''.img_picto($langs->trans("NewImport"), 'filenew').' ';
+ print ''.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').' ';
} else {
print $langs->trans("NotEnoughPermissions");
}
@@ -424,7 +424,7 @@ if ($step == 2 && $datatoimport)
print ''.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).' '.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'next', '')).' '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
';
@@ -445,7 +445,7 @@ if ($step == 2 && $datatoimport)
print ''.$langs->trans("DownloadEmptyExample").' ';
- print ''.img_picto($langs->trans("SelectFormat"), 'filenew').' ';
+ print ''.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15x"').' ';
print ' ';
print '';
}
@@ -549,7 +549,7 @@ if ($step == 3 && $datatoimport)
print ''.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).' '.$langs->trans("ChooseFileToImport", img_picto('', 'next')).' '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '
';
@@ -643,7 +643,7 @@ if ($step == 3 && $datatoimport)
print '">'.img_delete().'';
// Action button
print '';
- print ''.img_picto($langs->trans("NewImport"), 'filenew').' ';
+ print ''.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').' ';
print ' ';
print '';
}
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5ec9b8f8870..f6e15b2e8a2 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -156,6 +156,7 @@ class Odf
*/
public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
{
+ $value = $encode ? htmlspecialchars($value) : $value;
$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
$convertedValue = $value;
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 b66d205ef40..9bb097d10b2 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
@@ -119,7 +119,7 @@ ALTER TABLE llx_categorie_warehouse ADD CONSTRAINT fk_categorie_warehouse_fk_war
create table llx_holiday_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -135,7 +135,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
create table llx_entrepot_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -165,7 +165,7 @@ ALTER TABLE llx_events ADD COLUMN prefix_session varchar(255) NULL;
create table llx_payment_salary_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL, -- salary payment id
import_key varchar(14) -- import key
)ENGINE=innodb;
@@ -183,8 +183,8 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
ALTER TABLE llx_adherent_type ADD COLUMN duration varchar(6) DEFAULT NULL after morphy;
-ALTER TABLE llx_mailing ADD COLUMN tms timestamp;
-ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp;
+ALTER TABLE llx_mailing ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_projet ADD COLUMN usage_opportunity integer DEFAULT 0;
ALTER TABLE llx_projet ADD COLUMN usage_task integer DEFAULT 1;
@@ -458,7 +458,7 @@ create table llx_c_shipment_package_type
CREATE TABLE llx_product_fournisseur_price_extrafields (
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -478,7 +478,7 @@ CREATE TABLE llx_mrp_mo(
note_private text,
date_creation datetime NOT NULL,
date_valid datetime NULL,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_valid integer,
@@ -514,7 +514,7 @@ ALTER TABLE llx_mrp_mo ADD INDEX idx_mrp_mo_fk_project (fk_project);
create table llx_mrp_mo_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -551,7 +551,7 @@ CREATE TABLE llx_mrp_production(
fk_mrp_production integer, -- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
fk_stock_movement integer, -- id of stock movement when movements are validated
date_creation datetime NOT NULL,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14)
@@ -576,7 +576,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN fk_cond_reglement integer NOT NULL DEF
create table llx_commande_fournisseur_dispatch_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL, -- object id
import_key varchar(14) -- import key
)ENGINE=innodb;
@@ -587,7 +587,7 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
create table llx_facturedet_rec_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL, -- object id
import_key varchar(14) -- import key
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 994e5d89495..488548ae8b1 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -36,7 +36,7 @@ UPDATE llx_c_units set scale = 86400 where code = 'D' and unit_type = 'time';
create table llx_commande_fournisseur_dispatch_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL, -- object id
import_key varchar(14) -- import key
)ENGINE=innodb;
@@ -57,7 +57,7 @@ create table llx_c_shipment_package_type
create table llx_facturedet_rec_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL, -- object id
import_key varchar(14) -- import key
)ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
create table llx_mrp_mo_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -303,7 +303,7 @@ ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_
ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_website_page_rowid FOREIGN KEY (fk_website_page) REFERENCES llx_website_page (rowid);
ALTER TABLE llx_categorie ADD COLUMN date_creation datetime;
-ALTER TABLE llx_categorie ADD COLUMN tms timestamp;
+ALTER TABLE llx_categorie ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_categorie ADD COLUMN fk_user_creat integer;
ALTER TABLE llx_categorie ADD COLUMN fk_user_modif integer;
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 7c32a370c45..8820fe1968c 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -47,7 +47,7 @@ ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object
create table llx_mrp_mo_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -124,7 +124,7 @@ CREATE TABLE llx_recruitment_recruitmentjobposition(
note_public text,
note_private text,
date_creation datetime NOT NULL,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
last_main_doc varchar(255),
@@ -150,7 +150,7 @@ ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN remuneration_sugge
create table llx_recruitment_recruitmentjobposition_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -169,7 +169,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
note_public text,
note_private text,
date_creation datetime NOT NULL,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),
@@ -200,7 +200,7 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_rec
create table llx_recruitment_recruitmentcandidature_extrafields
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_object integer NOT NULL,
import_key varchar(14) -- import key
) ENGINE=innodb;
@@ -290,8 +290,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
-ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp;
-ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp;
+ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)' ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__', '__(Hello)__ __CANDIDATE_FULLNAME__,trans("AddAnAction"),'filenew');
//$out.=" ";
@@ -264,7 +266,7 @@ if ($object->id > 0)
$filters['search_agenda_label'] = $search_agenda_label;
// TODO Replace this with same code than into list.php
- show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, 'mymmodule');
+ show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
}
}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 49841fe24b9..1dacbcaac87 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -569,7 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, $object->element.'@mymodule', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+ $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
print '';
}
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 9530757b283..1ab98093984 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -58,6 +58,11 @@ function llxFooterVierge()
print '