diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f80a7acc565..047c761d140 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -465,7 +465,10 @@ function getEntity($element, $shared = 1, $currentobject = null)
$out = $mc->getEntity($element, $shared, $currentobject);
} else {
$out = '';
- $addzero = array('user', 'usergroup', 'cronjob', 'c_email_templates', 'c_holiday_types', 'email_template', 'default_values', 'overwrite_trans');
+ $addzero = array('user', 'usergroup', 'cronjob', 'c_email_templates', 'email_template', 'default_values', 'overwrite_trans');
+ if (getDolGlobalString('HOLIDAY_ALLOW_ZERO_IN_DIC')) {
+ $addzero[] = 'c_holiday_types';
+ }
if (in_array($element, $addzero)) {
$out .= '0,';
}
diff --git a/htdocs/includes/jquery/plugins/jcrop/index.html b/htdocs/includes/jquery/plugins/jcrop/index.html
deleted file mode 100644
index 209c929c61d..00000000000
--- a/htdocs/includes/jquery/plugins/jcrop/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-Jcrop: the jQuery Image Cropping Plugin
-
-
-
-
-
Jcrop Image Cropping Plugin
-
-
- Jcrop
- is the image cropping plugin for
- jQuery.
- You've successfully unpacked Jcrop.
-
-
-
Static Demos
-
-
-
-
Live Demo
-
-
-
-
Jcrop Links
-
-
-
-
-
- © 2008 Kelly Hallman and DeepLiquid.com
- Free software released under
- MIT License
-
-