Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-30 18:17:59 +01:00
parent 590ef86f40 786e2dedbe
commit c34ea09c2c
2 changed files with 4 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/functions.lib.php
View File

@@ -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,';
}

50
htdocs/includes/jquery/plugins/jcrop/index.html
View File

@@ -1,50 +0,0 @@
<html>
<head>
<title>Jcrop: the jQuery Image Cropping Plugin</title>
</head>
<body>
<div style="margin:0;padding:1em 5em;width:40em;">
<h1>Jcrop Image Cropping Plugin</h1>
<big>
<a href="http://deepliquid.com/content/Jcrop.html"><b>Jcrop</b></a>
is the image cropping plugin for
<a href="http://jquery.com/">jQuery</a>.<br>
You've successfully unpacked Jcrop.
</big>
<h3>Static Demos</h3>
<ul>
<li><a href="demos/tutorial1.html">Hello World</a> &mdash; default behavior</a></li>
<li><a href="demos/tutorial2.html">Basic Handler</a> &mdash; basic form integration</a></li>
<li><a href="demos/tutorial3.html">Aspect Ratio w/ Preview Pane</a> &mdash; nice visual example</a></li>
<li><a href="demos/tutorial4.html">Setting/Animating Selection</a> &mdash; animation demo</a></li>
<li><a href="demos/tutorial5.html">API Interface</a> &mdash; real-time API example</a></li>
</ul>
<h3>Live Demo</h3>
<ul>
<li><a href="demos/crop.php">PHP Cropping Demo</a> &mdash; requires PHP/gd support</a></li>
</ul>
<h3>Jcrop Links</h3>
<ul>
<li><a href="http://deepliquid.com/content/Jcrop.html">Jcrop Home</a></li>
<li><a href="http://deepliquid.com/content/Jcrop_Manual.html">Jcrop Manual</a></li>
</ul>
<hr noshade="noshade" size="1" style="margin-top:2em;" />
<small>
<b>&copy; 2008 Kelly Hallman and DeepLiquid.com</b><br>
Free software released under
<a href="http://deepliquid.com/content/Jcrop_License.html">MIT License</a>
</small>
</div>
</body>
</html>