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

FIX #5004

Browse Source
This commit is contained in:
arnaud 2016-06-30 14:57:23 +02:00
parent b6700c70d6
commit 97fe75f198
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/societe/consumption.php
View File

@ -280,6 +280,7 @@ if ($type_element == 'contract')
$thirdTypeSelect='customer'; $thirdTypeSelect='customer';
} }
if(!empty($sql_select)) {
$sql = $sql_select; $sql = $sql_select;
$sql.= ' d.description as description,'; $sql.= ' d.description as description,';
if ($type_element != 'fichinter' && $type_element != 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,'; if ($type_element != 'fichinter' && $type_element != 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,';
@ -317,6 +318,7 @@ $resql=$db->query($sql);
$totalnboflines = $db->num_rows($resql); $totalnboflines = $db->num_rows($resql);
$sql.= $db->plimit($limit + 1, $offset); $sql.= $db->plimit($limit + 1, $offset);
}
//print $sql; //print $sql;
// Define type of elements // Define type of elements