[ task #104 ] Possibilité de facturer plusieurs commandes. Init works

htdocs/commande/customer.php

@@ -0,0 +1,191 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville 	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin       		<regis@dolibarr.fr>
+ * 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>
+ *
+ * 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 2 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/commande/customer.php
+ *	\ingroup    compta
+ *	\brief      Show list of customers to add an new invoice from orders
+ */
+
+require("../main.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
+
+$action=GETPOST('action');
+
+// Secrutiy check
+if ($user->societe_id > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+
+if (! $user->rights->facture->creer)
+accessforbidden();
+
+$langs->load("companies");
+$langs->load("orders");
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="nom";
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$thirdpartystatic=new Societe($db);
+
+/*
+ * Mode List
+ */
+
+$sql = "SELECT s.rowid, s.nom, s.client, s.ville, s.datec, s.datea";
+$sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
+$sql.= " AND s.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (dol_strlen($stcomm))
+{
+	$sql.= " AND s.fk_stcomm=$stcomm";
+}
+
+if ($_GET["search_nom"])
+{
+	$sql.= " AND s.nom like '%".$db->escape(strtolower($_GET["search_nom"]))."%'";
+}
+if ($_GET["search_compta"])
+{
+	$sql.= " AND s.code_compta like '%".$db->escape($_GET["search_compta"])."%'";
+}
+if ($_GET["search_code_client"])
+{
+	$sql.= " AND s.code_client like '%".$db->escape($_GET["search_code_client"])."%'";
+}
+if (dol_strlen($begin))
+{
+	$sql.= " AND s.nom like '".$db->escape($begin)."'";
+}
+if ($socid)
+{
+	$sql.= " AND s.rowid = ".$socid;
+}
+$sql.= " AND c.fk_statut in (1, 2) AND c.facture = 0";
+$sql.= " GROUP BY s.nom";
+$sql.= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+//print $sql;
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	print_barre_liste($langs->trans("MenuOrdersToBill"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
+
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+
+	print '<table class="liste" width="100%">';
+	print '<tr class="liste_titre">';
+
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","",'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","","",'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec",$addu,"",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" name="search_nom" value="'.$_GET["search_nom"].'"></td>';
+
+	print '<td class="liste_titre">&nbsp;</td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_code_client" value="'.$_GET["search_code_client"].'">';
+	print '</td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_compta" value="'.$_GET["search_compta"].'">';
+	print '</td>';
+
+	print '<td align="right" colspan="2" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '</td>';
+	print "</tr>\n";
+
+	$var=True;
+
+	while ($i < min($num,$conf->liste_limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+		$var=!$var;
+
+		print "<tr $bc[$var]>";
+		print '<td>';
+		
+        $result='';
+        $lien=$lienfin='';
+        $lien = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php',1).'?socid='.$obj->rowid.'">';
+        $lienfin='</a>';
+        $name=$obj->nom;
+        $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
+        $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
+		
+		print $result;
+		print '</td>';
+		print '<td>'.$obj->ville.'&nbsp;</td>';
+		print '<td align="left">'.$obj->code_client.'&nbsp;</td>';
+		print '<td align="left">'.$obj->code_compta.'&nbsp;</td>';
+		print '<td align="right">'.dol_print_date($db->jdate($obj->datec)).'</td>';
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
+
+	print '</form>';
+
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+$db->close();
+
+llxFooter();
+?>

htdocs/commande/orderstoinvoice.php

@@ -0,0 +1,685 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville   	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur   	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo  	<marc@ocebo.com>
+ * Copyright (C) 2005-2011 Regis Houssin          	<regis@dolibarr.fr>
+ * 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>
+ *
+ * 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 2 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/commande/orderstoinvoice.php
+ *	\ingroup    commande
+ *	\brief      Page to invoice multiple orders
+ */
+
+require("../main.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.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");
+
+$langs->load('orders');
+$langs->load('deliveries');
+$langs->load('companies');
+$langs->load('orderstoinvoice@orderstoinvoice');
+
+$sref=GETPOST('sref');
+$sref_client=GETPOST('sref_client');
+$sall=GETPOST('sall');
+$socid=GETPOST('socid','int');
+
+if (! $user->rights->facture->creer)
+	accessforbidden();
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='c.rowid';
+if (! $sortorder) $sortorder='DESC';
+$limit = $conf->liste_limit;
+$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"]);
+$selected=GETPOST('orders_to_invoice');
+$action=GETPOST('action','alpha');
+if ($action == 'create')
+{
+	if (! is_array($selected)) 
+	{
+		$mesg='<div class="error">'.$langs->trans('Error_OrderNotChecked').'</div>';
+	}
+	else
+	{
+		$socid=GETPOST('socid');
+		$action=GETPOST('action');
+		$origin=GETPOST('origin');
+		$originid=GETPOST('originid');
+		//header('facture.php?orders_to_invoice='.$selected.'&socid='.$socid.'&action='.$action.'&origin='.$origin.'&originid='.$originid);
+	}
+}
+$now=dol_now();
+$html = new Form($db);
+$formfile = new FormFile($db);
+$companystatic = new Societe($db);
+$htmlother = new FormOther($db);
+
+/*
+ * Actions
+*/
+
+if (($action == 'create' || $action == 'add') && ! $mesg )
+{
+	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/modules/facture/modules_facture.php');
+	require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
+	require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
+	require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
+	if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
+	if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.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];
+	
+	}
+	if (GETPOST('mesg','int',1) && isset($_SESSION['message'])) $mesg=$_SESSION['message'];
+	$sall=isset($_GET['sall'])?trim($_GET['sall']):trim($_POST['sall']);
+	$projectid=isset($_GET['projectid'])?$_GET['projectid']:0;
+	$id				=(GETPOST('id')?GETPOST("id"):GETPOST("facid"));  // For backward compatibility
+	$ref			=GETPOST('ref');
+	$socid			=GETPOST('socid');
+	$action			=GETPOST('action');
+	$confirm		=GETPOST('confirm');
+	$lineid			=GETPOST('lineid');
+	$userid			=GETPOST('userid');
+	$search_ref		=GETPOST('sf_ref')?GETPOST('sf_ref'):GETPOST('search_ref');
+	
+	// Security check
+	$fieldid = isset($_GET["ref"])?'facnumber':'rowid';
+	if ($user->societe_id) $socid=$user->societe_id;
+	$result = restrictedArea($user, 'facture', $id,'','','fk_soc',$fieldid);
+
+	$usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
+	$object=new Facture($db);
+	
+	// Insert new invoice in database
+	if ($action == 'add' && $user->rights->facture->creer)
+	{
+		$object->socid=GETPOST('socid');
+		$db->begin();
+		$error=0; 
+		
+		// Standard or deposit or proforma invoice
+		if ($_POST['type'] == 0 )
+		{
+			$datefacture = dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			if (empty($datefacture))
+			{
+				$datefacture = dol_mktime(12, 0 , 0, date("m"), date("d"), date("Y"));
+			}
+			if (! $error)
+			{
+				// Si facture standard
+				$object->socid				= $_POST['socid'];
+				$object->type				= $_POST['type'];
+				$object->number				= $_POST['facnumber'];
+				$object->date				= $datefacture;
+				$object->note_public		= trim($_POST['note_public']);
+				$object->note				= trim($_POST['note']);
+				$object->ref_client			= $_POST['ref_client'];
+				$object->ref_int			= $_POST['ref_int'];
+				$object->modelpdf			= $_POST['model'];
+				$object->fk_project			= $_POST['projectid'];
+				$object->cond_reglement_id	= ($_POST['type'] == 3?1:$_POST['cond_reglement_id']);
+				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+				$object->amount				= $_POST['amount'];
+				$object->remise_absolue		= $_POST['remise_absolue'];
+				$object->remise_percent		= $_POST['remise_percent'];
+				
+				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.= ")";
+						
+							dol_syslog(get_class($this)."::add_object_linked sql=".$sql, LOG_DEBUG);
+							if ($db->query($sql))
+							{
+								$db->commit();
+							}
+							else
+							{
+						
+								$db->rollback();					
+							}
+						}
+						
+						while ($ii < $nn)
+						{
+							dol_include_once('/commande/class/commande.class.php');
+							$srcobject = new Commande($db);
+							dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+							$result=$srcobject->fetch($orders_id[$ii]);
+							if ($result > 0)
+							{
+								$srcobject->classer_facturee();
+								$srcobject->setStatut(3);
+								$lines = $srcobject->lines;
+								if (empty($lines) && method_exists($srcobject,'fetch_lines'))  $lines = $srcobject->fetch_lines();
+								$fk_parent_line=0;
+								$num=count($lines);
+								for ($i=0;$i<$num;$i++)
+								{
+									$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+									if ($lines[$i]->subprice < 0)
+									{
+										// Negative line, we create a discount line
+										$discount = new DiscountAbsolute($db);
+										$discount->fk_soc=$object->socid;
+										$discount->amount_ht=abs($lines[$i]->total_ht);
+										$discount->amount_tva=abs($lines[$i]->total_tva);
+										$discount->amount_ttc=abs($lines[$i]->total_ttc);
+										$discount->tva_tx=$lines[$i]->tva_tx;
+										$discount->fk_user=$user->id;
+										$discount->description=$desc;
+										$discountid=$discount->create($user);
+										if ($discountid > 0)
+										{
+											$result=$object->insert_discount($discountid);
+											//$result=$discount->link_to_invoice($lineid,$id);
+										}
+										else
+										{
+											$mesg=$discount->error;
+											$error++;
+											break;
+										}
+									}
+									else
+									{
+										// Positive line
+										$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+										// Date start
+										$date_start=false;
+										if ($lines[$i]->date_debut_prevue) $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
+										$date_end=false;
+										if ($lines[$i]->date_fin_prevue) $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;
+										}
+										$result = $object->addline(
+										$id,
+										$desc,
+										$lines[$i]->subprice,
+										$lines[$i]->qty,
+										$lines[$i]->tva_tx,
+										$lines[$i]->localtax1_tx,
+										$lines[$i]->localtax2_tx,
+										$lines[$i]->fk_product,
+										$lines[$i]->remise_percent,
+										$date_start,
+										$date_end,
+										0,
+										$lines[$i]->info_bits,
+										$lines[$i]->fk_remise_except,
+										'HT',
+										0,
+										$product_type,
+										$lines[$i]->rang,
+										$lines[$i]->special_code,
+										$object->origin,
+										$lines[$i]->rowid,
+										$fk_parent_line
+										);
+										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
+							{
+								$mesg=$srcobject->error;
+								$error++;
+							}
+							$ii++;
+						}										
+					}
+					else
+					{
+						$mesg=$object->error;
+						$error++;
+					}
+				}
+			}
+		}
+		
+		// End of object creation, we show it
+		if ($id > 0 && ! $error)
+		{
+			$db->commit();
+			Header('Location: '.DOL_URL_ROOT.'/compta/facture.php?facid='.$id);
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			$action='create';
+			$_GET["origin"]=$_POST["origin"];
+			$_GET["originid"]=$_POST["originid"];
+			if (! $mesg) $mesg='<div class="error">'.$object->error.'</div>';
+		}
+	}
+	
+	/*
+	* View
+	*/
+	$html = new Form($db);
+	$htmlother = new FormOther($db);
+	$formfile = new FormFile($db);
+	$now=dol_now();
+	
+	// Mode creation
+	if ($action == 'create')
+	{
+		$facturestatic=new Facture($db);
+		llxHeader();
+		print_fiche_titre($langs->trans('NewBill'));
+		dol_htmloutput_mesg($mesg);
+		$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;
+			$remise_percent 	= $soc->remise_percent;
+		}
+		$remise_absolue 	= 0;
+		$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
+		
+		$absolute_discount=$soc->getAvailableDiscounts();
+		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>';
+		// Tiers
+		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";
+		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
+		print '<table class="nobordernopadding">'."\n";
+		// Standard invoice
+		print '<tr height="18"><td width="16px" valign="middle">';
+		print '<input type="radio" name="type" value="0"'.(GETPOST('type')==0?' checked="true"':'').'>';
+		print '</td><td valign="middle">';
+		$desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+		print $desc;
+		print '</td></tr>'."\n";
+		print '</table>';
+		// Date invoice
+		print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
+		$html->select_date(0,'','','','',"add",1,1);
+		print '</td></tr>';
+		// Payment term
+		print '<tr><td 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 ($conf->projet->enabled)
+		{
+			$langs->load('projects');
+			print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
+			select_projects($soc->id, $projectid, 'projectid');
+			print '</td></tr>';
+		}
+		// Modele PDF
+		print '<tr><td>'.$langs->trans('Model').'</td>';
+		print '<td>';
+		include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php');
+    	$liste=ModelePDFFactures::liste_modeles($db);
+		print $html->selectarray('model',$liste,$conf->global->FACTURE_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.'">';
+		
+		dol_include_once('/commande/class/commande.class.php');
+		$srcobject = new Commande($db);
+		$commandes = $langs->trans("Orders").": ";
+		foreach ($selected as $sel)
+		{
+			$result=$srcobject->fetch($sel);
+			if ($result > 0)
+			{
+				$commandes.= $srcobject->ref." ";
+			}
+		}
+		print $commandes;
+
+		print '</textarea></td></tr>';
+		// Private note
+		if (! $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>';
+		print '</td></tr>';
+		
+	}
+	
+	while ($i < $n)
+	{
+		print '<input type="hidden" name="orders_to_invoice[]" value="'.$orders_id[$i].'">';
+	
+		$i++;
+	}
+	
+	print "</table>\n";
+	// Button "Create Draft"
+	print '<br><center><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></center>';
+	print "</form>\n";
+}
+
+
+//Mode liste
+else 
+{	
+	llxHeader();
+	?>
+	<script language="javascript" 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_client,';
+	$sql.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as facturee';
+	$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+	$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= ' WHERE c.fk_soc = s.rowid';
+	$sql.= ' AND c.fk_statut in (1, 2) AND c.facture = 0';
+	$sql.= ' AND s.entity = '.$conf->entity;
+	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_client LIKE \'%'.$db->escape($sref_client).'%\'';
+	}
+	$sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
+	$sql.= $db->plimit($limit + 1,$offset);
+	$resql = $db->query($sql);
+
+	if ($resql)
+	{
+		if ($socid)
+		{
+			$soc = new Societe($db);
+			$soc->fetch($socid);
+			$title = $langs->trans('ListOfOrders');
+		}
+		else
+		{
+			$title = $langs->trans('ListOfOrders');
+		}
+		$title.=' - '.$langs->trans('StatusOrderToBillShort');
+		$num = $db->num_rows($resql);
+		print_barre_liste($title, $_GET['page'], 'liste.php','&amp;socid='.$socid,$sortfield,$sortorder,'',$num);
+		$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);
+		// Company
+		print '<h3>';
+		$companystatic->id=$socid;
+		$companystatic->nom=$soc->nom;
+
+		print $companystatic->getNomUrl(1,'customer');
+		print '</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('RefCustomerOrder'),'orderstoinvoice.php','c.ref_client','','&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="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png"  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 Commande($db);
+		
+		while ($i < min($num,$limit))
+		{
+			$objp = $db->fetch_object($resql);
+			$var=!$var;
+			print '<tr '.$bc[$var].'>';
+			print '<td nowrap="nowrap">';
+
+			$generic_commande->id=$objp->rowid;
+			$generic_commande->ref=$objp->ref;
+
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			print '<td class="nobordernopadding" nowrap="nowrap">';
+			print $generic_commande->getNomUrl(1,$objp->fk_statut);
+			print '</td>';
+
+			print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
+			if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
+			print '</td>';
+
+			print '<td width="16" align="right" class="nobordernopadding">';
+			$filename=dol_sanitizeFileName($objp->ref);
+			$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid;
+			$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','',1,'',1);
+			print '</td></tr></table>';
+			print '</td>';
+
+			print '<td>'.$objp->ref_client.'</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" nowrap="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,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 '<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 '</form>';
+		$db->free($resql);
+	}
+	else
+	{
+		print dol_print_error($db);
+	}
+	
+}
+
+$db->close();
+dol_htmloutput_mesg($mesg);
+llxFooter();
+
+?>

htdocs/core/menus/standard/eldy.lib.php

@@ -944,6 +944,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                 $langs->load("orders");
                 if ($conf->facture->enabled) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
                 //                  if ($leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+                if ($conf->global->MAIN_FEATURES_LEVEL > 1)
+     				if ($leftmenu=="orders") $newmenu->add("/commande/customer.php", $langs->trans("GenerateBill"), 1, $user->rights->commande->lire);
             }
 
             // Donations

htdocs/langs/ca_ES/orders.lang

@@ -127,6 +127,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON no def
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definida
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s'
+Error_OrderNotChecked=No s'han seleccionat comandes a facturar
 
 # Sources
 OrderSource0=Pressupost

htdocs/langs/en_US/orders.lang

@@ -127,6 +127,8 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not de
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
+
 
 # Sources
 OrderSource0=Commercial proposal

htdocs/langs/es_ES/orders.lang

@@ -127,6 +127,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no de
 Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON no definida
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Error en la carga del archivo módulo '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Error en la carga del archivo módulo '%s'
+Error_OrderNotChecked=No se han seleccionado pedidos a facturar
 
 # Sources
 OrderSource0=Presupuesto

htdocs/langs/fr_FR/orders.lang

@@ -128,6 +128,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON non d
 Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non définie
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s'
+Error_OrderNotChecked=Pas de commandes pour facturer sélectionnés
 
 # Sources
 OrderSource0=Proposition commerciale