Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop Conflicts: htdocs/contrat/list.php
2014-10-04 17:32:01 +02:00 · 2014-10-04 17:32:01 +02:00 · 11d1be882c
commit 11d1be882c
parent 5601c979ab e70aebf2c7
16 changed files with 812 additions and 106 deletions
--- a/4
+++ b/4
@ -51,7 +51,7 @@ For users:
 - New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
 - New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
 - New: Enable supplier price log table.
- New: [ task #1204 ] add a External reference to contract.
+- New: [ task #1204 ] add a supplier reference to contract.
 - New: [ task #1218 ] Can drag and drop an event from calendar to change its day.
 - New: Optimize size of image static resources.
 - New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.
@ -59,7 +59,9 @@ For users:
 - New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture 
       onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 - New: Add more search field in list of cheque deposits.
+- New: Add feature to order to invoice on supplier part
 - Upgrade phpexcel lib to 1.7.8
+- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export
 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
 - Fix: [ bug #1470, #1472, #1473] User trigger problem
 - Fix: [ bug #1489, #1491 ] Intervention trigger problem
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@ -29,18 +29,18 @@
 */

 require ("../main.inc.php");
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/contract.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/contract/modules_contract.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';

@ -215,7 +215,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
    	$object->fk_project					= GETPOST('projectid','int');
    	$object->remise_percent				= GETPOST('remise_percent','alpha');
    	$object->ref						= GETPOST('ref','alpha');
-    	$object->ref_customer				= GETPOST('ref_customer','alpha');
+    	$object->ref_supplier				= GETPOST('ref_supplier','alpha');

 	    // If creation from another object of another module (Example: origin=propal, originid=1)
 	    if ($_POST['origin'] && $_POST['originid'])
@ -718,13 +718,17 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra
 		$action = 'edit_extras';
 		setEventMessage($object->error,'errors');
 	}
-} elseif ($action=='setref_customer') {
-	$object->ref_customer=GETPOST('ref_customer','alpha');
+} elseif ($action=='setref_supplier') {
+	$result = $object->fetch($id);
+	if ($result < 0) {
+		setEventMessage($object->errors,'errors');
+	}
+	$object->ref_supplier=GETPOST('ref_supplier','alpha');

 	$result = $object->update($user);
 	if ($result < 0) {
 		setEventMessage($object->errors,'errors');
-		$action='editref_customer';
+		$action='editref_supplier';
 	} else {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
@ -934,7 +938,7 @@ if ($action == 'create')

 	// Ref Int
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-	print '<td colspan="2"><input type="text" siez="5" name="ref_customer" id="ref_customer" value="'.GETPOST('ref_customer','alpha').'"></td></tr>';
+	print '<td colspan="2"><input type="text" siez="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';

    // Customer
 	print '<tr>';
@ -1131,9 +1135,9 @@ else

        print '<tr>';
 		print '<td  width="20%">';
-		print $form->editfieldkey("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer);
+		print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
 		print '</td><td>';
-		print $form->editfieldval("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer);
+		print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
 		print '</td>';
 		print '</tr>';

@ -1812,8 +1816,8 @@ else

        /*
         * Linked object block
-        */
-        $somethingshown = $object->showLinkedObjectBlock();
+         */
+        $somethingshown=$object->showLinkedObjectBlock();

        print '</div><div class="fichehalfright"><div class="ficheaddleft">';

--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@ -46,7 +46,7 @@ class Contrat extends CommonObject
 	var $id;
 	var $ref;
 	var $ref_ext;
-	var $ref_customer;
+	var $ref_supplier;
 	var $socid;
 	var $societe;		// Objet societe
 	var $statut=0;		// 0=Draft,
@ -403,7 +403,7 @@ class Contrat extends CommonObject
 		$sql.= " fk_projet,";
 		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
 		$sql.= " note_private, note_public, model_pdf, extraparams";
-		$sql.= " ,ref_customer";
+		$sql.= " ,ref_supplier";
 		$sql.= " ,ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
 		if ($ref)
@ -423,7 +423,7 @@ class Contrat extends CommonObject
 			{
 				$this->id						= $result["rowid"];
 				$this->ref						= (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
-				$this->ref_customer				= $result["ref_customer"];
+				$this->ref_supplier				= $result["ref_supplier"];
 				$this->ref_ext					= $result["ref_ext"];
 				$this->statut					= $result["statut"];
 				$this->mise_en_service			= $this->db->jdate($result["datemise"]);
@ -726,7 +726,7 @@ class Contrat extends CommonObject
 		// Insert contract
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
 		$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
-		$sql.= " ref, entity, note_private, note_public, ref_customer, ref_ext)";
+		$sql.= " ref, entity, note_private, note_public, ref_supplier, ref_ext)";
 		$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
 		$sql.= ", '".$this->db->idate($this->date_contrat)."'";
 		$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
@ -736,7 +736,7 @@ class Contrat extends CommonObject
 		$sql.= ", ".$conf->entity;
 		$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
 		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
-		$sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL");
+		$sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
 		$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
 		$sql.= ")";
 		$resql=$this->db->query($sql);
@ -988,7 +988,7 @@ class Contrat extends CommonObject
 		// Clean parameters

 		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
+		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
 		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
 		if (isset($this->entity)) $this->entity=trim($this->entity);
 		if (isset($this->statut)) $this->statut=trim($this->statut);
@ -1012,7 +1012,7 @@ class Contrat extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";

 		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
+		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
 		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
 		$sql.= " entity=".$conf->entity.",";
 		$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@ -42,7 +42,7 @@ $offset = $limit * $page ;

 $search_nom=GETPOST('search_nom');
 $search_contract=GETPOST('search_contract');
-$search_ref_customer=GETPOST('search_ref_customer','alpha');
+$search_ref_supplier=GETPOST('search_ref_supplier','alpha');
 $sall=GETPOST('sall');
 $statut=GETPOST('statut')?GETPOST('statut'):1;
 $socid=GETPOST('socid');
@ -75,7 +75,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
 $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,";
 $sql.= " s.nom, s.rowid as socid";
-$sql.= " ,c.ref_customer";
+$sql.= " ,c.ref_supplier";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."contrat as c";
@ -90,8 +90,8 @@ if ($search_nom) {
 if ($search_contract) {
    $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
 }
-if (!empty($search_ref_customer)) {
-	$sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
+if (!empty($search_ref_supplier)) {
+	$sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 }
 if ($sall) {
    $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall);
@ -113,9 +113,9 @@ if ($resql)
    print '<tr class="liste_titre">';
    $param='&amp;search_contract='.$search_contract;
    $param.='&amp;search_nom='.$search_nom;
-    $param.='&amp;search_ref_customer='.$search_ref_customer;
+    $param.='&amp;search_ref_supplier='.$search_ref_supplier;
    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
    print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
    //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder);
    print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
@ -133,7 +133,7 @@ if ($resql)
    print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">';
    print '</td>';
    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" size="7" name="search_ref_customer value="'.$search_ref_customer.'">';
+    print '<input type="text" class="flat" size="7" name="search_ref_supplier value="'.$search_ref_supplier.'">';
    print '</td>';
    print '<td class="liste_titre">';
    print '<input type="text" class="flat" size="24" name="search_nom" value="'.$search_nom.'">';
@ -155,7 +155,7 @@ if ($resql)
        print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>';
        if ($obj->nb_late) print img_warning($langs->trans("Late"));
        print '</td>';
-        print '<td>'.$obj->ref_customer.'</td>';
+        print '<td>'.$obj->ref_supplier.'</td>';
        print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
        //print '<td align="center">'.dol_print_date($obj->datec).'</td>';
        print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>';
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@ -790,6 +790,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&amp;viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
 				//                  if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
+			
+			// Supplier Orders
+			if (! empty($conf->fournisseur->enabled))
+			{
+				$langs->load("supplier");
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				//                  if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+			}
+			

 			// Donations
 			if (! empty($conf->don->enabled))
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@ -190,6 +190,14 @@ class ExportExcel extends ModeleExports
 	            	return -1;
 	            }
 		    }
+		    
+		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+			    $cacheSettings = array (
+			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+			    );
+			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+		    }

            $this->workbook = new PHPExcel();
            $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@ -100,8 +100,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->posxcomm=112;
 		//$this->posxtva=112;
 		//$this->posxup=126;
-		$this->posxqty=174;
-		$this->posxremainingqty=165;
+		$this->posxqty=165;
+		$this->posxremainingqty=185;
 		//$this->posxdiscount=162;
 		//$this->postotalht=174;
 		if ($this->page_largeur < 210) // To work with US executive format
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@ -7,6 +7,7 @@
 * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
 * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
 * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2014		Francis Appels			<francis.appels@yahoo.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -1433,6 +1434,18 @@ else if ($id || $ref)
 					$entrepot = new Entrepot($db);
 					$entrepot->fetch($lines[$i]->entrepot_id);
 					print $entrepot->getNomUrl(1);
+				} 
+				else if (count($lines[$i]->details_entrepot) > 1)
+				{
+					$detail = '';
+					foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+						if ($detail_entrepot->entrepot_id > 0) {
+							$entrepot = new Entrepot($db);
+							$entrepot->fetch($detail_entrepot->entrepot_id);
+							$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+						}
+					}
+					print $form->textwithtooltip($langs->trans("DetailWarehouseNumber"),$detail);
 				}
 				print '</td>';
 			}
@ -1440,6 +1453,7 @@ else if ($id || $ref)
 			// Batch number managment
 			if (! empty($conf->productbatch->enabled)) {
 				if (isset($lines[$i]->detail_batch) ) {
+					$flagBatch = true;
 					print '<td align="center">';
 					$detail = '';
 					foreach ($lines[$i]->detail_batch as $dbatch) {
@ -1526,10 +1540,17 @@ else if ($id || $ref)
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans($label).'</a>';
 			}
 		}
-
+        
 		if ($user->rights->expedition->supprimer)
 		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+			if (empty($conf->productbatch->enabled) || (!empty($conf->productbatch->enabled) && !$conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !isset($flagBatch))
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+			}
+			else
+			{
+				print '<a class="butActionRefused" href="#">'.$langs->trans('Delete').'</a>';
+			}
 		}

 		print '</div>';
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@ -7,6 +7,7 @@
 * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
 * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
 * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014       Francis Appels          <francis.appels@yahoo.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -1068,7 +1069,7 @@ class Expedition extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql.= " WHERE ed.fk_expedition = ".$this->id;
 		$sql.= " AND ed.fk_origin_line = cd.rowid";
-		$sql.= " ORDER BY cd.rang";
+		$sql.= " ORDER BY cd.rang, ed.fk_origin_line";

 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@ -1078,6 +1079,8 @@ class Expedition extends CommonObject

 			$num = $this->db->num_rows($resql);
 			$i = 0;
+			$lineindex = 0;
+			$originline = 0;

 			$this->total_ht = 0;
 			$this->total_tva = 0;
@ -1087,13 +1090,25 @@ class Expedition extends CommonObject

 			while ($i < $num)
 			{
-				$line = new ExpeditionLigne($this->db);
-				$obj = $this->db->fetch_object($resql);
-
+				$obj = $this->db->fetch_object($resql);			    
+			    
+			    if ($originline == $obj->fk_origin_line) {	
+			        $line->entrepot_id       = 0; // entrepod_id in details_entrepot
+				    $line->qty_shipped    	+= $obj->qty_shipped;				    
+				} else {
+				    $line = new ExpeditionLigne($this->db);
+				    $line->entrepot_id    	= $obj->fk_entrepot;
+				    $line->qty_shipped    	= $obj->qty_shipped;
+				}
+				
+				$detail_entrepot              = new stdClass;
+				$detail_entrepot->entrepot_id = $obj->fk_entrepot;
+				$detail_entrepot->qty_shipped = $obj->qty_shipped;
+				$line->details_entrepot[]     = $detail_entrepot;
+				
                $line->line_id          = $obj->line_id;
 				$line->fk_origin_line 	= $obj->fk_origin_line;
 				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
-				$line->entrepot_id    	= $obj->fk_entrepot;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
 				$line->ref				= $obj->product_ref;		// TODO deprecated
@ -1103,7 +1118,6 @@ class Expedition extends CommonObject
 				$line->label			= $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
-				$line->qty_shipped    	= $obj->qty_shipped;
 				$line->weight         	= $obj->weight;
 				$line->weight_units   	= $obj->weight_units;
 				$line->length         	= $obj->length;
@ -1116,7 +1130,7 @@ class Expedition extends CommonObject
 				// For invoicing
 				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type);	// We force type to 0
 				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
-				$line->qty 				= $obj->qty_shipped;
+				$line->qty 				= $line->qty_shipped;
 				$line->total_ht			= $tabprice[0];
 				$line->total_localtax1 	= $tabprice[9];
 				$line->total_localtax2 	= $tabprice[10];
@ -1141,11 +1155,25 @@ class Expedition extends CommonObject
                     * May be conf is not well initialized for dark reason 
                     */
                    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-					$line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+                    if ($originline != $obj->fk_origin_line) {
+                        $line->detail_batch = ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+                    } else {
+                        $line->detail_batch = array_merge($line->detail_batch,ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id));
+                    }
+				}
+				if ($originline != $obj->fk_origin_line) {
+				    $this->lines[$lineindex] = $line;
+				    $lineindex++;
+				} else {
+				    $line->total_ht			+= $tabprice[0];
+				    $line->total_localtax1 	+= $tabprice[9];
+				    $line->total_localtax2 	+= $tabprice[10];
+				    $line->total_ttc	 	+= $tabprice[2];
+				    $line->total_tva	 	+= $tabprice[1];
 				}
-				$this->lines[$i] = $line;

 				$i++;
+				$originline = $obj->fk_origin_line;	
 			}
 			$this->db->free($resql);
 			return 1;
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@ -304,6 +304,28 @@ if ($object->fetch($id))

 	if ($user->rights->fournisseur->commande->lire)
 	{
+		
+		
+		// TODO move to DAO class
+		// Check if there are supplier orders billable
+		$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
+		$sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+		$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
+		$sql2.= ' WHERE c.fk_soc = s.rowid';
+		$sql2.= ' AND s.rowid = '.$object->id;
+		// Show orders with status validated, shipping started and delivered (well any order we can bill)
+		$sql2.= " AND c.fk_statut IN (5)";
+		// Find order that are not already invoiced
+		$sql2 .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
+		$resql2=$db->query($sql2);
+		if ($resql2) {
+			$orders2invoice = $db->num_rows($resql2);
+			$db->free($resql2);
+		} else {
+			setEventMessage($db->lasterror(),'errors');
+		}
+		
 		// TODO move to DAO class
 		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
@ -436,60 +458,66 @@ if ($object->fetch($id))
 	if (empty($reshook)) 
 	{

-		print '<div class="tabsAction">';
-
-		if ($user->rights->fournisseur->commande->creer)
-		{
-			$langs->load("orders");
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
-		}
-
-		if ($user->rights->fournisseur->facture->creer)
-		{
-			$langs->load("bills");
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
-		}
-
-		// Add action
-		if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-		{
-		    if ($user->rights->agenda->myactions->create)
-		    {
-		        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-		    }
-		    else
-		    {
-		        print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-		    }
-		}
-
-		print '</div>';
-		print '<br>';
-
-		if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
-		{
-		    print '<br>';
-		    // List of contacts
-		    show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-		}
-
-		// Addresses list
-		if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
-		{
-			$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-		}
-
-		if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-		{
-		    print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
-
-		    // List of todo actions
-		    show_actions_todo($conf,$langs,$db,$object);
-
-		    // List of done actions
-		    show_actions_done($conf,$langs,$db,$object);
-		}
+	print '<div class="tabsAction">';
+	
+	if ($user->rights->fournisseur->commande->creer)
+	{
+		$langs->load("orders");
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
 	}
+
+	if ($user->rights->fournisseur->facture->creer)
+	{
+		$langs->load("bills");
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+	}
+	
+	if ($user->rights->fournisseur->facture->creer)
+	{
+		if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+		else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+	}
+
+    // Add action
+    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    {
+        if ($user->rights->agenda->myactions->create)
+        {
+            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+        }
+        else
+        {
+            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+        }
+    }
+
+	print '</div>';
+	print '<br>';
+
+    if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
+    {
+        print '<br>';
+        // List of contacts
+        show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
+
+    // Addresses list
+    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+    {
+    	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
+
+    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    {
+        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+
+        // List of todo actions
+        show_actions_todo($conf,$langs,$db,$object);
+
+        // List of done actions
+        show_actions_done($conf,$langs,$db,$object);
+    }
+}
 }
 else
 {
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@ -51,6 +51,8 @@ $socid = GETPOST('socid','int');
 $sortorder = GETPOST('sortorder','alpha');
 $sortfield = GETPOST('sortfield','alpha');

+$viewstatut=GETPOST('viewstatut');
+
 // Security check
 $orderid = GETPOST('orderid');
 if ($user->societe_id) $socid=$user->societe_id;
@ -255,6 +257,8 @@ if ($resql)
 	}
 	print "</table>\n";
 	print "</form>\n";
+	
+	print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';

 	$db->free($resql);
 }
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@ -0,0 +1,594 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville   	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur   	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo  	<marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin          	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012	   Andreu Bisquerra Gaya  	<jove@bisquerra.com>
+ * Copyright (C) 2012	   David Rodriguez Martinez <davidrm146@gmail.com>
+ * Copyright (C) 2012	   Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2014	   Florian Henry			<florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/fourn/commande/orderstoinvoice.php
+ * \ingroup commande
+ * \brief Page to invoice multiple supplier orders
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.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 . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+if (! empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
+
+$langs->load('orders');
+$langs->load('deliveries');
+$langs->load('companies');
+
+if (! $user->rights->facture->creer)
+	accessforbidden();
+
+$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$sref = GETPOST('sref');
+$sref_client = GETPOST('sref_client');
+$sall = GETPOST('sall');
+$socid = GETPOST('socid', 'int');
+$selected = GETPOST('orders_to_invoice');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$viewstatut = GETPOST('viewstatut');
+
+if (! $sortfield)
+	$sortfield = 'c.rowid';
+if (! $sortorder)
+	$sortorder = 'DESC';
+
+$now = dol_now();
+$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
+$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
+$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
+$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
+
+if ($action == 'create') {
+	if (is_array($selected) == false) {
+		$mesgs = array (
+				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>' 
+		);
+	} else {
+		$origin = GETPOST('origin');
+		$originid = GETPOST('originid');
+	}
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('orderstoinvoicesupplier'));
+
+/*
+ * Actions
+ */
+
+if (($action == 'create' || $action == 'add') && empty($mesgs)) {
+	
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
+	if (! empty($conf->projet->enabled))
+		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+	
+	$langs->load('bills');
+	$langs->load('products');
+	$langs->load('main');
+	if (isset($_GET['orders_to_invoice'])) {
+		$orders_id = $_GET['orders_to_invoice'];
+		$n = count($orders_id);
+		$i = 0;
+		
+		$originid = $orders_id[0];
+		$_GET['originid'] = $orders_id[0];
+	}
+	if (isset($_POST['orders_to_invoice'])) {
+		$orders_id = $_POST['orders_to_invoice'];
+		$nn = count($orders_id);
+		$ii = 0;
+		
+		$originid = $orders_id[0];
+		$_POST['originid'] = $orders_id[0];
+	}
+	
+	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
+	$lineid = GETPOST('lineid', 'int');
+	$userid = GETPOST('userid', 'int');
+	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
+	
+	// Security check
+	if ($user->societe_id)
+		$socid = $user->societe_id;
+	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+	
+	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
+	$object = new FactureFournisseur($db);
+	
+	// Insert new invoice in database
+	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
+		$object->socid = GETPOST('socid');
+		$db->begin();
+		$error = 0;
+		
+		// Standard or deposit or proforma invoice
+		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		if (empty($datefacture)) {
+			$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+		}
+		if (! $error) {
+			$object->ref = $_POST['ref'];
+			$object->ref_supplier = $_POST['ref_supplier'];
+			$object->socid = $_POST['socid'];
+			$object->libelle = $_POST['libelle'];
+			$object->date = $datefacture;
+			$object->date_echeance = $datedue;
+			$object->note_public = GETPOST('note_public');
+			$object->note_private = GETPOST('note_private');
+			$object->cond_reglement_id = GETPOST('cond_reglement_id');
+			$object->mode_reglement_id = GETPOST('mode_reglement_id');
+			$projectid = GETPOST('projectid');
+			if ($projectid > 0)
+				$object->fk_project = $projectid;
+				
+				// Auto calculation of date due if not filled by user
+			if (empty($object->date_echeance))
+				$object->date_echeance = $object->calculate_date_lim_reglement();
+			
+			if ($_POST['origin'] && $_POST['originid']) {
+				$object->origin = $_POST['origin'];
+				$object->origin_id = $orders_id[$ii];
+				$object->linked_objects = $orders_id;
+				$id = $object->create($user);
+				
+				if ($id > 0) {
+					foreach ( $orders_id as $origin => $origin_id ) {
+						$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
+						$db->begin();
+						$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
+						$sql .= "fk_source";
+						$sql .= ", sourcetype";
+						$sql .= ", fk_target";
+						$sql .= ", targettype";
+						$sql .= ") VALUES (";
+						$sql .= $origin_id;
+						$sql .= ", '" . $object->origin . "'";
+						$sql .= ", " . $id;
+						$sql .= ", '" . $object->element . "'";
+						$sql .= ")";
+						
+						if ($db->query($sql)) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
+					}
+					
+					while ( $ii < $nn ) {
+						$objectsrc = new CommandeFournisseur($db);
+						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+						$result = $objectsrc->fetch($orders_id[$ii]);
+						if ($result > 0) {
+							$lines = $objectsrc->lines;
+							if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
+								$objectsrc->fetch_lines();
+								$lines = $objectsrc->lines;
+							}
+							$fk_parent_line = 0;
+							$num = count($lines);
+							for($i = 0; $i < $num; $i ++) {
+								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+								
+								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+								
+								// Dates
+								// TODO mutualiser
+								$date_start = $lines[$i]->date_debut_prevue;
+								if ($lines[$i]->date_debut_reel)
+									$date_start = $lines[$i]->date_debut_reel;
+								if ($lines[$i]->date_start)
+									$date_start = $lines[$i]->date_start;
+								$date_end = $lines[$i]->date_fin_prevue;
+								if ($lines[$i]->date_fin_reel)
+									$date_end = $lines[$i]->date_fin_reel;
+								if ($lines[$i]->date_end)
+									$date_end = $lines[$i]->date_end;
+									
+									// Reset fk_parent_line for no child products and special product
+								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
+									$fk_parent_line = 0;
+								}
+								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
+								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
+								
+								if ($result > 0) {
+									$lineid = $result;
+								} else {
+									$lineid = 0;
+									$error ++;
+									break;
+								}
+								// Defined the new fk_parent_line
+								if ($result > 0 && $lines[$i]->product_type == 9) {
+									$fk_parent_line = $result;
+								}
+							}
+						} else {
+							$mesgs[] = $objectsrc->error;
+							$error ++;
+						}
+						$ii ++;
+					}
+				} else {
+					$mesgs[] = $object->error;
+					$error ++;
+				}
+			}
+		}
+		
+		// End of object creation, we show it
+		if ($id > 0 && ! $error) {
+			$db->commit();
+			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
+			exit();
+		} else {
+			$db->rollback();
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			$mesgs[] = '<div class="error">' . $object->error . '</div>';
+		}
+	}
+}
+
+/*
+ * View
+ */
+
+$html = new Form($db);
+$htmlother = new FormOther($db);
+$formfile = new FormFile($db);
+$companystatic = new Societe($db);
+
+// Mode creation
+if ($action == 'create' && empty($mesgs)) {
+	
+	llxHeader();
+	print_fiche_titre($langs->trans('NewBill'));
+	
+	$soc = new Societe($db);
+	if ($socid)
+		$res = $soc->fetch($socid);
+	if ($res) {
+		$cond_reglement_id = $soc->cond_reglement_id;
+		$mode_reglement_id = $soc->mode_reglement_id;
+	}
+	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
+	
+	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
+	print '<input name="facnumber" type="hidden" value="provisoire">';
+	print '<input name="ref_client" type="hidden" value="' . $ref_client . '">';
+	print '<input name="ref_int" type="hidden" value="' . $ref_int . '">';
+	print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
+	print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
+	print '<table class="border" width="100%">';
+	
+	// Ref
+	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+	
+	// Ref supplier
+	print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
+	print '</tr>';
+	
+	// Third party
+	print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
+	print $soc->getNomUrl(1);
+	print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+	print '</td>';
+	print '</tr>' . "\n";
+	
+	// Date invoice
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	$html->select_date('', '', '', '', '', "add", 1, 1);
+	print '</td></tr>';
+	// Payment term
+	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
+	print '</td></tr>';
+	// Payment mode
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
+	print '</td></tr>';
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$formproject = new FormProjets($db);
+		
+		$langs->load('projects');
+		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		$formproject->select_projects($soc->id, $projectid, 'projectid');
+		print '</td></tr>';
+	}
+	
+	$objectsrc = new CommandeFournisseur($db);
+	$listoforders = array ();
+	foreach ( $selected as $sel ) {
+		$result = $objectsrc->fetch($sel);
+		if ($result > 0) {
+			$listoforders[] = $objectsrc->ref;
+		}
+	}
+	
+	// Other attributes
+	$parameters = array (
+			'objectsrc' => $objectsrc,
+			'idsrc' => $listoforders,
+			'colspan' => ' colspan="3"' 
+	);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	                                                                                           
+	// Modele PDF
+	print '<tr><td>' . $langs->trans('Model') . '</td>';
+	print '<td>';
+	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
+	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
+	print "</td></tr>";
+	
+	// Public note
+	print '<tr>';
+	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
+	print '<td valign="top" colspan="2">';
+	print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+	
+	print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
+	
+	print '</textarea></td></tr>';
+	// Private note
+	if (empty($user->societe_id)) {
+		print '<tr>';
+		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td valign="top" colspan="2">';
+		print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+		
+		print '</textarea></td></tr>';
+	}
+	
+	print '</table>';
+	
+	while ( $i < $n ) {
+		print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
+		
+		$i ++;
+	}
+	
+	// Button "Create Draft"
+	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></center>';
+	print "</form>\n";
+	
+	print '</td></tr>';
+	print "</table>\n";
+}
+
+// Mode liste
+if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
+	llxHeader();
+	?>
+<script type="text/javascript">
+		jQuery(document).ready(function() {
+		jQuery("#checkall").click(function() {
+			jQuery(".checkformerge").attr('checked', true);
+		});
+		jQuery("#checknone").click(function() {
+			jQuery(".checkformerge").attr('checked', false);
+		});
+	});
+	</script>
+<?php
+	
+	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
+	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
+	$sql .= ', ' . MAIN_DB_PREFIX . 'commande_fournisseur as c';
+	if (! $user->rights->societe->client->voir && ! $socid)
+		$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+	$sql .= ' WHERE c.entity = ' . $conf->entity;
+	$sql .= ' AND c.fk_soc = s.rowid';
+	
+	// Show orders with status validated, shipping started and delivered (well any order we can bill)
+	$sql .= " AND c.fk_statut IN (5)";
+	
+	// Find order that are not already invoiced
+	$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
+	
+	if ($socid)
+		$sql .= ' AND s.rowid = ' . $socid;
+	if (! $user->rights->societe->client->voir && ! $socid)
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+	if ($sref) {
+		$sql .= " AND c.ref LIKE '%" . $db->escape($sref) . "%'";
+	}
+	if ($sall) {
+		$sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
+	}
+	
+	// Date filter
+	if ($date_start && $date_end)
+		$sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
+	if ($date_starty && $date_endy)
+		$sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
+	
+	if (! empty($sref_client)) {
+		$sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
+	}
+	$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
+	dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
+	$resql = $db->query($sql);
+	
+	if ($resql) {
+		if ($socid) {
+			$soc = new Societe($db);
+			$soc->fetch($socid);
+		}
+		$title = $langs->trans('ListOfSupplierOrders');
+		$title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort');
+		$num = $db->num_rows($resql);
+		print_fiche_titre($title);
+		$i = 0;
+		$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
+		$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
+		
+		if (! empty($socid)) {
+			// Company
+			$companystatic->id = $socid;
+			$companystatic->nom = $soc->nom;
+			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
+		}
+		
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('RefSupplier'), 'orderstoinvoice.php', 'c.ref_supplier', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('OrderDate'), 'orderstoinvoice.php', 'c.date_commande', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
+		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
+		print '</tr>';
+		
+		// Lignes des champs de filtre
+		print '<form method="get" action="orderstoinvoice.php">';
+		print '<input type="hidden" name="socid" value="' . $socid . '">';
+		print '<tr class="liste_titre">';
+		print '<td class="liste_titre">';
+		// REF
+		print '<input class="flat" size="10" type="text" name="sref" value="' . $sref . '">';
+		print '</td>';
+		// print '<td class="liste_titre">';
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
+		
+		// DATE ORDER
+		print '<td class="liste_titre" align="center">';
+		print $period;
+		print '</td>';
+		
+		// DATE DELIVERY
+		print '<td class="liste_titre" align="center">';
+		print $periodely;
+		print '</td>';
+		
+		// SEARCH BUTTON
+		print '</td><td align="right" class="liste_titre">';
+		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+		
+		// ALL/NONE
+		print '<td class="liste_titre" align="center">';
+		if ($conf->use_javascript_ajax)
+			print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
+		print '</td>';
+		
+		print '</td></tr>';
+		print '</form>';
+		
+		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
+		$var = True;
+		$generic_commande = new CommandeFournisseur($db);
+		
+		while ( $i < $num ) {
+			$objp = $db->fetch_object($resql);
+			$var = ! $var;
+			print '<tr ' . $bc[$var] . '>';
+			print '<td class="nowrap">';
+			
+			$generic_commande->id = $objp->rowid;
+			$generic_commande->ref = $objp->ref;
+			
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			print '<td class="nobordernopadding nowrap">';
+			print $generic_commande->getNomUrl(1, $objp->fk_statut);
+			print '</td>';
+			
+			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+			$filename = dol_sanitizeFileName($objp->ref);
+			$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+			$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $objp->rowid;
+			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
+			print '</td></tr></table>';
+			print '</td>';
+			
+			print '<td>' . $objp->ref_supplier . '</td>';
+			
+			// Order date
+			print '<td align="center" nowrap>';
+			print dol_print_date($db->jdate($objp->date_commande), 'day');
+			print '</td>';
+			
+			// Delivery date
+			print '<td align="center" nowrap>';
+			print dol_print_date($db->jdate($objp->date_livraison), 'day');
+			print '</td>';
+			
+			// Statut
+			print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
+			
+			// Checkbox
+			print '<td align="center">';
+			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
+			print '</td>';
+			
+			print '</tr>';
+			
+			$total = $total + $objp->price;
+			$subtotal = $subtotal + $objp->price;
+			$i ++;
+		}
+		print '</table>';
+		
+		/*
+		 * Boutons actions
+		*/
+		print '<center>';
+		print '<div align="right">';
+		print '<input type="hidden" name="socid" value="' . $socid . '">';
+		print '<input type="hidden" name="action" value="create">';
+		print '<input type="hidden" name="origin" value="commande"><br>';
+		// print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
+		print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
+		print '</div>';
+		print '</form>';
+		$db->free($resql);
+	} else {
+		print dol_print_error($db);
+	}
+}
+
+dol_htmloutput_mesg($mesg, $mesgs);
+
+llxFooter();
+$db->close();
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@ -47,9 +47,9 @@ ALTER TABLE llx_user ADD COLUMN fk_user_modif integer AFTER fk_user_creat;

 -- Add module accounting Expert
 ALTER TABLE llx_bookkeeping RENAME TO llx_accounting_bookkeeping; -- To update old user of module Accounting Expert
- 

-CREATE TABLE llx_accounting_bookkeeping 
+
+CREATE TABLE llx_accounting_bookkeeping
 (
  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
  doc_date			date NOT NULL,
@ -74,12 +74,12 @@ ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL
 ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number;

 ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity;
+ALTER TABLE llx_accountingaccount add column datec datetime AFTER entity;
 ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
 ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label;
 ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;

-- Qual 
+-- Qual
 UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE';
 UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER';
 UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER';
@ -204,7 +204,7 @@ create table llx_accounting_fiscalyear
 )ENGINE=innodb;

 ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref;
-ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30) after ref_ext;
+ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext;

 ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison;
 ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison;
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
 NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@ -40,3 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur
 ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
 NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment
 SentToSuppliers=Envoyés aux fournisseurs
+ListOfSupplierOrders=Liste des commandes fournisseur
+MenuOrdersSupplierToBill=Commandes fournisseur à facturer