Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
f07ebe0065
3 changed files with 6 additions and 13 deletions
|
|
@ -615,7 +615,7 @@ class CMailFile
|
|||
if (!empty($this->atleastonefile)) {
|
||||
foreach ($filename_list as $i => $val) {
|
||||
$content = file_get_contents($filename_list[$i]);
|
||||
$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i], $cid_list[$i]);
|
||||
$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i], (empty($cid_list[$i]) ? '' : $cid_list[$i]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4993,25 +4993,19 @@ abstract class CommonObject
|
|||
$totalWeight = 0;
|
||||
$totalVolume = 0;
|
||||
// defined for shipment only
|
||||
$totalOrdered = '';
|
||||
$totalOrdered = 0;
|
||||
// defined for shipment only
|
||||
$totalToShip = '';
|
||||
$totalToShip = 0;
|
||||
|
||||
if (empty($this->lines)) {
|
||||
return array();
|
||||
return array('weight' => $totalWeight, 'volume' => $totalVolume, 'ordered' => $totalOrdered, 'toship' => $totalToShip);
|
||||
}
|
||||
|
||||
foreach ($this->lines as $line) {
|
||||
if (isset($line->qty_asked)) {
|
||||
if (empty($totalOrdered)) {
|
||||
$totalOrdered = 0; // Avoid warning because $totalOrdered is ''
|
||||
}
|
||||
$totalOrdered += $line->qty_asked; // defined for shipment only
|
||||
}
|
||||
if (isset($line->qty_shipped)) {
|
||||
if (empty($totalToShip)) {
|
||||
$totalToShip = 0; // Avoid warning because $totalToShip is ''
|
||||
}
|
||||
$totalToShip += $line->qty_shipped; // defined for shipment only
|
||||
} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) {
|
||||
if (empty($totalToShip)) {
|
||||
|
|
|
|||
|
|
@ -56,11 +56,10 @@ div.tabsAction > div.divButAction > a.butActionDelete,
|
|||
div.tabsAction > div.divButAction > a.butActionRefused {
|
||||
margin-bottom: 1.4em !important;
|
||||
margin-right: 0px !important;
|
||||
|
||||
}
|
||||
.divButAction {
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
}
|
||||
div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused {
|
||||
margin-bottom: 0 !important;
|
||||
|
|
|
|||
Loading…
Reference in a new issue