diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 85245b38e89..20dfd81f277 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1459,8 +1459,8 @@ class Expedition extends CommonObject
}
}
- // delete batch expedition line
- if (!$error && $conf->productbatch->enabled) {
+ // delete batch expedition line (we try deletion even if module not enabled in case of the module were enabled and disabled previously)
+ if (!$error) {
if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index e7a09abea6e..56ae2b29323 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -627,6 +627,12 @@ if ($resql) {
print '';
}
+ // End date
+ if (!empty($arrayfields['cp.date_valid']['checked'])) {
+ print '
';
+ print '
';
+ }
+
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
@@ -687,6 +693,9 @@ if ($resql) {
if (!empty($arrayfields['cp.date_fin']['checked'])) {
print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
}
+ if (!empty($arrayfields['cp.date_valid']['checked'])) {
+ print_liste_field_titre($arrayfields['cp.date_valid']['label'], $_SERVER["PHP_SELF"], "cp.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
@@ -816,6 +825,18 @@ if ($resql) {
$totalarray['nbfield']++;
}
}
+ if (!empty($arrayfields['cp.date_valid']['checked'])) { // date_valid is both date_valid but also date_approval
+ print '