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 develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-10 12:06:21 +02:00
commit 1b88f05f28
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/website2.lib.php
View File

@ -108,7 +108,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$dirname = dirname($filealias); $dirname = dirname($filealias);
$filename = basename($filealias); $filename = basename($filealias);
foreach (explode(',', $object->otherlang) as $sublang) { foreach (explode(',', $object->otherlang) as $sublang) {
// Avoid to erase main alias file if $sublang is empty string // Avoid to erase main alias file if $sublang is empty string
if (empty(trim($sublang))) continue; if (empty(trim($sublang))) continue;
$filealiassub = $dirname.'/'.$sublang.'/'.$filename; $filealiassub = $dirname.'/'.$sublang.'/'.$filename;

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2708,7 +2708,7 @@ class CommandeFournisseur extends CommonOrder
if ($qty < $this->line->packaging) { if ($qty < $this->line->packaging) {
$qty = $this->line->packaging; $qty = $this->line->packaging;
} else { } else {
if (! empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) { if (! empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
$coeff = intval($qty / $this->line->packaging) + 1; $coeff = intval($qty / $this->line->packaging) + 1;
$qty = $this->line->packaging * $coeff; $qty = $this->line->packaging * $coeff;
setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs'); setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');

2
htdocs/product/class/api_products.class.php
View File

@ -808,7 +808,7 @@ class Products extends DolibarrApi
$sql .= ' WHERE t.entity IN ('.getEntity('product').')'; $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
if ($supplier > 0) { if ($supplier > 0) {
$sql .= " AND s.fk_soc = "((int) $supplier); $sql .= " AND s.fk_soc = ".((int) $supplier);
} }
if ($socid > 0) { // if external user if ($socid > 0) { // if external user
$sql .= " AND s.fk_soc = ".((int) $socid); $sql .= " AND s.fk_soc = ".((int) $socid);