lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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; $qty= $obj->qty;
$discount_percent_line = $obj->remise_percent; $discount_percent_line = $obj->remise_percent;
$total_ht = $obj->total_ht; $total_ht = $obj->total_ht;
$total_discount_line = price2num(($pu_ht * $qty) - $total_ht, 'MT'); $total_discount_line = price2num(($pu_ht * $qty) - $total_ht, 'MT');
$total_discount += $total_discount_line; $total_discount += $total_discount_line;
$i++; $i++;
} }
} }
else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR); else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR);
//print $total_discount; exit; //print $total_discount; exit;
return price2num($total_discount); return price2num($total_discount);
} }
@ -2479,7 +2479,7 @@ abstract class CommonObject
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action); // Note that $action and $object may have been modified by hook $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); $num = count($this->linkedObjects);

2
htdocs/core/class/hookmanager.class.php
View File

@ -41,6 +41,8 @@ class HookManager
// Array result // Array result
var $resArray=array(); var $resArray=array();
// Printable result (int, string)
var $resPrint;
/** /**
* Constructor * Constructor