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

Merge pull request #592 from marcosgdf/minor

Browse Source 
Minor changes related to commit 8ac33e9
This commit is contained in:
Laurent Destailleur 2013-01-10 12:10:49 -08:00
commit 9251d9a6ac
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -60,7 +60,7 @@ For users:
- New: [ task #210 ] Can choose cash account during POS login. - New: [ task #210 ] Can choose cash account during POS login.
- New: [ task #104 ] Can create an invoice from several orders. - New: [ task #104 ] Can create an invoice from several orders.
- New: Update libs/tools/logo for DoliWamp (now use PHP 5.3). - New: Update libs/tools/logo for DoliWamp (now use PHP 5.3).
- New: Added ODT Template tag {object_total_discount} - New: Added ODT Template tag {object_total_discount_ht}
- New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices - New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices
- New: English bank account need a bank code (called sort code) to identify an account. - New: English bank account need a bank code (called sort code) to identify an account.
- New: Can choose menu entry to show with external site module. - New: Can choose menu entry to show with external site module.

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

@ -2255,11 +2255,11 @@ abstract class CommonObject
/** /**
* Function that returns the total amount HT of discounts applied for all lines. * Function that returns the total amount HT of discounts applied for all lines.
* *
* @return in 0 if no discount * @return float
*/ */
function getTotalDiscount() function getTotalDiscount()
{ {
$total_discount=0; $total_discount=0.00;
$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht"; $sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det"; $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";