debut reception setup page

htdocs/admin/reception_setup.php

@@ -0,0 +1,520 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * 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/admin/confexped.php
+ *		\ingroup    produit
+ *		\brief      Page to setup reception module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
+
+$langs->load("admin");
+$langs->load("receptions");
+$langs->load('other');
+
+
+if (!$user->admin)
+  accessforbidden();
+
+$action=GETPOST('action','alpha');
+$value=GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scan_dir','alpha');
+$type='reception';
+
+
+/*
+ * Actions
+ */
+
+if (! empty($conf->reception->enabled) && empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+{
+    // This option should always be set to on when module is on.
+    dolibarr_set_const($db, "MAIN_SUBMODULE_RECEPTION", "1",'chaine',0,'',$conf->entity);
+}
+
+if (empty($conf->global->RECEPTION_ADDON_NUMBER))
+{
+    $conf->global->RECEPTION_ADDON_NUMBER='mod_reception_beryl';
+}
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+if ($action == 'updateMask')
+{
+	$maskconst=GETPOST('maskconstreception','alpha');
+	$maskvalue=GETPOST('maskreception','alpha');
+	if (! empty($maskconst))
+		$res = dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity);
+
+	if (isset($res))
+	{
+		if ($res > 0)
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		else
+			setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+else if ($action == 'set_param')
+{
+	$freetext=GETPOST('RECEPTION_FREE_TEXT','none');	// No alpha here, we want exact string
+	$res = dolibarr_set_const($db, "RECEPTION_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+	if ($res <= 0)
+	{
+		$error++;
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+
+	$draft=GETPOST('RECEPTION_DRAFT_WATERMARK','alpha');
+	$res = dolibarr_set_const($db, "RECEPTION_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
+	if ($res <= 0)
+	{
+		$error++;
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+}
+
+else if ($action == 'specimen')
+{
+	$modele=GETPOST('module','alpha');
+
+	$exp = new Reception($db);
+	$exp->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/reception/doc/pdf_".$modele.".modules.php",0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($exp,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=reception&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+else if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+else if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->RECEPTION_ADDON_PDF == "$value") dolibarr_del_const($db, 'RECEPTION_ADDON_PDF',$conf->entity);
+	}
+}
+
+// Set default model
+else if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "RECEPTION_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->RECEPTION_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+else if ($action == 'setmodel')
+{
+	dolibarr_set_const($db, "RECEPTION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
+}
+
+
+
+
+/*
+ * View
+ */
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+$form=new Form($db);
+
+llxHeader("",$langs->trans("ReceptionsSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ReceptionsSetup"),$linkback,'title_setup');
+print '<br>';
+$head = reception_admin_prepare_head();
+
+dol_fiche_head($head, 'reception', $langs->trans("Receptions"), -1, 'reception');
+
+// Reception numbering model
+
+print load_fiche_titre($langs->trans("ReceptionsNumberingModules"));
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="100">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Example").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td class="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/reception/");
+	
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+				if (substr($file, 0, 14) == 'mod_reception_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file)-4);
+
+					require_once $dir.$file.'.php';
+
+					$module = new $file;
+
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+						print '<tr><td>'.$module->nom."</td>\n";
+						print '<td>';
+						print $module->info();
+						print '</td>';
+
+                        // Show example of numbering module
+                        print '<td class="nowrap">';
+                        $tmp=$module->getExample();
+                        if (preg_match('/^Error/',$tmp)) {
+							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+						}
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+                        else print $tmp;
+                        print '</td>'."\n";
+
+						print '<td align="center">';
+						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"),'switch_on');
+						}
+						else
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+							print img_picto($langs->trans("Disabled"),'switch_off');
+							print '</a>';
+						}
+						print '</td>';
+
+						$reception=new Reception($db);
+						$reception->initAsSpecimen();
+
+						// Info
+						$htmltooltip='';
+						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval=$module->getNextValue($mysoc,$reception);
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
+
+						print '<td align="center">';
+						print $form->textwithpicto('',$htmltooltip,1,0);
+						print '</td>';
+
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+print '</table><br>';
+
+
+/*
+ *  Documents models for Receptions Receipt
+ */
+print load_fiche_titre($langs->trans("ReceptionsReceiptModel"));
+
+// Defini tableau def de modele invoice
+$type="reception";
+$def = array();
+
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="140">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
+print '<td align="center" width="80" class="nowrap">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80" class="nowrap">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/reception".$valdir);
+
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            print '<tr><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td align="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print '<td align="center">';
+	                            if ($conf->global->RECEPTION_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"),'reception').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print '<br>';
+
+
+/*
+ * Other options
+ *
+ */
+/*
+print load_fiche_titre($langs->trans("OtherOptions"));
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_param">';
+
+print "<table class=\"noborder\" width=\"100%\">";
+print "<tr class=\"liste_titre\">";
+print "<td>".$langs->trans("Parameter")."</td>\n";
+print "</tr>";
+
+$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
+print '<tr><td>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnReceptions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+$variablename='RECEPTION_FREE_TEXT';
+if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+{
+    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+}
+else
+{
+    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
+    print $doleditor->Create();
+}
+print "</td></tr>\n";
+
+print '<tr><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
+print '<input size="50" class="flat" type="text" name="RECEPTION_DRAFT_WATERMARK" value="'.$conf->global->RECEPTION_DRAFT_WATERMARK.'">';
+print "</td></tr>\n";
+*/
+print '</table>';
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+llxFooter();
+$db->close();

htdocs/core/lib/reception.lib.php

@@ -0,0 +1,101 @@
+<?php
+/* Copyright (C) 2006-2012	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007		Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2010-2012	Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010		Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015 Claudio Aschieri				<c.aschieri@19.coop>
+ *
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/lib/reception.lib.php
+ *  \brief      Function for reception module
+ *  \ingroup    reception
+ */
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @param   Reception	$object		Object related to tabs
+ * @return  array				Array of tabs to show
+ */
+function reception_prepare_head(Reception $object)
+{
+	global $langs, $conf, $user;
+	if (! empty($conf->reception->enabled)) $langs->load("receptions");
+	$langs->load("orders");
+
+	$h = 0;
+	$head = array();
+	$h = 0;
+	
+	$head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
+	$head[$h][1] = $langs->trans("Setup");
+	$h++;
+	
+	
+	
+
+	
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+
+    return $head;
+}
+
+/**
+ *  Return array head with list of tabs to view object informations.
+ *
+ *  @return	array   	    		    head array with tabs
+ */
+function reception_admin_prepare_head()
+{
+	global $langs, $conf, $user;
+	$langs->load("receptions");
+
+	$h = 0;
+	$head = array();
+	
+	$head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
+	$head[$h][1] = $langs->trans("Reception");
+	$head[$h][2] = 'reception';
+	$h++;
+
+	
+	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	{
+	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes_reception';
+	$h++;
+	}
+	
+	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	{
+	$head[$h][0] = DOL_URL_ROOT.'/admin/receptiondet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines_reception';
+	$h++;
+	}
+	
+	
+	
+	complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
+
+	return $head;
+}
+
+

htdocs/core/menus/init_menu_auguria.sql

@@ -122,6 +122,11 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/card.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/list.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 2, __ENTITY__);
+-- Product - Reception
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled', __HANDLER__, 'left', 1300__+MAX_llx_menu__, 'commercial', 'receptions', 3__+MAX_llx_menu__, '/reception/index.php?leftmenu=receptions', 'Receptions', 0, 'receptions', '$user->rights->reception->lire', '', 2, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled && $leftmenu=="receptions"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/reception/card.php?action=create2&leftmenu=receptions', 'NewSending', 1, 'receptions', '$user->rights->reception->creer', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled && $leftmenu=="receptions"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/reception/list.php?leftmenu=receptions', 'List', 1, 'receptions', '$user->rights->reception->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled && $leftmenu=="receptions"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/reception/stats/index.php?leftmenu=receptions', 'Statistics', 1, 'receptions', '$user->rights->reception->lire', '', 2, 2, __ENTITY__);
 
 -- Commercial - Proposals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1100__+MAX_llx_menu__, 'commercial', 'propals', 5__+MAX_llx_menu__, '/comm/propal/index.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);

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

@@ -1269,6 +1269,18 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="sendings") $newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
 				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
 			}
+			// Receptions
+			if (! empty($conf->reception->enabled))
+			{
+				$langs->load("receptions");
+				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');
+				$newmenu->add("/reception/card.php?action=create2&leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
+				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="receptions") $newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
+			}
 
 		}
 

htdocs/core/modules/modReception.class.php

@@ -0,0 +1,266 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * 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/>.
+ */
+
+/**
+ *	\defgroup   reception     Module reception
+ *	\brief      Module pour gerer les réceptions de produits
+ *	\file       htdocs/core/modules/modReception.class.php
+ *	\ingroup    reception
+ *	\brief      Fichier de description et activation du module Reception
+ */
+
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *	Class to describe and enable module Reception
+ */
+class modReception extends DolibarrModules
+{
+
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+		$this->numero = 104160;
+
+		$this->family = "crm";
+		$this->module_position = 40;
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->description = "Gestion des réceptions fournisseurs";
+
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->special = 0;
+		$this->picto = "sending";
+
+		// Data directories to create when module is enabled
+		$this->dirs = array("/reception/receipt",
+		                    "/reception/receipt/temp",
+		                    "/doctemplates/reception"
+		                    );
+
+		// Config pages
+		$this->config_page_url = array("reception_setup.php");
+
+		// Dependencies
+		$this->depends = array("modFournisseur");
+		$this->requiredby = array();
+		$this->conflictwith = array();
+		$this->langfiles = array('receptions');
+
+		// Constants
+		$this->const = array();
+		$r=0;
+
+		$this->const[$r][0] = "RECEPTION_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "squille";
+		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons receptions en PDF';
+		$this->const[$r][4] = 0;
+		$r++;
+
+		$this->const[$r][0] = "RECEPTION_ADDON_NUMBER";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_reception_beryl";
+		$this->const[$r][3] = 'Name for numbering manager for receptions';
+		$this->const[$r][4] = 0;
+		$r++;
+
+		$this->const[$r][0] = "RECEPTION_ADDON_PDF_ODT_PATH";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/receptions";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
+
+		$this->const[$r][0] = "MAIN_SUBMODULE_RECEPTION";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "1";
+		$this->const[$r][3] = "Enable receptions";
+		$this->const[$r][4] = 0;
+		$r++;
+
+		// Boxes
+		$this->boxes = array();
+
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'reception';
+		$r=0;
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r;
+		$this->rights[$r][1] = 'Lire les receptions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'lire';
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r;
+		$this->rights[$r][1] = 'Creer modifier les receptions';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'creer';
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r;
+		$this->rights[$r][1] = 'Valider les receptions';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'reception_advance';
+		$this->rights[$r][5] = 'validate';
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r; // id de la permission
+		$this->rights[$r][1] = 'Envoyer les receptions aux clients'; // libelle de la permission
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'reception_advance';
+        $this->rights[$r][5] = 'send';
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r;
+		$this->rights[$r][1] = 'Exporter les receptions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'reception';
+		$this->rights[$r][5] = 'export';
+
+		$r++;
+		$this->rights[$r][0] = $this->numero.$r;
+		$this->rights[$r][1] = 'Supprimer les receptions';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supprimer';
+
+
+		// Menus
+		//-------
+		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		
+		
+		// Exports
+		//--------
+		$r=0;
+/*
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		$shipment=new Commande($this->db);
+		$contact_arrays=$shipment->liste_type_contact('external','',0,0,'');
+		if (is_array($contact_arrays) && count($contact_arrays)>0){
+			$idcontacts=join(',',array_keys($shipment->liste_type_contact('external','',0,0,'')));
+		} else {
+			$idcontacts=0;
+		}
+
+
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r]=array(array("reception","shipment","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company','co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product','p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product');
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
+		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+		{
+		    $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
+		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		}
+		$keyforselect='reception'; $keyforelement='shipment'; $keyforaliasextra='extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$keyforselect='receptiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'reception as c';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'reception_extrafields as extra ON c.rowid = extra.fk_object,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
+		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'receptiondet as ed';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'receptiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+		{
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+		  $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+		}
+		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_origin_line = cd.rowid';
+		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('reception').')';
+		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;*/
+	}
+
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	function init($options='')
+	{
+		global $conf,$langs;
+
+		// Permissions
+		$this->remove($options);
+
+		//ODT template
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/reception/template_reception.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/reception';
+		$dest=$dirodt.'/template_reception.odt';
+
+		if (file_exists($src) && ! file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result=dol_copy($src,$dest,0,0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				return 0;
+			}
+		}
+
+		$sql = array();
+
+		$sql = array(
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'reception' AND entity = ".$conf->entity,
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','reception',".$conf->entity.")",
+		);
+
+		return $this->_init($sql,$options);
+	}
+}

htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php

@@ -0,0 +1,522 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+*
+* 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/>.
+* or see http://www.gnu.org/
+*/
+
+/**
+ *	\file       htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+ *	\ingroup    reception
+ *	\brief      File of class to build ODT documents for reception
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_reception_odt extends ModelePdfReception
+{
+	var $emetteur;	// Objet societe qui emet
+
+	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
+	var $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("companies");
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'RECEPTION_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+		// Dimension page pour format A4
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=0;
+		$this->marge_droite=0;
+		$this->marge_haute=0;
+		$this->marge_basse=0;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 0;                     // Gere option tva RECEPTION_TVAOPTION
+		$this->option_modereg = 0;                 // Affiche mode reglement
+		$this->option_condreg = 0;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 0;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+		// Recupere emetteur
+		$this->emetteur=$mysoc;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	function info($langs)
+	{
+		global $conf,$langs;
+
+		$langs->load("companies");
+		$langs->load("errors");
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte.= '<input type="hidden" name="param1" value="RECEPTION_ADDON_PDF_ODT_PATH">';
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte.= '<tr><td>';
+		$texttitle=$langs->trans("ListOfDirectories");
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->RECEPTION_ADDON_PDF_ODT_PATH)));
+		$listoffiles=array();
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			}
+		}
+		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte.= '<textarea class="flat" cols="60" name="value1">';
+		$texte.=$conf->global->RECEPTION_ADDON_PDF_ODT_PATH;
+		$texte.= '</textarea>';
+		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte.= '<br></div></div>';
+
+		// Scan directories
+		$nbofiles=count($listoffiles);
+		if (! empty($conf->global->RECEPTION_ADDON_PDF_ODT_PATH))
+		{
+			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+			$texte.=count($listoffiles);
+			//$texte.=$nbofiles?'</a>':'';
+			$texte.='</b>';
+		}
+		if ($nbofiles)
+		{
+   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach($listoffiles as $file)
+   			{
+                $texte.=$file['name'].'<br>';
+   			}
+   			$texte.='<div id="div_'.get_class($this).'">';
+		}
+
+		$texte.= '</td>';
+
+		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte.= '</td>';
+		$texte.= '</tr>';
+
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *	Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Reception	$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	{
+		global $user,$langs,$conf,$mysoc,$hookmanager;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		$sav_charset_output=$outputlangs->charset_output;
+		$outputlangs->charset_output='UTF-8';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+
+		if ($conf->reception->dir_output."/reception")
+		{
+			// If $object is id instead of object
+			if (! is_object($object))
+			{
+				$id = $object;
+				$object = new Reception($this->db);
+				$result=$object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db,$object->error);
+					return -1;
+				}
+			}
+
+			$dir = $conf->reception->dir_output."/reception";
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			$file = $dir . "/" . $objectref . ".odt";
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile=basename($srctemplatepath);
+				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
+				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfiletmp=$objectref.'_'.$newfiletmp;
+				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+				// Get extension (ods or odt)
+				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				}
+				else
+				{
+					$filename=$newfiletmp.'.'.$newfileformat;
+				}
+				$file=$dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+				dol_mkdir($conf->reception->dir_temp);
+
+
+				// If BILLING contact defined on invoice, we use it
+				$usecontact=false;
+				$arrayidcontact=$object->getIdContact('external','BILLING');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact=true;
+					$result=$object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				if (! empty($usecontact))
+				{
+					// On peut utiliser le nom de la societe du contact
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					else $socobject = $object->thirdparty;
+				}
+				else
+				{
+					$socobject=$object->thirdparty;
+				}
+
+				// Make substitution
+				$substitutionarray=array(
+				'__FROM_NAME__' => $this->emetteur->name,
+				'__FROM_EMAIL__' => $this->emetteur->email,
+				'__TOTAL_TTC__' => $object->total_ttc,
+				'__TOTAL_HT__' => $object->total_ht,
+				'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext='';
+				$paramfreetext='RECEPTION_FREE_TEXT';
+				if (! empty($conf->global->$paramfreetext))
+				{
+					$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->reception->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				}
+				catch(Exception $e)
+				{
+					$this->error=$e->getMessage();
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				}
+				catch(OdfException $e)
+				{
+				}
+
+				// Make substitutions into odt of user info
+				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
+				//var_dump($tmparray); exit;
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							//var_dump($value);exit;
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Make substitutions into odt of mysoc
+				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				//var_dump($tmparray); exit;
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key))	// Image
+						{
+							//var_dump($value);exit;
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else	// Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Make substitutions into odt of thirdparty
+				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key))	// Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else	// Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of object + external modules
+				$tmparray=$this->get_substitutionarray_reception($object,$outputlangs);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+				// Call the ODTSubstitution hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/',$key)) // Image
+						{
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						}
+						else    // Text
+						{
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+				// Replace tags of lines
+				try
+				{
+					$listlines = $odfHandler->setSegment('lines');
+					foreach ($object->lines as $line)
+					{
+						$tmparray=$this->get_substitutionarray_reception_lines($line,$outputlangs);
+						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+						// Call the ODTSubstitutionLine hook
+						$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
+						$reshook=$hookmanager->executeHooks('ODTSubstitutionLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+						foreach($tmparray as $key => $val)
+						{
+							try
+							{
+								$listlines->setVars($key, $val, true, 'UTF-8');
+							}
+							catch(OdfException $e)
+							{
+							}
+							catch(SegmentException $e)
+							{
+							}
+						}
+						$listlines->merge();
+					}
+					$odfHandler->mergeSegment($listlines);
+				}
+				catch(OdfException $e)
+				{
+					$this->error=$e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+
+				// Replace labels translated
+				$tmparray=$outputlangs->get_translations_for_substitutions();
+				foreach($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					}
+					catch(OdfException $e)
+					{
+					}
+				}
+
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+					$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler=null;	// Destroy object
+
+				return 1;   // Success
+			}
+			else
+			{
+				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+
+}
+

htdocs/core/modules/reception/mod_reception_beryl.php

@@ -0,0 +1,145 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/reception/mod_reception_beryl.php
+ *  \ingroup    reception
+ *  \brief      File of class to manage shipments numbering rules Beryl
+ */
+require_once DOL_DOCUMENT_ROOT .'/core/modules/reception/modules_reception.php';
+
+/**
+ *	Class to manage reception numbering rules Beryl
+ */
+class mod_reception_beryl extends ModelNumRefReception
+{
+	var $version='dolibarr';
+	var $prefix='RCP';
+	var $error='';
+	var $nom='Beryl';
+
+
+	/**
+	 *	Return default description of numbering model
+	 *
+	 *	@return     string      text description
+	 */
+    function info()
+    {
+    	global $langs;
+      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+    }
+
+
+	/**
+	 *	Return numbering example
+	 *
+	 *	@return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *	Test if existing numbers make problems with numbering
+	 *
+	 *	@return     boolean     false if conflit, true if ok
+	 */
+	function canBeActivated()
+	{
+		global $conf,$langs,$db;
+
+		$coyymm=''; $max='';
+
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql.= " FROM ".MAIN_DB_PREFIX."reception";
+		$sql.= " WHERE ref LIKE '".$this->prefix."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		{
+			$langs->load("errors");
+			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 *	Return next value
+	 *
+	 *	@param	Societe		$objsoc     Third party object
+	 *	@param	Object		$shipment	Shipment object
+	 *	@return string      			Value if OK, 0 if KO
+	 */
+	function getNextValue($objsoc,$shipment)
+	{
+		global $db,$conf;
+
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql.= " FROM ".MAIN_DB_PREFIX."reception";
+		$sql.= " WHERE ref like '".$this->prefix."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max=0;
+		}
+		else
+		{
+			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		$date=time();
+		$yymm = strftime("%y%m",$date);
+
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
+
+		dol_syslog("mod_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+
+	/**
+	 *  Return next free value
+	 *
+	 *	@param	Societe		$objsoc     Third party object
+	 *	@param	Object		$objforref	Shipment object
+	 *	@return string      			Next free value
+	 */
+	function reception_get_num($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
+
+}

htdocs/core/modules/reception/mod_reception_moonstone.php

@@ -0,0 +1,137 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/reception/mod_reception_moonstone.php
+ *  \ingroup    reception
+ *  \brief      File of class to manage reception numbering rules Moonstone
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/reception/modules_reception.php';
+
+/**
+ *	Class to manage reception numbering rules Moonstone
+ */
+class mod_reception_moonstone extends ModelNumRefReception
+{
+	var $version='dolibarr';
+	var $error = '';
+	var $nom = 'Moonstone';
+
+	/**
+	 *	Return default description of numbering model
+	 *
+	 *	@return     string      text description
+	 */
+	function info()
+    {
+    	global $conf,$langs;
+
+		$langs->load("bills");
+
+		$form = new Form($this->db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte.= '<input type="hidden" name="action" value="updateMask">';
+		$texte.= '<input type="hidden" name="maskconstreception" value="RECEPTION_MOONSTONE_MASK">';
+		$texte.= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Reception"),$langs->transnoentities("Reception"));
+		$tooltip.=$langs->trans("GenericMaskCodes2");
+		$tooltip.=$langs->trans("GenericMaskCodes3");
+		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Reception"),$langs->transnoentities("Reception"));
+		$tooltip.=$langs->trans("GenericMaskCodes5");
+
+		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreception" value="'.$conf->global->RECEPTION_MOONSTONE_MASK.'">',$tooltip,1,1).'</td>';
+		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte.= '</tr>';
+		$texte.= '</table>';
+		$texte.= '</form>';
+
+		return $texte;
+    }
+
+	/**
+	 *	Return numbering example
+	 *
+	 *	@return     string      Example
+	 */
+    function getExample()
+    {
+     	global $conf,$langs,$mysoc;
+
+    	$old_code_client=$mysoc->code_client;
+    	$old_code_type=$mysoc->typent_code;
+    	$mysoc->code_client='CCCCCCCCCC';
+    	$mysoc->typent_code='TTTTTTTTTT';
+     	$numExample = $this->getNextValue($mysoc,'');
+		$mysoc->code_client=$old_code_client;
+		$mysoc->typent_code=$old_code_type;
+
+		if (! $numExample)
+		{
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+    }
+
+	/**
+	 *	Return next value
+	 *
+	 *	@param	Societe		$objsoc     Third party object
+	 *	@param	Object		$reception	Reception object
+	 *	@return string      			Value if OK, 0 if KO
+	 */
+    function getNextValue($objsoc,$reception)
+    {
+		global $db,$conf;
+
+		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+
+		$mask=$conf->global->RECEPTION_MOONSTONE_MASK;
+
+		if (! $mask)
+		{
+			$this->error='NotConfigured';
+			return 0;
+		}
+
+		$date = $reception->date_reception;
+
+		$numFinal=get_next_value($db,$mask,'reception','ref','',$objsoc,$date);
+
+		return  $numFinal;
+	}
+
+	/**
+	 *  Return next free value
+	 *
+	 *	@param	Societe		$objsoc     Third party object
+	 *	@param	Object		$objforref	Reception object
+	 *	@return string      			Next free value
+	 */
+    function reception_get_num($objsoc,$objforref)
+    {
+        return $this->getNextValue($objsoc,$objforref);
+    }
+
+}
+

htdocs/core/modules/reception/modules_reception.php

@@ -0,0 +1,136 @@
+<?php
+/* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/reception/modules_reception.php
+ *  \ingroup    reception
+ *  \brief      File that contains parent class for sending receipts models
+ *              and parent class for sending receipts numbering models
+ */
+ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+/**
+ *	Parent class of sending receipts models
+ */
+abstract class ModelePdfReception extends CommonDocGenerator
+{
+    var $error='';
+
+
+	/**
+	 *  Return list of active generation modules
+	 *
+     *  @param	DoliDB	$db     			Database handler
+     *  @param  integer	$maxfilenamelength  Max length of value to show
+     *  @return	array						List of templates
+	 */
+	static function liste_modeles($db,$maxfilenamelength=0)
+	{
+		global $conf;
+
+		$type='reception';
+		$liste=array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
+
+		return $liste;
+	}
+}
+
+
+/**
+ *  Parent Class of numbering models of sending receipts references
+ */
+abstract class ModelNumRefReception
+{
+	var $error='';
+
+	/** Return if a model can be used or not
+	 *
+	 *  @return		boolean     true if model can be used
+	 */
+	function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 *	Return default description of numbering model
+	 *
+	 *	@return     string      text description
+	 */
+	function info()
+	{
+		global $langs;
+		$langs->load("reception");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns numbering example
+	 *
+	 *	@return     string      Example
+	 */
+	function getExample()
+	{
+		global $langs;
+		$langs->load("reception");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *	Test if existing numbers make problems with numbering
+	 *
+	 *	@return     boolean     false if conflit, true if ok
+	 */
+	function canBeActivated()
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next value assigned
+	 *
+	 *	@param	Societe		$objsoc     Third party object
+	 *	@param	Object		$shipment	Shipment object
+	 *	@return	string					Value
+	 */
+	function getNextValue($objsoc, $shipment)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of the numbering model
+	 *
+	 *	@return     string      Value
+	 */
+	function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+}

htdocs/install/mysql/tables/llx_reception.key.sql

@@ -0,0 +1,31 @@
+-- ===================================================================
+-- Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@capnetworks.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
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity);
+
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_shipping_method (fk_shipping_method);
+
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc				FOREIGN KEY (fk_soc)			 REFERENCES llx_societe (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author		FOREIGN KEY (fk_user_author)	 REFERENCES llx_user (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid 		FOREIGN KEY (fk_user_valid)		 REFERENCES llx_user (rowid);
+ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_shipping_method 	FOREIGN KEY (fk_shipping_method) REFERENCES llx_c_shipment_mode (rowid);

htdocs/install/mysql/tables/llx_reception.sql

@@ -0,0 +1,62 @@
+-- ===================================================================
+-- Copyright (C) 2003-2010 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2011-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- 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 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/>.
+--
+-- ===================================================================
+
+create table llx_expedition
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  tms                   timestamp,
+  ref                   varchar(30)        NOT NULL,
+  entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
+  fk_soc                integer            NOT NULL,
+  fk_projet  		integer  DEFAULT NULL,
+  
+  ref_ext               varchar(30),					-- reference into an external system (not used by dolibarr)
+  ref_int				varchar(30),					-- reference into an internal system (used by dolibarr to store extern id like paypal info)
+  ref_customer          varchar(30),					-- customer number
+  
+  date_creation         datetime,						-- date de creation
+  fk_user_author        integer,						-- author of creation
+  fk_user_modif         integer,						-- author of last change
+  date_valid            datetime,						-- date de validation
+  fk_user_valid         integer,						-- valideur
+  date_delivery			datetime	DEFAULT NULL,		-- date planned of delivery
+  date_expedition       datetime,						-- not used (deprecated)
+  fk_address  			integer		DEFAULT NULL, 		-- delivery address (deprecated)
+  fk_shipping_method    integer,
+  tracking_number       varchar(50),
+  fk_statut             smallint	DEFAULT 0,			-- 0 = draft, 1 = validated, 2 = billed or closed depending on WORKFLOW_BILL_ON_SHIPMENT option
+  billed                smallint    DEFAULT 0,
+  
+  height                float,							-- height
+  width                 float,							-- with
+  size_units            integer,						-- unit of all sizes (height, width, depth)
+  size                  float,							-- depth
+  weight_units          integer,						-- unit of weight
+  weight                float,							-- weight
+  note_private          text,
+  note_public           text,
+  model_pdf             varchar(255),
+  fk_incoterms          integer,						-- for incoterms
+  location_incoterms    varchar(255),					-- for incoterms
+  
+  import_key			varchar(14),
+  extraparams			varchar(255)							-- for other parameters with json format
+)ENGINE=innodb;

htdocs/install/mysql/tables/llx_reception_extrafields.key.sql

@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2015      Claudio Aschieri	<c.aschieri@19.coop>
+--
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_object);

htdocs/install/mysql/tables/llx_reception_extrafields.sql

@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2015      Claudio Aschieri	<c.aschieri@19.coop>
+--
+-- 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/>.
+--
+-- ========================================================================
+
+create table llx_expedition_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+

htdocs/install/mysql/tables/llx_receptiondet.key.sql

@@ -0,0 +1,22 @@
+-- ===================================================================
+-- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008 Regis Houssin        <regis.houssin@capnetworks.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
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_expedition (fk_expedition);
+ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_expedition FOREIGN KEY (fk_expedition) REFERENCES llx_expedition (rowid);

htdocs/install/mysql/tables/llx_receptiondet.sql

@@ -0,0 +1,29 @@
+-- ===================================================================
+-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2008 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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/>.
+--
+-- ===================================================================
+
+create table llx_expeditiondet
+(
+  rowid             integer AUTO_INCREMENT PRIMARY KEY,
+  fk_expedition     integer NOT NULL,
+  fk_origin_line    integer,           -- Correspondance de la ligne avec le document d'origine (propal, commande)
+  fk_entrepot       integer,           -- Entrepot de depart du produit
+  qty               real,              -- Quantity
+  rang              integer  DEFAULT 0
+)ENGINE=innodb;

htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql

@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.fr>
+--
+-- 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/>.
+--
+-- ============================================================================
+
+ALTER TABLE llx_expeditiondet_batch ADD INDEX idx_fk_expeditiondet (fk_expeditiondet);
+ALTER TABLE llx_expeditiondet_batch ADD CONSTRAINT fk_expeditiondet_batch_fk_expeditiondet FOREIGN KEY (fk_expeditiondet) REFERENCES llx_expeditiondet(rowid);

htdocs/install/mysql/tables/llx_receptiondet_batch.sql

@@ -0,0 +1,27 @@
+-- ============================================================================
+-- Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.fr>
+--
+-- 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/>.
+--
+-- ============================================================================
+CREATE TABLE llx_expeditiondet_batch (
+  rowid integer AUTO_INCREMENT PRIMARY KEY,
+  fk_expeditiondet int NOT NULL,
+  eatby date DEFAULT NULL,
+  sellby date DEFAULT NULL,
+  batch varchar(30) DEFAULT NULL,
+  qty double NOT NULL DEFAULT '0',
+  fk_origin_stock integer NOT NULL
+) ENGINE=InnoDB;
+

htdocs/install/mysql/tables/llx_receptiondet_extrafields.key.sql

@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2015      Claudio Aschieri	<c.aschieri@19.coop>
+--
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafields (fk_object);

htdocs/install/mysql/tables/llx_receptiondet_extrafields.sql

@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2015      Claudio Aschieri	<c.aschieri@19.coop>
+--
+-- 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/>.
+--
+-- ===================================================================
+
+create table llx_expeditiondet_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- object id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;

htdocs/langs/en_US/receptions.lang

@@ -0,0 +1,70 @@
+# Dolibarr language file - Source file is en_US - receptions
+RefReception=Ref. reception
+Reception=Reception
+Receptions=Receptions
+AllReceptions=All Receptions
+Reception=Reception
+Receptions=Receptions
+ShowReception=Show Receptions
+Receivings=Delivery Receipts
+ReceptionsArea=Receptions area
+ListOfReceptions=List of receptions
+ReceptionMethod=Shipping method
+LastReceptions=Latest %s receptions
+StatisticsOfReceptions=Statistics for receptions
+NbOfReceptions=Number of receptions
+NumberOfReceptionsByMonth=Number of receptions by month
+ReceptionCard=Reception card
+NewReception=New reception
+CreateReception=Create reception
+QtyShipped=Qty shipped
+QtyPreparedOrShipped=Qty prepared or shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+QtyInOtherReceptions=Qty in other receptions
+KeepToShip=Remain to ship
+OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
+ReceptionsToValidate=Receptions to validate
+StatusReceptionCanceled=Canceled
+StatusReceptionDraft=Draft
+StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionProcessed=Processed
+StatusReceptionDraftShort=Draft
+StatusReceptionValidatedShort=Validated
+StatusReceptionProcessedShort=Processed
+ReceptionSheet=Reception sheet
+ConfirmDeleteReception=Are you sure you want to delete this reception?
+ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmCancelReception=Are you sure you want to cancel this reception?
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+DateDeliveryPlanned=Planned date of delivery
+RefDeliveryReceipt=Ref delivery receipt
+StatusReceipt=Status delivery receipt
+DateReceived=Date delivery received
+SendShippingByEMail=Send reception by EMail
+SendShippingRef=Submission of reception %s
+ActionsOnShipping=Events on reception
+LinkToTrackYourPackage=Link to track your package
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
+ReceptionLine=Reception line
+ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
+ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
+ProductQtyInReceptionAlreadySent=Product quantity from open customer order already sent
+ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
+NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse. 
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
+
+# Reception methods
+# ModelDocument
+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)

htdocs/langs/fr_FR/admin.lang

@@ -1438,6 +1438,13 @@ SendingsNumberingModules=Modèles de numérotation des expéditions
 SendingsAbility=Prise en charge des bons d'expédition pour les livraisons clients
 NoNeedForDeliveryReceipts=Dans le plupart des cas, la fiche expédition est utilisée en tant que bon d'expédition (liste des produits expédiés) et bon de livraison (signée par le client). Le bon de réception est un doublon de fonctionnalité et est rarement utilisé.
 FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
+##### Reception #####
+ReceptionsSetup=Configuration du module Réception/Livraison
+ReceptionsReceiptModel=Modèles de bordereau de réception
+ReceptionsNumberingModules=Modèles de numérotation des réceptions
+ReceptionsAbility=Prise en charge des bons d'réception pour les livraisons clients
+NoNeedForDeliveryReceipts=Dans le plupart des cas, la fiche réception est utilisée en tant que bon d'réception (liste des produits expédiés) et bon de livraison (signée par le client). Le bon de réception est un doublon de fonctionnalité et est rarement utilisé.
+FreeLegalTextOnShippings=Mention complémentaire sur les réceptions
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modèle de numérotation des bons de réception client
 DeliveryOrderModel=Modèle de bon de réception client

htdocs/langs/fr_FR/receptions.lang

@@ -0,0 +1,70 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefReception=Réf. réception
+Reception=Réception
+Receptions=Réceptions
+AllReceptions=Toutes les réceptions
+Shipment=Réception
+Shipments=Réceptions
+ShowReception=Afficher Réceptions
+Receivings=Bons de réceptions
+ReceptionsArea=Espace réceptions
+ListOfReceptions=Liste des réceptions
+ReceptionMethod=Méthode d'réception
+LastReceptions=Les %s dernières réceptions
+StatisticsOfReceptions=Statistiques des réceptions
+NbOfReceptions=Nombre d'réceptions
+NumberOfShipmentsByMonth=Nombre d'réceptions par mois
+ReceptionCard=Fiche réception
+NewReception=Nouvelle réception
+CreateShipment=Créer réception
+QtyShipped=Qté. expédiée
+QtyPreparedOrShipped=Quantité préparée ou envoyée
+QtyToShip=Qté. à expédier
+QtyReceived=Qté. reçue
+QtyInOtherShipments=Qté dans les autres réceptions
+KeepToShip=Reste à expédier
+OtherReceptionsForSameOrder=Autres réceptions pour cette commande
+ReceptionsAndReceivingForSameOrder=Réceptions et réceptions pour cette commande
+ReceptionsToValidate=Réceptions à valider
+StatusReceptionCanceled=Annulée
+StatusReceptionDraft=Brouillon
+StatusReceptionValidated=Validée (produits à envoyer ou envoyés)
+StatusReceptionProcessed=Traitée
+StatusReceptionDraftShort=Brouillon
+StatusReceptionValidatedShort=Validée
+StatusReceptionProcessedShort=Traitée
+ReceptionSheet=Fiche réception
+ConfirmDeleteReception=Êtes-vous sûr de vouloir supprimer cette réception ?
+ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception sous la référence <b>%s</b>?
+ConfirmCancelReception=Êtes-vous sûr de vouloir annuler cette réception ?
+DocumentModelMerou=Modèle Merou A5
+WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'réception.
+StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les réceptions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
+DateDeliveryPlanned=Date prévue de livraison
+RefDeliveryReceipt=Ref bon de réception
+StatusReceipt=Status du bon de réception
+DateReceived=Date de réception réelle
+SendShippingByEMail=Envoyer bon d'réception par email
+SendShippingRef=Envoi du bordereau d'réception %s
+ActionsOnShipping=Événements sur l'réception
+LinkToTrackYourPackage=Lien pour le suivi de votre colis
+ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle réception se fait depuis la fiche commande.
+ShipmentLine=Ligne d'réception
+ProductQtyInCustomersOrdersRunning=Quantité de produit en commandes client ouvertes
+ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur ouvertes
+ProductQtyInShipmentAlreadySent=Quantité de produit en commande client ouverte déjà expédiée
+ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
+NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
+WeightVolShort=Poids/vol.
+ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une réception.
+
+# Reception methods
+# ModelDocument
+DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
+SumOfProductVolumes=Somme des volumes des produits
+SumOfProductWeights=Somme des poids des produits
+
+# warehouse details
+DetailWarehouseNumber= Détail de l'entrepôt
+DetailWarehouseFormat= W:%s (Qté : %d)

htdocs/reception/class/expeditionbatch.class.php

@@ -0,0 +1,223 @@
+<?php
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.fr>
+ *
+ * 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       expedition/class/expeditionbatch.class.php
+ *  \ingroup    productbatch
+ *  \brief      This file implements CRUD method for managing shipment batch lines
+ *				with batch record
+ */
+
+/**
+ *	CRUD class for batch number management within shipment
+ */
+class ExpeditionLineBatch extends CommonObject
+{
+	var $element='expeditionlignebatch';			//!< Id that identify managed objects
+	private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored
+
+	var $sellby;
+	var $eatby;
+	var $batch;
+	var $dluo_qty;
+	var $entrepot_id;
+	var $fk_origin_stock;
+	var $fk_expeditiondet;
+
+    /**
+     *  Constructor
+     *
+     *  @param	DoliDb		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        return 1;
+    }
+
+	/**
+	 * Fill object based on a product-warehouse-batch's record
+	 *
+	 * @param	int		$id_stockdluo	Rowid in product_batch table
+	 * @return	int      		   	 -1 if KO, 1 if OK
+	 */
+	function fetchFromStock($id_stockdluo)
+	{
+        $sql = "SELECT";
+		$sql.= " t.sellby,";
+		$sql.= " t.eatby,";
+		$sql.= " t.batch,";
+		$sql.= " e.fk_entrepot";
+
+        $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as t inner join ";
+        $sql.= MAIN_DB_PREFIX."product_stock as e on t.fk_product_stock=e.rowid ";
+        $sql.= " WHERE t.rowid = ".(int) $id_stockdluo;
+
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+				$this->sellby = $this->db->jdate($obj->sellby);
+				$this->eatby = $this->db->jdate($obj->eatby);
+				$this->batch = $obj->batch;
+				$this->entrepot_id= $obj->fk_entrepot;
+				$this->fk_origin_stock=(int) $id_stockdluo;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+      	    $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+	/**
+	 * Create an expeditiondet_batch DB record link to an expedtiondet record
+	 *
+	 * @param	int		$id_line_expdet		rowid of expedtiondet record
+	 * @return	int							<0 if KO, Id of record (>0) if OK
+	 */
+	function create($id_line_expdet)
+	{
+		$error = 0;
+
+		$id_line_expdet = (int) $id_line_expdet;
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.self::$_table_element." (";
+		$sql.= "fk_expeditiondet";
+		$sql.= ", sellby";
+		$sql.= ", eatby";
+		$sql.= ", batch";
+		$sql.= ", qty";
+		$sql.= ", fk_origin_stock";
+		$sql.= ") VALUES (";
+		$sql.= $id_line_expdet.",";
+		$sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':("'".$this->db->idate($this->sellby))."'").",";
+		$sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':("'".$this->db->idate($this->eatby))."'").",";
+		$sql.= " ".(! isset($this->batch)?'NULL':("'".$this->db->escape($this->batch)."'")).",";
+		$sql.= " ".(! isset($this->dluo_qty)?'NULL':$this->dluo_qty).",";
+		$sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock);
+		$sql.= ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		if (! $error)
+		{
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
+			$this->fk_expeditiondet=$id_line_expdet;
+			return $this->id;
+		}
+		else
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+	}
+
+	/**
+	 * Delete batch record attach to a shipment
+	 *
+	 * @param	DoliDB	$db				Database object
+	 * @param	int		$id_expedition	rowid of shipment
+	 * @return 	int						-1 if KO, 1 if OK
+	 */
+	static function deletefromexp($db,$id_expedition)
+	{
+		$id_expedition = (int) $id_expedition;
+
+		$sql="DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
+		$sql.=" WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		if ($db->query($sql))
+		{
+			return 1;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 * Retrieve all batch number details link to a shipment line
+	 *
+	 * @param	DoliDB	$db					Database object
+	 * @param	int		$id_line_expdet		id of shipment line
+	 * @return	variant						-1 if KO, array of ExpeditionLineBatch if OK
+	 */
+	static function fetchAll($db,$id_line_expdet)
+	{
+		$sql="SELECT rowid,";
+		$sql.= "fk_expeditiondet";
+		$sql.= ", sellby";
+		$sql.= ", eatby";
+		$sql.= ", batch";
+		$sql.= ", qty";
+		$sql.= ", fk_origin_stock";
+		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
+		$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
+
+		dol_syslog(__METHOD__ ."", LOG_DEBUG);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num=$db->num_rows($resql);
+			$i=0;
+			$ret = array();
+			while ($i<$num)
+			{
+				$tmp=new self($db);
+
+				$obj = $db->fetch_object($resql);
+
+				$tmp->sellby = $db->jdate($obj->sellby);
+				$tmp->eatby = $db->jdate($obj->eatby);
+				$tmp->batch = $obj->batch;
+				$tmp->id = $obj->rowid;
+				$tmp->fk_origin_stock = $obj->fk_origin_stock;
+				$tmp->fk_expeditiondet = $obj->fk_expeditiondet;
+				$tmp->dluo_qty = $obj->qty;
+
+				$ret[]=$tmp;
+				$i++;
+			}
+			$db->free($resql);
+			return $ret;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+}

htdocs/reception/class/expeditionstats.class.php

@@ -0,0 +1,142 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (c) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011      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 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/expedition/class/expeditionstats.class.php
+ *  \ingroup    expedition
+ *  \brief      File of class fo tmanage shipment statistics
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+
+
+/**
+ *		Class to manage shipment statistics
+ */
+class ExpeditionStats extends Stats
+{
+	public $table_element;
+
+	var $socid;
+    var $userid;
+
+    var $from;
+	var $field;
+    var $where;
+    
+
+    /**
+     * Constructor
+     *
+     * @param	DoliDB	$db      	Database handler
+	 * @param 	int		$socid	   	Id third party for filter
+	 * @param 	string	$mode	   	Option (not used)
+	 * @param   int		$userid    	Id user for filter (creation user)
+     */
+    function __construct($db, $socid, $mode, $userid=0)
+    {
+		global $user, $conf;
+    	
+		$this->db = $db;
+        
+		$this->socid = ($socid > 0 ? $socid : 0);
+        $this->userid = $userid;
+		$this->cachefilesuffix = $mode; 
+        
+        $object=new Expedition($this->db);
+		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
+		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
+		$this->field='weight';	// Warning, unit of weight is NOT USED AND MUST BE
+		$this->where.= " c.fk_statut > 0";    // Not draft and not cancelled
+
+		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
+		$this->where.= " AND c.entity = ".$conf->entity;
+		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($this->socid)
+		{
+			$this->where.=" AND c.fk_soc = ".$this->socid;
+		}
+        if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
+    }
+
+    /**
+     * Return shipment number by month for a year
+     *
+	 * @param	int		$year		Year to scan
+	 * @return	array				Array with number by month
+     */
+    function getNbByMonth($year)
+    {
+        global $user;
+
+        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql.= " AND ".$this->where;
+		$sql.= " GROUP BY dm";
+        $sql.= $this->db->order('dm','DESC');
+
+		$res=$this->_getNbByMonth($year, $sql);
+		return $res;
+    }
+
+	/**
+	 * Return shipments number per year
+	 *
+	 * @return	array	Array with number by year
+	 *
+	 */
+	function getNbByYear()
+	{
+		global $user;
+
+		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE ".$this->where;
+		$sql.= " GROUP BY dm";
+        $sql.= $this->db->order('dm','DESC');
+
+		return $this->_getNbByYear($sql);
+	}
+
+	/**
+	 *	Return nb, total and average
+	 *
+	 *	@return	array	Array of values
+	 */
+	function getAllByYear()
+	{
+		global $user;
+
+		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
+		$sql.= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql.= " WHERE ".$this->where;
+		$sql.= " GROUP BY year";
+        $sql.= $this->db->order('year','DESC');
+
+		return $this->_getAllByYear($sql);
+	}
+}
+

htdocs/reception/contact.php

@@ -0,0 +1,274 @@
+<?php
+/* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
+ * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.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
+ * 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/expedition/contact.php
+ *     \ingroup    expedition
+ *     \brief      Onglet de gestion des contacts de expedition
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.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';
+}
+
+$langs->load("orders");
+$langs->load("sendings");
+$langs->load("companies");
+
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'expedition', $id,'');
+
+$object = new Expedition($db);
+if ($id > 0 || ! empty($ref))
+{
+    $object->fetch($id, $ref);
+    $object->fetch_thirdparty();
+
+    if (!empty($object->origin))
+    {
+        $typeobject = $object->origin;
+        $origin = $object->origin;
+        $object->fetch_origin();
+    }
+
+    // Linked documents
+    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    {
+        $objectsrc=new Commande($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    {
+        $objectsrc=new Propal($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'addcontact' && $user->rights->expedition->creer)
+{
+    if ($result > 0 && $id > 0)
+    {
+  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+    }
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') 
+		{
+			$langs->load("errors");
+			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $objectsrc->error;
+			$mesgs = $objectsrc->errors;
+		}
+		setEventMessages($mesg, $mesgs, 'errors');
+	}
+}
+
+// bascule du statut d'un contact
+else if ($action == 'swapstatut' && $user->rights->expedition->creer)
+{
+    $result=$objectsrc->swapContactStatus(GETPOST('ligne'));
+}
+
+// Efface un contact
+else if ($action == 'deletecontact' && $user->rights->expedition->creer)
+{
+	$result = $objectsrc->delete_contact(GETPOST("lineid"));
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else {
+		dol_print_error($db);
+	}
+}
+/*
+else if ($action == 'setaddress' && $user->rights->expedition->creer)
+{
+	$object->fetch($id);
+	$result=$object->setDeliveryAddress($_POST['fk_address']);
+	if ($result < 0) dol_print_error($db,$object->error);
+}*/
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$formother = new FormOther($db);
+$contactstatic=new Contact($db);
+$userstatic=new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($id > 0 || ! empty($ref))
+{
+	$langs->trans("OrderCard");
+
+	$head = shipping_prepare_head($object);
+	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
+
+
+	// Shipment card
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='<div class="refidno">';
+	// Ref customer shipment
+	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    if (! empty($conf->projet->enabled)) {
+        $langs->load("projects");
+        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        if (0) {    // Do not change on shipment
+            if ($action != 'classify') {
+                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+            }
+            if ($action == 'classify') {
+                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '</form>';
+            } else {
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+            }
+        } else {
+            // We don't have project on shipment, so we will use the project or source object instead
+            // TODO Add project on shipment
+            $morehtmlref .= ' : ';
+            if (! empty($objectsrc->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($objectsrc->fk_project);
+                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= $proj->ref;
+                $morehtmlref .= '</a>';
+            } else {
+                $morehtmlref .= '';
+            }
+        }
+    }
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+	print '<div class="fichecenter">';
+    //print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+
+    print '<table class="border centpercent">';
+
+    // Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+	{
+	    print '<tr><td class="titlefield">';
+	    $objectsrc=new Commande($db);
+	    $objectsrc->fetch($object->$typeobject->id);
+	    print $langs->trans("RefOrder").'</td>';
+	    print '<td colspan="3">';
+	    print $objectsrc->getNomUrl(1,'commande');
+	    print "</td>\n";
+	    print '</tr>';
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+	{
+	    print '<tr><td class="titlefield">';
+	    $objectsrc=new Propal($db);
+	    $objectsrc->fetch($object->$typeobject->id);
+	    print $langs->trans("RefProposal").'</td>';
+	    print '<td colspan="3">';
+	    print $objectsrc->getNomUrl(1,'expedition');
+	    print "</td>\n";
+	    print '</tr>';
+	}
+	
+	print "</table>";
+
+	
+	//print '</div>';
+	//print '<div class="fichehalfright">';
+	//print '<div class="ficheaddleft">';
+	//print '<div class="underbanner clearboth"></div>';
+	
+	
+	//print '</div>';
+	//print '</div>';
+	print '</div>';
+		
+	print '<div class="clearboth"></div>';
+	
+	
+	dol_fiche_end();
+
+	// Lignes de contacts
+	echo '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+	foreach($dirtpls as $reldir)
+	{
+	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+	    if ($res) break;
+	}
+
+}
+
+llxFooter();
+
+$db->close();

htdocs/reception/index.php

@@ -0,0 +1,296 @@
+<?php
+/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.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
+ * 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/expedition/index.php
+ *       \ingroup    expedition
+ *       \brief      Home page of shipping area.
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+
+$langs->load("orders");
+$langs->load("sendings");
+
+/*
+ *	View
+ */
+
+$orderstatic=new Commande($db);
+$companystatic=new Societe($db);
+$shipment=new Expedition($db);
+
+$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
+llxHeader('',$langs->trans("Shipment"),$helpurl);
+
+print load_fiche_titre($langs->trans("SendingsArea"));
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    print '<form method="post" action="list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
+
+/*
+ * Shipments to validate
+ */
+$clause = " WHERE ";
+
+$sql = "SELECT e.rowid, e.ref, e.ref_customer,";
+$sql.= " s.nom as name, s.rowid as socid,";
+$sql.= " c.ref as commande_ref, c.rowid as commande_id";
+$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid)
+{
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+	$sql.= $clause." sc.fk_user = " .$user->id;
+	$clause = " AND ";
+}
+$sql.= $clause." e.fk_statut = 0";
+$sql.= " AND e.entity IN (".getEntity('expedition').")";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			
+			$shipment->id=$obj->rowid;
+			$shipment->ref=$obj->ref;
+			$shipment->ref_customer=$obj->ref_customer;				
+			
+			print '<tr class="oddeven"><td class="nowrap">';
+			print $shipment->getNomUrl(1);
+			print "</td>";
+			print '<td>';
+			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
+			print '</td>';
+			print '<td>';
+			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			print '</td></tr>';
+			$i++;
+		}
+		print "</table><br>";
+	}
+}
+
+
+/*
+ * Commandes a traiter
+ */
+$sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut, s.nom as name, s.rowid as socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql.= " ".MAIN_DB_PREFIX."societe as s";
+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.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 1";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.rowid ASC";
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$langs->load("orders");
+
+		$i = 0;
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+
+			$orderstatic->id=$obj->rowid;
+			$orderstatic->ref=$obj->ref;
+			$orderstatic->ref_customer=$obj->ref_customer;
+			$orderstatic->statut=$obj->fk_statut;
+			$orderstatic->facturee=0;
+			
+			$companystatic->name=$obj->name;
+			$companystatic->id=$obj->socid;			
+			
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">';
+			print $orderstatic->getNomUrl(1);
+			print '</td>';
+			print '<td>';
+			print $companystatic->getNomUrl(1,'customer',32);
+			print '</td>';
+			print '<td align="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+		print "</table><br>";
+	}
+}
+
+
+//print '</td><td valign="top" width="70%">';
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+/*
+ * Commandes en traitement
+ */
+$sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql.= " ".MAIN_DB_PREFIX."societe as s";
+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.entity = ".$conf->entity;
+$sql.= " AND c.fk_statut = 2";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+
+$resql = $db->query($sql);
+if ( $resql )
+{
+	$langs->load("orders");
+
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			
+		    $orderstatic->id=$obj->rowid;
+			$orderstatic->ref=$obj->ref;
+			$orderstatic->ref_customer=$obj->ref_customer;
+			$orderstatic->statut=$obj->status;
+            $orderstatic->facturee=$obj->billed;
+			
+            $companystatic->name=$obj->name;
+			$companystatic->id=$obj->socid;				
+			
+			print '<tr class="oddeven"><td>';
+			print $orderstatic->getNomUrl(1);
+			print '</td>';
+			print '<td>';
+			print $companystatic->getNomUrl(1,'customer');
+			print '</td>';
+            print '<td align="right">';
+            print $orderstatic->getLibStatut(3);
+            print '</td>';
+            print '</tr>';
+			$i++;
+		}
+		print "</table><br>";
+	}
+}
+else dol_print_error($db);
+
+
+/*
+ * Last shipments
+ */
+$sql = "SELECT e.rowid, e.ref, e.ref_customer,";
+$sql.= " s.nom as name, s.rowid as socid,";
+$sql.= " c.ref as commande_ref, c.rowid as commande_id";
+$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
+$sql.= " AND e.fk_statut = 1";
+if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+$sql.= " ORDER BY e.date_delivery DESC";
+$sql.= $db->plimit(5, 0);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+		    
+			$shipment->id=$obj->rowid;
+			$shipment->ref=$obj->ref;
+			$shipment->ref_customer=$obj->ref_customer;				
+			
+			print '<tr class="oddeven"><td>';
+			print $shipment->getNomUrl(1);
+			print '</td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+			print '<td>';
+			if ($obj->commande_id > 0)
+			{
+				$orderstatic->id=$obj->commande_id;
+				$orderstatic->ref=$obj->commande_ref;
+				print $orderstatic->getNomUrl(1);
+			}
+			else print '&nbsp;';
+			print '</td></tr>';
+			$i++;
+		}
+		print "</table><br>";
+	}
+	$db->free($resql);
+}
+else dol_print_error($db);
+
+
+print '</div></div></div>';
+
+
+llxFooter();
+$db->close();

