diff --git a/ChangeLog b/ChangeLog index ba9eef93f64..acfd46d2ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.6 compared to 3.5.* ***** +For users: +- New: Add list of orders products in tab "consumption" on thirdparties. + + ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: - New: Add hidden option BANK_DISABLE_DIRECT_INPUT. diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 21d98fbd64c..1609a44b6ae 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -1,6 +1,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2013 Juanjo Menent * * Version V1.1 Initial version of Philippe Berthet * Version V2 Change to be compatible with 3.4 and enhanced to be more generic @@ -30,6 +31,7 @@ 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.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; @@ -173,7 +175,15 @@ $thirdTypeSelect='customer'; } if ($type_element == 'order') { - // TODO + $documentstatic=new Commande($db); + $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, "1" as doc_type, f.date_commande as datePrint, '; + $tables_from = MAIN_DB_PREFIX."commande as f,".MAIN_DB_PREFIX."commandedet as d"; + $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid; + $where.= " AND d.fk_commande = f.rowid"; + $where.= " AND f.entity = ".$conf->entity; + $datePrint = 'f.date_creation'; + $doc_number='f.ref'; + $thirdTypeSelect='customer'; } if ($type_element == 'supplier_order')