diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 990acd801c78f6d39518d971e6cb694d76df80c2..3f2893ffcfbbf19229cd2ba3ec5151500edc4eaa 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -162,7 +162,7 @@ if (! empty($conf->global->DISPLAY_MARK_RATES)) { print "</table>"; print '</form>'; -$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity"; +$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,"; if ($id > 0) $sql.= " d.fk_product,"; if ($id > 0) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,"; $sql.= " sum(d.total_ht) as selling_price,"; diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 7697c203048a2395a1dec3c87d10f3c9c407a440..2282b42cf0ffd0e693d674653c72110b729dcd44 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -285,7 +285,7 @@ $sql = $sql_select; $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 == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty,'; -if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity'; +if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,'; $sql.= " s.rowid as socid "; if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;