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

Merge remote-tracking branch 'origin/3.4' into 3.5

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-01 15:06:25 +01:00
commit 0b83f1a670
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -34,8 +34,9 @@ Fix: The customer code was set to uppercase when using numbering module leopard.
must keep data safe of any change. must keep data safe of any change.
Fix: Loading actions extrafields fails. Fix: Loading actions extrafields fails.
Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid
Fix: Corrected project contact types translation Fix: Corrected project contact types translation.
Fix: [ bug #1206 ] PMP price is bad calculated Fix: [ bug #1206 ] PMP price is bad calculated.
Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
***** ChangeLog for 3.5 compared to 3.4.* ***** ***** ChangeLog for 3.5 compared to 3.4.* *****
For users: For users:

4
htdocs/product/index.php
View File

@ -114,8 +114,8 @@ $result = $db->query($sql);
while ($objp = $db->fetch_object($result)) while ($objp = $db->fetch_object($result))
{ {
$status=1; $status=1;
if (! $objp->tosell && ! $objp->tobuy) $status=0; if (! $objp->tosell && ! $objp->tobuy) $status=0; // To sell OR to buy
$prodser[$objp->fk_product_type][$status]=$objp->total; $prodser[$objp->fk_product_type][$status]+=$objp->total;
} }
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';