lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	htdocs/user/perms.php
This commit is contained in:
Laurent Destailleur 2020-04-10 12:04:21 +02:00
commit 5ff981bf61
1200 changed files with 33162 additions and 33164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/lessc.class.php
View File

@ -789,8 +789,7 @@ class Lessc {
$result = $this->tryImport($importPath, $block, $out); $result = $this->tryImport($importPath, $block, $out);
$this->env->imports[$importId] = $result === false ? $this->env->imports[$importId] = $result === false ?
array(false, "@import " . $this->compileValue($importPath).";") : array(false, "@import ".$this->compileValue($importPath).";") : $result;
$result;
break; break;
case "import_mixin": case "import_mixin":
@ -1457,8 +1456,7 @@ class Lessc {
$r = $g = $b = $L; $r = $g = $b = $L;
} else { } else {
$temp2 = $L < 0.5 ? $temp2 = $L < 0.5 ?
$L * (1.0 + $S) : $L * (1.0 + $S) : $L + $S - $L * $S;
$L + $S - $L * $S;
$temp1 = 2.0 * $L - $temp2; $temp1 = 2.0 * $L - $temp2;
@ -1957,8 +1955,7 @@ class Lessc {
} }
$current = isset($current->storeParent) ? $current = isset($current->storeParent) ?
$current->storeParent : $current->storeParent : $current->parent;
$current->parent;
} }
$this->throwError("variable $name is undefined"); $this->throwError("variable $name is undefined");

9
htdocs/core/lib/date.lib.php
View File

@ -877,7 +877,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
* @param int $lastday We include last day, 0: no, 1:yes * @param int $lastday We include last day, 0: no, 1:yes
* @param int $halfday Tag to define half day when holiday start and end * @param int $halfday Tag to define half day when holiday start and end
* @param string $country_code Country code (company country code if not defined) * @param string $country_code Country code (company country code if not defined)
* @return int Number of days or hours * @return int|string Number of days or hours or string if error
* @seealso num_between_day(), num_public_holiday() * @seealso num_between_day(), num_public_holiday()
*/ */
function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, $halfday = 0, $country_code = '') function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, $halfday = 0, $country_code = '')
@ -897,15 +897,14 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
{ {
$numdays = num_between_day($timestampStart, $timestampEnd, $lastday); $numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday); $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
$nbOpenDay = $numdays - $numholidays; $nbOpenDay = ($numdays - $numholidays);
$nbOpenDay.= " " . $langs->trans("Days"); if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday)); return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
} }
elseif ($timestampStart == $timestampEnd) elseif ($timestampStart == $timestampEnd)
{ {
$nbOpenDay = $lastday; $nbOpenDay = $lastday;
if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort"); if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday)); return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
} }
else else

2
htdocs/install/mysql/tables/llx_societe_rib.key.sql
View File

@ -18,3 +18,5 @@
ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(label, fk_soc); ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(label, fk_soc);
ALTER TABLE llx_societe_rib ADD CONSTRAINT llx_societe_rib_fk_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);