htdocs/reception/list.php

@@ -0,0 +1,669 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016	   Ferran Marcet        <fmarcet@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 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/expedition/list.php
+ *      \ingroup    expedition
+ *      \brief      Page to list all shipments
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+$langs->load("sendings");
+$langs->load("deliveries");
+$langs->load('companies');
+
+$socid=GETPOST('socid','int');
+// Security check
+$expeditionid = GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'expedition',$expeditionid,'');
+
+$diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
+
+$search_ref_exp = GETPOST("search_ref_exp");
+$search_ref_liv = GETPOST('search_ref_liv');
+$search_company = GETPOST("search_company");
+$search_town=GETPOST('search_town','alpha');
+$search_zip=GETPOST('search_zip','alpha');
+$search_state=trim(GETPOST("search_state"));
+$search_country=GETPOST("search_country",'int');
+$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
+$search_billed=GETPOST("search_billed",'int');
+$sall = GETPOST('sall', 'alphanohtml');
+$optioncss = GETPOST('optioncss','alpha');
+
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if (! $sortfield) $sortfield="e.ref";
+if (! $sortorder) $sortorder="DESC";
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$contextpage='shipmentlist';
+
+$viewstatut=GETPOST('viewstatut');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('shipmentlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('expedition');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    'e.ref'=>"Ref",
+    's.nom'=>"ThirdParty",
+    'e.note_public'=>'NotePublic',
+);
+if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+
+$checkedtypetiers=0;
+$arrayfields=array(
+    'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
+    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
+    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+    'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
+    'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+    'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>$conf->livraison_bon->enabled),
+    'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>$conf->livraison_bon->enabled),
+    'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
+);
+
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+    }
+}
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction')) { $massaction=''; }
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+// Purge search criteria
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+{
+    $search_ref_exp='';
+    $search_ref_liv='';
+    $search_company='';
+    $search_town='';
+	$search_zip="";
+    $search_state="";
+	$search_type='';
+	$search_country='';
+	$search_type_thirdparty='';
+	$search_billed='';
+    $viewstatut='';
+    $search_array_options=array();
+}
+
+if (empty($reshook))
+{
+    // Mass actions. Controls on number of lines checked
+    $maxformassaction=1000;
+    if (! empty($massaction) && count($toselect) < 1)
+    {
+        $error++;
+        setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
+    }
+    if (! $error && count($toselect) > $maxformassaction)
+    {
+        setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+        $error++;
+    }
+
+}
+
+
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+$companystatic=new Societe($db);
+$shipment=new Expedition($db);
+$formcompany=new FormCompany($db);
+
+$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
+llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
+
+$sql = "SELECT e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
+$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql.= " typent.code as typent_code,";
+$sql.= " state.code_departement as state_code, state.nom as state_name,";
+$sql.= ' e.date_creation as date_creation, e.tms as date_update';
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+{
+	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+{
+	$sql.= " AND e.fk_soc = sc.fk_soc";
+	$sql.= " AND sc.fk_user = " .$user->id;
+}
+if ($socid)
+{
+	$sql.= " AND e.fk_soc = ".$socid;
+}
+if ($viewstatut <> '' && $viewstatut >= 0) {
+	$sql.= " AND e.fk_statut = ".$viewstatut;
+}
+if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
+if ($search_town)  $sql.= natural_search('s.town', $search_town);
+if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
+if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
+if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
+if ($search_company) $sql .= natural_search('s.nom', $search_company);
+if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
+    if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
+    if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+    {
+        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+    }
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit + 1,$offset);
+
+//print $sql;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$expedition = new Expedition($db);
+
+	$param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($sall) $param.= "&amp;sall=".$sall;
+	if ($search_ref_exp) $param.= "&amp;search_ref_exp=".$search_ref_exp;
+	if ($search_ref_liv) $param.= "&amp;search_ref_liv=".$search_ref_liv;
+	if ($search_company) $param.= "&amp;search_company=".$search_company;
+	if ($optioncss != '') $param.='&amp;optioncss='.$optioncss;
+	// Add $param from extra fields
+	foreach ($search_array_options as $key => $val)
+	{
+	    $crit=$val;
+	    $tmpkey=preg_replace('/search_options_/','',$key);
+	    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	}
+
+	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+	$i = 0;
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, '', '', $limit);
+
+    if ($sall)
+    {
+        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+    }
+
+    $moreforfilter='';
+    if (! empty($moreforfilter))
+    {
+        print '<div class="liste_titre liste_titre_bydiv centpercent">';
+        print $moreforfilter;
+        $parameters=array('type'=>$type);
+        $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        print '</div>';
+    }
+
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre_filter">';
+	// Ref
+	if (! empty($arrayfields['e.ref']['checked']))
+	{
+	    print '<td class="liste_titre">';
+    	print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
+        print '</td>';
+	}
+	// Ref customer
+	if (! empty($arrayfields['e.ref_customer']['checked']))
+	{
+	    print '<td class="liste_titre">';
+    	print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
+        print '</td>';
+	}
+	// Thirdparty
+	if (! empty($arrayfields['s.nom']['checked']))
+	{
+    	print '<td class="liste_titre" align="left">';
+    	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+    	print '</td>';
+	}
+	// Town
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	// Zip
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	// State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print '<td class="liste_titre">';
+    	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    	print '</td>';
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+    	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    	print '</td>';
+    }
+	// Company type
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    	print '</td>';
+    }
+	// Date delivery planned
+	if (! empty($arrayfields['e.date_delivery']['checked']))
+	{
+    	print '<td class="liste_titre">&nbsp;</td>';
+	}
+	if (! empty($arrayfields['l.ref']['checked']))
+	{
+    	// Delivery ref
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
+		print '</td>';
+	}
+	if (! empty($arrayfields['l.date_delivery']['checked']))
+	{
+	    // Date received
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+	            $typeofextrafield=$extrafields->attribute_type[$key];
+	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+	            {
+	                $crit=$val;
+	                $tmpkey=preg_replace('/search_options_/','',$key);
+	                $searchclass='';
+	                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+	                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+	                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+	            }
+	            print '</td>';
+	        }
+	    }
+	}
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (! empty($arrayfields['e.datec']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Date modification
+	if (! empty($arrayfields['e.tms']['checked']))
+	{
+	    print '<td class="liste_titre">';
+	    print '</td>';
+	}
+	// Status
+	if (! empty($arrayfields['e.fk_statut']['checked']))
+	{
+	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+	    print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
+	    print '</td>';
+	}
+	// Status billed
+	if (! empty($arrayfields['e.billed']['checked']))
+	{
+	    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+	    print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+	    print '</td>';
+	}
+	// Action column
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+    print '</td>';
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	    foreach($extrafields->attribute_label as $key => $val)
+	    {
+	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        {
+	            $align=$extrafields->getAlignFlag($key);
+    			$sortonfield = "ef.".$key;
+    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+	        }
+	    }
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	print "</tr>\n";
+
+	$i=0;
+	$var=true;
+	$totalarray=array();
+	while ($i < min($num,$limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+    	$shipment->id=$obj->rowid;
+    	$shipment->ref=$obj->ref;
+
+    	$companystatic->id=$obj->socid;
+    	$companystatic->ref=$obj->name;
+    	$companystatic->name=$obj->name;
+
+
+    	print '<tr class="oddeven">';
+
+		// Ref
+		if (! empty($arrayfields['e.ref']['checked']))
+		{
+    		print "<td>";
+    		print $shipment->getNomUrl(1);
+    		print "</td>\n";
+    		if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Ref customer
+		if (! empty($arrayfields['e.ref_customer']['checked']))
+		{
+		    print "<td>";
+		    print $obj->ref_customer;
+		    print "</td>\n";
+		    if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Third party
+		if (! empty($arrayfields['s.nom']['checked']))
+		{
+    		print '<td>';
+    		print $companystatic->getNomUrl(1);
+    		print '</td>';
+    		if (! $i) $totalarray['nbfield']++;
+		}
+		// Town
+		if (! empty($arrayfields['s.town']['checked']))
+		{
+		    print '<td class="nocellnopadd">';
+		    print $obj->town;
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Zip
+		if (! empty($arrayfields['s.zip']['checked']))
+		{
+		    print '<td class="nocellnopadd">';
+		    print $obj->zip;
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// State
+		if (! empty($arrayfields['state.nom']['checked']))
+		{
+		    print "<td>".$obj->state_name."</td>\n";
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Country
+		if (! empty($arrayfields['country.code_iso']['checked']))
+		{
+		    print '<td align="center">';
+		    $tmparray=getCountry($obj->fk_pays,'all');
+		    print $tmparray['label'];
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Type ent
+		if (! empty($arrayfields['typent.code']['checked']))
+		{
+		    print '<td align="center">';
+		    if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		    print $typenArray[$obj->typent_code];
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Date delivery planed
+		if (! empty($arrayfields['e.date_delivery']['checked']))
+		{
+    		print '<td align="center">';
+    		print dol_print_date($db->jdate($obj->date_livraison),"day");
+    		/*$now = time();
+    		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
+    		{
+    		}*/
+    		print "</td>\n";
+		}
+
+		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+        {
+		    $shipment->fetchObjectLinked($shipment->id,$shipment->element);
+            $receiving='';
+            if (count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+
+    		if (! empty($arrayfields['l.ref']['checked']))
+            {
+                // Ref
+                print '<td>';
+                print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+                print '</td>';
+            }
+
+    		if (! empty($arrayfields['l.date_delivery']['checked']))
+            {
+                // Date received
+            	print '<td align="center">';
+    			print dol_print_date($db->jdate($obj->date_reception),"day");
+    			print '</td>'."\n";
+            }
+		}
+
+		// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+		{
+		    foreach($extrafields->attribute_label as $key => $val)
+		    {
+		        if (! empty($arrayfields["ef.".$key]['checked']))
+		        {
+		            print '<td class="tdofextrafield"';
+		            $align=$extrafields->getAlignFlag($key);
+		            if ($align) print ' align="'.$align.'"';
+		            print '>';
+		            $tmpkey='options_'.$key;
+		            print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+		            print '</td>';
+		            if (! $i) $totalarray['nbfield']++;
+		        }
+		    }
+		}
+		// Fields from hook
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (! empty($arrayfields['e.datec']['checked']))
+		{
+		    print '<td align="center" class="nowrap">';
+		    print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Date modification
+		if (! empty($arrayfields['e.tms']['checked']))
+		{
+		    print '<td align="center" class="nowrap">';
+		    print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+		    print '</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Status
+		if (! empty($arrayfields['e.fk_statut']['checked']))
+		{
+		    print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
+		    if (! $i) $totalarray['nbfield']++;
+		}
+		// Billed
+		if (! empty($arrayfields['e.billed']['checked']))
+		{
+			print '<td align="center">'.yn($obj->billed).'</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Action column
+		print '<td></td>';
+		if (! $i) $totalarray['nbfield']++;
+
+		print "</tr>\n";
+
+		$i++;
+	}
+
+	print "</table>";
+	print "</div>";
+	print '</form>';
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+llxFooter();
+$db->close();

htdocs/reception/note.php

@@ -0,0 +1,164 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013 	   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/expedition/note.php
+ *      \ingroup    expedition
+ *      \brief      Note card expedition
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.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';
+}
+
+$langs->load("sendings");
+$langs->load("companies");
+$langs->load("bills");
+$langs->load('deliveries');
+$langs->load('orders');
+$langs->load('stocks');
+$langs->load('other');
+$langs->load('propal');
+
+$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+$socid='';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user, $origin, $origin_id);
+
+$object = new Expedition($db);
+if ($id > 0 || ! empty($ref))
+{
+    $object->fetch($id, $ref);
+    $object->fetch_thirdparty();
+
+    if (!empty($object->origin))
+    {
+        $typeobject = $object->origin;
+        $origin = $object->origin;
+        $object->fetch_origin();
+    }
+
+    // Linked documents
+    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    {
+        $objectsrc=new Commande($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    {
+        $objectsrc=new Propal($db);
+        $objectsrc->fetch($object->$typeobject->id);
+    }
+}
+
+$permissionnote=$user->rights->expedition->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+if ($id > 0 || ! empty($ref))
+{
+
+	$head=shipping_prepare_head($object);
+	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
+
+    
+	// Shipment card
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref='<div class="refidno">';
+	// Ref customer shipment
+	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    // Project
+    if (! empty($conf->projet->enabled)) {
+        $langs->load("projects");
+        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        if (0) {    // Do not change on shipment
+            if ($action != 'classify') {
+                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+            }
+            if ($action == 'classify') {
+                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '</form>';
+            } else {
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+            }
+        } else {
+            // We don't have project on shipment, so we will use the project or source object instead
+            // TODO Add project on shipment
+            $morehtmlref .= ' : ';
+            if (! empty($objectsrc->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($objectsrc->fk_project);
+                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= $proj->ref;
+                $morehtmlref .= '</a>';
+            } else {
+                $morehtmlref .= '';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
+    
+    
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+    
+    
+    print '<div class="underbanner clearboth"></div>';
+    
+	$cssclass='titlefield';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	dol_fiche_end();
+}
+
+
+llxFooter();
+
+$db->close();

htdocs/reception/shipment.php

@@ -0,0 +1,939 @@
+<?php
+/* Copyright (C) 2003-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2015	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 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/expedition/shipment.php
+ *	\ingroup    expedition
+ *  \brief      Tab shipments/delivery receipts on the order
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.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';
+}
+if (! empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$langs->load('orders');
+$langs->load("companies");
+$langs->load("bills");
+$langs->load('propal');
+$langs->load('deliveries');
+$langs->load('stocks');
+$langs->load("productbatch");
+
+$id=GETPOST('id','int');			// id of order
+$ref= GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+$socid=0;
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result=restrictedArea($user,'commande',$id);
+
+$object = new Commande($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
+
+
+
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Categorisation dans projet
+    if ($action == 'classin')
+    {
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$object->setProject(GETPOST('projectid','int'));
+    }
+    
+    if ($action == 'confirm_cloture' && GETPOST('confirm','alpha') == 'yes')
+    {
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$result = $object->cloture($user);
+    }
+    
+    // Positionne ref commande client
+    else if ($action == 'setref_client' && $user->rights->commande->creer) {
+        $result = $object->set_ref_client($user, GETPOST('ref_client'));
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+    
+    if ($action == 'setdatedelivery' && $user->rights->commande->creer)
+    {
+    	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+    	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
+    
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$result=$object->set_date_livraison($user,$datelivraison);
+    	if ($result < 0)
+    		setEventMessages($object->error, $object->errors, 'errors');
+    }
+    /*
+    if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
+    {
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$object->setDeliveryAddress(GETPOST('delivery_address_id','int'));
+    	if ($result < 0)
+    		setEventMessages($object->error, $object->errors, 'errors');
+    }
+    */
+    if ($action == 'setmode' && $user->rights->commande->creer)
+    {
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+    	if ($result < 0)
+    		setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    if ($action == 'setavailability' && $user->rights->commande->creer) {
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result=$object->availability(GETPOST('availability_id'));
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    if ($action == 'setdemandreason' && $user->rights->commande->creer) {
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result=$object->demand_reason(GETPOST('demand_reason_id'));
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    if ($action == 'setconditions' && $user->rights->commande->creer)
+    {
+    	$object = new Commande($db);
+    	$object->fetch($id);
+    	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+    	if ($result < 0)
+    		setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    // shipping method
+    if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result=$object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+    	if ($result < 0)
+    		setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    // warehouse
+    if ($action == 'setwarehouse' && $user->rights->commande->creer) {
+        $object = new Commande($db);
+        $object->fetch($id);
+        $result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+        if ($result < 0)
+            setEventMessages($object->error, $object->errors, 'errors');
+    }
+    
+    if ($action == 'update_extras')
+    {
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+        if ($ret < 0) $error++;
+    
+        if (! $error)
+        {
+            // Actions on extra fields (by external module or standard code)
+            $hookmanager->initHooks(array('orderdao'));
+            $parameters = array('id' => $object->id);
+            $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
+            // some hooks
+            if (empty($reshook)) {
+                $result = $object->insertExtraFields();
+                if ($result < 0) {
+                    $error++;
+                }
+            } else if ($reshook < 0)
+                $error++;
+        }
+    
+        if ($error)
+            $action = 'edit_extras';
+    }
+    
+    if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+    {
+        $object->fetch($id);
+        $object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
+    
+        header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+        exit();
+    }
+    
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproduct = new FormProduct($db);
+if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+
+llxHeader('',$langs->trans('OrderCard'),'');
+
+
+if ($id > 0 || ! empty($ref))
+{
+	$object = new Commande($db);
+	if ( $object->fetch($id,$ref) > 0)
+	{
+		$object->loadExpeditions(1);
+
+		$product_static=new Product($db);
+
+		$soc = new Societe($db);
+		$soc->fetch($object->socid);
+
+		$author = new User($db);
+		$author->fetch($object->user_author_id);
+
+		$res = $object->fetch_optionals($object->id, $extralabels);
+		
+		$head = commande_prepare_head($object);
+		dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
+
+		
+		$formconfirm = '';
+		
+		// Confirm validation
+		if ($action == 'cloture')
+		{
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture");
+
+		}
+
+		if (! $formconfirm) {
+		    $parameters = array();
+		    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		    if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+		    elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		}
+		
+		// Print form confirm
+		print $formconfirm;
+		
+		
+		// Order card
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
+		$morehtmlref='<div class="refidno">';
+		// Ref customer
+		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
+		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+	    // Thirdparty
+	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	    // Project
+	    if (! empty($conf->projet->enabled))
+	    {
+	        $langs->load("projects");
+	        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	        if ($user->rights->commande->creer)
+	        {
+	            if ($action != 'classify')
+	                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	                if ($action == 'classify') {
+	                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	                    $morehtmlref.='</form>';
+	                } else {
+	                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	                }
+	        } else {
+	            if (! empty($object->fk_project)) {
+	                $proj = new Project($db);
+	                $proj->fetch($object->fk_project);
+	                $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+	                $morehtmlref.=$proj->ref;
+	                $morehtmlref.='</a>';
+	            } else {
+	                $morehtmlref.='';
+	            }
+	        }
+	    }
+	    $morehtmlref.='</div>';
+
+
+	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	    print '<div class="fichecenter">';
+	    print '<div class="fichehalfleft">';
+	    print '<div class="underbanner clearboth"></div>';
+	    
+	    print '<table class="border" width="100%">';
+
+		// Discounts for third party
+		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
+		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
+		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+		$absolute_discount=$soc->getAvailableDiscounts('','fk_facture_source IS NULL');
+		$absolute_creditnote=$soc->getAvailableDiscounts('','fk_facture_source IS NOT NULL');
+		$absolute_discount=price2num($absolute_discount,'MT');
+		$absolute_creditnote=price2num($absolute_creditnote,'MT');
+		if ($absolute_discount)
+		{
+			if ($object->statut > Commande::STATUS_DRAFT)
+			{
+				print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
+			}
+			else
+			{
+				// Remise dispo de type non avoir
+				$filter='fk_facture_source IS NULL';
+				print '<br>';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter, 0, '', 1);
+			}
+		}
+		if ($absolute_creditnote)
+		{
+			print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. ';
+		}
+		if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
+		print '</td></tr>';
+
+		// Date
+		print '<tr><td>'.$langs->trans('Date').'</td>';
+		print '<td colspan="2">';
+		print dol_print_date($object->date,'daytext');
+		if ($object->hasDelay() && empty($object->date_livraison)) {
+		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Delivery date planned
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('DateDeliveryPlanned');
+		print '</td>';
+
+		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editdate_livraison')
+		{
+			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="setdatedelivery">';
+			$form->select_date($object->date_livraison>0?$object->date_livraison:-1,'liv_','','','',"setdatedelivery");
+			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		}
+		else
+		{
+			print dol_print_date($object->date_livraison,'daytext');
+			if ($object->hasDelay() && ! empty($object->date_livraison)) {
+			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+			}
+		}
+		print '</td>';
+		// Note on several rows
+		//print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
+		//print nl2br($object->note_public);
+		//print '</td>';
+		print '</tr>';
+
+        // Shipping Method
+        print '<tr><td>';
+        print '<table width="100%" class="nobordernopadding"><tr><td>';
+        print $langs->trans('SendingMethod');
+        print '</td>';
+        if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editshippingmethod') {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+        } else {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Warehouse
+        if (! empty($conf->stock->enabled) && ! empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+            require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+            $formproduct=new FormProduct($db);
+            print '<tr><td>';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans('Warehouse');
+            print '</td>';
+            if ($action != 'editwarehouse' && $user->rights->commande->creer)
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'),1).'</a></td>';
+            print '</tr></table>';
+            print '</td><td colspan="2">';
+            if ($action == 'editwarehouse') {
+                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
+            } else {
+                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
+            }
+            print '</td>';
+            print '</tr>';
+        }
+
+		// Terms of payment
+		/*
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentConditionsShort');
+		print '</td>';
+
+		if ($action != 'editconditions' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editconditions')
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+		}
+		else
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+		}
+		print '</td></tr>';
+
+		// Mode of payment
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editmode')
+		{
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+		}
+		else
+		{
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+		}
+		print '</td></tr>';*/
+
+		// Availability
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('AvailabilityPeriod');
+		print '</td>';
+		if ($action != 'editavailability')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editavailability') {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
+		} else {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
+		}
+		print '</td></tr>';
+
+		// Source
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Source');
+		print '</td>';
+		if ($action != 'editdemandreason')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdemandreason') {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+		} else {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
+		}
+
+		$tmparray=$object->getTotalWeightVolume();
+		$totalWeight=$tmparray['weight'];
+		$totalVolume=$tmparray['volume'];
+		if ($totalWeight || $totalVolume)
+		{
+		    print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+		    print '<td>';
+		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+		    print '</td></tr>';
+		    print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+		    print '<td>';
+		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+		    print '</td></tr>';
+		}
+		
+		// TODO How record was recorded OrderMode (llx_c_input_method)
+		
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{
+		    print '<tr><td>';
+		    print '<table width="100%" class="nobordernopadding"><tr><td>';
+		    print $langs->trans('IncotermLabel');
+		    print '<td><td align="right">';
+		    if ($user->rights->commande->creer) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		    else print '&nbsp;';
+		    print '</td></tr></table>';
+		    print '</td>';
+		    print '<td colspan="3">';
+		    if ($action != 'editincoterm')
+		    {
+		        print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+		    }
+		    else
+		    {
+		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		    }
+		    print '</td></tr>';
+		}
+		
+		// Other attributes
+		$cols = 2;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+		print '</table>';
+
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
+
+		print '<table class="border centpercent">';
+
+		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
+		{
+		    // Multicurrency Amount HT
+		    print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+		    print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '</tr>';
+		
+		    // Multicurrency Amount VAT
+		    print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+		    print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '</tr>';
+		
+		    // Multicurrency Amount TTC
+		    print '<tr><td>' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+		    print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+		    print '</tr>';
+		}
+		
+		// Total HT
+		print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+		print '<td>'.price($object->total_ht, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
+
+		// Total VAT
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
+
+		// Amount Local Taxes
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
+		{
+		    print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+		    print '<td>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
+		{
+		    print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+		    print '<td>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+		
+		// Total TTC
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
+
+		print '</table>';
+
+		print '</div>';
+		print '</div>';
+		print '</div>';
+		
+		print '<div class="clearboth"></div><br>';
+		
+		
+		
+		/**
+		 *  Lines or orders with quantity shipped and remain to ship
+		 *  Note: Qty shipped are already available into $object->expeditions[fk_product]
+		 */
+		print '<table class="noborder noshadow" width="100%">';
+
+		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
+		$sql.= " cd.price, cd.tva_tx, cd.subprice,";
+		$sql.= " cd.qty,";
+		$sql.= ' cd.date_start,';
+		$sql.= ' cd.date_end,';
+		$sql.= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc';
+		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+		$sql.= " WHERE cd.fk_commande = ".$object->id;
+		$sql.= " ORDER BY cd.rang, cd.rowid";
+
+		//print $sql;
+		dol_syslog("shipment.php", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Description").'</td>';
+			print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+			print '<td align="center">'.$langs->trans("KeepToShip").'</td>';
+			if (! empty($conf->stock->enabled))
+			{
+				print '<td align="center">'.$langs->trans("RealStock").'</td>';
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+			}
+			print "</tr>\n";
+
+			$var=true;
+			$toBeShipped=array();
+			$toBeShippedTotal=0;
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				
+
+				// Show product and description
+				$type=isset($objp->type)?$objp->type:$objp->product_type;
+
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (! empty($objp->date_start)) $type=1;
+				if (! empty($objp->date_end)) $type=1;
+
+				print '<tr class="oddeven">';
+
+				// Product label
+				if ($objp->fk_product > 0)
+				{
+					// Define output language
+					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					{
+						$object->fetch_thirdparty();
+
+						$prod = new Product($db);
+                        $prod->id = $objp->fk_product;
+                        $prod->entity = $objp->entity;
+						$prod->getMultiLangs();
+
+						$outputlangs = $langs;
+						$newlang='';
+						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+						if (! empty($newlang))
+						{
+							$outputlangs = new Translate("",$conf);
+							$outputlangs->setDefaultLang($newlang);
+						}
+
+						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+					}
+					else
+						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
+
+					print '<td>';
+					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+					// Show product and description
+					$product_static->type=$type;
+					$product_static->id=$objp->fk_product;
+					$product_static->ref=$objp->ref;
+                    $product_static->entity = $objp->entity;
+					$text=$product_static->getNomUrl(1);
+					$text.= ' - '.$label;
+					$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description)).'<br>';
+                    $description.= $product_static->show_photos($conf->product->multidir_output[$product_static->entity],1,1,0,0,0,80);
+					print $form->textwithtooltip($text,$description,3,'','',$i);
+
+					// Show range
+					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+
+					// Add description in form
+					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					{
+						print ($objp->description && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+					}
+
+					print '</td>';
+				}
+				else
+				{
+					print "<td>";
+					if ($type==1) $text = img_object($langs->trans('Service'),'service');
+					else $text = img_object($langs->trans('Product'),'product');
+
+					if (! empty($objp->label)) {
+						$text.= ' <strong>'.$objp->label.'</strong>';
+						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+					} else {
+						print $text.' '.nl2br($objp->description);
+					}
+
+					// Show range
+					print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
+					print "</td>\n";
+				}
+
+				// Qty ordered
+				print '<td align="center">' . $objp->qty . '</td>';
+
+				// Qty already shipped
+				$qtyProdCom=$objp->qty;
+				print '<td align="center">';
+				// Nb of sending products for this line of order
+				$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
+				print $qtyAlreadyShipped;
+				print '</td>';
+
+				// Qty remains to ship
+				print '<td align="center">';
+				if ($type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
+					$toBeShippedTotal += $toBeShipped[$objp->fk_product];
+					print $toBeShipped[$objp->fk_product];
+				}
+				else
+				{
+					print '0 ('.$langs->trans("Service").')';
+				}
+				print '</td>';
+
+				if ($objp->fk_product > 0)
+				{
+					$product = new Product($db);
+					$product->fetch($objp->fk_product);
+					$product->load_stock('warehouseopen');
+				}
+
+				if ($objp->fk_product > 0 && $type == 0 && ! empty($conf->stock->enabled))
+				{
+					print '<td align="center">';
+					print $product->stock_reel;
+					if ($product->stock_reel < $toBeShipped[$objp->fk_product])
+					{
+						print ' '.img_warning($langs->trans("StockTooLow"));
+					}
+					print '</td>';
+				}
+				else
+				{
+					print '<td>&nbsp;</td>';
+				}
+				print "</tr>\n";
+
+				// Show subproducts lines
+				if ($objp->fk_product > 0 && ! empty($conf->global->PRODUIT_SOUSPRODUITS))
+				{
+					// Set tree of subproducts in product->sousprods
+					$product->get_sousproduits_arbo();
+					//var_dump($product->sousprods);exit;
+
+					// Define a new tree with quantiies recalculated
+					$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+					//var_dump($prods_arbo);
+					if (count($prods_arbo) > 0)
+					{
+						foreach($prods_arbo as $key => $value)
+						{
+							$img='';
+							if ($value['stock'] < $value['stock_alert'])
+							{
+								$img=img_warning($langs->trans("StockTooLow"));
+							}
+							print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
+							print '<td align="center"> '.$value['nb_total'].'</td>';
+							print '<td>&nbsp</td>';
+							print '<td>&nbsp</td>';
+							print '<td align="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
+						}
+					}
+				}
+
+				$i++;
+			}
+			$db->free($resql);
+
+			if (! $num)
+			{
+				print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
+			}
+
+			print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		print '</div>';
+
+
+		/*
+		 * Boutons Actions
+		 */
+
+		if (empty($user->societe_id))
+		{
+			print '<div class="tabsAction">';
+
+            // Bouton expedier sans gestion des stocks
+            if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+			{
+				if ($user->rights->expedition->creer)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("CreateShipment").'</a>';
+					if ($toBeShippedTotal <= 0)
+					{
+						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+					}
+				}
+				else
+				{
+					print '<a class="butActionRefused" href="#">'.$langs->trans("CreateShipment").'</a>';
+				}
+			}
+			print "</div>";
+		}
+
+
+        // Bouton expedier avec gestion des stocks
+
+        if (! empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
+        {
+            print $langs->trans("ValidateOrderFirstBeforeShipment");
+        }
+        
+		if (! empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+		{
+			if ($user->rights->expedition->creer)
+			{
+				//print load_fiche_titre($langs->trans("CreateShipment"));
+                print '<div class="tabsAction">';
+                
+				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
+				print '<input type="hidden" name="action" value="create">';
+				//print '<input type="hidden" name="id" value="'.$object->id.'">';
+                print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
+				print '<input type="hidden" name="origin" value="commande">';
+				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
+				//print '<table class="border" width="100%">';
+
+				$langs->load("stocks");
+
+				//print '<tr>';
+
+				if (! empty($conf->stock->enabled))
+				{
+					//print '<td>';
+					print $langs->trans("WarehouseSource");
+					//print '</td>';
+					//print '<td>';
+					print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
+					if (count($formproduct->cache_warehouses) <= 0)
+					{
+						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
+					}
+					//print '</td>';
+				}
+				//print '<td align="center">';
+				print '<input type="submit" class="butAction" named="save" value="'.$langs->trans("CreateShipment").'">';
+				if ($toBeShippedTotal <= 0)
+				{
+					print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
+				}
+				//print '</td></tr>';
+
+				//print "</table>";
+				print "</form>\n";
+				
+				print '</div>';
+
+				$somethingshown=1;
+
+			}
+			else
+			{
+				print '<div class="tabsAction">';
+				print '<a class="butActionRefused" href="#">'.$langs->trans("CreateShipment").'</a>';
+				print '</div>';
+			}
+		}
+
+		show_list_sending_receive('commande',$object->id);
+	}
+	else
+	{
+		/* Commande non trouvee */
+		print "Commande inexistante";
+	}
+}
+
+
+llxFooter();
+
+$db->close();

htdocs/reception/stats/index.php

@@ -0,0 +1,364 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.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
+ * 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/expedition/stats/index.php
+ *     \ingroup    expedition
+ *     \brief      Page with shipment statistics
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+// Security check
+if ($user->societe_id > 0)
+{
+    $action = '';
+    $socid = $user->societe_id;
+}
+
+$nowyear=strftime("%Y", dol_now());
+$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+//$startyear=$year-2;
+$startyear=$year-1;
+$endyear=$year;
+
+$langs->load("sendings");
+$langs->load("other");
+$langs->load("companies");
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+llxHeader();
+
+print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
+
+
+dol_mkdir($dir);
+
+$stats = new ExpeditionStats($db, $socid, $mode, ($userid>0?$userid:0));
+
+// Build graphic number of object
+$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+//var_dump($data);exit;
+// $data = array(array('Lib',val1,val2,val3),...)
+
+
+if (!$user->rights->societe->client->voir || $user->societe_id)
+{
+    $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+}
+else
+{
+    $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
+    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$year.'.png';
+    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$year.'.png';
+}
+
+$px1 = new DolGraph();
+$mesg = $px1->isGraphKo();
+if (! $mesg)
+{
+    $px1->SetData($data);
+    $px1->SetPrecisionY(0);
+    $i=$startyear;$legend=array();
+    while ($i <= $endyear)
+    {
+        $legend[]=$i;
+        $i++;
+    }
+    $px1->SetLegend($legend);
+    $px1->SetMaxValue($px1->GetCeilMaxValue());
+    $px1->SetMinValue(min(0,$px1->GetFloorMinValue()));
+    $px1->SetWidth($WIDTH);
+    $px1->SetHeight($HEIGHT);
+    $px1->SetYLabel($langs->trans("NbOfSendings"));
+    $px1->SetShading(3);
+    $px1->SetHorizTickIncrement(1);
+    $px1->SetPrecisionY(0);
+    $px1->mode='depth';
+    $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
+
+    $px1->draw($filenamenb,$fileurlnb);
+}
+
+// Build graphic amount of object
+/*
+$data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
+//var_dump($data);
+// $data = array(array('Lib',val1,val2,val3),...)
+
+if (!$user->rights->societe->client->voir || $user->societe_id)
+{
+    $filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
+}
+else
+{
+    $filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
+    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$year.'.png';
+    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$year.'.png';
+}
+
+$px2 = new DolGraph();
+$mesg = $px2->isGraphKo();
+if (! $mesg)
+{
+    $px2->SetData($data);
+    $i=$startyear;$legend=array();
+    while ($i <= $endyear)
+    {
+        $legend[]=$i;
+        $i++;
+    }
+    $px2->SetLegend($legend);
+    $px2->SetMaxValue($px2->GetCeilMaxValue());
+    $px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+    $px2->SetWidth($WIDTH);
+    $px2->SetHeight($HEIGHT);
+    $px2->SetYLabel($langs->trans("AmountOfShipments"));
+    $px2->SetShading(3);
+    $px2->SetHorizTickIncrement(1);
+    $px2->SetPrecisionY(0);
+    $px2->mode='depth';
+    $px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
+
+    $px2->draw($filenameamount,$fileurlamount);
+}
+*/
+
+/*
+$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
+
+if (!$user->rights->societe->client->voir || $user->societe_id)
+{
+    $filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
+    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
+}
+else
+{
+    $filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
+    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$year.'.png';
+    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$year.'.png';
+}
+
+$px3 = new DolGraph();
+$mesg = $px3->isGraphKo();
+if (! $mesg)
+{
+    $px3->SetData($data);
+    $i=$startyear;$legend=array();
+    while ($i <= $endyear)
+    {
+        $legend[]=$i;
+        $i++;
+    }
+    $px3->SetLegend($legend);
+    $px3->SetYLabel($langs->trans("AmountAverage"));
+    $px3->SetMaxValue($px3->GetCeilMaxValue());
+    $px3->SetMinValue($px3->GetFloorMinValue());
+    $px3->SetWidth($WIDTH);
+    $px3->SetHeight($HEIGHT);
+    $px3->SetShading(3);
+    $px3->SetHorizTickIncrement(1);
+    $px3->SetPrecisionY(0);
+    $px3->mode='depth';
+    $px3->SetTitle($langs->trans("AmountAverage"));
+
+    $px3->draw($filename_avg,$fileurl_avg);
+}
+*/
+
+
+// Show array
+$data = $stats->getAllByYear();
+$arrayyears=array();
+foreach($data as $val) {
+	if (! empty($val['year'])) {
+		$arrayyears[$val['year']]=$val['year'];
+	}
+}
+if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT . '/commande/stats/index.php?mode='.$mode;
+$head[$h][1] = $langs->trans("ByMonthYear");
+$head[$h][2] = 'byyear';
+$h++;
+
+$type='shipment_stats';
+
+complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+
+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+//if (empty($socid))
+//{
+	// Show filter box
+	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+	// Company
+	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
+	if ($mode == 'customer') $filter='s.client in (1,2,3)';
+	if ($mode == 'supplier') $filter='s.fournisseur = 1';
+	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+	print '</td></tr>';
+	// User
+	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
+	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print '</td></tr>';
+	// Year
+	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
+	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	arsort($arrayyears);
+	print $form->selectarray('year',$arrayyears,$year,0);
+	print '</td></tr>';
+	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+	print '</table>';
+	print '</form>';
+	print '<br><br>';
+//}
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre" height="24">';
+print '<td align="center">'.$langs->trans("Year").'</td>';
+print '<td align="right">'.$langs->trans("NbOfSendings").'</td>';
+/*print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
+print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
+print '</tr>';
+
+$oldyear=0;
+foreach ($data as $val)
+{
+	$year = $val['year'];
+	while (! empty($year) && $oldyear > $year+1)
+	{ // If we have empty year
+		$oldyear--;
+		
+		
+		print '<tr class="oddeven" height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
+	
+		print '<td align="right">0</td>';
+		/*print '<td align="right">0</td>';
+		print '<td align="right">0</td>';*/
+		print '</tr>';
+	}
+	
+	print '<tr class="oddeven" height="24">';
+	print '<td align="center">';
+	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	print '</td>';
+	print '<td align="right">'.$val['nb'].'</td>';
+	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
+	print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
+	print '</tr>';
+	$oldyear=$year;
+}
+
+print '</table>';
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+// Show graphs
+print '<table class="border" width="100%"><tr valign="top"><td align="center">';
+if ($mesg) { print $mesg; }
+else {
+    print $px1->show();
+    print "<br>\n";
+    /*print $px2->show();
+    print "<br>\n";
+    print $px3->show();*/
+}
+print '</td></tr></table>';
+
+
+print '</div></div></div>';
+print '<div style="clear:both"></div>';
+
+dol_fiche_end();
+
+
+
+// TODO USe code similar to commande/stats/index.php instead of this one.
+/*
+print '<table class="border" width="100%">';
+print '<tr><td align="center">'.$langs->trans("Year").'</td>';
+print '<td width="40%" align="center">'.$langs->trans("NbOfSendings").'</td></tr>';
+
+$sql = "SELECT count(*) as nb, date_format(date_expedition,'%Y') as dm";
+$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
+$sql.= " WHERE fk_statut > 0";
+$sql.= " AND entity = ".$conf->entity;
+$sql.= " GROUP BY dm DESC";
+
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num)
+    {
+        $row = $db->fetch_row($resql);
+        $nbproduct = $row[0];
+        $year = $row[1];
+        print "<tr>";
+        print '<td align="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td align="center">'.$nbproduct.'</td></tr>';
+        $i++;
+    }
+}
+$db->free($resql);
+
+print '</table>';
+*/
+
+print '<br>';
+print '<i>'.$langs->trans("StatsOnShipmentsOnlyValidated").'</i>';
+
+llxFooter();
+
+$db->close();

htdocs/reception/stats/month.php

@@ -0,0 +1,76 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/expedition/stats/month.php
+ *    \ingroup    commande
+ *    \brief      Page des stats expeditions par mois
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+
+$mesg = '';
+
+print load_fiche_titre($langs->trans("StatisticsOfSendings").' '.$_GET["year"], $mesg);
+
+$stats = new ExpeditionStats($db);
+$data = $stats->getNbExpeditionByMonth($_GET["year"]);
+
+dol_mkdir($conf->expedition->dir_temp);
+
+$filename = $conf->expedition->dir_temp."/expedition".$year.".png";
+$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expedition'.$year.'.png';
+
+$px = new DolGraph();
+$mesg = $px->isGraphKo();
+if (! $mesg)
+{
+    $px->SetData($data);
+    $px->SetMaxValue($px->GetCeilMaxValue());
+    $px->SetWidth($WIDTH);
+    $px->SetHeight($HEIGHT);
+    $px->SetYLabel($langs->trans("NbOfOrders"));
+    $px->SetShading(3);
+	$px->SetHorizTickIncrement(1);
+	$px->SetPrecisionY(0);
+    $px->draw($filename,$fileurl);
+}
+
+print '<table class="border" width="100%">';
+print '<tr><td align="center">Nombre d expedition par mois</td>';
+print '<td align="center">';
+print $px->show();
+print '</td></tr>';
+print '</table>';
+
+llxFooter();
+
+$db->close();

htdocs/reception/tpl/linkedobjectblock.tpl.php

@@ -0,0 +1,80 @@
+<?php
+/* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014 Marcos García <marcosgdf@gmail.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
+ * 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/>.
+ *
+ */
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+global $user;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+$langs->load("sendings");
+
+$total=0; $ilink=0;
+$var=true;
+foreach($linkedObjectBlock as $key => $objectlink)
+{
+    $ilink++;
+    
+    $trclass=($var?'pair':'impair');
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+?>
+    <tr class="<?php echo $trclass; ?>">
+        <td><?php echo $langs->trans("Shipment"); ?></td>
+        <td><?php echo $objectlink->getNomUrl(1); ?></td>
+        <td></td>
+    	<td align="center"><?php echo dol_print_date($objectlink->date_delivery,'day'); ?></td>
+    	<td align="right"><?php
+    		if ($user->rights->expedition->lire) {
+    			$total = $total + $objectlink->total_ht;
+    			echo price($objectlink->total_ht);
+    		} ?></td>
+    	<td align="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+    	<td align="right">
+    		<?php
+    		// For now, shipments must stay linked to order, so link is not deletable
+    		if($object->element != 'commande') {
+    			?>
+    			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
+    			<?php
+    		}
+    		?>
+    </tr>
+<?php
+}
+if (count($linkedObjectBlock) > 1)
+{
+    ?>
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+        <td><?php echo $langs->trans("Total"); ?></td>
+        <td></td>
+    	<td align="center"></td>
+    	<td align="center"></td>
+    	<td align="right"><?php echo price($total); ?></td>
+    	<td align="right"></td>
+    	<td align="right"></td>
+    </tr>
+    <?php  
+}
+?>
+
+<!-- END PHP TEMPLATE -->