From 48973c6d0296882d99e1a9a553c22923d6e35f9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Jan 2014 16:00:45 +0100
Subject: [PATCH] Fix: Some SQL requests were not finished into new tab
 "consumption".

---
 htdocs/societe/consumption.php | 71 ++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 28 deletions(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 20110c63315..03036f36a04 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -29,9 +29,7 @@ require("../main.inc.php");
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 // Security check
 $socid = GETPOST('socid','int');
@@ -161,37 +159,54 @@ print '<input type="hidden" name="socid" value="'.$socid.'">'."\n";
 
 $sql_select='';
 if ($type_element == 'invoice')
-{ // Customer : show products from invoices
-$documentstatic=new Facture($db);
-$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as datePrint, ';
-$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
-$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-$where.= " AND d.fk_facture = f.rowid";
-$where.= " AND f.entity = ".$conf->entity;
-$datePrint = 'f.datef';
-$doc_number='f.facnumber';
-$thirdTypeSelect='customer';
+{ 	// Customer : show products from invoices
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$documentstatic=new Facture($db);
+	$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as datePrint, ';
+	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
+	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND d.fk_facture = f.rowid";
+	$where.= " AND f.entity = ".$conf->entity;
+	$datePrint = 'f.datef';
+	$doc_number='f.facnumber';
+	$thirdTypeSelect='customer';
 }
 if ($type_element == 'order')
 {
-	// TODO
-
-}
-if ($type_element == 'supplier_order')
-{ // Supplier : Show products from orders.
-$documentstatic=new CommandeFournisseur($db);
-$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, "1" as doc_type, c.date_valid as datePrint, ';
-$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
-$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-$where.= " AND d.fk_commande = c.rowid";
-$datePrint = 'c.date_creation';
-$doc_number='c.ref';
-$thirdTypeSelect='supplier';
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+	$documentstatic=new Commande($db);
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, "1" as doc_type, c.date_commande as datePrint, ';
+	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
+	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND d.fk_commande = c.rowid";
+	$where.= " AND c.entity = ".$conf->entity;
+	$datePrint = 'c.datef';
+	$doc_number='c.ref';
+	$thirdTypeSelect='customer';
 }
 if ($type_element == 'supplier_invoice')
-{
-	// TODO
-
+{ 	// Supplier : Show products from invoices.
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+	$documentstatic=new FactureFournisseur($db);
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, "1" as doc_type, f.datef as datePrint, ';
+	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
+	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND d.fk_facture_fourn = f.rowid";
+	$datePrint = 'f.datef';
+	$doc_number='f.ref';
+	$thirdTypeSelect='supplier';
+}
+if ($type_element == 'supplier_order')
+{ 	// Supplier : Show products from orders.
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	$documentstatic=new CommandeFournisseur($db);
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, "1" as doc_type, c.date_valid as datePrint, ';
+	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
+	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND d.fk_commande = c.rowid";
+	$datePrint = 'c.date_valid';
+	$doc_number='c.ref';
+	$thirdTypeSelect='supplier';
 }
 
 $sql = $sql_select;