Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: broken feature

Browse Source
This commit is contained in:
Regis Houssin
2013-01-22 16:53:39 +01:00
parent a9b0469f7d
commit 910543c5b9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/commonobject.class.php
View File

@@ -2279,16 +2279,16 @@ abstract class CommonObject
$qty= $obj->qty;
$discount_percent_line = $obj->remise_percent;
$total_ht = $obj->total_ht;
$total_discount_line = price2num(($pu_ht * $qty) - $total_ht, 'MT');
$total_discount += $total_discount_line;
$i++;
}
}
else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR);
//print $total_discount; exit;
//print $total_discount; exit;
return price2num($total_discount);
}
@@ -2479,7 +2479,7 @@ abstract class CommonObject
$parameters=array();
$reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action); // Note that $action and $object may have been modified by hook
if (! $reshook)
if (empty($hookmanager->resPrint))
{
$num = count($this->linkedObjects);