alxarafe / alixar

dolibarr/htdocs/comm/prospect/index.php

Indentation +142 added lines, -142 removed lines

@@ -32,7 +32,7 @@ 
 
 if ($user->societe_id > 0)
 {
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 }
 
 
@@ -54,16 +54,16 @@ 
 
 if (! empty($conf->propal->enabled))
 {
-	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/card.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("SearchAProposal").'</td></tr>';
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-	print '</tr>';
-	print "</table></form><br>\n";
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/card.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("SearchAProposal").'</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+    print '</tr>';
+    print "</table></form><br>\n";
 }
 
 /*
@@ -85,26 +85,26 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num > 0 )
-	{
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("ProspectsByStatus").'</td></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			print '<tr class="oddeven"><td>';
-			print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
-			print img_action($langs->trans("Show"),$obj->id).' ';
-			print $langs->trans("StatusProspect".$obj->id);
-			print '</a></td><td align="right">'.$obj->cc.'</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+    if ($num > 0 )
+    {
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td colspan="2">'.$langs->trans("ProspectsByStatus").'</td></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            print '<tr class="oddeven"><td>';
+            print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
+            print img_action($langs->trans("Show"),$obj->id).' ';
+            print $langs->trans("StatusProspect".$obj->id);
+            print '</a></td><td align="right">'.$obj->cc.'</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 
 
@@ -113,47 +113,47 @@ 
  */
 if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
-	$sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_statut = 0";
-	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	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)
-	{
-		$total=0;
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<table class="noborder"" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<td colspan="2">'.$langs->trans("ProposalsDraft").'</td></tr>';
-
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-
-				print '<tr class="oddeven"><td>';
-				print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
-				print '</td><td align="right">';
-				print price($obj->price);
-				print "</td></tr>";
-				$i++;
-				$total += $obj->price;
-			}
-			if ($total>0) {
-
-				print '<tr class="liste_total"><td>'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
-			}
-			print "</table><br>";
-		}
-		$db->free($resql);
-	}
+    $sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
+    $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+    if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE p.fk_statut = 0";
+    $sql.= " AND p.fk_soc = s.rowid";
+    $sql.= " AND p.entity IN (".getEntity('propal').")";
+    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)
+    {
+        $total=0;
+        $num = $db->num_rows($resql);
+        $i = 0;
+        if ($num > 0)
+        {
+            print '<table class="noborder"" width="100%">';
+            print '<tr class="liste_titre">';
+            print '<td colspan="2">'.$langs->trans("ProposalsDraft").'</td></tr>';
+
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+
+                print '<tr class="oddeven"><td>';
+                print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
+                print '</td><td align="right">';
+                print price($obj->price);
+                print "</td></tr>";
+                $i++;
+                $total += $obj->price;
+            }
+            if ($total>0) {
+
+                print '<tr class="liste_total"><td>'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
+            }
+            print "</table><br>";
+        }
+        $db->free($resql);
+    }
 }
 
 
@@ -171,64 +171,64 @@ 
  */
 if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
-	$sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas,";
-	$sql.= " p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.fk_statut = c.id";
-	$sql.= " AND p.fk_statut = 1";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY p.rowid DESC";
-	$sql.= $db->plimit(5, 0);
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$total = 0;
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ProposalsOpened").'</td></tr>';
-
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-
-				print '<tr class="oddeven"><td>';
-				print '<a href="../propal.php?id='.$obj->propalid.'">';
-				print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
-
-				print "<td>";
+    $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas,";
+    $sql.= " p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql.= ", ".MAIN_DB_PREFIX."propal as p";
+    $sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
+    if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE p.fk_soc = s.rowid";
+    $sql.= " AND p.fk_statut = c.id";
+    $sql.= " AND p.fk_statut = 1";
+    $sql.= " AND p.entity IN (".getEntity('propal').")";
+    if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND s.rowid = ".$socid;
+    $sql.= " ORDER BY p.rowid DESC";
+    $sql.= $db->plimit(5, 0);
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $total = 0;
+        $num = $db->num_rows($resql);
+        $i = 0;
+        if ($num > 0)
+        {
+            print '<table class="noborder" width="100%">';
+            print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ProposalsOpened").'</td></tr>';
+
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+
+                print '<tr class="oddeven"><td>';
+                print '<a href="../propal.php?id='.$obj->propalid.'">';
+                print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
+
+                print "<td>";
                 $companystatic->id=$obj->socid;
                 $companystatic->name=$obj->name;
                 $companystatic->client=$obj->client;
                 $companystatic->canvas=$obj->canvas;
                 print $companystatic->getNomUrl(1,'',44);
-				print "</td>\n";
-				print "<td align=\"right\">";
-				print dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
-				print "<td align=\"right\">".price($obj->total_ttc)."</td></tr>\n";
-				$i++;
-				$total += $obj->price;
-			}
-			if ($total>0)
-			{
-				print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
-			}
-			print "</table><br>";
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+                print "</td>\n";
+                print "<td align=\"right\">";
+                print dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
+                print "<td align=\"right\">".price($obj->total_ttc)."</td></tr>\n";
+                $i++;
+                $total += $obj->price;
+            }
+            if ($total>0)
+            {
+                print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
+            }
+            print "</table><br>";
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 /*
@@ -247,28 +247,28 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num > 0 )
-	{
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td>'.$langs->trans("ProspectToContact").'</td></tr>';
-
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			print '<tr class="oddeven"><td width="12%">';
+    $num = $db->num_rows($resql);
+    $i = 0;
+    if ($num > 0 )
+    {
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><td>'.$langs->trans("ProspectToContact").'</td></tr>';
+
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            print '<tr class="oddeven"><td width="12%">';
             $companystatic->id=$obj->socid;
             $companystatic->name=$obj->name;
             $companystatic->client=$obj->client;
             $companystatic->canvas=$obj->canvas;
             print $companystatic->getNomUrl(1,'prospect',44);
-			print '</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+            print '</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 
 

Braces +31 added lines, -12 removed lines

@@ -74,11 +74,15 @@ 
 $sql = "SELECT count(*) as cc, st.libelle, st.id";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.client IN (2, 3)";
 $sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " GROUP BY st.id";
 $sql.= " ORDER BY st.id";
 
@@ -116,11 +120,15 @@ 
 	$sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
 	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (! $user->rights->societe->client->voir && ! $socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE p.fk_statut = 0";
 	$sql.= " AND p.fk_soc = s.rowid";
 	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	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)
@@ -164,7 +172,9 @@ 
 /*
  * Actions commerciales a faire
  */
-if (! empty($conf->agenda->enabled)) show_array_actions_to_do(10);
+if (! empty($conf->agenda->enabled)) {
+    show_array_actions_to_do(10);
+}
 
 /*
  * Dernieres propales ouvertes
@@ -176,13 +186,19 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (! $user->rights->societe->client->voir && ! $socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE p.fk_soc = s.rowid";
 	$sql.= " AND p.fk_statut = c.id";
 	$sql.= " AND p.fk_statut = 1";
 	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (! $user->rights->societe->client->voir && ! $socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+	if ($socid) {
+	    $sql.= " AND s.rowid = ".$socid;
+	}
 	$sql.= " ORDER BY p.rowid DESC";
 	$sql.= $db->plimit(5, 0);
 
@@ -224,8 +240,7 @@ 
 			}
 			print "</table><br>";
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -237,10 +252,14 @@ 
  */
 $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE s.fk_stcomm = 1";
 $sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " ORDER BY s.tms ASC";
 $sql.= $db->plimit(15, 0);
 

Spacing +70 added lines, -70 removed lines

@@ -26,7 +26,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
 // Load translation files required by the page
@@ -44,7 +44,7 @@ 
  *	View
  */
 
-$companystatic=new Societe($db);
+$companystatic = new Societe($db);
 
 llxHeader();
 
@@ -55,9 +55,9 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->propal->enabled))
+if (!empty($conf->propal->enabled))
 {
-	$var=false;
+	$var = false;
 	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/card.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder nohover" width="100%">';
@@ -75,22 +75,22 @@ 
  */
 
 $sql = "SELECT count(*) as cc, st.libelle, st.id";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.client IN (2, 3)";
-$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " GROUP BY st.id";
-$sql.= " ORDER BY st.id";
-
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE s.fk_stcomm = st.id";
+$sql .= " AND s.client IN (2, 3)";
+$sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " GROUP BY st.id";
+$sql .= " ORDER BY st.id";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	if ($num > 0 )
+	if ($num > 0)
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
@@ -101,7 +101,7 @@ 
 
 			print '<tr class="oddeven"><td>';
 			print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
-			print img_action($langs->trans("Show"),$obj->id).' ';
+			print img_action($langs->trans("Show"), $obj->id).' ';
 			print $langs->trans("StatusProspect".$obj->id);
 			print '</a></td><td align="right">'.$obj->cc.'</td></tr>';
 			$i++;
@@ -114,21 +114,21 @@ 
 /*
  * Liste des propal brouillons
  */
-if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
 	$sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_statut = 0";
-	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-	$resql=$db->query($sql);
+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE p.fk_statut = 0";
+	$sql .= " AND p.fk_soc = s.rowid";
+	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	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)
 	{
-		$total=0;
+		$total = 0;
 		$num = $db->num_rows($resql);
 		$i = 0;
 		if ($num > 0)
@@ -142,14 +142,14 @@ 
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td>';
-				print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"), "propal").' '.$obj->ref.'</a>';
 				print '</td><td align="right">';
 				print price($obj->price);
 				print "</td></tr>";
 				$i++;
 				$total += $obj->price;
 			}
-			if ($total>0) {
+			if ($total > 0) {
 
 				print '<tr class="liste_total"><td>'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
 			}
@@ -167,29 +167,29 @@ 
 /*
  * Actions commerciales a faire
  */
-if (! empty($conf->agenda->enabled)) show_array_actions_to_do(10);
+if (!empty($conf->agenda->enabled)) show_array_actions_to_do(10);
 
 /*
  * Dernieres propales ouvertes
  */
-if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
 	$sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas,";
-	$sql.= " p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.fk_statut = c.id";
-	$sql.= " AND p.fk_statut = 1";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY p.rowid DESC";
-	$sql.= $db->plimit(5, 0);
-
-	$resql=$db->query($sql);
+	$sql .= " p.rowid as propalid, p.total as total_ttc, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+	$sql .= ", ".MAIN_DB_PREFIX."c_propalst as c";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE p.fk_soc = s.rowid";
+	$sql .= " AND p.fk_statut = c.id";
+	$sql .= " AND p.fk_statut = 1";
+	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY p.rowid DESC";
+	$sql .= $db->plimit(5, 0);
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$total = 0;
@@ -206,22 +206,22 @@ 
 
 				print '<tr class="oddeven"><td>';
 				print '<a href="../propal.php?id='.$obj->propalid.'">';
-				print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
+				print img_object($langs->trans("ShowPropal"), "propal").' '.$obj->ref.'</a></td>';
 
 				print "<td>";
-                $companystatic->id=$obj->socid;
-                $companystatic->name=$obj->name;
-                $companystatic->client=$obj->client;
-                $companystatic->canvas=$obj->canvas;
-                print $companystatic->getNomUrl(1,'',44);
+                $companystatic->id = $obj->socid;
+                $companystatic->name = $obj->name;
+                $companystatic->client = $obj->client;
+                $companystatic->canvas = $obj->canvas;
+                print $companystatic->getNomUrl(1, '', 44);
 				print "</td>\n";
 				print "<td align=\"right\">";
-				print dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
+				print dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
 				print "<td align=\"right\">".price($obj->total_ttc)."</td></tr>\n";
 				$i++;
 				$total += $obj->price;
 			}
-			if ($total>0)
+			if ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" align="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td></tr>";
 			}
@@ -239,20 +239,20 @@ 
  *
  */
 $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE s.fk_stcomm = 1";
-$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY s.tms ASC";
-$sql.= $db->plimit(15, 0);
-
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE s.fk_stcomm = 1";
+$sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " ORDER BY s.tms ASC";
+$sql .= $db->plimit(15, 0);
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	if ($num > 0 )
+	if ($num > 0)
 	{
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><td>'.$langs->trans("ProspectToContact").'</td></tr>';
@@ -262,11 +262,11 @@ 
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td width="12%">';
-            $companystatic->id=$obj->socid;
-            $companystatic->name=$obj->name;
-            $companystatic->client=$obj->client;
-            $companystatic->canvas=$obj->canvas;
-            print $companystatic->getNomUrl(1,'prospect',44);
+            $companystatic->id = $obj->socid;
+            $companystatic->name = $obj->name;
+            $companystatic->client = $obj->client;
+            $companystatic->canvas = $obj->canvas;
+            print $companystatic->getNomUrl(1, 'prospect', 44);
 			print '</td></tr>';
 			$i++;
 		}

dolibarr/htdocs/reception/class/reception.class.php

Indentation +1643 added lines, -1643 removed lines

@@ -43,717 +43,717 @@ 
  */
 class Reception extends CommonObject
 {
-	public $element="reception";
-	public $fk_element="fk_reception";
-	public $table_element="reception";
-	public $table_element_line="commande_fournisseur_dispatch";
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+    public $element="reception";
+    public $fk_element="fk_reception";
+    public $table_element="reception";
+    public $table_element_line="commande_fournisseur_dispatch";
+    protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'reception';
 
-	var $socid;
-	var $ref_supplier;
-	var $ref_int;
-	var $brouillon;
-	var $entrepot_id;
-	var $lines=array();
-	var $tracking_number;
-	var $tracking_url;
-	var $billed;
-	var $model_pdf;
-
-	var $trueWeight;
-	var $weight_units;
-	var $trueWidth;
-	var $width_units;
-	var $trueHeight;
-	var $height_units;
-	var $trueDepth;
-	var $depth_units;
-	// A denormalized value
-	var $trueSize;
-
-	var $date_delivery;		// Date delivery planed
-
-
-	/**
-	 * Effective delivery date
-	 * @var int
-	 */
-	public $date_reception;
-	var $date_creation;
-	var $date_valid;
-
-	var $meths;
-	var $listmeths;			// List of carriers
-
-
-	const STATUS_DRAFT = 0;
-	const STATUS_VALIDATED = 1;
-	const STATUS_CLOSED = 2;
-
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->lines = array();
-		$this->products = array();
-
-		// List of long language codes for status
-		$this->statuts = array();
-		$this->statuts[-1] = 'StatusReceptionCanceled';
-		$this->statuts[0]  = 'StatusReceptionDraft';
-		$this->statuts[1]  = 'StatusReceptionValidated';
-		$this->statuts[2]  = 'StatusReceptionProcessed';
-	}
-
-	/**
-	 *	Return next contract ref
-	 *
-	 *	@param	Societe		$soc	Thirdparty object
-	 *	@return string				Free reference for contract
-	 */
-	function getNextNumRef($soc)
-	{
-		global $langs, $conf;
-		$langs->load("receptions");
-
-	    if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
+    var $socid;
+    var $ref_supplier;
+    var $ref_int;
+    var $brouillon;
+    var $entrepot_id;
+    var $lines=array();
+    var $tracking_number;
+    var $tracking_url;
+    var $billed;
+    var $model_pdf;
+
+    var $trueWeight;
+    var $weight_units;
+    var $trueWidth;
+    var $width_units;
+    var $trueHeight;
+    var $height_units;
+    var $trueDepth;
+    var $depth_units;
+    // A denormalized value
+    var $trueSize;
+
+    var $date_delivery;		// Date delivery planed
+
+
+    /**
+     * Effective delivery date
+     * @var int
+     */
+    public $date_reception;
+    var $date_creation;
+    var $date_valid;
+
+    var $meths;
+    var $listmeths;			// List of carriers
+
+
+    const STATUS_DRAFT = 0;
+    const STATUS_VALIDATED = 1;
+    const STATUS_CLOSED = 2;
+
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->lines = array();
+        $this->products = array();
+
+        // List of long language codes for status
+        $this->statuts = array();
+        $this->statuts[-1] = 'StatusReceptionCanceled';
+        $this->statuts[0]  = 'StatusReceptionDraft';
+        $this->statuts[1]  = 'StatusReceptionValidated';
+        $this->statuts[2]  = 'StatusReceptionProcessed';
+    }
+
+    /**
+     *	Return next contract ref
+     *
+     *	@param	Societe		$soc	Thirdparty object
+     *	@return string				Free reference for contract
+     */
+    function getNextNumRef($soc)
+    {
+        global $langs, $conf;
+        $langs->load("receptions");
+
+        if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
         {
-			$mybool = false;
+            $mybool = false;
 
-			$file = $conf->global->RECEPTION_ADDON_NUMBER.".php";
-			$classname = $conf->global->RECEPTION_ADDON_NUMBER;
+            $file = $conf->global->RECEPTION_ADDON_NUMBER.".php";
+            $classname = $conf->global->RECEPTION_ADDON_NUMBER;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+            // Include file with class
+            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-	        foreach ($dirmodels as $reldir) {
+            foreach ($dirmodels as $reldir) {
 
-		        $dir = dol_buildpath($reldir."core/modules/reception/");
+                $dir = dol_buildpath($reldir."core/modules/reception/");
 
-		        // Load file with numbering class (if found)
-		        $mybool|=@include_once $dir.$file;
-	        }
+                // Load file with numbering class (if found)
+                $mybool|=@include_once $dir.$file;
+            }
 
-	        if (! $mybool)
-	        {
-		        dol_print_error('',"Failed to include file ".$file);
-		        return '';
-	        }
+            if (! $mybool)
+            {
+                dol_print_error('',"Failed to include file ".$file);
+                return '';
+            }
 
-			$obj = new $classname();
+            $obj = new $classname();
 
-			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
+            $numref = "";
+            $numref = $obj->getNextValue($soc,$this);
 
-			if ( $numref != "")
-			{
-				return $numref;
-			}
-			else
-			{
-				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-				return "";
-			}
+            if ( $numref != "")
+            {
+                return $numref;
+            }
+            else
+            {
+                dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+                return "";
+            }
+        }
+        else
+        {
+            print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
+            return "";
         }
-	    else
-	    {
-		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
-		    return "";
-	    }
-	}
-
-	/**
-	 *  Create reception en base
-	 *
-	 *  @param	User	$user       Objet du user qui cree
-	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return int 				<0 si erreur, id reception creee si ok
-	 */
-	function create($user, $notrigger=0)
-	{
-		global $conf, $hookmanager;
-
-		$now=dol_now();
-
-		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
-		$error = 0;
-
-		// Clean parameters
-		$this->brouillon = 1;
-		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
-
-		$this->user = $user;
-
-
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."reception (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", ref_supplier";
-		$sql.= ", ref_int";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_reception";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_soc";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_shipping_method";
-		$sql.= ", tracking_number";
-		$sql.= ", weight";
-		$sql.= ", size";
-		$sql.= ", width";
-		$sql.= ", height";
-		$sql.= ", weight_units";
-		$sql.= ", size_units";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".($this->ref_supplier?"'".$this->db->escape($this->ref_supplier)."'":"null");
-		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_reception>0?"'".$this->db->idate($this->date_reception)."'":"null");
-		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".$this->socid;
-		$sql.= ", ".$this->fk_project;
-		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
-		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".$this->weight;
-		$sql.= ", ".$this->sizeS;	// TODO Should use this->trueDepth
-		$sql.= ", ".$this->sizeW;	// TODO Should use this->trueWidth
-		$sql.= ", ".$this->sizeH;	// TODO Should use this->trueHeight
-		$sql.= ", ".$this->weight_units;
-		$sql.= ", ".$this->size_units;
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
+    }
+
+    /**
+     *  Create reception en base
+     *
+     *  @param	User	$user       Objet du user qui cree
+     *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+     *  @return int 				<0 si erreur, id reception creee si ok
+     */
+    function create($user, $notrigger=0)
+    {
+        global $conf, $hookmanager;
+
+        $now=dol_now();
+
+        require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+        $error = 0;
+
+        // Clean parameters
+        $this->brouillon = 1;
+        $this->tracking_number = dol_sanitizeFileName($this->tracking_number);
+        if (empty($this->fk_project)) $this->fk_project = 0;
+
+        $this->user = $user;
+
+
+        $this->db->begin();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."reception (";
+        $sql.= "ref";
+        $sql.= ", entity";
+        $sql.= ", ref_supplier";
+        $sql.= ", ref_int";
+        $sql.= ", date_creation";
+        $sql.= ", fk_user_author";
+        $sql.= ", date_reception";
+        $sql.= ", date_delivery";
+        $sql.= ", fk_soc";
+        $sql.= ", fk_projet";
+        $sql.= ", fk_shipping_method";
+        $sql.= ", tracking_number";
+        $sql.= ", weight";
+        $sql.= ", size";
+        $sql.= ", width";
+        $sql.= ", height";
+        $sql.= ", weight_units";
+        $sql.= ", size_units";
+        $sql.= ", note_private";
+        $sql.= ", note_public";
+        $sql.= ", model_pdf";
+        $sql.= ", fk_incoterms, location_incoterms";
+        $sql.= ") VALUES (";
+        $sql.= "'(PROV)'";
+        $sql.= ", ".$conf->entity;
+        $sql.= ", ".($this->ref_supplier?"'".$this->db->escape($this->ref_supplier)."'":"null");
+        $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
+        $sql.= ", '".$this->db->idate($now)."'";
+        $sql.= ", ".$user->id;
+        $sql.= ", ".($this->date_reception>0?"'".$this->db->idate($this->date_reception)."'":"null");
+        $sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
+        $sql.= ", ".$this->socid;
+        $sql.= ", ".$this->fk_project;
+        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
+        $sql.= ", '".$this->db->escape($this->tracking_number)."'";
+        $sql.= ", ".$this->weight;
+        $sql.= ", ".$this->sizeS;	// TODO Should use this->trueDepth
+        $sql.= ", ".$this->sizeW;	// TODO Should use this->trueWidth
+        $sql.= ", ".$this->sizeH;	// TODO Should use this->trueHeight
+        $sql.= ", ".$this->weight_units;
+        $sql.= ", ".$this->size_units;
+        $sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
+        $sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+        $sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
         $sql.= ", ".(int) $this->fk_incoterms;
         $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-
-		$resql=$this->db->query($sql);
-
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."reception");
-
-			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-			$sql.= " SET ref = '(PROV".$this->id.")'";
-			$sql.= " WHERE rowid = ".$this->id;
-
-			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
-				// Insertion des lignes
-				$num=count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					$this->lines[$i]->fk_reception = $this->id;
-
-					if (! $this->lines[$i]->create($user) > 0)
-					{
-						$error++;
-					}
-				}
-
-				if (! $error && $this->id && $this->origin_id)
-				{
-					$ret = $this->add_object_linked();
-					if (!$ret)
-					{
-						$error++;
-					}
-				}
-
-				// Actions on extra fields (by external module or standard code)
-				// TODO le hook fait double emploi avec le trigger !!
-				$action='add';
-				$hookmanager->initHooks(array('receptiondao'));
-				$parameters=array('socid'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-				if (empty($reshook))
-				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-					{
-						$result=$this->insertExtraFields();
-						if ($result < 0)
-						{
-							$error++;
-						}
-					}
-				}
-				else if ($reshook < 0) $error++;
-
-				if (! $error && ! $notrigger)
-				{
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+
+        $resql=$this->db->query($sql);
+
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."reception");
+
+            $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
+            $sql.= " SET ref = '(PROV".$this->id.")'";
+            $sql.= " WHERE rowid = ".$this->id;
+
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            if ($this->db->query($sql))
+            {
+                // Insertion des lignes
+                $num=count($this->lines);
+                for ($i = 0; $i < $num; $i++)
+                {
+                    $this->lines[$i]->fk_reception = $this->id;
+
+                    if (! $this->lines[$i]->create($user) > 0)
+                    {
+                        $error++;
+                    }
+                }
+
+                if (! $error && $this->id && $this->origin_id)
+                {
+                    $ret = $this->add_object_linked();
+                    if (!$ret)
+                    {
+                        $error++;
+                    }
+                }
+
+                // Actions on extra fields (by external module or standard code)
+                // TODO le hook fait double emploi avec le trigger !!
+                $action='add';
+                $hookmanager->initHooks(array('receptiondao'));
+                $parameters=array('socid'=>$this->id);
+                $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                if (empty($reshook))
+                {
+                    if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                    {
+                        $result=$this->insertExtraFields();
+                        if ($result < 0)
+                        {
+                            $error++;
+                        }
+                    }
+                }
+                else if ($reshook < 0) $error++;
+
+                if (! $error && ! $notrigger)
+                {
                     // Call trigger
                     $result=$this->call_trigger('RECEPTION_CREATE',$user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 
-					if (! $error)
-					{
-						$this->db->commit();
-						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;
-					}
-				}
-				else
-				{
-					$error++;
-					$this->error=$this->db->lasterror()." - sql=$sql";
-					$this->db->rollback();
-					return -3;
-				}
-			}
-			else
-			{
-				$error++;
-				$this->error=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -2;
-			}
-		}
-		else
-		{
-			$error++;
-			$this->error=$this->db->error()." - sql=$sql";
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-
-	/**
-	 *	Get object and lines from database
-	 *
-	 *	@param	int		$id       	Id of object to load
-	 * 	@param	string	$ref		Ref of object
-	 * 	@param	string	$ref_ext	External reference of object
+                    if (! $error)
+                    {
+                        $this->db->commit();
+                        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;
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $this->error=$this->db->lasterror()." - sql=$sql";
+                    $this->db->rollback();
+                    return -3;
+                }
+            }
+            else
+            {
+                $error++;
+                $this->error=$this->db->lasterror()." - sql=$sql";
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else
+        {
+            $error++;
+            $this->error=$this->db->error()." - sql=$sql";
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+
+
+    /**
+     *	Get object and lines from database
+     *
+     *	@param	int		$id       	Id of object to load
+     * 	@param	string	$ref		Ref of object
+     * 	@param	string	$ref_ext	External reference of object
      * 	@param	string	$ref_int	Internal reference of other object
-	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
-	 */
-	function fetch($id, $ref='', $ref_ext='', $ref_int='')
-	{
-		global $conf;
-
-		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
-
-		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
-		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
-		$sql.= ", e.date_reception as date_reception, e.model_pdf,  e.date_delivery";
-		$sql.= ", e.fk_shipping_method, e.tracking_number";
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-		$sql.= ", e.note_private, e.note_public";
+     *	@return int			        >0 if OK, 0 if not found, <0 if KO
+     */
+    function fetch($id, $ref='', $ref_ext='', $ref_int='')
+    {
+        global $conf;
+
+        // Check parameters
+        if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+
+        $sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
+        $sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
+        $sql.= ", e.date_reception as date_reception, e.model_pdf,  e.date_delivery";
+        $sql.= ", e.fk_shipping_method, e.tracking_number";
+        $sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
+        $sql.= ", e.note_private, e.note_public";
         $sql.= ', e.fk_incoterms, e.location_incoterms';
         $sql.= ', i.libelle as libelle_incoterms';
-		$sql.= " FROM ".MAIN_DB_PREFIX."reception as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('reception').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
+        $sql.= " FROM ".MAIN_DB_PREFIX."reception as e";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
+        $sql.= " WHERE e.entity IN (".getEntity('reception').")";
+        if ($id)   	  $sql.= " AND e.rowid=".$id;
         if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
         if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
         if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id                   = $obj->rowid;
-				$this->ref                  = $obj->ref;
-				$this->socid                = $obj->socid;
-				$this->ref_supplier			= $obj->ref_supplier;
-				$this->ref_ext				= $obj->ref_ext;
-				$this->ref_int				= $obj->ref_int;
-				$this->statut               = $obj->fk_statut;
-				$this->user_author_id       = $obj->fk_user_author;
-				$this->date_creation        = $this->db->jdate($obj->date_creation);
-				$this->date                 = $this->db->jdate($obj->date_reception);	// TODO deprecated
-				$this->date_reception      = $this->db->jdate($obj->date_reception);	// TODO deprecated
-				$this->date_reception        = $this->db->jdate($obj->date_reception);	// Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
-				$this->fk_delivery_address  = $obj->fk_address;
-				$this->modelpdf             = $obj->model_pdf;
-				$this->shipping_method_id	= $obj->fk_shipping_method;
-				$this->tracking_number      = $obj->tracking_number;
-				$this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
-				$this->origin_id            = $obj->origin_id;
-				$this->billed				= ($obj->fk_statut==2?1:0);
-
-				$this->trueWeight           = $obj->weight;
-				$this->weight_units         = $obj->weight_units;
-
-				$this->trueWidth            = $obj->width;
-				$this->width_units          = $obj->size_units;
-				$this->trueHeight           = $obj->height;
-				$this->height_units         = $obj->size_units;
-				$this->trueDepth            = $obj->size;
-				$this->depth_units          = $obj->size_units;
-
-				$this->note_public          = $obj->note_public;
-				$this->note_private         = $obj->note_private;
-
-				// A denormalized value
-				$this->trueSize           	= $obj->size."x".$obj->width."x".$obj->height;
-				$this->size_units           = $obj->size_units;
-
-				//Incoterms
-				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;
-				$this->libelle_incoterms = $obj->libelle_incoterms;
-
-				$this->db->free($result);
-
-				if ($this->statut == 0) $this->brouillon = 1;
-
-				$file = $conf->reception->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'reception') . "/" . $this->id.".pdf";
-				$this->pdf_filename = $file;
-
-				// Tracking url
-				$this->getUrlTrackingStatus($obj->tracking_number);
-
-				/*
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $this->id                   = $obj->rowid;
+                $this->ref                  = $obj->ref;
+                $this->socid                = $obj->socid;
+                $this->ref_supplier			= $obj->ref_supplier;
+                $this->ref_ext				= $obj->ref_ext;
+                $this->ref_int				= $obj->ref_int;
+                $this->statut               = $obj->fk_statut;
+                $this->user_author_id       = $obj->fk_user_author;
+                $this->date_creation        = $this->db->jdate($obj->date_creation);
+                $this->date                 = $this->db->jdate($obj->date_reception);	// TODO deprecated
+                $this->date_reception      = $this->db->jdate($obj->date_reception);	// TODO deprecated
+                $this->date_reception        = $this->db->jdate($obj->date_reception);	// Date real
+                $this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
+                $this->fk_delivery_address  = $obj->fk_address;
+                $this->modelpdf             = $obj->model_pdf;
+                $this->shipping_method_id	= $obj->fk_shipping_method;
+                $this->tracking_number      = $obj->tracking_number;
+                $this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
+                $this->origin_id            = $obj->origin_id;
+                $this->billed				= ($obj->fk_statut==2?1:0);
+
+                $this->trueWeight           = $obj->weight;
+                $this->weight_units         = $obj->weight_units;
+
+                $this->trueWidth            = $obj->width;
+                $this->width_units          = $obj->size_units;
+                $this->trueHeight           = $obj->height;
+                $this->height_units         = $obj->size_units;
+                $this->trueDepth            = $obj->size;
+                $this->depth_units          = $obj->size_units;
+
+                $this->note_public          = $obj->note_public;
+                $this->note_private         = $obj->note_private;
+
+                // A denormalized value
+                $this->trueSize           	= $obj->size."x".$obj->width."x".$obj->height;
+                $this->size_units           = $obj->size_units;
+
+                //Incoterms
+                $this->fk_incoterms = $obj->fk_incoterms;
+                $this->location_incoterms = $obj->location_incoterms;
+                $this->libelle_incoterms = $obj->libelle_incoterms;
+
+                $this->db->free($result);
+
+                if ($this->statut == 0) $this->brouillon = 1;
+
+                $file = $conf->reception->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'reception') . "/" . $this->id.".pdf";
+                $this->pdf_filename = $file;
+
+                // Tracking url
+                $this->getUrlTrackingStatus($obj->tracking_number);
+
+                /*
 				 * Thirparty
 				 */
-				$result=$this->fetch_thirdparty();
+                $result=$this->fetch_thirdparty();
 
 
-				// Retrieve all extrafields for reception
-				// fetch optionals attributes and labels
-				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+                // Retrieve all extrafields for reception
+                // fetch optionals attributes and labels
+                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                $extrafields=new ExtraFields($this->db);
+                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+                $this->fetch_optionals($this->id,$extralabels);
 
-				/*
+                /*
 				 * Lines
 				 */
-				$result=$this->fetch_lines();
-				if ($result < 0)
-				{
-					return -3;
-				}
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found';
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Validate object and update stock if option enabled
-	 *
-	 *  @param      User		$user       Object user that validate
+                $result=$this->fetch_lines();
+                if ($result < 0)
+                {
+                    return -3;
+                }
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
+                $this->error='Delivery with id '.$id.' not found';
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
+    /**
+     *  Validate object and update stock if option enabled
+     *
+     *  @param      User		$user       Object user that validate
      *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if OK, >0 if KO
-	 */
-	function valid($user, $notrigger=0)
-	{
-		global $conf, $langs;
+     *  @return     int						<0 if OK, >0 if KO
+     */
+    function valid($user, $notrigger=0)
+    {
+        global $conf, $langs;
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		dol_syslog(get_class($this)."::valid");
+        dol_syslog(get_class($this)."::valid");
 
-		// Protection
-		if ($this->statut)
-		{
-			dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
-			return 0;
-		}
+        // Protection
+        if ($this->statut)
+        {
+            dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
+            return 0;
+        }
 
         if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
-		{
-			$this->error='Permission denied';
-			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-			return -1;
-		}
+           || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
+        {
+            $this->error='Permission denied';
+            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+            return -1;
+        }
 
-		$this->db->begin();
+        $this->db->begin();
 
-		$error = 0;
+        $error = 0;
 
-		// Define new ref
-		$soc = new Societe($this->db);
-		$soc->fetch($this->socid);
+        // Define new ref
+        $soc = new Societe($this->db);
+        $soc->fetch($this->socid);
 
 
-		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
-			$numref = $this->getNextNumRef($soc);
-		}
-		else {
-			$numref = $this->ref;
-		}
+        // Define new ref
+        if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+        {
+            $numref = $this->getNextNumRef($soc);
+        }
+        else {
+            $numref = $this->ref;
+        }
 
         $this->newref = $numref;
 
-		$now=dol_now();
-
-		// Validate
-		$sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
-		$sql.= " ref='".$this->db->escape($numref)."'";
-		$sql.= ", fk_statut = 1";
-		$sql.= ", date_valid = '".$this->db->idate($now)."'";
-		$sql.= ", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
-		dol_syslog(get_class($this)."::valid update reception", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			$error++;
-		}
-
-		// If stock increment is done on reception (recommanded choice)
-		if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-			$langs->load("agenda");
-
-			// Loop on each product line to add a stock movement
-			// TODO in future, reception lines may not be linked to order line
-			$sql = "SELECT cd.fk_product, cd.subprice,";
-			$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-			$sql.= " ed.eatby, ed.sellby, ed.batch";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-			$sql.= " WHERE ed.fk_reception = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_commandefourndet";
-
-			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					$qty = $obj->qty;
-
-					if ($qty <= 0) continue;
-					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-					//var_dump($this->lines[$i]);
-					$mouvS = new MouvementStock($this->db);
-					$mouvS->origin = &$this;
-
-					if (empty($obj->batch))
-					{
-						// line without batch detail
-
-						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref));
-						if ($result < 0) {
-							$error++;
-							$this->errors[]=$mouvS->error;
-							$this->errors = array_merge($this->errors, $mouvS->errors);
-							break;
-						}
-					}
-					else
-					{
-						// line with batch detail
-
-						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
-						if ($result < 0) {
-							$error++;
-							$this->errors[]=$mouvS->error;
-							$this->errors = array_merge($this->errors, $mouvS->errors);
-							break;
-						}
-					}
-				}
-			}
-			else
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -2;
-			}
-		}
-
-		// Change status of order to "reception in process"
-		$ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
+        $now=dol_now();
+
+        // Validate
+        $sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
+        $sql.= " ref='".$this->db->escape($numref)."'";
+        $sql.= ", fk_statut = 1";
+        $sql.= ", date_valid = '".$this->db->idate($now)."'";
+        $sql.= ", fk_user_valid = ".$user->id;
+        $sql.= " WHERE rowid = ".$this->id;
+        dol_syslog(get_class($this)."::valid update reception", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error=$this->db->lasterror();
+            $error++;
+        }
+
+        // If stock increment is done on reception (recommanded choice)
+        if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+            $langs->load("agenda");
+
+            // Loop on each product line to add a stock movement
+            // TODO in future, reception lines may not be linked to order line
+            $sql = "SELECT cd.fk_product, cd.subprice,";
+            $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
+            $sql.= " ed.eatby, ed.sellby, ed.batch";
+            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+            $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+            $sql.= " WHERE ed.fk_reception = ".$this->id;
+            $sql.= " AND cd.rowid = ed.fk_commandefourndet";
+
+            dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $cpt = $this->db->num_rows($resql);
+                for ($i = 0; $i < $cpt; $i++)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    $qty = $obj->qty;
+
+                    if ($qty <= 0) continue;
+                    dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                    //var_dump($this->lines[$i]);
+                    $mouvS = new MouvementStock($this->db);
+                    $mouvS->origin = &$this;
+
+                    if (empty($obj->batch))
+                    {
+                        // line without batch detail
+
+                        // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
+                        $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref));
+                        if ($result < 0) {
+                            $error++;
+                            $this->errors[]=$mouvS->error;
+                            $this->errors = array_merge($this->errors, $mouvS->errors);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        // line with batch detail
+
+                        // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
+                        // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
+                        $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+                        if ($result < 0) {
+                            $error++;
+                            $this->errors[]=$mouvS->error;
+                            $this->errors = array_merge($this->errors, $mouvS->errors);
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -2;
+            }
+        }
+
+        // Change status of order to "reception in process"
+        $ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
 
         if (! $ret)
-		{
-		    $error++;
-		}
+        {
+            $error++;
+        }
 
-		if (! $error && ! $notrigger)
-		{
+        if (! $error && ! $notrigger)
+        {
             // Call trigger
             $result=$this->call_trigger('RECEPTION_VALIDATE',$user);
             if ($result < 0) { $error++; }
             // End call triggers
-		}
+        }
 
-		if (! $error)
-		{
+        if (! $error)
+        {
             $this->oldref = $this->ref;
 
-			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
-				// On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
-				// in order not to lose the attached files
-				$oldref = dol_sanitizeFileName($this->ref);
-				$newref = dol_sanitizeFileName($numref);
-				$dirsource = $conf->reception->dir_output.'/'.$oldref;
-				$dirdest = $conf->reception->dir_output.'/'.$newref;
-				if (file_exists($dirsource))
-				{
-					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
-
-					if (@rename($dirsource, $dirdest))
-					{
-					    dol_syslog("Rename ok");
+            // Rename directory if dir was a temporary ref
+            if (preg_match('/^[\(]?PROV/i', $this->ref))
+            {
+                // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
+                // in order not to lose the attached files
+                $oldref = dol_sanitizeFileName($this->ref);
+                $newref = dol_sanitizeFileName($numref);
+                $dirsource = $conf->reception->dir_output.'/'.$oldref;
+                $dirdest = $conf->reception->dir_output.'/'.$newref;
+                if (file_exists($dirsource))
+                {
+                    dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
+
+                    if (@rename($dirsource, $dirdest))
+                    {
+                        dol_syslog("Rename ok");
                         // Rename docs starting with $oldref with $newref
                         $listoffiles=dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
                         foreach($listoffiles as $fileentry)
                         {
-                        	$dirsource=$fileentry['name'];
-                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-                        	@rename($dirsource, $dirdest);
+                            $dirsource=$fileentry['name'];
+                            $dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+                            $dirsource=$fileentry['path'].'/'.$dirsource;
+                            $dirdest=$fileentry['path'].'/'.$dirdest;
+                            @rename($dirsource, $dirdest);
                         }
-					}
-				}
-			}
-		}
-
-		// Set new ref and current status
-		if (! $error)
-		{
-			$this->ref = $numref;
-			$this->statut = 1;
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-	}
-
-
-
-	/**
-	 * Add an reception line.
-	 * If STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS is set, you can add a reception line, with no stock source defined
-	 * If STOCK_MUST_BE_ENOUGH_FOR_RECEPTION is not set, you can add a reception line, even if not enough into stock
-	 *
-	 * @param 	int			$entrepot_id		Id of warehouse
-	 * @param 	int			$id					Id of source line (supplier order line)
-	 * @param 	int			$qty				Quantity
-	 * @param	array		$array_options		extrafields array
-	 * @param	string		$comment				Comment for stock movement
-	 * @param	date		$eatby					eat-by date
-	 * @param	date		$sellby					sell-by date
-	 * @param	string		$batch					Lot number
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	function addline($entrepot_id, $id, $qty, $array_options=0, $comment='', $eatby='', $sellby='', $batch='')
-	{
-		global $conf, $langs, $user;
-
-		$num = count($this->lines);
-		$line = new CommandeFournisseurDispatch($this->db);
-
-		$line->fk_entrepot = $entrepot_id;
-		$line->fk_commandefourndet = $id;
-		$line->qty = $qty;
-
-		$supplierorderline = new CommandeFournisseurLigne($this->db);
-		$supplierorderline->fetch($id);
-
-		if (! empty($conf->stock->enabled) && ! empty($supplierorderline->fk_product))
-		{
-			$fk_product = $supplierorderline->fk_product;
-
-			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
-			{
-			    $langs->load("errors");
-				$this->error=$langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
-				return -1;
-			}
-		}
-
-		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
-			$line->array_options = $array_options;
-
-		$line->fk_product = $fk_product;
-		$line->fk_commande = $supplierorderline->fk_commande ;
-		$line->fk_user = $user->id ;
-		$line->comment = $comment;
-		$line->batch = $batch;
-		$line->eatby = $eatby;
-		$line->sellby = $sellby;
-		$line->status=1;
-		$line->fk_reception=$this->id;
-
-		$this->lines[$num] = $line;
-	}
+                    }
+                }
+            }
+        }
+
+        // Set new ref and current status
+        if (! $error)
+        {
+            $this->ref = $numref;
+            $this->statut = 1;
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+    }
+
+
+
+    /**
+     * Add an reception line.
+     * If STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS is set, you can add a reception line, with no stock source defined
+     * If STOCK_MUST_BE_ENOUGH_FOR_RECEPTION is not set, you can add a reception line, even if not enough into stock
+     *
+     * @param 	int			$entrepot_id		Id of warehouse
+     * @param 	int			$id					Id of source line (supplier order line)
+     * @param 	int			$qty				Quantity
+     * @param	array		$array_options		extrafields array
+     * @param	string		$comment				Comment for stock movement
+     * @param	date		$eatby					eat-by date
+     * @param	date		$sellby					sell-by date
+     * @param	string		$batch					Lot number
+     * @return	int							<0 if KO, >0 if OK
+     */
+    function addline($entrepot_id, $id, $qty, $array_options=0, $comment='', $eatby='', $sellby='', $batch='')
+    {
+        global $conf, $langs, $user;
+
+        $num = count($this->lines);
+        $line = new CommandeFournisseurDispatch($this->db);
+
+        $line->fk_entrepot = $entrepot_id;
+        $line->fk_commandefourndet = $id;
+        $line->qty = $qty;
+
+        $supplierorderline = new CommandeFournisseurLigne($this->db);
+        $supplierorderline->fetch($id);
+
+        if (! empty($conf->stock->enabled) && ! empty($supplierorderline->fk_product))
+        {
+            $fk_product = $supplierorderline->fk_product;
+
+            if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
+            {
+                $langs->load("errors");
+                $this->error=$langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
+                return -1;
+            }
+        }
+
+        // extrafields
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+            $line->array_options = $array_options;
+
+        $line->fk_product = $fk_product;
+        $line->fk_commande = $supplierorderline->fk_commande ;
+        $line->fk_user = $user->id ;
+        $line->comment = $comment;
+        $line->batch = $batch;
+        $line->eatby = $eatby;
+        $line->sellby = $sellby;
+        $line->status=1;
+        $line->fk_reception=$this->id;
+
+        $this->lines[$num] = $line;
+    }
 
 
     /**
@@ -765,314 +765,314 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf;
-		$error=0;
-
-		// Clean parameters
-
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
+        global $conf;
+        $error=0;
+
+        // Clean parameters
+
+        if (isset($this->ref)) $this->ref=trim($this->ref);
+        if (isset($this->entity)) $this->entity=trim($this->entity);
+        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+        if (isset($this->socid)) $this->socid=trim($this->socid);
+        if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
+        if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
+        if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
+        if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
+        if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
+        if (isset($this->statut)) $this->statut=(int) $this->statut;
+        if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
+        if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
+        if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
+        if (isset($this->size_units)) $this->size_units=trim($this->size_units);
+        if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
+        if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
+        if (isset($this->note_private)) $this->note=trim($this->note_private);
+        if (isset($this->note_public)) $this->note=trim($this->note_public);
+        if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+
+
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
 
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " date_creation=".(dol_strlen($this->date_creation)!=0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " date_valid=".(dol_strlen($this->date_valid)!=0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-		$sql.= " date_reception=".(dol_strlen($this->date_reception)!=0 ? "'".$this->db->idate($this->date_reception)."'" : 'null').",";
-		$sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
-		$sql.= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0)?$this->shipping_method_id:"null").",";
-		$sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " height=".(($this->trueHeight != '')?$this->trueHeight:"null").",";
-		$sql.= " width=".(($this->trueWidth != '')?$this->trueWidth:"null").",";
-		$sql.= " size_units=".(isset($this->size_units)?$this->size_units:"null").",";
-		$sql.= " size=".(($this->trueDepth != '')?$this->trueDepth:"null").",";
-		$sql.= " weight_units=".(isset($this->weight_units)?$this->weight_units:"null").",";
-		$sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " entity=".$conf->entity;
+        $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+        $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
+        $sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
+        $sql.= " date_creation=".(dol_strlen($this->date_creation)!=0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
+        $sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
+        $sql.= " date_valid=".(dol_strlen($this->date_valid)!=0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
+        $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
+        $sql.= " date_reception=".(dol_strlen($this->date_reception)!=0 ? "'".$this->db->idate($this->date_reception)."'" : 'null').",";
+        $sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
+        $sql.= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0)?$this->shipping_method_id:"null").",";
+        $sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
+        $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
+        $sql.= " height=".(($this->trueHeight != '')?$this->trueHeight:"null").",";
+        $sql.= " width=".(($this->trueWidth != '')?$this->trueWidth:"null").",";
+        $sql.= " size_units=".(isset($this->size_units)?$this->size_units:"null").",";
+        $sql.= " size=".(($this->trueDepth != '')?$this->trueDepth:"null").",";
+        $sql.= " weight_units=".(isset($this->weight_units)?$this->weight_units:"null").",";
+        $sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
+        $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+        $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+        $sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
+        $sql.= " entity=".$conf->entity;
 
         $sql.= " WHERE rowid=".$this->id;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
                 // Call trigger
                 $result=$this->call_trigger('RECEPTION_MODIFY',$user);
                 if ($result < 0) { $error++; }
                 // End call triggers
-	    	}
-		}
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-	/**
-	 * 	Delete reception.
-	 *
-	 *	@param	User	$user	Object user
-	 * 	@return	int				>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
-	 */
-	function delete(User $user)
-	{
-		global $conf, $langs, $user;
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$error=0;
-		$this->error='';
-
-
-		$this->db->begin();
-
-		// Stock control
-		if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_RECEPTION && $this->statut > 0)
-		{
-			require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
-
-			$langs->load("agenda");
-
-			// Loop on each product line to add a stock movement
-			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.eatby, ed.sellby, ed.batch, ed.rowid as commande_fournisseur_dispatch_id";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-			$sql.= " WHERE ed.fk_reception = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_commandefourndet";
-
-			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					dol_syslog(get_class($this)."::delete movement index ".$i);
-					$obj = $this->db->fetch_object($resql);
-
-					$mouvS = new MouvementStock($this->db);
-					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
-
-					$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref),'', $obj->eatby, $obj->sellby, $obj->batch);  // Price is set to 0, because we don't want to see WAP changed
-				}
-			}
-			else
-			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
-			}
-		}
-
-		if (! $error)
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
-			$sql.= " WHERE fk_reception = ".$this->id;
-
-			if ( $this->db->query($sql) )
-			{
-				// Delete linked object
-				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
-
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."reception";
-					$sql.= " WHERE rowid = ".$this->id;
-
-					if ($this->db->query($sql))
-					{
-						// Call trigger
-						$result=$this->call_trigger('RECEPTION_DELETE',$user);
-						if ($result < 0) { $error++; }
-						// End call triggers
-
-						if (! empty($this->origin) && $this->origin_id > 0)
-						{
-						    $this->fetch_origin();
-						    $origin=$this->origin;
-						    if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
-						    {
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+    /**
+     * 	Delete reception.
+     *
+     *	@param	User	$user	Object user
+     * 	@return	int				>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
+     */
+    function delete(User $user)
+    {
+        global $conf, $langs, $user;
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $error=0;
+        $this->error='';
+
+
+        $this->db->begin();
+
+        // Stock control
+        if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_RECEPTION && $this->statut > 0)
+        {
+            require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
+
+            $langs->load("agenda");
+
+            // Loop on each product line to add a stock movement
+            $sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.eatby, ed.sellby, ed.batch, ed.rowid as commande_fournisseur_dispatch_id";
+            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+            $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+            $sql.= " WHERE ed.fk_reception = ".$this->id;
+            $sql.= " AND cd.rowid = ed.fk_commandefourndet";
+
+            dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $cpt = $this->db->num_rows($resql);
+                for ($i = 0; $i < $cpt; $i++)
+                {
+                    dol_syslog(get_class($this)."::delete movement index ".$i);
+                    $obj = $this->db->fetch_object($resql);
+
+                    $mouvS = new MouvementStock($this->db);
+                    // we do not log origin because it will be deleted
+                    $mouvS->origin = null;
+
+                    $result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref),'', $obj->eatby, $obj->sellby, $obj->batch);  // Price is set to 0, because we don't want to see WAP changed
+                }
+            }
+            else
+            {
+                $error++;$this->errors[]="Error ".$this->db->lasterror();
+            }
+        }
+
+        if (! $error)
+        {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
+            $sql.= " WHERE fk_reception = ".$this->id;
+
+            if ( $this->db->query($sql) )
+            {
+                // Delete linked object
+                $res = $this->deleteObjectLinked();
+                if ($res < 0) $error++;
+
+                if (! $error)
+                {
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."reception";
+                    $sql.= " WHERE rowid = ".$this->id;
+
+                    if ($this->db->query($sql))
+                    {
+                        // Call trigger
+                        $result=$this->call_trigger('RECEPTION_DELETE',$user);
+                        if ($result < 0) { $error++; }
+                        // End call triggers
+
+                        if (! empty($this->origin) && $this->origin_id > 0)
+                        {
+                            $this->fetch_origin();
+                            $origin=$this->origin;
+                            if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
+                            {
                                 // Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
-						        $this->$origin->loadReceptions();
-						        //var_dump($this->$origin->receptions);exit;
-						        if (count($this->$origin->receptions) <= 0)
-						        {
+                                $this->$origin->loadReceptions();
+                                //var_dump($this->$origin->receptions);exit;
+                                if (count($this->$origin->receptions) <= 0)
+                                {
                                     $this->$origin->setStatut(3); // ordered
-						        }
-						    }
-						}
-
-						if (! $error)
-						{
-							$this->db->commit();
-
-							// We delete PDFs
-							$ref = dol_sanitizeFileName($this->ref);
-							if (! empty($conf->reception->dir_output))
-							{
-								$dir = $conf->reception->dir_output . '/' . $ref ;
-								$file = $dir . '/' . $ref . '.pdf';
-								if (file_exists($file))
-								{
-									if (! dol_delete_file($file))
-									{
-										return 0;
-									}
-								}
-								if (file_exists($dir))
-								{
-									if (!dol_delete_dir_recursive($dir))
-									{
-										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
-										return 0;
-									}
-								}
-							}
-
-							return 1;
-						}
-						else
-						{
-							$this->db->rollback();
-							return -1;
-						}
-					}
-					else
-					{
-						$this->error=$this->db->lasterror()." - sql=$sql";
-						$this->db->rollback();
-						return -3;
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
-					$this->db->rollback();
-					return -2;
-				}
-			}
-			else
-			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
+                                }
+                            }
+                        }
+
+                        if (! $error)
+                        {
+                            $this->db->commit();
+
+                            // We delete PDFs
+                            $ref = dol_sanitizeFileName($this->ref);
+                            if (! empty($conf->reception->dir_output))
+                            {
+                                $dir = $conf->reception->dir_output . '/' . $ref ;
+                                $file = $dir . '/' . $ref . '.pdf';
+                                if (file_exists($file))
+                                {
+                                    if (! dol_delete_file($file))
+                                    {
+                                        return 0;
+                                    }
+                                }
+                                if (file_exists($dir))
+                                {
+                                    if (!dol_delete_dir_recursive($dir))
+                                    {
+                                        $this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+                                        return 0;
+                                    }
+                                }
+                            }
+
+                            return 1;
+                        }
+                        else
+                        {
+                            $this->db->rollback();
+                            return -1;
+                        }
+                    }
+                    else
+                    {
+                        $this->error=$this->db->lasterror()." - sql=$sql";
+                        $this->db->rollback();
+                        return -3;
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror()." - sql=$sql";
+                    $this->db->rollback();
+                    return -2;
+                }
+            }
+            else
+            {
+                $this->error=$this->db->lasterror()." - sql=$sql";
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Load lines
-	 *
-	 *	@return	int		>0 if OK, Otherwise if KO
-	 */
-	function fetch_lines()
-	{
-		// phpcs:enable
-		global $db;
-		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE fk_reception='.$this->id;
-		$resql = $db->query($sql);
-
-		if(!empty($resql)){
-			$this->lines = array();
-			while ($obj = $resql->fetch_object()){
-				$line = new CommandeFournisseurDispatch($db);
-				$line->fetch($obj->rowid);
-				$line->fetch_product();
-				$sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
-				$resql_commfourndet = $db->query($sql_commfourndet);
-				if(!empty($resql_commfourndet)){
-					$obj = $db->fetch_object($resql_commfourndet);
-					$line->qty_asked = $obj->qty;
-					$line->description = $line->comment;
-					$line->desc =  $line->comment;
-					$line->tva_tx = $obj->tva_tx;
-					$line->vat_src_code = $obj->vat_src_code;
-					$line->subprice = $obj->subprice;
-					$line->multicurrency_subprice = $obj->multicurrency_subprice;
-					$line->remise_percent = $obj->remise_percent;
-					$line->label = !empty($obj->label)?$obj->label:$line->product->label;
-					$line->ref_supplier = $obj->ref;
-				}else {
-					$line->qty_asked = 0;
-					$line->description = '';
-					$line->label = $obj->label;
-				}
-
-				$pu_ht=($line->subprice*$line->qty)*(100-$line->remise_percent)/100;
-				$tva = $pu_ht*$line->tva_tx/100;
-				$this->total_ht += $pu_ht;
-				$this->total_tva += $pu_ht*$line->tva_tx/100;
-
-				$this->total_ttc += $pu_ht+$tva;
-
-
-				$this->lines[]=$line;
-			}
-
-			return 1;
-		}
-		else {
-			return -1;
-		}
-	}
-
-	/**
+    /**
+     *	Load lines
+     *
+     *	@return	int		>0 if OK, Otherwise if KO
+     */
+    function fetch_lines()
+    {
+        // phpcs:enable
+        global $db;
+        dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE fk_reception='.$this->id;
+        $resql = $db->query($sql);
+
+        if(!empty($resql)){
+            $this->lines = array();
+            while ($obj = $resql->fetch_object()){
+                $line = new CommandeFournisseurDispatch($db);
+                $line->fetch($obj->rowid);
+                $line->fetch_product();
+                $sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
+                $resql_commfourndet = $db->query($sql_commfourndet);
+                if(!empty($resql_commfourndet)){
+                    $obj = $db->fetch_object($resql_commfourndet);
+                    $line->qty_asked = $obj->qty;
+                    $line->description = $line->comment;
+                    $line->desc =  $line->comment;
+                    $line->tva_tx = $obj->tva_tx;
+                    $line->vat_src_code = $obj->vat_src_code;
+                    $line->subprice = $obj->subprice;
+                    $line->multicurrency_subprice = $obj->multicurrency_subprice;
+                    $line->remise_percent = $obj->remise_percent;
+                    $line->label = !empty($obj->label)?$obj->label:$line->product->label;
+                    $line->ref_supplier = $obj->ref;
+                }else {
+                    $line->qty_asked = 0;
+                    $line->description = '';
+                    $line->label = $obj->label;
+                }
+
+                $pu_ht=($line->subprice*$line->qty)*(100-$line->remise_percent)/100;
+                $tva = $pu_ht*$line->tva_tx/100;
+                $this->total_ht += $pu_ht;
+                $this->total_tva += $pu_ht*$line->tva_tx/100;
+
+                $this->total_ttc += $pu_ht+$tva;
+
+
+                $this->lines[]=$line;
+            }
+
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    }
+
+    /**
      *	Return clicable link of object (with eventually picto)
      *
      *	@param      int			$withpicto      Add picto into link
@@ -1082,152 +1082,152 @@ 
      *  @param      int         $notooltip      1=No tooltip
      *	@return     string          			String with URL
      */
-	function getNomUrl($withpicto=0,$option=0,$max=0,$short=0,$notooltip=0)
-	{
-		global $langs;
-		$result='';
+    function getNomUrl($withpicto=0,$option=0,$max=0,$short=0,$notooltip=0)
+    {
+        global $langs;
+        $result='';
         $label = '<u>' . $langs->trans("ShowReception") . '</u>';
         $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
         $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
 
-		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
+        $url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
-		if ($short) return $url;
+        if ($short) return $url;
 
-		$linkclose='';
-		if (empty($notooltip))
-		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowReception");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
-		}
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowReception");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip"';
+        }
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+        $linkend='</a>';
 
-		$picto='sending';
+        $picto='sending';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
-		return $result;
-	}
+        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        $result.=$linkstart.$this->ref.$linkend;
+        return $result;
+    }
 
-	/**
+    /**
      *	Return status label
      *
      *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
      *	@return     string      		Libelle
      */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return label of a status
-	 *
-	 * @param      int		$statut		Id statut
-	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
-	 * @return     string				Label of status
-	 */
-	function LibStatut($statut,$mode)
-	{
-		// phpcs:enable
-		global $langs;
-
-		if ($mode==0)
-		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==2)  return $langs->trans($this->statuts[$statut]);
-		}
-		if ($mode==1)
-		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort');
-		}
-		if ($mode == 3)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6');
-		}
-		if ($mode == 4)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6').' '.$langs->trans('StatusReceptionProcessed');
-		}
-		if ($mode == 5)
-		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'),'statut6');
-		}
-	}
-
-	/**
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * Return label of a status
+     *
+     * @param      int		$statut		Id statut
+     * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+     * @return     string				Label of status
+     */
+    function LibStatut($statut,$mode)
+    {
+        // phpcs:enable
+        global $langs;
+
+        if ($mode==0)
+        {
+            if ($statut==0) return $langs->trans($this->statuts[$statut]);
+            if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+            if ($statut==2)  return $langs->trans($this->statuts[$statut]);
+        }
+        if ($mode==1)
+        {
+            if ($statut==0) return $langs->trans('StatusReceptionDraftShort');
+            if ($statut==1) return $langs->trans('StatusReceptionValidatedShort');
+            if ($statut==2) return $langs->trans('StatusReceptionProcessedShort');
+        }
+        if ($mode == 3)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
+            if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6');
+        }
+        if ($mode == 4)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6').' '.$langs->trans('StatusReceptionProcessed');
+        }
+        if ($mode == 5)
+        {
+            if ($statut==0) return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            if ($statut==1) return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
+            if ($statut==2) return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'),'statut6');
+        }
+    }
+
+    /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
      *	id must be 0 if object instance is a specimen.
      *
      *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		global $langs;
-		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
-		$now=dol_now();
+     */
+    function initAsSpecimen()
+    {
+        global $langs;
+        dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
+        $now=dol_now();
 
-		dol_syslog(get_class($this)."::initAsSpecimen");
+        dol_syslog(get_class($this)."::initAsSpecimen");
 
         // Load array of products prodids
-		$num_prods = 0;
-		$prodids = array();
-		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num_prods = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num_prods)
-			{
-				$i++;
-				$row = $this->db->fetch_row($resql);
-				$prodids[$i] = $row[0];
-			}
-		}
-
-		$order=new Commande($this->db);
-		$order->initAsSpecimen();
-
-		// Initialise parametres
-		$this->id=0;
-		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
-		$this->statut               = 1;
-		$this->livraison_id         = 0;
-		$this->date                 = $now;
-		$this->date_creation        = $now;
-		$this->date_valid           = $now;
-		$this->date_delivery        = $now;
-		$this->date_reception      = $now + 24*3600;
-
-		$this->entrepot_id          = 0;
-		$this->fk_delivery_address  = 0;
-		$this->socid                = 1;
-
-		$this->commande_id          = 0;
-		$this->commande             = $order;
+        $num_prods = 0;
+        $prodids = array();
+        $sql = "SELECT rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."product";
+        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num_prods = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num_prods)
+            {
+                $i++;
+                $row = $this->db->fetch_row($resql);
+                $prodids[$i] = $row[0];
+            }
+        }
+
+        $order=new Commande($this->db);
+        $order->initAsSpecimen();
+
+        // Initialise parametres
+        $this->id=0;
+        $this->ref = 'SPECIMEN';
+        $this->specimen=1;
+        $this->statut               = 1;
+        $this->livraison_id         = 0;
+        $this->date                 = $now;
+        $this->date_creation        = $now;
+        $this->date_valid           = $now;
+        $this->date_delivery        = $now;
+        $this->date_reception      = $now + 24*3600;
+
+        $this->entrepot_id          = 0;
+        $this->fk_delivery_address  = 0;
+        $this->socid                = 1;
+
+        $this->commande_id          = 0;
+        $this->commande             = $order;
 
         $this->origin_id            = 1;
         $this->origin               = 'commande';
@@ -1235,85 +1235,85 @@ 
         $this->note_private			= 'Private note';
         $this->note_public			= 'Public note';
 
-		$nbp = 5;
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$line=new CommandeFournisseurDispatch($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
-			$line->libelle=$langs->trans("Description")." ".$xnbp;
-			$line->qty=10;
+        $nbp = 5;
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $line=new CommandeFournisseurDispatch($this->db);
+            $line->desc=$langs->trans("Description")." ".$xnbp;
+            $line->libelle=$langs->trans("Description")." ".$xnbp;
+            $line->qty=10;
 
-			$line->fk_product=$this->commande->lines[$xnbp]->fk_product;
+            $line->fk_product=$this->commande->lines[$xnbp]->fk_product;
 
-			$this->lines[]=$line;
-			$xnbp++;
-		}
-	}
+            $this->lines[]=$line;
+            $xnbp++;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Set the planned delivery date
-	 *
-	 *	@param      User			$user        		Objet utilisateur qui modifie
-	 *	@param      timestamp		$date_livraison     Date de livraison
-	 *	@return     int         						<0 if KO, >0 if OK
-	 */
-	function set_date_livraison($user, $date_livraison)
-	{
-		// phpcs:enable
-		if ($user->rights->reception->creer)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
-
-			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->date_delivery = $date_livraison;
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-				return -1;
-			}
-		}
-		else
-		{
-			return -2;
-		}
-	}
+    /**
+     *	Set the planned delivery date
+     *
+     *	@param      User			$user        		Objet utilisateur qui modifie
+     *	@param      timestamp		$date_livraison     Date de livraison
+     *	@return     int         						<0 if KO, >0 if OK
+     */
+    function set_date_livraison($user, $date_livraison)
+    {
+        // phpcs:enable
+        if ($user->rights->reception->creer)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
+            $sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+            $sql.= " WHERE rowid = ".$this->id;
+
+            dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->date_delivery = $date_livraison;
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+                return -1;
+            }
+        }
+        else
+        {
+            return -2;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
-	 *
-	 * 	@return	void
-	 */
-	function fetch_delivery_methods()
-	{
-		// phpcs:enable
-		global $langs;
-		$this->meths = array();
-
-		$sql = "SELECT em.rowid, em.code, em.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		$sql.= " WHERE em.active = 1";
-		$sql.= " ORDER BY em.libelle ASC";
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$label=$langs->trans('ReceptionMethod'.$obj->code);
-				$this->meths[$obj->rowid] = ($label != 'ReceptionMethod'.$obj->code?$label:$obj->libelle);
-			}
-		}
-	}
+    /**
+     *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
+     *
+     * 	@return	void
+     */
+    function fetch_delivery_methods()
+    {
+        // phpcs:enable
+        global $langs;
+        $this->meths = array();
+
+        $sql = "SELECT em.rowid, em.code, em.libelle";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+        $sql.= " WHERE em.active = 1";
+        $sql.= " ORDER BY em.libelle ASC";
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $label=$langs->trans('ReceptionMethod'.$obj->code);
+                $this->meths[$obj->rowid] = ($label != 'ReceptionMethod'.$obj->code?$label:$obj->libelle);
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -1324,7 +1324,7 @@ 
      */
     function list_delivery_methods($id='')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $this->listmeths = array();
@@ -1361,7 +1361,7 @@ 
      */
     function update_delivery_method($id='')
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($id=='')
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
@@ -1381,7 +1381,7 @@ 
         if ($resql < 0) dol_print_error($this->db,'');
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  Activate delivery method.
      *
@@ -1391,7 +1391,7 @@ 
      */
     function activ_delivery_method($id)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
         $sql.= ' WHERE rowid='.$id;
 
@@ -1408,7 +1408,7 @@ 
      */
     function disable_delivery_method($id)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
         $sql.= ' WHERE rowid='.$id;
 
@@ -1416,366 +1416,366 @@ 
     }
 
 
-	/**
-	 * Forge an set tracking url
-	 *
-	 * @param	string	$value		Value
-	 * @return	void
-	 */
-	function getUrlTrackingStatus($value='')
-	{
-		if (! empty($this->shipping_method_id))
-		{
-			$sql = "SELECT em.code, em.tracking";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-			$sql.= " WHERE em.rowid = ".$this->shipping_method_id;
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if ($obj = $this->db->fetch_object($resql))
-				{
-					$tracking = $obj->tracking;
-				}
-			}
-		}
-
-		if (!empty($tracking) && !empty($value))
-		{
-			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
-		}
-		else
-		{
-			$this->tracking_url = $value;
-		}
-	}
-
-	/**
-	 *	Classify the reception as closed.
-	 *
-	 *	@return     int     <0 if KO, >0 if OK
-	 */
-	function setClosed()
-	{
-		global $conf,$langs,$user;
-
-		$error=0;
-
-		$this->db->begin();
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut='.self::STATUS_CLOSED;
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			// Set order billed if 100% of order is received (qty in reception lines match qty in order lines)
-			if ($this->origin == 'order_supplier' && $this->origin_id > 0)
-			{
-				$order = new CommandeFournisseur($this->db);
-				$order->fetch($this->origin_id);
-
-				$order->loadReceptions(self::STATUS_CLOSED);		// Fill $order->receptions = array(orderlineid => qty)
-
-				$receptions_match_order = 1;
-				foreach($order->lines as $line)
-				{
-					$lineid = $line->id;
-					$qty = $line->qty;
-					if (($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->receptions[$lineid] < $qty)
-					{
-						$receptions_match_order = 0;
-						$text='Qty for order line id '.$lineid.' is '.$qty.'. However in the receptions with status Reception::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->receptions[$lineid].', so we can t close order';
-						dol_syslog($text);
-						break;
-					}
-				}
-				if ($receptions_match_order)
-				{
-					dol_syslog("Qty for the ".count($order->lines)." lines of order have same value for receptions with status Reception::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
-					$order->Livraison($user, dol_now(), 'tot', 'Reception '.$this->ref);
-				}
-			}
-
-			$this->statut=self::STATUS_CLOSED;
-
-
-			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-				$langs->load("agenda");
-
-				// Loop on each product line to add a stock movement
-				// TODO possibilite de receptionner a partir d'une propale ou autre origine ?
-				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
-
-				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-
-				if ($resql)
-				{
-					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						$obj = $this->db->fetch_object($resql);
-
-						$qty = $obj->qty;
-
-						if ($qty <= 0) continue;
-						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-						$mouvS = new MouvementStock($this->db);
-						$mouvS->origin = &$this;
-
-						if (empty($obj->batch))
-						{
-							// line without batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref));
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-						else
-						{
-							// line with batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
-
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$error++;
-				}
-			}
-
-			// Call trigger
-			if (! $error)
-			{
-    			$result=$this->call_trigger('RECEPTION_CLOSED',$user);
-    			if ($result < 0) {
-    			    $error++;
-    			}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
+    /**
+     * Forge an set tracking url
+     *
+     * @param	string	$value		Value
+     * @return	void
+     */
+    function getUrlTrackingStatus($value='')
+    {
+        if (! empty($this->shipping_method_id))
+        {
+            $sql = "SELECT em.code, em.tracking";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+            $sql.= " WHERE em.rowid = ".$this->shipping_method_id;
+
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                if ($obj = $this->db->fetch_object($resql))
+                {
+                    $tracking = $obj->tracking;
+                }
+            }
+        }
+
+        if (!empty($tracking) && !empty($value))
+        {
+            $url = str_replace('{TRACKID}', $value, $tracking);
+            $this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+        }
+        else
+        {
+            $this->tracking_url = $value;
+        }
+    }
+
+    /**
+     *	Classify the reception as closed.
+     *
+     *	@return     int     <0 if KO, >0 if OK
+     */
+    function setClosed()
+    {
+        global $conf,$langs,$user;
+
+        $error=0;
+
+        $this->db->begin();
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut='.self::STATUS_CLOSED;
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            // Set order billed if 100% of order is received (qty in reception lines match qty in order lines)
+            if ($this->origin == 'order_supplier' && $this->origin_id > 0)
+            {
+                $order = new CommandeFournisseur($this->db);
+                $order->fetch($this->origin_id);
+
+                $order->loadReceptions(self::STATUS_CLOSED);		// Fill $order->receptions = array(orderlineid => qty)
+
+                $receptions_match_order = 1;
+                foreach($order->lines as $line)
+                {
+                    $lineid = $line->id;
+                    $qty = $line->qty;
+                    if (($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->receptions[$lineid] < $qty)
+                    {
+                        $receptions_match_order = 0;
+                        $text='Qty for order line id '.$lineid.' is '.$qty.'. However in the receptions with status Reception::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->receptions[$lineid].', so we can t close order';
+                        dol_syslog($text);
+                        break;
+                    }
+                }
+                if ($receptions_match_order)
+                {
+                    dol_syslog("Qty for the ".count($order->lines)." lines of order have same value for receptions with status Reception::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
+                    $order->Livraison($user, dol_now(), 'tot', 'Reception '.$this->ref);
+                }
+            }
+
+            $this->statut=self::STATUS_CLOSED;
+
+
+            // If stock increment is done on closing
+            if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+                $langs->load("agenda");
+
+                // Loop on each product line to add a stock movement
+                // TODO possibilite de receptionner a partir d'une propale ou autre origine ?
+                $sql = "SELECT cd.fk_product, cd.subprice,";
+                $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
+                $sql.= " ed.eatby, ed.sellby, ed.batch";
+                $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+                $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+                $sql.= " WHERE ed.fk_reception = ".$this->id;
+                $sql.= " AND cd.rowid = ed.fk_commandefourndet";
+
+                dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+
+                if ($resql)
+                {
+                    $cpt = $this->db->num_rows($resql);
+                    for ($i = 0; $i < $cpt; $i++)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+
+                        $qty = $obj->qty;
+
+                        if ($qty <= 0) continue;
+                        dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                        $mouvS = new MouvementStock($this->db);
+                        $mouvS->origin = &$this;
+
+                        if (empty($obj->batch))
+                        {
+                            // line without batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref));
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                        else
+                        {
+                            // line with batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $error++;
+                }
+            }
+
+            // Call trigger
+            if (! $error)
+            {
+                $result=$this->call_trigger('RECEPTION_CLOSED',$user);
+                if ($result < 0) {
+                    $error++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
             $error++;
-		}
-
-		if (! $error)
-		{
-		    $this->db->commit();
-		    return 1;
-		}
-		else
-		{
-		    $this->db->rollback();
-		    return -1;
-		}
-	}
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
-	 *
-	 *	@return     int     <0 if ko, >0 if ok
-	 */
-	function set_billed()
-	{
-		// phpcs:enable
-	    global $user;
-		$error=0;
-
-		$this->db->begin();
-
-		$this->setClosed();
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET  billed=1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->statut=2;
-			$this->billed=1;
-
-			// Call trigger
-			$result=$this->call_trigger('RECEPTION_BILLED',$user);
-			if ($result < 0) {
-				$error++;
-			}
-		} else {
-			$error++;
-			$this->errors[]=$this->db->lasterror;
-		}
-
-		if (empty($error)) {
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Classify the reception as validated/opened
-	 *
-	 *	@return     int     <0 if ko, >0 if ok
-	 */
-	function reOpen()
-	{
-		global $conf,$langs,$user;
-
-		$error=0;
-
-		$this->db->begin();
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut=1, billed=0';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->statut=1;
-			$this->billed=0;
-
-			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-				$numref = $this->ref;
-				$langs->load("agenda");
-
-				// Loop on each product line to add a stock movement
-				// TODO possibilite de receptionner a partir d'une propale ou autre origine
-				$sql = "SELECT ed.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
-
-				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if ($resql)
-				{
-					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						$obj = $this->db->fetch_object($resql);
-
-						$qty = $obj->qty;
-
-						if ($qty <= 0) continue;
-
-						dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid);
-
-						//var_dump($this->lines[$i]);
-						$mouvS = new MouvementStock($this->db);
-						$mouvS->origin = &$this;
-
-						if (empty($obj->batch))
-						{
-							// line without batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref));
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-								$error++; break;
-							}
-						}
-						else
-						{
-							// line with batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$error++;
-				}
-			}
-
-			if (! $error)
-			{
-    			// Call trigger
-    			$result=$this->call_trigger('RECEPTION_REOPEN',$user);
-    			if ($result < 0) {
-    				$error++;
-    			}
-   			}
-
-			if($this->origin == 'order_supplier'){
-				$commande = new CommandeFournisseur($this->db);
-				$commande->fetch($this->origin_id);
-				$commande->setStatus($user,4);
-			}
-		} else {
-			$error++;
-			$this->errors[]=$this->db->lasterror();
-		}
-
-		if (! $error)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
+    /**
+     *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
+     *
+     *	@return     int     <0 if ko, >0 if ok
+     */
+    function set_billed()
+    {
+        // phpcs:enable
+        global $user;
+        $error=0;
 
+        $this->db->begin();
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	 /**
-     *	Set draft status
+        $this->setClosed();
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET  billed=1';
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->statut=2;
+            $this->billed=1;
+
+            // Call trigger
+            $result=$this->call_trigger('RECEPTION_BILLED',$user);
+            if ($result < 0) {
+                $error++;
+            }
+        } else {
+            $error++;
+            $this->errors[]=$this->db->lasterror;
+        }
+
+        if (empty($error)) {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *	Classify the reception as validated/opened
      *
-     *	@param	User	$user			Object user that modify
-     *	@return	int						<0 if KO, >0 if OK
+     *	@return     int     <0 if ko, >0 if ok
      */
+    function reOpen()
+    {
+        global $conf,$langs,$user;
+
+        $error=0;
+
+        $this->db->begin();
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut=1, billed=0';
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->statut=1;
+            $this->billed=0;
+
+            // If stock increment is done on closing
+            if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+                $numref = $this->ref;
+                $langs->load("agenda");
+
+                // Loop on each product line to add a stock movement
+                // TODO possibilite de receptionner a partir d'une propale ou autre origine
+                $sql = "SELECT ed.fk_product, cd.subprice,";
+                $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
+                $sql.= " ed.eatby, ed.sellby, ed.batch";
+                $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+                $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+                $sql.= " WHERE ed.fk_reception = ".$this->id;
+                $sql.= " AND cd.rowid = ed.fk_commandefourndet";
+
+                dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if ($resql)
+                {
+                    $cpt = $this->db->num_rows($resql);
+                    for ($i = 0; $i < $cpt; $i++)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+
+                        $qty = $obj->qty;
+
+                        if ($qty <= 0) continue;
+
+                        dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid);
+
+                        //var_dump($this->lines[$i]);
+                        $mouvS = new MouvementStock($this->db);
+                        $mouvS->origin = &$this;
+
+                        if (empty($obj->batch))
+                        {
+                            // line without batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref));
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                        else
+                        {
+                            // line with batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $error++;
+                }
+            }
+
+            if (! $error)
+            {
+                // Call trigger
+                $result=$this->call_trigger('RECEPTION_REOPEN',$user);
+                if ($result < 0) {
+                    $error++;
+                }
+                }
+
+            if($this->origin == 'order_supplier'){
+                $commande = new CommandeFournisseur($this->db);
+                $commande->fetch($this->origin_id);
+                $commande->setStatus($user,4);
+            }
+        } else {
+            $error++;
+            $this->errors[]=$this->db->lasterror();
+        }
+
+        if (! $error)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+        /**
+         *	Set draft status
+         *
+         *	@param	User	$user			Object user that modify
+         *	@return	int						<0 if KO, >0 if OK
+         */
     function set_draft($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf,$langs;
 
         $error=0;
@@ -1787,7 +1787,7 @@ 
         }
 
         if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
+           || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
         {
             $this->error='Permission denied';
             return -1;
@@ -1803,118 +1803,118 @@ 
         if ($this->db->query($sql))
         {
             // If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-
-				$langs->load("agenda");
-
-				// Loop on each product line to add a stock movement
-				// TODO possibilite de receptionner a partir d'une propale ou autre origine
-				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
-
-				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if ($resql)
-				{
-					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						$obj = $this->db->fetch_object($resql);
-
-						$qty = $obj->qty;
-
-
-						if ($qty <= 0) continue;
-						dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
-
-						//var_dump($this->lines[$i]);
-						$mouvS = new MouvementStock($this->db);
-						$mouvS->origin = &$this;
-
-						if (empty($obj->batch))
-						{
-							// line without batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref));
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-								$error++;
-								break;
-							}
-						}
-						else
-						{
-							// line with batch detail
-
-							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
-							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
-							}
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$error++;
-				}
-			}
+            if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+                $langs->load("agenda");
+
+                // Loop on each product line to add a stock movement
+                // TODO possibilite de receptionner a partir d'une propale ou autre origine
+                $sql = "SELECT cd.fk_product, cd.subprice,";
+                $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
+                $sql.= " ed.eatby, ed.sellby, ed.batch";
+                $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+                $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+                $sql.= " WHERE ed.fk_reception = ".$this->id;
+                $sql.= " AND cd.rowid = ed.fk_commandefourndet";
+
+                dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if ($resql)
+                {
+                    $cpt = $this->db->num_rows($resql);
+                    for ($i = 0; $i < $cpt; $i++)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+
+                        $qty = $obj->qty;
+
+
+                        if ($qty <= 0) continue;
+                        dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+                        //var_dump($this->lines[$i]);
+                        $mouvS = new MouvementStock($this->db);
+                        $mouvS->origin = &$this;
+
+                        if (empty($obj->batch))
+                        {
+                            // line without batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref));
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++;
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            // line with batch detail
+
+                            // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+                            $result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+                            if ($result < 0) {
+                                $this->error = $mouvS->error;
+                                $this->errors = $mouvS->errors;
+                                $error++; break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $error++;
+                }
+            }
 
             if (!$error) {
-            	// Call trigger
-            	$result=$this->call_trigger('RECEPTION_UNVALIDATE',$user);
-            	if ($result < 0) $error++;
+                // Call trigger
+                $result=$this->call_trigger('RECEPTION_UNVALIDATE',$user);
+                if ($result < 0) $error++;
+            }
+            if ($this->origin == 'order_supplier')
+            {
+                if (!empty($this->origin) && $this->origin_id > 0)
+                {
+                    $this->fetch_origin();
+                    $origin = $this->origin;
+                    if ($this->$origin->statut == 4)  // If order source of reception is "partially received"
+                    {
+                        // Check if there is no more reception validated.
+                        $this->$origin->fetchObjectLinked();
+                        $setStatut = 1;
+                        if (!empty($this->$origin->linkedObjects['reception']))
+                        {
+                            foreach ($this->$origin->linkedObjects['reception'] as $rcption)
+                            {
+                                if ($rcption->statut > 0)
+                                {
+                                    $setStatut = 0;
+                                    break;
+                                }
+                            }
+                            //var_dump($this->$origin->receptions);exit;
+                            if ($setStatut)
+                            {
+                                $this->$origin->setStatut(3); // ordered
+                            }
+                        }
+                    }
+                }
             }
-			if ($this->origin == 'order_supplier')
-			{
-				if (!empty($this->origin) && $this->origin_id > 0)
-				{
-					$this->fetch_origin();
-					$origin = $this->origin;
-					if ($this->$origin->statut == 4)  // If order source of reception is "partially received"
-					{
-						// Check if there is no more reception validated.
-						$this->$origin->fetchObjectLinked();
-						$setStatut = 1;
-						if (!empty($this->$origin->linkedObjects['reception']))
-						{
-							foreach ($this->$origin->linkedObjects['reception'] as $rcption)
-							{
-								if ($rcption->statut > 0)
-								{
-									$setStatut = 0;
-									break;
-								}
-							}
-							//var_dump($this->$origin->receptions);exit;
-							if ($setStatut)
-							{
-								$this->$origin->setStatut(3); // ordered
-							}
-						}
-					}
-				}
-			}
-
-			if (!$error) {
-           		$this->statut=self::STATUS_DRAFT;
-            	$this->db->commit();
-            	return 1;
+
+            if (!$error) {
+                    $this->statut=self::STATUS_DRAFT;
+                $this->db->commit();
+                return 1;
             }else {
-            	$this->db->rollback();
-            	return -1;
+                $this->db->rollback();
+                return -1;
             }
         }
         else
@@ -1925,52 +1925,52 @@ 
         }
     }
 
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 *  @param	    string		$modele			Force the model to using ('' to not force)
-	 *  @param		Translate	$outputlangs	object lang to use for translations
-	 *  @param      int			$hidedetails    Hide details of lines
-	 *  @param      int			$hidedesc       Hide description
-	 *  @param      int			$hideref        Hide ref
-	 *  @return     int         				0 if KO, 1 if OK
-	 */
-	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
-	{
-		global $conf,$langs;
-
-		$langs->load("receptions");
-
-		if (! dol_strlen($modele))
-		{
-			$modele = 'squille';
-
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->RECEPTION_ADDON_PDF)) {
-				$modele = $conf->global->RECEPTION_ADDON_PDF;
-			}
-		}
-
-		$modelpath = "core/modules/reception/doc/";
-
-		$this->fetch_origin();
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	}
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 *
-	 * @param DoliDB $db Database handler
-	 * @param int $origin_id Old thirdparty id
-	 * @param int $dest_id New thirdparty id
-	 * @return bool
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		$tables = array('reception');
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
+    /**
+     *  Create a document onto disk according to template module.
+     *
+     *  @param	    string		$modele			Force the model to using ('' to not force)
+     *  @param		Translate	$outputlangs	object lang to use for translations
+     *  @param      int			$hidedetails    Hide details of lines
+     *  @param      int			$hidedesc       Hide description
+     *  @param      int			$hideref        Hide ref
+     *  @return     int         				0 if KO, 1 if OK
+     */
+    public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
+    {
+        global $conf,$langs;
+
+        $langs->load("receptions");
+
+        if (! dol_strlen($modele))
+        {
+            $modele = 'squille';
+
+            if ($this->modelpdf) {
+                $modele = $this->modelpdf;
+            } elseif (! empty($conf->global->RECEPTION_ADDON_PDF)) {
+                $modele = $conf->global->RECEPTION_ADDON_PDF;
+            }
+        }
+
+        $modelpath = "core/modules/reception/doc/";
+
+        $this->fetch_origin();
+
+        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    }
+
+    /**
+     * Function used to replace a thirdparty id with another one.
+     *
+     * @param DoliDB $db Database handler
+     * @param int $origin_id Old thirdparty id
+     * @param int $dest_id New thirdparty id
+     * @return bool
+     */
+    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+    {
+        $tables = array('reception');
+
+        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+    }
 }
\ No newline at end of file

Spacing +417 added lines, -417 removed lines

@@ -34,8 +34,8 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 
 /**
@@ -43,11 +43,11 @@ 
  */
 class Reception extends CommonObject
 {
-	public $element="reception";
-	public $fk_element="fk_reception";
-	public $table_element="reception";
-	public $table_element_line="commande_fournisseur_dispatch";
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = "reception";
+	public $fk_element = "fk_reception";
+	public $table_element = "reception";
+	public $table_element_line = "commande_fournisseur_dispatch";
+	protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'reception';
 
 	var $socid;
@@ -55,7 +55,7 @@ 
 	var $ref_int;
 	var $brouillon;
 	var $entrepot_id;
-	var $lines=array();
+	var $lines = array();
 	var $tracking_number;
 	var $tracking_url;
 	var $billed;
@@ -72,7 +72,7 @@ 
 	// A denormalized value
 	var $trueSize;
 
-	var $date_delivery;		// Date delivery planed
+	var $date_delivery; // Date delivery planed
 
 
 	/**
@@ -84,7 +84,7 @@ 
 	var $date_valid;
 
 	var $meths;
-	var $listmeths;			// List of carriers
+	var $listmeths; // List of carriers
 
 
 	const STATUS_DRAFT = 0;
@@ -138,27 +138,27 @@ 
 		        $dir = dol_buildpath($reldir."core/modules/reception/");
 
 		        // Load file with numbering class (if found)
-		        $mybool|=@include_once $dir.$file;
+		        $mybool |= @include_once $dir.$file;
 	        }
 
-	        if (! $mybool)
+	        if (!$mybool)
 	        {
-		        dol_print_error('',"Failed to include file ".$file);
+		        dol_print_error('', "Failed to include file ".$file);
 		        return '';
 	        }
 
 			$obj = new $classname();
 
 			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
+			$numref = $obj->getNextValue($soc, $this);
 
-			if ( $numref != "")
+			if ($numref != "")
 			{
 				return $numref;
 			}
 			else
 			{
-				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
         }
@@ -176,13 +176,13 @@ 
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id reception creee si ok
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 		$error = 0;
 
 		// Clean parameters
@@ -196,82 +196,82 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."reception (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", ref_supplier";
-		$sql.= ", ref_int";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_reception";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_soc";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_shipping_method";
-		$sql.= ", tracking_number";
-		$sql.= ", weight";
-		$sql.= ", size";
-		$sql.= ", width";
-		$sql.= ", height";
-		$sql.= ", weight_units";
-		$sql.= ", size_units";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".($this->ref_supplier?"'".$this->db->escape($this->ref_supplier)."'":"null");
-		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_reception>0?"'".$this->db->idate($this->date_reception)."'":"null");
-		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".$this->socid;
-		$sql.= ", ".$this->fk_project;
-		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
-		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".$this->weight;
-		$sql.= ", ".$this->sizeS;	// TODO Should use this->trueDepth
-		$sql.= ", ".$this->sizeW;	// TODO Should use this->trueWidth
-		$sql.= ", ".$this->sizeH;	// TODO Should use this->trueHeight
-		$sql.= ", ".$this->weight_units;
-		$sql.= ", ".$this->size_units;
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
+		$sql .= "ref";
+		$sql .= ", entity";
+		$sql .= ", ref_supplier";
+		$sql .= ", ref_int";
+		$sql .= ", date_creation";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_reception";
+		$sql .= ", date_delivery";
+		$sql .= ", fk_soc";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_shipping_method";
+		$sql .= ", tracking_number";
+		$sql .= ", weight";
+		$sql .= ", size";
+		$sql .= ", width";
+		$sql .= ", height";
+		$sql .= ", weight_units";
+		$sql .= ", size_units";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_incoterms, location_incoterms";
+		$sql .= ") VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".($this->ref_supplier ? "'".$this->db->escape($this->ref_supplier)."'" : "null");
+		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->date_reception > 0 ? "'".$this->db->idate($this->date_reception)."'" : "null");
+		$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
+		$sql .= ", ".$this->socid;
+		$sql .= ", ".$this->fk_project;
+		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
+		$sql .= ", ".$this->weight;
+		$sql .= ", ".$this->sizeS; // TODO Should use this->trueDepth
+		$sql .= ", ".$this->sizeW; // TODO Should use this->trueWidth
+		$sql .= ", ".$this->sizeH; // TODO Should use this->trueHeight
+		$sql .= ", ".$this->weight_units;
+		$sql .= ", ".$this->size_units;
+		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."reception");
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-			$sql.= " SET ref = '(PROV".$this->id.")'";
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET ref = '(PROV".$this->id.")'";
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				// Insertion des lignes
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
 					$this->lines[$i]->fk_reception = $this->id;
 
-					if (! $this->lines[$i]->create($user) > 0)
+					if (!$this->lines[$i]->create($user) > 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && $this->id && $this->origin_id)
+				if (!$error && $this->id && $this->origin_id)
 				{
 					$ret = $this->add_object_linked();
 					if (!$ret)
@@ -282,15 +282,15 @@ 
 
 				// Actions on extra fields (by external module or standard code)
 				// TODO le hook fait double emploi avec le trigger !!
-				$action='add';
+				$action = 'add';
 				$hookmanager->initHooks(array('receptiondao'));
-				$parameters=array('socid'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('socid'=>$this->id);
+				$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
 					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 					{
-						$result=$this->insertExtraFields();
+						$result = $this->insertExtraFields();
 						if ($result < 0)
 						{
 							$error++;
@@ -299,33 +299,33 @@ 
 				}
 				else if ($reshook < 0) $error++;
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('RECEPTION_CREATE',$user);
+                    $result = $this->call_trigger('RECEPTION_CREATE', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						$this->db->commit();
 						return $this->id;
 					}
 					else
 					{
-						foreach($this->errors as $errmsg)
+						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-							$this->error.=($this->error?', '.$errmsg:$errmsg);
+							$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 						}
 						$this->db->rollback();
-						return -1*$error;
+						return -1 * $error;
 					}
 				}
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
@@ -333,7 +333,7 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
@@ -341,7 +341,7 @@ 
 		else
 		{
 			$error++;
-			$this->error=$this->db->error()." - sql=$sql";
+			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
 		}
@@ -358,7 +358,7 @@ 
      * 	@param	string	$ref_int	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
-	function fetch($id, $ref='', $ref_ext='', $ref_int='')
+	function fetch($id, $ref = '', $ref_ext = '', $ref_int = '')
 	{
 		global $conf;
 
@@ -366,21 +366,21 @@ 
 		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
-		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
-		$sql.= ", e.date_reception as date_reception, e.model_pdf,  e.date_delivery";
-		$sql.= ", e.fk_shipping_method, e.tracking_number";
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-		$sql.= ", e.note_private, e.note_public";
-        $sql.= ', e.fk_incoterms, e.location_incoterms';
-        $sql.= ', i.libelle as libelle_incoterms';
-		$sql.= " FROM ".MAIN_DB_PREFIX."reception as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('reception').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-        if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
+		$sql .= ", e.date_reception as date_reception, e.model_pdf,  e.date_delivery";
+		$sql .= ", e.fk_shipping_method, e.tracking_number";
+		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
+		$sql .= ", e.note_private, e.note_public";
+        $sql .= ', e.fk_incoterms, e.location_incoterms';
+        $sql .= ', i.libelle as libelle_incoterms';
+		$sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
+		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
+		if ($id)   	  $sql .= " AND e.rowid=".$id;
+        if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
+        if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+        if ($ref_int) $sql .= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -393,23 +393,23 @@ 
 				$this->id                   = $obj->rowid;
 				$this->ref                  = $obj->ref;
 				$this->socid                = $obj->socid;
-				$this->ref_supplier			= $obj->ref_supplier;
+				$this->ref_supplier = $obj->ref_supplier;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->ref_int				= $obj->ref_int;
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-				$this->date                 = $this->db->jdate($obj->date_reception);	// TODO deprecated
-				$this->date_reception      = $this->db->jdate($obj->date_reception);	// TODO deprecated
-				$this->date_reception        = $this->db->jdate($obj->date_reception);	// Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
+				$this->date                 = $this->db->jdate($obj->date_reception); // TODO deprecated
+				$this->date_reception = $this->db->jdate($obj->date_reception); // TODO deprecated
+				$this->date_reception = $this->db->jdate($obj->date_reception); // Date real
+				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->modelpdf             = $obj->model_pdf;
-				$this->shipping_method_id	= $obj->fk_shipping_method;
+				$this->shipping_method_id = $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
-				$this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
+				$this->origin               = ($obj->origin ? $obj->origin : 'commande'); // For compatibility
 				$this->origin_id            = $obj->origin_id;
-				$this->billed				= ($obj->fk_statut==2?1:0);
+				$this->billed = ($obj->fk_statut == 2 ? 1 : 0);
 
 				$this->trueWeight           = $obj->weight;
 				$this->weight_units         = $obj->weight_units;
@@ -425,8 +425,8 @@ 
 				$this->note_private         = $obj->note_private;
 
 				// A denormalized value
-				$this->trueSize           	= $obj->size."x".$obj->width."x".$obj->height;
-				$this->size_units           = $obj->size_units;
+				$this->trueSize = $obj->size."x".$obj->width."x".$obj->height;
+				$this->size_units = $obj->size_units;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -437,7 +437,7 @@ 
 
 				if ($this->statut == 0) $this->brouillon = 1;
 
-				$file = $conf->reception->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'reception') . "/" . $this->id.".pdf";
+				$file = $conf->reception->dir_output."/".get_exdir($this->id, 2, 0, 0, $this, 'reception')."/".$this->id.".pdf";
 				$this->pdf_filename = $file;
 
 				// Tracking url
@@ -446,20 +446,20 @@ 
 				/*
 				 * Thirparty
 				 */
-				$result=$this->fetch_thirdparty();
+				$result = $this->fetch_thirdparty();
 
 
 				// Retrieve all extrafields for reception
 				// fetch optionals attributes and labels
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$extrafields = new ExtraFields($this->db);
+				$extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+				$this->fetch_optionals($this->id, $extralabels);
 
 				/*
 				 * Lines
 				 */
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -470,13 +470,13 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found';
+				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -488,7 +488,7 @@ 
      *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-	function valid($user, $notrigger=0)
+	function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -503,10 +503,10 @@ 
 			return 0;
 		}
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
 		{
-			$this->error='Permission denied';
+			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -521,7 +521,7 @@ 
 
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
@@ -531,25 +531,25 @@ 
 
         $this->newref = $numref;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Validate
 		$sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
-		$sql.= " ref='".$this->db->escape($numref)."'";
-		$sql.= ", fk_statut = 1";
-		$sql.= ", date_valid = '".$this->db->idate($now)."'";
-		$sql.= ", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " ref='".$this->db->escape($numref)."'";
+		$sql .= ", fk_statut = 1";
+		$sql .= ", date_valid = '".$this->db->idate($now)."'";
+		$sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 		dol_syslog(get_class($this)."::valid update reception", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$error++;
 		}
 
 		// If stock increment is done on reception (recommanded choice)
-		if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
+		if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -558,15 +558,15 @@ 
 			// Loop on each product line to add a stock movement
 			// TODO in future, reception lines may not be linked to order line
 			$sql = "SELECT cd.fk_product, cd.subprice,";
-			$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-			$sql.= " ed.eatby, ed.sellby, ed.batch";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-			$sql.= " WHERE ed.fk_reception = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_commandefourndet";
+			$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+			$sql .= " ed.eatby, ed.sellby, ed.batch";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= " WHERE ed.fk_reception = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
 			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -588,10 +588,10 @@ 
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref));
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref));
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -602,10 +602,10 @@ 
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr",$numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -615,7 +615,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -2;
 			}
 		}
@@ -623,20 +623,20 @@ 
 		// Change status of order to "reception in process"
 		$ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
 
-        if (! $ret)
+        if (!$ret)
 		{
 		    $error++;
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
             // Call trigger
-            $result=$this->call_trigger('RECEPTION_VALIDATE',$user);
+            $result = $this->call_trigger('RECEPTION_VALIDATE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
             $this->oldref = $this->ref;
 
@@ -657,13 +657,13 @@ 
 					{
 					    dol_syslog("Rename ok");
                         // Rename docs starting with $oldref with $newref
-                        $listoffiles=dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-                        foreach($listoffiles as $fileentry)
+                        $listoffiles = dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+                        foreach ($listoffiles as $fileentry)
                         {
-                        	$dirsource=$fileentry['name'];
-                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+                        	$dirsource = $fileentry['name'];
+                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+                        	$dirdest = $fileentry['path'].'/'.$dirdest;
                         	@rename($dirsource, $dirdest);
                         }
 					}
@@ -672,26 +672,26 @@ 
 		}
 
 		// Set new ref and current status
-		if (! $error)
+		if (!$error)
 		{
 			$this->ref = $numref;
 			$this->statut = 1;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -712,7 +712,7 @@ 
 	 * @param	string		$batch					Lot number
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function addline($entrepot_id, $id, $qty, $array_options=0, $comment='', $eatby='', $sellby='', $batch='')
+	function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
 	{
 		global $conf, $langs, $user;
 
@@ -726,31 +726,31 @@ 
 		$supplierorderline = new CommandeFournisseurLigne($this->db);
 		$supplierorderline->fetch($id);
 
-		if (! empty($conf->stock->enabled) && ! empty($supplierorderline->fk_product))
+		if (!empty($conf->stock->enabled) && !empty($supplierorderline->fk_product))
 		{
 			$fk_product = $supplierorderline->fk_product;
 
-			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
+			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
 			{
 			    $langs->load("errors");
-				$this->error=$langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
+				$this->error = $langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
 				return -1;
 			}
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
 
 		$line->fk_product = $fk_product;
-		$line->fk_commande = $supplierorderline->fk_commande ;
-		$line->fk_user = $user->id ;
+		$line->fk_commande = $supplierorderline->fk_commande;
+		$line->fk_user = $user->id;
 		$line->comment = $comment;
 		$line->batch = $batch;
 		$line->eatby = $eatby;
 		$line->sellby = $sellby;
-		$line->status=1;
-		$line->fk_reception=$this->id;
+		$line->status = 1;
+		$line->fk_reception = $this->id;
 
 		$this->lines[$num] = $line;
 	}
@@ -763,32 +763,32 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return int 			       	<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+		if (isset($this->socid)) $this->socid = trim($this->socid);
+		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = trim($this->fk_delivery_address);
+		if (isset($this->shipping_method_id)) $this->shipping_method_id = trim($this->shipping_method_id);
+		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
+		if (isset($this->statut)) $this->statut = (int) $this->statut;
+		if (isset($this->trueDepth)) $this->trueDepth = trim($this->trueDepth);
+		if (isset($this->trueWidth)) $this->trueWidth = trim($this->trueWidth);
+		if (isset($this->trueHeight)) $this->trueHeight = trim($this->trueHeight);
+		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
+		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
+		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
 
 
 		// Check parameters
@@ -797,44 +797,44 @@ 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
 
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " date_creation=".(dol_strlen($this->date_creation)!=0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " date_valid=".(dol_strlen($this->date_valid)!=0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-		$sql.= " date_reception=".(dol_strlen($this->date_reception)!=0 ? "'".$this->db->idate($this->date_reception)."'" : 'null').",";
-		$sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
-		$sql.= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0)?$this->shipping_method_id:"null").",";
-		$sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " height=".(($this->trueHeight != '')?$this->trueHeight:"null").",";
-		$sql.= " width=".(($this->trueWidth != '')?$this->trueWidth:"null").",";
-		$sql.= " size_units=".(isset($this->size_units)?$this->size_units:"null").",";
-		$sql.= " size=".(($this->trueDepth != '')?$this->trueDepth:"null").",";
-		$sql.= " weight_units=".(isset($this->weight_units)?$this->weight_units:"null").",";
-		$sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " entity=".$conf->entity;
-
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+		$sql .= " date_creation=".(dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " date_valid=".(dol_strlen($this->date_valid) != 0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+		$sql .= " date_reception=".(dol_strlen($this->date_reception) != 0 ? "'".$this->db->idate($this->date_reception)."'" : 'null').",";
+		$sql .= " date_delivery=".(dol_strlen($this->date_delivery) != 0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
+		$sql .= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0) ? $this->shipping_method_id : "null").",";
+		$sql .= " tracking_number=".(isset($this->tracking_number) ? "'".$this->db->escape($this->tracking_number)."'" : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " height=".(($this->trueHeight != '') ? $this->trueHeight : "null").",";
+		$sql .= " width=".(($this->trueWidth != '') ? $this->trueWidth : "null").",";
+		$sql .= " size_units=".(isset($this->size_units) ? $this->size_units : "null").",";
+		$sql .= " size=".(($this->trueDepth != '') ? $this->trueDepth : "null").",";
+		$sql .= " weight_units=".(isset($this->weight_units) ? $this->weight_units : "null").",";
+		$sql .= " weight=".(($this->trueWeight != '') ? $this->trueWeight : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " entity=".$conf->entity;
+
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('RECEPTION_MODIFY',$user);
+                $result = $this->call_trigger('RECEPTION_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 	    	}
@@ -843,13 +843,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -869,8 +869,8 @@ 
 		global $conf, $langs, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
-		$this->error='';
+		$error = 0;
+		$this->error = '';
 
 
 		$this->db->begin();
@@ -884,13 +884,13 @@ 
 
 			// Loop on each product line to add a stock movement
 			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.eatby, ed.sellby, ed.batch, ed.rowid as commande_fournisseur_dispatch_id";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-			$sql.= " WHERE ed.fk_reception = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_commandefourndet";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= " WHERE ed.fk_reception = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
 			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -903,42 +903,42 @@ 
 					// we do not log origin because it will be deleted
 					$mouvS->origin = null;
 
-					$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref),'', $obj->eatby, $obj->sellby, $obj->batch);  // Price is set to 0, because we don't want to see WAP changed
+					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
 				}
 			}
 			else
 			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
-			$sql.= " WHERE fk_reception = ".$this->id;
+			$sql .= " WHERE fk_reception = ".$this->id;
 
-			if ( $this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."reception";
-					$sql.= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".$this->id;
 
 					if ($this->db->query($sql))
 					{
 						// Call trigger
-						$result=$this->call_trigger('RECEPTION_DELETE',$user);
+						$result = $this->call_trigger('RECEPTION_DELETE', $user);
 						if ($result < 0) { $error++; }
 						// End call triggers
 
-						if (! empty($this->origin) && $this->origin_id > 0)
+						if (!empty($this->origin) && $this->origin_id > 0)
 						{
 						    $this->fetch_origin();
-						    $origin=$this->origin;
+						    $origin = $this->origin;
 						    if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
 						    {
                                 // Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
@@ -951,19 +951,19 @@ 
 						    }
 						}
 
-						if (! $error)
+						if (!$error)
 						{
 							$this->db->commit();
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
-							if (! empty($conf->reception->dir_output))
+							if (!empty($conf->reception->dir_output))
 							{
-								$dir = $conf->reception->dir_output . '/' . $ref ;
-								$file = $dir . '/' . $ref . '.pdf';
+								$dir = $conf->reception->dir_output.'/'.$ref;
+								$file = $dir.'/'.$ref.'.pdf';
 								if (file_exists($file))
 								{
-									if (! dol_delete_file($file))
+									if (!dol_delete_file($file))
 									{
 										return 0;
 									}
@@ -972,7 +972,7 @@ 
 								{
 									if (!dol_delete_dir_recursive($dir))
 									{
-										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+										$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 										return 0;
 									}
 								}
@@ -988,21 +988,21 @@ 
 					}
 					else
 					{
-						$this->error=$this->db->lasterror()." - sql=$sql";
+						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
@@ -1028,41 +1028,41 @@ 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE fk_reception='.$this->id;
 		$resql = $db->query($sql);
 
-		if(!empty($resql)){
+		if (!empty($resql)) {
 			$this->lines = array();
-			while ($obj = $resql->fetch_object()){
+			while ($obj = $resql->fetch_object()) {
 				$line = new CommandeFournisseurDispatch($db);
 				$line->fetch($obj->rowid);
 				$line->fetch_product();
 				$sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
 				$resql_commfourndet = $db->query($sql_commfourndet);
-				if(!empty($resql_commfourndet)){
+				if (!empty($resql_commfourndet)) {
 					$obj = $db->fetch_object($resql_commfourndet);
 					$line->qty_asked = $obj->qty;
 					$line->description = $line->comment;
-					$line->desc =  $line->comment;
+					$line->desc = $line->comment;
 					$line->tva_tx = $obj->tva_tx;
 					$line->vat_src_code = $obj->vat_src_code;
 					$line->subprice = $obj->subprice;
 					$line->multicurrency_subprice = $obj->multicurrency_subprice;
 					$line->remise_percent = $obj->remise_percent;
-					$line->label = !empty($obj->label)?$obj->label:$line->product->label;
+					$line->label = !empty($obj->label) ? $obj->label : $line->product->label;
 					$line->ref_supplier = $obj->ref;
-				}else {
+				} else {
 					$line->qty_asked = 0;
 					$line->description = '';
 					$line->label = $obj->label;
 				}
 
-				$pu_ht=($line->subprice*$line->qty)*(100-$line->remise_percent)/100;
-				$tva = $pu_ht*$line->tva_tx/100;
+				$pu_ht = ($line->subprice * $line->qty) * (100 - $line->remise_percent) / 100;
+				$tva = $pu_ht * $line->tva_tx / 100;
 				$this->total_ht += $pu_ht;
-				$this->total_tva += $pu_ht*$line->tva_tx/100;
+				$this->total_tva += $pu_ht * $line->tva_tx / 100;
 
-				$this->total_ttc += $pu_ht+$tva;
+				$this->total_ttc += $pu_ht + $tva;
 
 
-				$this->lines[]=$line;
+				$this->lines[] = $line;
 			}
 
 			return 1;
@@ -1082,38 +1082,38 @@ 
      *  @param      int         $notooltip      1=No tooltip
      *	@return     string          			String with URL
      */
-	function getNomUrl($withpicto=0,$option=0,$max=0,$short=0,$notooltip=0)
+	function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
 	{
 		global $langs;
-		$result='';
-        $label = '<u>' . $langs->trans("ShowReception") . '</u>';
-        $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+		$result = '';
+        $label = '<u>'.$langs->trans("ShowReception").'</u>';
+        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
 		if ($short) return $url;
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label=$langs->trans("ShowReception");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		        $label = $langs->trans("ShowReception");
+		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose .= ' class="classfortooltip"';
 		}
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-		$picto='sending';
+		$picto = 'sending';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -1123,9 +1123,9 @@ 
      *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
      *	@return     string      		Libelle
      */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1136,40 +1136,40 @@ 
 	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 * @return     string				Label of status
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
 		// phpcs:enable
 		global $langs;
 
-		if ($mode==0)
+		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==2)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 2)  return $langs->trans($this->statuts[$statut]);
 		}
-		if ($mode==1)
+		if ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort');
+			if ($statut == 0) return $langs->trans('StatusReceptionDraftShort');
+			if ($statut == 1) return $langs->trans('StatusReceptionValidatedShort');
+			if ($statut == 2) return $langs->trans('StatusReceptionProcessedShort');
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			if ($statut == 2) return img_picto($langs->trans('StatusReceptionProcessed'), 'statut6');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6').' '.$langs->trans('StatusReceptionProcessed');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans('StatusReceptionProcessed'), 'statut6').' '.$langs->trans('StatusReceptionProcessed');
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'),'statut6');
+			if ($statut == 0) return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1) return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			if ($statut == 2) return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'), 'statut6');
 		}
 	}
 
@@ -1184,7 +1184,7 @@ 
 	{
 		global $langs;
 		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
-		$now=dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
@@ -1192,8 +1192,8 @@ 
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1207,20 +1207,20 @@ 
 			}
 		}
 
-		$order=new Commande($this->db);
+		$order = new Commande($this->db);
 		$order->initAsSpecimen();
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->statut               = 1;
 		$this->livraison_id         = 0;
 		$this->date                 = $now;
 		$this->date_creation        = $now;
 		$this->date_valid           = $now;
 		$this->date_delivery        = $now;
-		$this->date_reception      = $now + 24*3600;
+		$this->date_reception = $now + 24 * 3600;
 
 		$this->entrepot_id          = 0;
 		$this->fk_delivery_address  = 0;
@@ -1232,21 +1232,21 @@ 
         $this->origin_id            = 1;
         $this->origin               = 'commande';
 
-        $this->note_private			= 'Private note';
-        $this->note_public			= 'Public note';
+        $this->note_private = 'Private note';
+        $this->note_public = 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$line=new CommandeFournisseurDispatch($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
-			$line->libelle=$langs->trans("Description")." ".$xnbp;
-			$line->qty=10;
+			$line = new CommandeFournisseurDispatch($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->libelle = $langs->trans("Description")." ".$xnbp;
+			$line->qty = 10;
 
-			$line->fk_product=$this->commande->lines[$xnbp]->fk_product;
+			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
 
-			$this->lines[]=$line;
+			$this->lines[] = $line;
 			$xnbp++;
 		}
 	}
@@ -1265,11 +1265,11 @@ 
 		if ($user->rights->reception->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->date_delivery = $date_livraison;
@@ -1277,7 +1277,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1300,17 +1300,17 @@ 
 		$this->meths = array();
 
 		$sql = "SELECT em.rowid, em.code, em.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		$sql.= " WHERE em.active = 1";
-		$sql.= " ORDER BY em.libelle ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		$sql .= " WHERE em.active = 1";
+		$sql .= " ORDER BY em.libelle ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label=$langs->trans('ReceptionMethod'.$obj->code);
-				$this->meths[$obj->rowid] = ($label != 'ReceptionMethod'.$obj->code?$label:$obj->libelle);
+				$label = $langs->trans('ReceptionMethod'.$obj->code);
+				$this->meths[$obj->rowid] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
 			}
 		}
 	}
@@ -1322,17 +1322,17 @@ 
      *  @param  int      $id     only this carrier, all if none
      *  @return void
      */
-    function list_delivery_methods($id='')
+    function list_delivery_methods($id = '')
     {
 		// phpcs:enable
         global $langs;
 
         $this->listmeths = array();
-        $i=0;
+        $i = 0;
 
         $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id!='') $sql.= " WHERE em.rowid=".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+        if ($id != '') $sql .= " WHERE em.rowid=".$id;
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1341,8 +1341,8 @@ 
             {
                 $this->listmeths[$i]['rowid'] = $obj->rowid;
                 $this->listmeths[$i]['code'] = $obj->code;
-                $label=$langs->trans('ReceptionMethod'.$obj->code);
-                $this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code?$label:$obj->libelle);
+                $label = $langs->trans('ReceptionMethod'.$obj->code);
+                $this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
                 $this->listmeths[$i]['description'] = $obj->description;
                 $this->listmeths[$i]['tracking'] = $obj->tracking;
                 $this->listmeths[$i]['active'] = $obj->active;
@@ -1359,26 +1359,26 @@ 
      *
      *  @return void
      */
-    function update_delivery_method($id='')
+    function update_delivery_method($id = '')
     {
 		// phpcs:enable
-        if ($id=='')
+        if ($id == '')
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-            $sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+            $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
         }
         else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql.= " code='".$this->db->escape($this->update['code'])."'";
-            $sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-            $sql.= ",description='".$this->db->escape($this->update['description'])."'";
-            $sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-            $sql.= " WHERE rowid=".$id;
+            $sql .= " code='".$this->db->escape($this->update['code'])."'";
+            $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+            $sql .= ",description='".$this->db->escape($this->update['description'])."'";
+            $sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+            $sql .= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
-        if ($resql < 0) dol_print_error($this->db,'');
+        if ($resql < 0) dol_print_error($this->db, '');
     }
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1393,7 +1393,7 @@ 
     {
 		// phpcs:enable
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-        $sql.= ' WHERE rowid='.$id;
+        $sql .= ' WHERE rowid='.$id;
 
         $resql = $this->db->query($sql);
     }
@@ -1410,7 +1410,7 @@ 
     {
 		// phpcs:enable
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-        $sql.= ' WHERE rowid='.$id;
+        $sql .= ' WHERE rowid='.$id;
 
         $resql = $this->db->query($sql);
     }
@@ -1422,13 +1422,13 @@ 
 	 * @param	string	$value		Value
 	 * @return	void
 	 */
-	function getUrlTrackingStatus($value='')
+	function getUrlTrackingStatus($value = '')
 	{
-		if (! empty($this->shipping_method_id))
+		if (!empty($this->shipping_method_id))
 		{
 			$sql = "SELECT em.code, em.tracking";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-			$sql.= " WHERE em.rowid = ".$this->shipping_method_id;
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+			$sql .= " WHERE em.rowid = ".$this->shipping_method_id;
 
 			$resql = $this->db->query($sql);
 			if ($resql)
@@ -1443,7 +1443,7 @@ 
 		if (!empty($tracking) && !empty($value))
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		}
 		else
 		{
@@ -1458,16 +1458,16 @@ 
 	 */
 	function setClosed()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut='.self::STATUS_CLOSED;
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Set order billed if 100% of order is received (qty in reception lines match qty in order lines)
@@ -1476,17 +1476,17 @@ 
 				$order = new CommandeFournisseur($this->db);
 				$order->fetch($this->origin_id);
 
-				$order->loadReceptions(self::STATUS_CLOSED);		// Fill $order->receptions = array(orderlineid => qty)
+				$order->loadReceptions(self::STATUS_CLOSED); // Fill $order->receptions = array(orderlineid => qty)
 
 				$receptions_match_order = 1;
-				foreach($order->lines as $line)
+				foreach ($order->lines as $line)
 				{
 					$lineid = $line->id;
 					$qty = $line->qty;
-					if (($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->receptions[$lineid] < $qty)
+					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->receptions[$lineid] < $qty)
 					{
 						$receptions_match_order = 0;
-						$text='Qty for order line id '.$lineid.' is '.$qty.'. However in the receptions with status Reception::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->receptions[$lineid].', so we can t close order';
+						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the receptions with status Reception::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->receptions[$lineid].', so we can t close order';
 						dol_syslog($text);
 						break;
 					}
@@ -1498,11 +1498,11 @@ 
 				}
 			}
 
-			$this->statut=self::STATUS_CLOSED;
+			$this->statut = self::STATUS_CLOSED;
 
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -1511,15 +1511,15 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine ?
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " WHERE ed.fk_reception = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 
 				if ($resql)
 				{
@@ -1541,7 +1541,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref));
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref));
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1553,7 +1553,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
@@ -1565,15 +1565,15 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
 			// Call trigger
-			if (! $error)
+			if (!$error)
 			{
-    			$result=$this->call_trigger('RECEPTION_CLOSED',$user);
+    			$result = $this->call_trigger('RECEPTION_CLOSED', $user);
     			if ($result < 0) {
     			    $error++;
     			}
@@ -1585,7 +1585,7 @@ 
             $error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 		    $this->db->commit();
 		    return 1;
@@ -1607,7 +1607,7 @@ 
 	{
 		// phpcs:enable
 	    global $user;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -1616,20 +1616,20 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET  billed=1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=2;
-			$this->billed=1;
+			$this->statut = 2;
+			$this->billed = 1;
 
 			// Call trigger
-			$result=$this->call_trigger('RECEPTION_BILLED',$user);
+			$result = $this->call_trigger('RECEPTION_BILLED', $user);
 			if ($result < 0) {
 				$error++;
 			}
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror;
+			$this->errors[] = $this->db->lasterror;
 		}
 
 		if (empty($error)) {
@@ -1650,23 +1650,23 @@ 
 	 */
 	function reOpen()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut=1, billed=0';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=1;
-			$this->billed=0;
+			$this->statut = 1;
+			$this->billed = 0;
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$numref = $this->ref;
@@ -1675,15 +1675,15 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine
 				$sql = "SELECT ed.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " WHERE ed.fk_reception = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -1706,7 +1706,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref));
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref));
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1718,7 +1718,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr",$numref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1729,31 +1729,31 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
     			// Call trigger
-    			$result=$this->call_trigger('RECEPTION_REOPEN',$user);
+    			$result = $this->call_trigger('RECEPTION_REOPEN', $user);
     			if ($result < 0) {
     				$error++;
     			}
    			}
 
-			if($this->origin == 'order_supplier'){
+			if ($this->origin == 'order_supplier') {
 				$commande = new CommandeFournisseur($this->db);
 				$commande->fetch($this->origin_id);
-				$commande->setStatus($user,4);
+				$commande->setStatus($user, 4);
 			}
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -1776,9 +1776,9 @@ 
     function set_draft($user)
     {
 		// phpcs:enable
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $error=0;
+        $error = 0;
 
         // Protection
         if ($this->statut <= self::STATUS_DRAFT)
@@ -1786,24 +1786,24 @@ 
             return 0;
         }
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
         {
-            $this->error='Permission denied';
+            $this->error = 'Permission denied';
             return -1;
         }
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-        $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             // If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -1812,15 +1812,15 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " ed.eatby, ed.sellby, ed.batch";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-				$sql.= " WHERE ed.fk_reception = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_commandefourndet";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " WHERE ed.fk_reception = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -1843,7 +1843,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref));
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref));
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1856,7 +1856,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr",$this->ref),  $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1867,14 +1867,14 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
             if (!$error) {
             	// Call trigger
-            	$result=$this->call_trigger('RECEPTION_UNVALIDATE',$user);
+            	$result = $this->call_trigger('RECEPTION_UNVALIDATE', $user);
             	if ($result < 0) $error++;
             }
 			if ($this->origin == 'order_supplier')
@@ -1909,17 +1909,17 @@ 
 			}
 
 			if (!$error) {
-           		$this->statut=self::STATUS_DRAFT;
+           		$this->statut = self::STATUS_DRAFT;
             	$this->db->commit();
             	return 1;
-            }else {
+            } else {
             	$this->db->rollback();
             	return -1;
             }
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -1935,19 +1935,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("receptions");
 
-		if (! dol_strlen($modele))
+		if (!dol_strlen($modele))
 		{
 			$modele = 'squille';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->RECEPTION_ADDON_PDF)) {
+			} elseif (!empty($conf->global->RECEPTION_ADDON_PDF)) {
 				$modele = $conf->global->RECEPTION_ADDON_PDF;
 			}
 		}

Braces +215 added lines, -131 removed lines

@@ -34,8 +34,12 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 
 
 /**
@@ -155,14 +159,12 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else
+        } else
 	    {
 		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
 		    return "";
@@ -188,7 +190,9 @@ 
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
+		if (empty($this->fk_project)) {
+		    $this->fk_project = 0;
+		}
 
 		$this->user = $user;
 
@@ -288,16 +292,19 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+					    // For avoid conflicts if trigger used
 					{
 						$result=$this->insertExtraFields();
+					}
 						if ($result < 0)
 						{
 							$error++;
 						}
 					}
+				} else if ($reshook < 0) {
+				    $error++;
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && ! $notrigger)
 				{
@@ -310,8 +317,7 @@ 
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
+					} else
 					{
 						foreach($this->errors as $errmsg)
 						{
@@ -321,24 +327,21 @@ 
 						$this->db->rollback();
 						return -1*$error;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->error()." - sql=$sql";
@@ -363,7 +366,9 @@ 
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) {
+		    return -1;
+		}
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_supplier, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
 		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
@@ -377,10 +382,18 @@ 
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('reception').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-        if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		if ($id) {
+		    $sql.= " AND e.rowid=".$id;
+		}
+        if ($ref) {
+            $sql.= " AND e.ref='".$this->db->escape($ref)."'";
+        }
+        if ($ref_ext) {
+            $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+        }
+        if ($ref_int) {
+            $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+        }
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -435,7 +448,9 @@ 
 
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+				    $this->brouillon = 1;
+				}
 
 				$file = $conf->reception->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'reception') . "/" . $this->id.".pdf";
 				$this->pdf_filename = $file;
@@ -466,15 +481,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
 				$this->error='Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -521,11 +534,12 @@ 
 
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+		    // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
-		else {
+		} else {
 			$numref = $this->ref;
 		}
 
@@ -576,7 +590,9 @@ 
 
 					$qty = $obj->qty;
 
-					if ($qty <= 0) continue;
+					if ($qty <= 0) {
+					    continue;
+					}
 					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 					//var_dump($this->lines[$i]);
@@ -595,8 +611,7 @@ 
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// line with batch detail
 
@@ -611,8 +626,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error();
@@ -682,8 +696,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -739,8 +752,10 @@ 
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+		    // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
+		}
 
 		$line->fk_product = $fk_product;
 		$line->fk_commande = $supplierorderline->fk_commande ;
@@ -770,25 +785,63 @@ 
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) {
+		    $this->ref=trim($this->ref);
+		}
+		if (isset($this->entity)) {
+		    $this->entity=trim($this->entity);
+		}
+		if (isset($this->ref_supplier)) {
+		    $this->ref_supplier=trim($this->ref_supplier);
+		}
+		if (isset($this->socid)) {
+		    $this->socid=trim($this->socid);
+		}
+		if (isset($this->fk_user_author)) {
+		    $this->fk_user_author=trim($this->fk_user_author);
+		}
+		if (isset($this->fk_user_valid)) {
+		    $this->fk_user_valid=trim($this->fk_user_valid);
+		}
+		if (isset($this->fk_delivery_address)) {
+		    $this->fk_delivery_address=trim($this->fk_delivery_address);
+		}
+		if (isset($this->shipping_method_id)) {
+		    $this->shipping_method_id=trim($this->shipping_method_id);
+		}
+		if (isset($this->tracking_number)) {
+		    $this->tracking_number=trim($this->tracking_number);
+		}
+		if (isset($this->statut)) {
+		    $this->statut=(int) $this->statut;
+		}
+		if (isset($this->trueDepth)) {
+		    $this->trueDepth=trim($this->trueDepth);
+		}
+		if (isset($this->trueWidth)) {
+		    $this->trueWidth=trim($this->trueWidth);
+		}
+		if (isset($this->trueHeight)) {
+		    $this->trueHeight=trim($this->trueHeight);
+		}
+		if (isset($this->size_units)) {
+		    $this->size_units=trim($this->size_units);
+		}
+		if (isset($this->weight_units)) {
+		    $this->weight_units=trim($this->weight_units);
+		}
+		if (isset($this->trueWeight)) {
+		    $this->weight=trim($this->trueWeight);
+		}
+		if (isset($this->note_private)) {
+		    $this->note=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+		    $this->note=trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+		    $this->modelpdf=trim($this->modelpdf);
+		}
 
 
 		// Check parameters
@@ -850,8 +903,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -905,8 +957,7 @@ 
 
 					$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref),'', $obj->eatby, $obj->sellby, $obj->batch);  // Price is set to 0, because we don't want to see WAP changed
 				}
-			}
-			else
+			} else
 			{
 				$error++;$this->errors[]="Error ".$this->db->lasterror();
 			}
@@ -921,7 +972,9 @@ 
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
+				if ($res < 0) {
+				    $error++;
+				}
 
 				if (! $error)
 				{
@@ -939,10 +992,12 @@ 
 						{
 						    $this->fetch_origin();
 						    $origin=$this->origin;
-						    if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
+						    if ($this->$origin->statut == 4) {
+						        // If order source of reception is "partially received"
 						    {
                                 // Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
 						        $this->$origin->loadReceptions();
+						    }
 						        //var_dump($this->$origin->receptions);exit;
 						        if (count($this->$origin->receptions) <= 0)
 						        {
@@ -979,35 +1034,30 @@ 
 							}
 
 							return 1;
-						}
-						else
+						} else
 						{
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1048,7 +1098,7 @@ 
 					$line->remise_percent = $obj->remise_percent;
 					$line->label = !empty($obj->label)?$obj->label:$line->product->label;
 					$line->ref_supplier = $obj->ref;
-				}else {
+				} else {
 					$line->qty_asked = 0;
 					$line->description = '';
 					$line->label = $obj->label;
@@ -1066,8 +1116,7 @@ 
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1092,7 +1141,9 @@ 
 
 		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+		    return $url;
+		}
 
 		$linkclose='';
 		if (empty($notooltip))
@@ -1111,8 +1162,12 @@ 
 
 		$picto='sending';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto) {
+		    $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+		    $result.=' ';
+		}
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -1143,33 +1198,63 @@ 
 
 		if ($mode==0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==2)  return $langs->trans($this->statuts[$statut]);
+			if ($statut==0) {
+			    return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+			    return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==2) {
+			    return $langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode==1)
 		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort');
+			if ($statut==0) {
+			    return $langs->trans('StatusReceptionDraftShort');
+			}
+			if ($statut==1) {
+			    return $langs->trans('StatusReceptionValidatedShort');
+			}
+			if ($statut==2) {
+			    return $langs->trans('StatusReceptionProcessedShort');
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6');
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut==1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			}
+			if ($statut==2) {
+			    return img_picto($langs->trans('StatusReceptionProcessed'),'statut6');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans('StatusReceptionProcessed'),'statut6').' '.$langs->trans('StatusReceptionProcessed');
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==2) {
+			    return img_picto($langs->trans('StatusReceptionProcessed'),'statut6').' '.$langs->trans('StatusReceptionProcessed');
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'),'statut6');
+			if ($statut==0) {
+			    return $langs->trans('StatusReceptionDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut==1) {
+			    return $langs->trans('StatusReceptionValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			}
+			if ($statut==2) {
+			    return $langs->trans('StatusReceptionProcessedShort').' '.img_picto($langs->trans('StatusReceptionProcessedShort'),'statut6');
+			}
 		}
 	}
 
@@ -1274,14 +1359,12 @@ 
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -1332,7 +1415,9 @@ 
 
         $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id!='') $sql.= " WHERE em.rowid=".$id;
+        if ($id!='') {
+            $sql.= " WHERE em.rowid=".$id;
+        }
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1367,8 +1452,7 @@ 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
             $sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
-        }
-        else
+        } else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
             $sql.= " code='".$this->db->escape($this->update['code'])."'";
@@ -1378,7 +1462,9 @@ 
             $sql.= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
-        if ($resql < 0) dol_print_error($this->db,'');
+        if ($resql < 0) {
+            dol_print_error($this->db,'');
+        }
     }
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1444,8 +1530,7 @@ 
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
-		}
-		else
+		} else
 		{
 			$this->tracking_url = $value;
 		}
@@ -1530,7 +1615,9 @@ 
 
 						$qty = $obj->qty;
 
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+						    continue;
+						}
 						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						$mouvS = new MouvementStock($this->db);
@@ -1547,8 +1634,7 @@ 
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -1562,8 +1648,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -1578,8 +1663,7 @@ 
     			    $error++;
     			}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
             $error++;
@@ -1589,8 +1673,7 @@ 
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
+		} else
 		{
 		    $this->db->rollback();
 		    return -1;
@@ -1635,8 +1718,7 @@ 
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1693,7 +1775,9 @@ 
 
 						$qty = $obj->qty;
 
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+						    continue;
+						}
 
 						dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid);
 
@@ -1712,8 +1796,7 @@ 
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -1726,8 +1809,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -1757,8 +1839,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1831,7 +1912,9 @@ 
 						$qty = $obj->qty;
 
 
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+						    continue;
+						}
 						dol_syslog(get_class($this)."::reopen reception movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						//var_dump($this->lines[$i]);
@@ -1850,8 +1933,7 @@ 
 								$error++;
 								break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -1864,8 +1946,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -1875,7 +1956,9 @@ 
             if (!$error) {
             	// Call trigger
             	$result=$this->call_trigger('RECEPTION_UNVALIDATE',$user);
-            	if ($result < 0) $error++;
+            	if ($result < 0) {
+            	    $error++;
+            	}
             }
 			if ($this->origin == 'order_supplier')
 			{
@@ -1883,10 +1966,12 @@ 
 				{
 					$this->fetch_origin();
 					$origin = $this->origin;
-					if ($this->$origin->statut == 4)  // If order source of reception is "partially received"
+					if ($this->$origin->statut == 4) {
+					    // If order source of reception is "partially received"
 					{
 						// Check if there is no more reception validated.
 						$this->$origin->fetchObjectLinked();
+					}
 						$setStatut = 1;
 						if (!empty($this->$origin->linkedObjects['reception']))
 						{
@@ -1912,12 +1997,11 @@ 
            		$this->statut=self::STATUS_DRAFT;
             	$this->db->commit();
             	return 1;
-            }else {
+            } else {
             	$this->db->rollback();
             	return -1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();

dolibarr/htdocs/reception/class/receptionstats.class.php

Indentation +67 added lines, -67 removed lines

@@ -34,13 +34,13 @@ 
  */
 class ReceptionStats extends Stats
 {
-	public $table_element;
+    public $table_element;
 
-	var $socid;
+    var $socid;
     var $userid;
 
     var $from;
-	var $field;
+    var $field;
     var $where;
 
 
@@ -48,95 +48,95 @@ 
      * 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)
+     * @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;
+        global $user, $conf;
 
-		$this->db = $db;
+        $this->db = $db;
 
-		$this->socid = ($socid > 0 ? $socid : 0);
+        $this->socid = ($socid > 0 ? $socid : 0);
         $this->userid = $userid;
-		$this->cachefilesuffix = $mode;
+        $this->cachefilesuffix = $mode;
 
         $object=new Reception($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;
-		}
+        $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 reception number by month for a year
      *
-	 * @param	int		$year		Year to scan
-	 * @return	array				Array with number by month
+     * @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.= " 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;
+        $res=$this->_getNbByMonth($year, $sql);
+        return $res;
     }
 
-	/**
-	 * Return receptions 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";
+    /**
+     * Return receptions 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);
-	}
+        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);
+    }
 }
 

Spacing +25 added lines, -25 removed lines

@@ -24,9 +24,9 @@ 
  *  \brief      File of class fo tmanage reception statistics
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT . '/reception/class/reception.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 /**
@@ -52,7 +52,7 @@ 
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
      */
-    function __construct($db, $socid, $mode, $userid=0)
+    function __construct($db, $socid, $mode, $userid = 0)
     {
 		global $user, $conf;
 
@@ -62,20 +62,20 @@ 
         $this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object=new Reception($this->db);
+        $object = new Reception($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->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;
+		$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;
+			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
+        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
     }
 
     /**
@@ -89,14 +89,14 @@ 
         global $user;
 
         $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
-		$sql.= " FROM ".$this->from;
+		$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');
+		$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);
+		$res = $this->_getNbByMonth($year, $sql);
 		return $res;
     }
 
@@ -111,11 +111,11 @@ 
 		global $user;
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
-		$sql.= " FROM ".$this->from;
+		$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');
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+        $sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -130,11 +130,11 @@ 
 		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;
+		$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');
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}

Braces +15 added lines, -5 removed lines

@@ -70,12 +70,16 @@ 
 
 		//$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 (!$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;
+        if ($this->userid > 0) {
+            $this->where.=' AND c.fk_user_author = '.$this->userid;
+        }
     }
 
     /**
@@ -90,7 +94,9 @@ 
 
         $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";
+		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";
@@ -112,7 +118,9 @@ 
 
 		$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";
+		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');
@@ -131,7 +139,9 @@ 
 
 		$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";
+		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');

dolibarr/htdocs/reception/card.php

Indentation +1673 added lines, -1673 removed lines

@@ -47,8 +47,8 @@ 
 if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->fournisseur->enabled)){
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 }
 if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 if (! empty($conf->projet->enabled)) {
@@ -76,16 +76,16 @@ 
 
 if ($origin == 'reception') $result=restrictedArea($user, $origin, $id);
 else {
-	$result=restrictedArea($user, 'reception');
-	if($origin == 'supplierorder'){
-		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+    $result=restrictedArea($user, 'reception');
+    if($origin == 'supplierorder'){
+        if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
+    }else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
 $action		= GETPOST('action','alpha');
 //Select mail models is same action as presend
 if (GETPOST('modelselected')) {
-	$action = 'presend';
+    $action = 'presend';
 }
 $confirm	= GETPOST('confirm','alpha');
 $cancel     = GETPOST('cancel','alpha');
@@ -127,52 +127,52 @@ 
 if (empty($reshook))
 {
     if ($cancel)
-	{
-		$action = '';
-		$object->fetch($id); // show reception also after canceling modification
-	}
+    {
+        $action = '';
+        $object->fetch($id); // show reception also after canceling modification
+    }
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
-	// Reopen
-	if ($action == 'reopen' && $user->rights->reception->creer)
-	{
-	    $object->fetch($id);
-	    $result = $object->reOpen();
-	}
+    // Reopen
+    if ($action == 'reopen' && $user->rights->reception->creer)
+    {
+        $object->fetch($id);
+        $result = $object->reOpen();
+    }
 
-	// Confirm back to draft status
-	if ($action == 'modif' && $user->rights->reception->creer)
-	{
-		$result = $object->set_draft($user);
-		if ($result >= 0)
-		{
-			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-				$model=$object->modelpdf;
-				$ret = $object->fetch($id); // Reload to get new records
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-	}
-
-	// Set incoterm
-	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
-	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
+    // Confirm back to draft status
+    if ($action == 'modif' && $user->rights->reception->creer)
+    {
+        $result = $object->set_draft($user);
+        if ($result >= 0)
+        {
+            // Define output language
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+                $model=$object->modelpdf;
+                $ret = $object->fetch($id); // Reload to get new records
+                $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+        }
+    }
 
-	if ($action == 'setref_supplier')
-	{
+    // Set incoterm
+    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+        $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    }
+
+    if ($action == 'setref_supplier')
+    {
         $result = $object->fetch($id);
         if ($result < 0) {
             setEventMessages($object->error, $object->errors, 'errors');
@@ -186,259 +186,259 @@ 
             header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
             exit;
         }
-	}
+    }
 
-	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 ($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)
-	        // TODO le hook fait double emploi avec le trigger !!
-	        $hookmanager->initHooks(array('receptiondao'));
-	        $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)
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$error++;
-				}
-	        } else if ($reshook < 0)
-	            $error++;
-	    }
+        if (! $error)
+        {
+            // Actions on extra fields (by external module or standard code)
+            // TODO le hook fait double emploi avec le trigger !!
+            $hookmanager->initHooks(array('receptiondao'));
+            $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)
+                {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                    $error++;
+                }
+            } else if ($reshook < 0)
+                $error++;
+        }
 
-	    if ($error)
-	        $action = 'edit_extras';
-	}
+        if ($error)
+            $action = 'edit_extras';
+    }
 
-	// Create reception
-	if ($action == 'add' && $user->rights->reception->creer)
-	{
+    // Create reception
+    if ($action == 'add' && $user->rights->reception->creer)
+    {
 
-		$error = 0;
-		$predef = '';
+        $error = 0;
+        $predef = '';
 
-		$db->begin();
+        $db->begin();
 
-		$object->note = GETPOST('note', 'alpha');
-		$object->origin = $origin;
-		$object->origin_id = $origin_id;
-		$object->fk_project = GETPOST('projectid', 'int');
-		$object->weight = GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
-		$object->sizeH = GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
-		$object->sizeW = GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
-		$object->sizeS = GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
-		$object->size_units = GETPOST('size_units', 'int');
-		$object->weight_units = GETPOST('weight_units', 'int');
+        $object->note = GETPOST('note', 'alpha');
+        $object->origin = $origin;
+        $object->origin_id = $origin_id;
+        $object->fk_project = GETPOST('projectid', 'int');
+        $object->weight = GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
+        $object->sizeH = GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
+        $object->sizeW = GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
+        $object->sizeS = GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
+        $object->size_units = GETPOST('size_units', 'int');
+        $object->weight_units = GETPOST('weight_units', 'int');
 
-		$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+        $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
-		// On va boucler sur chaque ligne du document d'origine pour completer objet reception
-		// avec info diverses + qte a livrer
+        // On va boucler sur chaque ligne du document d'origine pour completer objet reception
+        // avec info diverses + qte a livrer
 
-		if ($object->origin == "supplierorder")
-			$classname = 'CommandeFournisseur';
-		else
-			$classname = ucfirst($object->origin);
-		$objectsrc = new $classname($db);
-		$objectsrc->fetch($object->origin_id);
+        if ($object->origin == "supplierorder")
+            $classname = 'CommandeFournisseur';
+        else
+            $classname = ucfirst($object->origin);
+        $objectsrc = new $classname($db);
+        $objectsrc->fetch($object->origin_id);
 
 
 
-		$object->socid = $objectsrc->socid;
-		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
-		$object->model_pdf = GETPOST('model');
-		$object->date_delivery = $date_delivery;	 // Date delivery planed
-		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
-		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
-		$object->tracking_number = GETPOST('tracking_number', 'alpha');
-		$object->ref_int = GETPOST('ref_int', 'alpha');
-		$object->note_private = GETPOST('note_private', 'none');
-		$object->note_public = GETPOST('note_public', 'none');
-		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
-		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
-
-		$batch_line = array();
-		$stockLine = array();
-		$array_options = array();
-
-		$totalqty = 0;
-
-		$num = 0;
-		foreach ($_POST as $key => $value)
-		{
-			// without batch module enabled
-
-			if (strpos($key, 'qtyasked') !== false)
-			{
-				$num++;
-			}
-		}
-
-		for ($i = 1; $i <= $num; $i++)
-		{
-			$idl = "idl".$i;
-
-			$sub_qty = array();
-			$subtotalqty = 0;
-
-			$j = 0;
-			$batch = "batchl".$i."_0";
-			$stockLocation = "ent1".$i."_0";
-			$qty = "qtyl".$i;
-
-
-
-				//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
-				//reception line for product with no batch management and no multiple stock location
-			if (GETPOST($qty, 'int') > 0)
-				$totalqty += GETPOST($qty, 'int');
-
-
-			// Extrafields
-			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-			$array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
-		}
-
-
-		if ($totalqty > 0)  // There is at least one thing to ship
-		{
-			//var_dump($_POST);exit;
-			for ($i = 1; $i <= $num; $i++)
-			{
-				$lineToTest = '';
-				foreach($objectsrc->lines as $linesrc){
-					if($linesrc->id == GETPOST($idl, 'int'))$lineToTest=$linesrc;
-				}
-				$qty = "qtyl".$i;
-				$comment = "comment".$i;
-				$eatby = "dlc".$i;
-				$sellby = "dluo".$i;
-				$batch = "batch".$i;
-
-
-
-				$timeFormat = '%d/%m/%Y';
-
-				if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->RECEPTION_GETS_ALL_ORDER_PRODUCTS))
-				{
-					$ent = "entl".$i;
-
-					$idl = "idl".$i;
-
-					$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
-
-					if ($entrepot_id < 0)
-						$entrepot_id = '';
-					if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						$entrepot_id = 0;
-					$eatby = GETPOST($eatby, 'alpha');
-					$sellby = GETPOST($sellby, 'alpha');
-					$eatbydate = str_replace('/','-',$eatby);
-					$sellbydate = str_replace('/','-',$sellby);
-
-
-					$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate),strtotime($sellbydate), GETPOST($batch, 'alpha'));
-					if ($ret < 0)
-					{
-						setEventMessages($object->error, $object->errors, 'errors');
-						$error++;
-					}
-				}
-			}
-
-
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	        if ($ret < 0) $error++;
-	        if (! $error)
-	        {
-	            $ret=$object->create($user);		// This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
+        $object->socid = $objectsrc->socid;
+        $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
+        $object->model_pdf = GETPOST('model');
+        $object->date_delivery = $date_delivery;	 // Date delivery planed
+        $object->fk_delivery_address = $objectsrc->fk_delivery_address;
+        $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+        $object->tracking_number = GETPOST('tracking_number', 'alpha');
+        $object->ref_int = GETPOST('ref_int', 'alpha');
+        $object->note_private = GETPOST('note_private', 'none');
+        $object->note_public = GETPOST('note_public', 'none');
+        $object->fk_incoterms = GETPOST('incoterm_id', 'int');
+        $object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
-	            if ($ret <= 0)
-	            {
-	                setEventMessages($object->error, $object->errors, 'errors');
-	                $error++;
-	            }
-	        }
-	    }
-	    else
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	        $error++;
-	    }
+        $batch_line = array();
+        $stockLine = array();
+        $array_options = array();
 
-	    if (! $error)
-	    {
-	        $db->commit();
-	        header("Location: card.php?id=".$object->id);
-	        exit;
-	    }
-	    else
-	    {
-	        $db->rollback();
-	        $_GET["commande_id"]=GETPOST('commande_id','int');
-	        $action='create';
-	    }
-	}
+        $totalqty = 0;
+
+        $num = 0;
+        foreach ($_POST as $key => $value)
+        {
+            // without batch module enabled
+
+            if (strpos($key, 'qtyasked') !== false)
+            {
+                $num++;
+            }
+        }
+
+        for ($i = 1; $i <= $num; $i++)
+        {
+            $idl = "idl".$i;
+
+            $sub_qty = array();
+            $subtotalqty = 0;
+
+            $j = 0;
+            $batch = "batchl".$i."_0";
+            $stockLocation = "ent1".$i."_0";
+            $qty = "qtyl".$i;
+
+
+
+                //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
+                //reception line for product with no batch management and no multiple stock location
+            if (GETPOST($qty, 'int') > 0)
+                $totalqty += GETPOST($qty, 'int');
+
+
+            // Extrafields
+            $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+            $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
+        }
+
+
+        if ($totalqty > 0)  // There is at least one thing to ship
+        {
+            //var_dump($_POST);exit;
+            for ($i = 1; $i <= $num; $i++)
+            {
+                $lineToTest = '';
+                foreach($objectsrc->lines as $linesrc){
+                    if($linesrc->id == GETPOST($idl, 'int'))$lineToTest=$linesrc;
+                }
+                $qty = "qtyl".$i;
+                $comment = "comment".$i;
+                $eatby = "dlc".$i;
+                $sellby = "dluo".$i;
+                $batch = "batch".$i;
+
+
+
+                $timeFormat = '%d/%m/%Y';
 
-	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
+                if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->RECEPTION_GETS_ALL_ORDER_PRODUCTS))
+                {
+                    $ent = "entl".$i;
+
+                    $idl = "idl".$i;
+
+                    $entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
+
+                    if ($entrepot_id < 0)
+                        $entrepot_id = '';
+                    if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                        $entrepot_id = 0;
+                    $eatby = GETPOST($eatby, 'alpha');
+                    $sellby = GETPOST($sellby, 'alpha');
+                    $eatbydate = str_replace('/','-',$eatby);
+                    $sellbydate = str_replace('/','-',$sellby);
+
+
+                    $ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate),strtotime($sellbydate), GETPOST($batch, 'alpha'));
+                    if ($ret < 0)
+                    {
+                        setEventMessages($object->error, $object->errors, 'errors');
+                        $error++;
+                    }
+                }
+            }
+
+
+            // Fill array 'array_options' with data from add form
+            $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+            if ($ret < 0) $error++;
+            if (! $error)
+            {
+                $ret=$object->create($user);		// This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
+
+                if ($ret <= 0)
+                {
+                    setEventMessages($object->error, $object->errors, 'errors');
+                    $error++;
+                }
+            }
+        }
+        else
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            header("Location: card.php?id=".$object->id);
+            exit;
+        }
+        else
+        {
+            $db->rollback();
+            $_GET["commande_id"]=GETPOST('commande_id','int');
+            $action='create';
+        }
+    }
+
+    else if ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
-	)
-	{
-	    $object->fetch_thirdparty();
+           || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
+    )
+    {
+        $object->fetch_thirdparty();
 
-	    $result = $object->valid($user);
+        $result = $object->valid($user);
 
-	    if ($result < 0)
-	    {
-			$langs->load("errors");
-	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
-	    {
-	    	// Define output language
-	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	    	{
-	    		$outputlangs = $langs;
-	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	    		if (! empty($newlang)) {
-	    			$outputlangs = new Translate("", $conf);
-	    			$outputlangs->setDefaultLang($newlang);
-	    		}
-	    		$model=$object->modelpdf;
-	    		$ret = $object->fetch($id); // Reload to get new records
-
-	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
-	    	}
-	    }
-	}
+        if ($result < 0)
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans($object->error), null, 'errors');
+        }
+        else
+        {
+            // Define output language
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+                $model=$object->modelpdf;
+                $ret = $object->fetch($id); // Reload to get new records
 
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
-	{
-	    $result = $object->delete($user);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
-	        exit;
-	    }
-	    else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-	// TODO add alternative status
-	/*else if ($action == 'reopen' && (! empty($user->rights->reception->creer) || ! empty($user->rights->reception->reception_advance->validate)))
+                $result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                if ($result < 0) dol_print_error($db,$result);
+            }
+        }
+    }
+
+    else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+    {
+        $result = $object->delete($user);
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT.'/reception/index.php');
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+    // TODO add alternative status
+    /*else if ($action == 'reopen' && (! empty($user->rights->reception->creer) || ! empty($user->rights->reception->reception_advance->validate)))
 	{
 	    $result = $object->setStatut(0);
 	    if ($result < 0)
@@ -447,262 +447,262 @@ 
 	    }
 	}*/
 
-	else if ($action == 'setdate_livraison' && $user->rights->reception->creer)
-	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+    else if ($action == 'setdate_livraison' && $user->rights->reception->creer)
+    {
+        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+        $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
 
-	    $object->fetch($id);
-	    $result=$object->set_date_livraison($user,$datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-
-	// Action update
-	else if ($action == 'settracking_number' || $action == 'settracking_url'
-	|| $action == 'settrueWeight'
-	|| $action == 'settrueWidth'
-	|| $action == 'settrueHeight'
-	|| $action == 'settrueDepth'
-	|| $action == 'setshipping_method_id')
-	{
-	    $error=0;
+        $object->fetch($id);
+        $result=$object->set_date_livraison($user,$datedelivery);
+        if ($result < 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
-	    if ($action == 'settrueWeight')	{
-	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
-			$object->weight_units = GETPOST('weight_units','int');
-	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
-	    if ($action == 'settrueHeight'){
-	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
-						$object->size_units = GETPOST('size_units','int');
-		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
-
-	    if (! $error)
-	    {
-	        if ($object->update($user) >= 0)
-	        {
-	            header("Location: card.php?id=".$object->id);
-	            exit;
-	        }
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+    // Action update
+    else if ($action == 'settracking_number' || $action == 'settracking_url'
+    || $action == 'settrueWeight'
+    || $action == 'settrueWidth'
+    || $action == 'settrueHeight'
+    || $action == 'settrueDepth'
+    || $action == 'setshipping_method_id')
+    {
+        $error=0;
 
-	    $action="";
-	}
+        if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
+        if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
+        if ($action == 'settrueWeight')	{
+            $object->trueWeight = trim(GETPOST('trueWeight','int'));
+            $object->weight_units = GETPOST('weight_units','int');
+        }
+        if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
+        if ($action == 'settrueHeight'){
+                        $object->trueHeight = trim(GETPOST('trueHeight','int'));
+                        $object->size_units = GETPOST('size_units','int');
+        }
+        if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
+        if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
 
-	// Build document
-	else if ($action == 'builddoc')	// En get ou en post
-	{
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    // Define output language
-	    $outputlangs = $langs;
-	    $newlang='';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$reception->thirdparty->default_lang;
-	    if (! empty($newlang))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result <= 0)
-	    {
-			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-	    }
-	}
+        if (! $error)
+        {
+            if ($object->update($user) >= 0)
+            {
+                header("Location: card.php?id=".$object->id);
+                exit;
+            }
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
 
-	// Delete file in doc form
-	elseif ($action == 'remove_file')
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $action="";
+    }
+
+    // Build document
+    else if ($action == 'builddoc')	// En get ou en post
+    {
+        // Save last template used to generate document
+        if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+        // Define output language
+        $outputlangs = $langs;
+        $newlang='';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$reception->thirdparty->default_lang;
+        if (! empty($newlang))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+        $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+        if ($result <= 0)
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action='';
+        }
+    }
 
-		$upload_dir =	$conf->reception->dir_output ;
-		$file =	$upload_dir	. '/' .	GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
+    // Delete file in doc form
+    elseif ($action == 'remove_file')
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	elseif ($action == 'classifybilled')
-	{
-	    $object->fetch($id);
-	    $result = $object->set_billed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-	    	exit();
-	    }
-	}
+        $upload_dir =	$conf->reception->dir_output ;
+        $file =	$upload_dir	. '/' .	GETPOST('file');
+        $ret=dol_delete_file($file,0,0,0,$object);
+        if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+        else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+    }
 
-	elseif ($action == 'classifyclosed')
-	{
-	    $object->fetch($id);
-	    $result = $object->setClosed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-	    	exit();
-	    }
-	}
+    elseif ($action == 'classifybilled')
+    {
+        $object->fetch($id);
+        $result = $object->set_billed();
+        if($result >= 0) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+    }
+
+    elseif ($action == 'classifyclosed')
+    {
+        $object->fetch($id);
+        $result = $object->setClosed();
+        if($result >= 0) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+    }
 
-	/*
+    /*
 	 *  delete a line
 	 */
-	elseif ($action == 'deleteline' && ! empty($line_id))
-	{
-		$object->fetch($id);
-		$lines = $object->lines;
-		$line = new CommandeFournisseurDispatch($db);
-
-		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			if ($lines[$i]->id == $line_id)
-			{
-					// delete single warehouse line
-					$line->id = $line_id;
-					if (! $error && $line->delete($user) < 0)
-					{
-						$error++;
-					}
-			}
-			unset($_POST["lineid"]);
-		}
-
-		if(! $error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-			exit();
-		}
-		else
-		{
-			setEventMessages($line->error, $line->errors, 'errors');
-		}
-	}
-
-	/*
+    elseif ($action == 'deleteline' && ! empty($line_id))
+    {
+        $object->fetch($id);
+        $lines = $object->lines;
+        $line = new CommandeFournisseurDispatch($db);
+
+        $num_prod = count($lines);
+        for ($i = 0 ; $i < $num_prod ; $i++)
+        {
+            if ($lines[$i]->id == $line_id)
+            {
+                    // delete single warehouse line
+                    $line->id = $line_id;
+                    if (! $error && $line->delete($user) < 0)
+                    {
+                        $error++;
+                    }
+            }
+            unset($_POST["lineid"]);
+        }
+
+        if(! $error) {
+            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+            exit();
+        }
+        else
+        {
+            setEventMessages($line->error, $line->errors, 'errors');
+        }
+    }
+
+    /*
 	 *  Update a line
 	 */
-	else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('save'))
-	{
-		// Clean parameters
-		$qty = 0;
-		$entrepot_id = 0;
-		$batch_id = 0;
-
-		$lines = $object->lines;
-		$num_prod = count($lines);
-		for ($i = 0; $i < $num_prod; $i++)
-		{
-			if ($lines[$i]->id == $line_id)  // we have found line to update
-			{
-				$line = new CommandeFournisseurDispatch($db);
-				$line->fetch($line_id);
-				// Extrafields Lines
-				$extrafieldsline = new ExtraFields($db);
-				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-				$line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
-
-
-				$line->fk_product = $lines[$i]->fk_product;
-
-
-				if ($lines[$i]->fk_product > 0)
-				{
-					// single warehouse reception line
-					$stockLocation = "entl".$line_id;
-					$qty = "qtyl".$line_id;
-					$comment = "comment".$line_id;
-
-
-					$line->id = $line_id;
-					$line->fk_entrepot = GETPOST($stockLocation, 'int');
-					$line->qty = GETPOST($qty, 'int');
-					$line->comment = GETPOST($comment, 'alpha');
-
-					if(!empty($conf->productbatch->enabled)){
-						$batch = "batch".$line_id;
-						$dlc = "dlc".$line_id;
-						$dluo = "dluo".$line_id;
-						$eatby = GETPOST($dlc, 'alpha');
-						$eatbydate = str_replace('/','-',$eatby);
-						$sellby = GETPOST($dluo, 'alpha');
-						$sellbydate = str_replace('/','-',$sellby);
-						$line->batch = GETPOST($batch, 'alpha');
-						$line->eatby = strtotime($eatbydate);
-						$line->sellby = strtotime($sellbydate);
-					}
-
-					if ($line->update($user) < 0)
-					{
-						setEventMessages($line->error, $line->errors, 'errors');
-						$error++;
-					}
-				}
-				else // Product no predefined
-				{
-					$qty = "qtyl".$line_id;
-					$line->id = $line_id;
-					$line->qty = GETPOST($qty, 'int');
-					$line->fk_entrepot = 0;
-					if ($line->update($user) < 0)
-					{
-						setEventMessages($line->error, $line->errors, 'errors');
-						$error++;
-					}
-					unset($_POST[$qty]);
-				}
-			}
-		}
-
-		unset($_POST["lineid"]);
-
-		if (! $error) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				// Define output language
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-		else
-		{
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
-			exit();
-		}
-	}
-
-	else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
-		exit();
-	}
-
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-	// Actions to send emails
-	if (empty($id)) $id=$facid;
-	$trigger_name='RECEPTION_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromreception';
-	$trackid='shi'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+    else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('save'))
+    {
+        // Clean parameters
+        $qty = 0;
+        $entrepot_id = 0;
+        $batch_id = 0;
+
+        $lines = $object->lines;
+        $num_prod = count($lines);
+        for ($i = 0; $i < $num_prod; $i++)
+        {
+            if ($lines[$i]->id == $line_id)  // we have found line to update
+            {
+                $line = new CommandeFournisseurDispatch($db);
+                $line->fetch($line_id);
+                // Extrafields Lines
+                $extrafieldsline = new ExtraFields($db);
+                $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+                $line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+
+
+                $line->fk_product = $lines[$i]->fk_product;
+
+
+                if ($lines[$i]->fk_product > 0)
+                {
+                    // single warehouse reception line
+                    $stockLocation = "entl".$line_id;
+                    $qty = "qtyl".$line_id;
+                    $comment = "comment".$line_id;
+
+
+                    $line->id = $line_id;
+                    $line->fk_entrepot = GETPOST($stockLocation, 'int');
+                    $line->qty = GETPOST($qty, 'int');
+                    $line->comment = GETPOST($comment, 'alpha');
+
+                    if(!empty($conf->productbatch->enabled)){
+                        $batch = "batch".$line_id;
+                        $dlc = "dlc".$line_id;
+                        $dluo = "dluo".$line_id;
+                        $eatby = GETPOST($dlc, 'alpha');
+                        $eatbydate = str_replace('/','-',$eatby);
+                        $sellby = GETPOST($dluo, 'alpha');
+                        $sellbydate = str_replace('/','-',$sellby);
+                        $line->batch = GETPOST($batch, 'alpha');
+                        $line->eatby = strtotime($eatbydate);
+                        $line->sellby = strtotime($sellbydate);
+                    }
+
+                    if ($line->update($user) < 0)
+                    {
+                        setEventMessages($line->error, $line->errors, 'errors');
+                        $error++;
+                    }
+                }
+                else // Product no predefined
+                {
+                    $qty = "qtyl".$line_id;
+                    $line->id = $line_id;
+                    $line->qty = GETPOST($qty, 'int');
+                    $line->fk_entrepot = 0;
+                    if ($line->update($user) < 0)
+                    {
+                        setEventMessages($line->error, $line->errors, 'errors');
+                        $error++;
+                    }
+                    unset($_POST[$qty]);
+                }
+            }
+        }
+
+        unset($_POST["lineid"]);
+
+        if (! $error) {
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+                // Define output language
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+                    $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+                    $newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+
+                $ret = $object->fetch($object->id); // Reload to get new records
+                $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+        }
+        else
+        {
+            header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+            exit();
+        }
+    }
+
+    else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
+        header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+        exit();
+    }
+
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+    // Actions to send emails
+    if (empty($id)) $id=$facid;
+    $trigger_name='RECEPTION_SENTBYMAIL';
+    $paramname='id';
+    $mode='emailfromreception';
+    $trackid='shi'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -741,7 +741,7 @@ 
 
     if ($origin)
     {
-		if($origin == 'supplierorder')$classname = 'CommandeFournisseur';
+        if($origin == 'supplierorder')$classname = 'CommandeFournisseur';
         else $classname = ucfirst($origin);
 
         $object = new $classname($db);
@@ -834,7 +834,7 @@ 
                 print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
                 print '<td colspan="3">';
                 $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        		print $doleditor->Create(1);
+                print $doleditor->Create(1);
                 print "</td></tr>";
             }
 
@@ -877,38 +877,38 @@ 
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$recept,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
-			if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-				// copy from order
-				$orderExtrafields = new Extrafields($db);
-				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
-				if ($object->fetch_optionals($object->id, $orderExtrafieldLabels) > 0) {
-					$recept->array_options = array_merge($recept->array_options, $object->array_options);
-				}
-				print $object->showOptionals($extrafields, 'edit');
-			}
+            if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+                // copy from order
+                $orderExtrafields = new Extrafields($db);
+                $orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
+                if ($object->fetch_optionals($object->id, $orderExtrafieldLabels) > 0) {
+                    $recept->array_options = array_merge($recept->array_options, $object->array_options);
+                }
+                print $object->showOptionals($extrafields, 'edit');
+            }
 
 
             // Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
-				print '<tr>';
-				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
-				print '</td></tr>';
-			}
+            if (!empty($conf->incoterm->enabled))
+            {
+                print '<tr>';
+                print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
+                print '<td colspan="3" class="maxwidthonsmartphone">';
+                print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+                print '</td></tr>';
+            }
 
             // Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/reception/modules_reception.php';
-			$liste = ModelePdfReception::liste_modeles($db);
+            include_once DOL_DOCUMENT_ROOT . '/core/modules/reception/modules_reception.php';
+            $liste = ModelePdfReception::liste_modeles($db);
 
-			if (count($liste) > 1)
-			{
-    			print "<tr><td>".$langs->trans("DefaultModel")."</td>";
+            if (count($liste) > 1)
+            {
+                print "<tr><td>".$langs->trans("DefaultModel")."</td>";
                 print '<td colspan="3">';
-    			print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
+                print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
                 print "</td></tr>\n";
-			}
+            }
 
             print "</table>";
 
@@ -916,64 +916,64 @@ 
 
 
             // Reception lines
-			$numAsked=0;
-			$dispatchLines = array();
-			foreach ($_POST as $key => $value)
-			{
-				// without batch module enabled
-				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
-				{
-					$numAsked ++;
-
-					// $numline=$reg[2] + 1; // line of product
-					$numline = $numAsked;
-					$prod = "product_".$reg[1].'_'.$reg[2];
-					$qty = "qty_".$reg[1].'_'.$reg[2];
-					$ent = "entrepot_".$reg[1].'_'.$reg[2];
-					$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
-					$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
-					$dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
-				}
-
-				// with batch module enabled
-				if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg))
-				{
-					$numAsked++;
-
-					// eat-by date dispatch
-					// $numline=$reg[2] + 1; // line of product
-					$numline = $numAsked;
-					$prod = 'product_batch_'.$reg[1].'_'.$reg[2];
-					$qty = 'qty_'.$reg[1].'_'.$reg[2];
-					$ent = 'entrepot_'.$reg[1].'_'.$reg[2];
-					$pu = 'pu_'.$reg[1].'_'.$reg[2];
-					$lot = 'lot_number_'.$reg[1].'_'.$reg[2];
-					$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1].'_'.$reg[2].'month'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'day'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'year']);
-					$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1].'_'.$reg[2].'month'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'day'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'year']);
-					$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
-					$dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'),'DLC'=> $dDLC,'DLUO'=> $dDLUO,'lot'=> GETPOST($lot, 'alpha'));
-				}
-			}
+            $numAsked=0;
+            $dispatchLines = array();
+            foreach ($_POST as $key => $value)
+            {
+                // without batch module enabled
+                if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
+                {
+                    $numAsked ++;
+
+                    // $numline=$reg[2] + 1; // line of product
+                    $numline = $numAsked;
+                    $prod = "product_".$reg[1].'_'.$reg[2];
+                    $qty = "qty_".$reg[1].'_'.$reg[2];
+                    $ent = "entrepot_".$reg[1].'_'.$reg[2];
+                    $pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
+                    $fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
+                    $dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
+                }
+
+                // with batch module enabled
+                if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg))
+                {
+                    $numAsked++;
+
+                    // eat-by date dispatch
+                    // $numline=$reg[2] + 1; // line of product
+                    $numline = $numAsked;
+                    $prod = 'product_batch_'.$reg[1].'_'.$reg[2];
+                    $qty = 'qty_'.$reg[1].'_'.$reg[2];
+                    $ent = 'entrepot_'.$reg[1].'_'.$reg[2];
+                    $pu = 'pu_'.$reg[1].'_'.$reg[2];
+                    $lot = 'lot_number_'.$reg[1].'_'.$reg[2];
+                    $dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1].'_'.$reg[2].'month'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'day'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'year']);
+                    $dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1].'_'.$reg[2].'month'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'day'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'year']);
+                    $fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
+                    $dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'),'DLC'=> $dDLC,'DLUO'=> $dDLUO,'lot'=> GETPOST($lot, 'alpha'));
+                }
+            }
 
 
             print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    	$i=1;
-    	    	while($i <= $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
+                $i=1;
+                while($i <= $numAsked)
+                {
+                    print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+                    $i++;
+                }
+                print '});
 	            jQuery("#autoreset").click(function() {';
-    	    	$i=1;
-    	    	while($i <= $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
+                $i=1;
+                while($i <= $numAsked)
+                {
+                    print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+                    $i++;
+                }
+                print '});
         	});
             </script>';
 
@@ -994,22 +994,22 @@ 
                 print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
                 print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
                 print '<td align="center">'.$langs->trans("QtyToReceive");
-				if (empty($conf->productbatch->enabled))
-				{
-	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
-				}
+                if (empty($conf->productbatch->enabled))
+                {
+                    print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+                    print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+                }
                 print '</td>';
                 if (! empty($conf->stock->enabled))
                 {
-					print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+                    print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+                }
+                if (!empty($conf->productbatch->enabled))
+                {
+                    print '<td align="left">'.$langs->trans("batch_number").'</td>';
+                    print '<td align="left">'.$langs->trans("EatByDate").'</td>';
+                    print '<td align="left">'.$langs->trans("SellByDate").'</td>';
                 }
-				if (!empty($conf->productbatch->enabled))
-				{
-					print '<td align="left">'.$langs->trans("batch_number").'</td>';
-					print '<td align="left">'.$langs->trans("EatByDate").'</td>';
-					print '<td align="left">'.$langs->trans("SellByDate").'</td>';
-				}
                 print "</tr>\n";
             }
 
@@ -1018,12 +1018,12 @@ 
             while ($indiceAsked <= $numAsked)
             {
                 $product = new Product($db);
-				foreach($object->lines as $supplierLine){
-					if($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id){
-						$line = $supplierLine;
-						break;
-					}
-				}
+                foreach($object->lines as $supplierLine){
+                    if($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id){
+                        $line = $supplierLine;
+                        break;
+                    }
+                }
 
 
                 // Show product and description
@@ -1070,16 +1070,16 @@ 
                     print '</td>';
                 }
                 else
-				{
-				    print "<td>";
+                {
+                    print "<td>";
                     if ($type==1) $text = img_object($langs->trans('Service'),'service');
                     else $text = img_object($langs->trans('Product'),'product');
 
                     if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+                        $text.= ' <strong>'.$line->label.'</strong>';
+                        print $form->textwithtooltip($text,$line->desc,3,'','',$i);
                     } else {
-                    	print $text.' '.nl2br($line->desc);
+                        print $text.' '.nl2br($line->desc);
                     }
 
                     // Show range
@@ -1089,8 +1089,8 @@ 
 
                 // Qty
                 print '<td align="center">'.$line->qty;
-				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
-				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
+                print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
+                print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
                 print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
                 print '</td>';
                 $qtyProdCom=$line->qty;
@@ -1105,96 +1105,96 @@ 
                 print '</td>';
 
 
-				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
-					$quantityToBeDelivered = 0;
-				}
-				else
-				{
-					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
-				}
+                if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                {
+                    $quantityToBeDelivered = 0;
+                }
+                else
+                {
+                    $quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
+                }
                 $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
 
 
-				$warehouseObject = null;
-				if ( !empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
-				{
-				    print '<!-- Case warehouse already known or product not a predefined product -->';
+                $warehouseObject = null;
+                if ( !empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+                {
+                    print '<!-- Case warehouse already known or product not a predefined product -->';
 
-					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
-					$deliverableQty=$dispatchLines[$indiceAsked]['qty'];
+                    $stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
+                    $deliverableQty=$dispatchLines[$indiceAsked]['qty'];
 
 
 
-						// Quantity to send
-						print '<td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						{
+                        // Quantity to send
+                        print '<td align="center">';
+                        if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+                        {
                             if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-						}
-						else print $langs->trans("NA");
-						print '</td>';
-
-						// Stock
-						if (! empty($conf->stock->enabled))
-						{
-							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
-							{
-								// Show warehouse combo list
-								$ent = "entl".$indiceAsked;
-								$idl = "idl".$indiceAsked;
-								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
-								if ($line->fk_product > 0)
-								{
-									print '<!-- Show warehouse selection -->';
-									print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
-								}
-							}
-							else
-							{
-								print $langs->trans("Service");
-							}
-							print '</td>';
-						}
-
-						if (!empty($conf->productbatch->enabled))
-						{
-							if (!empty($product->status_batch))
-							{
-								print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
-								print '<td>';
-								print $form->select_date($dispatchLines[$indiceAsked]['DLC'],'dlc' . $indiceAsked, '', '', 1, "");
-								print '</td>';
-								print '<td>';
-								print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
-								print '</td>';
-							}
-							else {
-								print '<td colspan="3"></td>';
-							}
-						}
-						print "</tr>\n";
-				}
-
-				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0)
-				{
-					$colspan=5;
-					if($conf->productbatch->enabled)$colspan+=3;
-					$orderLineExtrafields = new Extrafields($db);
-					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
-					$srcLine = new CommandeFournisseurLigne($db);
-					$srcLine->fetch_optionals($line->id,$orderLineExtrafieldLabels); // fetch extrafields also available in orderline
-					$line = new CommandeFournisseurDispatch($db);
-					$line->fetch_optionals($object->id,$extralabelslines);
-					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
-					print '<tr class="oddeven">';
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-					print '</tr>';
-				}
+                            print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+                        }
+                        else print $langs->trans("NA");
+                        print '</td>';
+
+                        // Stock
+                        if (! empty($conf->stock->enabled))
+                        {
+                            print '<td align="left">';
+                            if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+                            {
+                                // Show warehouse combo list
+                                $ent = "entl".$indiceAsked;
+                                $idl = "idl".$indiceAsked;
+                                $tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
+                                if ($line->fk_product > 0)
+                                {
+                                    print '<!-- Show warehouse selection -->';
+                                    print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
+                                }
+                            }
+                            else
+                            {
+                                print $langs->trans("Service");
+                            }
+                            print '</td>';
+                        }
+
+                        if (!empty($conf->productbatch->enabled))
+                        {
+                            if (!empty($product->status_batch))
+                            {
+                                print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
+                                print '<td>';
+                                print $form->select_date($dispatchLines[$indiceAsked]['DLC'],'dlc' . $indiceAsked, '', '', 1, "");
+                                print '</td>';
+                                print '<td>';
+                                print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
+                                print '</td>';
+                            }
+                            else {
+                                print '<td colspan="3"></td>';
+                            }
+                        }
+                        print "</tr>\n";
+                }
+
+                //Display lines extrafields
+                if (is_array($extralabelslines) && count($extralabelslines)>0)
+                {
+                    $colspan=5;
+                    if($conf->productbatch->enabled)$colspan+=3;
+                    $orderLineExtrafields = new Extrafields($db);
+                    $orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
+                    $srcLine = new CommandeFournisseurLigne($db);
+                    $srcLine->fetch_optionals($line->id,$orderLineExtrafieldLabels); // fetch extrafields also available in orderline
+                    $line = new CommandeFournisseurDispatch($db);
+                    $line->fetch_optionals($object->id,$extralabelslines);
+                    $line->array_options = array_merge($line->array_options, $srcLine->array_options);
+                    print '<tr class="oddeven">';
+                    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                    print '</tr>';
+                }
 
                 $indiceAsked++;
             }
@@ -1214,7 +1214,7 @@ 
             print '<br>';
         }
         else
-		{
+        {
             dol_print_error($db);
         }
     }
@@ -1226,111 +1226,111 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 {
-	$lines = $object->lines;
+    $lines = $object->lines;
 
-	$num_prod = count($lines);
+    $num_prod = count($lines);
 
-	if ($object->id > 0)
-	{
-		if (!empty($object->origin) && $object->origin_id > 0)
-		{
-			$object->origin = 'CommandeFournisseur';
-			$typeobject = $object->origin;
-			$origin = $object->origin;
-			$origin_id = $object->origin_id;
-			$object->fetch_origin();         // Load property $object->commande, $object->propal, ...
-		}
-
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$res = $object->fetch_optionals($object->id, $extralabels);
-
-		$head=reception_prepare_head($object);
-		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'reception');
-
-		$formconfirm='';
-
-		// Confirm deleteion
-		if ($action == 'delete')
-		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteReception'),$langs->trans("ConfirmDeleteReception",$object->ref),'confirm_delete','',0,1);
-		}
-
-		// Confirmation validation
-		if ($action == 'valid')
-		{
-			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV')
-			{
-				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans("ConfirmValidateReception",$numref);
-
-			if (! empty($conf->notification->enabled))
-			{
-				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-				$notify=new Notify($db);
-				$text.='<br>';
-				$text.=$notify->confirmMessage('RECEPTION_VALIDATE',$object->socid, $object);
-			}
-
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateReception'),$text,'confirm_valid','',0,1);
-		}
-
-		// Confirm cancelation
-		if ($action == 'annuler')
-		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelReception'),$langs->trans("ConfirmCancelReception",$object->ref),'confirm_cancel','',0,1);
-		}
-
-		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;
-
-
-		// Calculate totalWeight and totalVolume for all products
-		// by adding weight and volume of each product line.
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
-
-
-		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);
-		}
-		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
-		{
-		    $objectsrc=new CommandeFournisseur($db);
-		    $objectsrc->fetch($object->$typeobject->id);
-		}
-		// Reception card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
-		$morehtmlref='<div class="refidno">';
-		// Ref customer reception
-
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
-
-		// Thirdparty
+    if ($object->id > 0)
+    {
+        if (!empty($object->origin) && $object->origin_id > 0)
+        {
+            $object->origin = 'CommandeFournisseur';
+            $typeobject = $object->origin;
+            $origin = $object->origin;
+            $origin_id = $object->origin_id;
+            $object->fetch_origin();         // Load property $object->commande, $object->propal, ...
+        }
+
+        $soc = new Societe($db);
+        $soc->fetch($object->socid);
+
+        $res = $object->fetch_optionals($object->id, $extralabels);
+
+        $head=reception_prepare_head($object);
+        dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'reception');
+
+        $formconfirm='';
+
+        // Confirm deleteion
+        if ($action == 'delete')
+        {
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteReception'),$langs->trans("ConfirmDeleteReception",$object->ref),'confirm_delete','',0,1);
+        }
+
+        // Confirmation validation
+        if ($action == 'valid')
+        {
+            $objectref = substr($object->ref, 1, 4);
+            if ($objectref == 'PROV')
+            {
+                $numref = $object->getNextNumRef($soc);
+            }
+            else
+            {
+                $numref = $object->ref;
+            }
+
+            $text = $langs->trans("ConfirmValidateReception",$numref);
+
+            if (! empty($conf->notification->enabled))
+            {
+                require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+                $notify=new Notify($db);
+                $text.='<br>';
+                $text.=$notify->confirmMessage('RECEPTION_VALIDATE',$object->socid, $object);
+            }
+
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateReception'),$text,'confirm_valid','',0,1);
+        }
+
+        // Confirm cancelation
+        if ($action == 'annuler')
+        {
+            $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelReception'),$langs->trans("ConfirmCancelReception",$object->ref),'confirm_cancel','',0,1);
+        }
+
+        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;
+
+
+        // Calculate totalWeight and totalVolume for all products
+        // by adding weight and volume of each product line.
+        $tmparray=$object->getTotalWeightVolume();
+        $totalWeight=$tmparray['weight'];
+        $totalVolume=$tmparray['volume'];
+
+
+        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);
+        }
+        if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
+        {
+            $objectsrc=new CommandeFournisseur($db);
+            $objectsrc->fetch($object->$typeobject->id);
+        }
+        // Reception card
+        $linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+        $morehtmlref='<div class="refidno">';
+        // Ref customer reception
+
+        $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+
+        // Thirdparty
         $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
         // Project
         if (! empty($conf->projet->enabled))
@@ -1367,897 +1367,897 @@ 
                 }
             }
         }
-		$morehtmlref.='</div>';
+        $morehtmlref.='</div>';
 
-		$object->picto = 'sending';
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+        $object->picto = 'sending';
+        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 '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        print '<div class="underbanner clearboth"></div>';
 
         print '<table class="border" width="100%">';
 
-		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-		{
-			print '<tr><td>';
-			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>';
-			print $langs->trans("RefProposal").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'reception');
-			print "</td>\n";
-			print '</tr>';
-		}
-		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-		{
-			print '<tr><td>';
-			print $langs->trans("RefSupplierOrder").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'reception');
-			print "</td>\n";
-			print '</tr>';
-		}
-
-		// Date creation
-		print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
-		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="setdate_livraison">';
-			print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Weight
-		print '<tr><td>';
-		print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->reception->creer);
-		print '</td><td colspan="3">';
-
-		if ($action=='edittrueWeight')
-		{
-			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueWeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
-			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
-		}
+        // Linked documents
+        if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+        {
+            print '<tr><td>';
+            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>';
+            print $langs->trans("RefProposal").'</td>';
+            print '<td colspan="3">';
+            print $objectsrc->getNomUrl(1,'reception');
+            print "</td>\n";
+            print '</tr>';
+        }
+        if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+        {
+            print '<tr><td>';
+            print $langs->trans("RefSupplierOrder").'</td>';
+            print '<td colspan="3">';
+            print $objectsrc->getNomUrl(1,'reception');
+            print "</td>\n";
+            print '</tr>';
+        }
+
+        // Date creation
+        print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+        print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
+        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="setdate_livraison">';
+            print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
+            print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Weight
+        print '<tr><td>';
+        print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->reception->creer);
+        print '</td><td colspan="3">';
+
+        if ($action=='edittrueWeight')
+        {
+            print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input name="action" value="settrueWeight" type="hidden">';
+            print '<input name="id" value="'.$object->id.'" type="hidden">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
+            print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
+            print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+            print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->trueWeight;
+            print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
+        }
 
         // Calculated
-		if ($totalWeight > 0)
-		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
-			//print $totalWeight.' '.measuring_units_string(0,"weight");
-			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');
-			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
-			if (!empty($object->trueWeight)) print ')';
-		}
-		print '</td></tr>';
-
-		// Width
-		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer);
-		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
-		print '</td></tr>';
-
-		// Height
-		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight')
-		{
-			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueHeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
-			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
-		}
-
-		print '</td></tr>';
-
-		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer);
-		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
-		print '</td></tr>';
-
-		// Volume
-		print '<tr><td>';
-		print $langs->trans("Volume");
-		print '</td>';
-		print '<td colspan="3">';
-		$calculatedVolume=0;
-		$volumeUnit=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
-		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit=$object->size_units * 3;
-		}
-		// If reception volume not defined we use sum of products
-		if ($calculatedVolume > 0)
-		{
-			if ($volumeUnit < 50)
-			{
-			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
-			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-		}
-		if ($totalVolume > 0)
-		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
-			//print $totalVolume.' '.measuring_units_string(0,"volume");
-			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');
-			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) print ')';
-		}
-		print "</td>\n";
-		print '</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">';
-
-		// Reception method
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('ReceptionMethod');
-		print '</td>';
-
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editshipping_method_id')
-		{
-			print '<form name="setshipping_method_id" 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="setshipping_method_id">';
-			$object->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($object->shipping_method_id > 0)
-			{
-				// Get code using getLabelFromKey
-				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
-				print $langs->trans("SendingMethod".strtoupper($code));
-			}
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Tracking Number
-
-		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->reception->creer,'string',$object->tracking_number);
-		print '</td></tr>';
-
-		// 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->reception->creer) print '<a href="'.DOL_URL_ROOT.'/reception/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>';
-		}
-
-		print "</table>";
-
-		print '</div>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-
-		// Lines of products
-		if ($action == 'editline')
-		{
-			print '<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
+        if ($totalWeight > 0)
+        {
+            if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+            //print $totalWeight.' '.measuring_units_string(0,"weight");
+            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');
+            //if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
+            if (!empty($object->trueWeight)) print ')';
+        }
+        print '</td></tr>';
+
+        // Width
+        print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
+        print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer);
+        print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
+        print '</td></tr>';
+
+        // Height
+        print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->reception->creer).'</td><td colspan="3">';
+        if($action=='edittrueHeight')
+        {
+            print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input name="action" value="settrueHeight" type="hidden">';
+            print '<input name="id" value="'.$object->id.'" type="hidden">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
+            print $formproduct->select_measuring_units("size_units","size",$object->size_units);
+            print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+            print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+            print '</form>';
+        }
+        else
+        {
+            print $object->trueHeight;
+            print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
+        }
+
+        print '</td></tr>';
+
+        // Depth
+        print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
+        print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer);
+        print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
+        print '</td></tr>';
+
+        // Volume
+        print '<tr><td>';
+        print $langs->trans("Volume");
+        print '</td>';
+        print '<td colspan="3">';
+        $calculatedVolume=0;
+        $volumeUnit=0;
+        if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
+        {
+            $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+            $volumeUnit=$object->size_units * 3;
+        }
+        // If reception volume not defined we use sum of products
+        if ($calculatedVolume > 0)
+        {
+            if ($volumeUnit < 50)
+            {
+                //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+                print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
+            }
+            else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+        }
+        if ($totalVolume > 0)
+        {
+            if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+            //print $totalVolume.' '.measuring_units_string(0,"volume");
+            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');
+            //if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
+            if ($calculatedVolume) print ')';
+        }
+        print "</td>\n";
+        print '</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">';
+
+        // Reception method
+        print '<tr><td height="10">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('ReceptionMethod');
+        print '</td>';
+
+        if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editshipping_method_id')
+        {
+            print '<form name="setshipping_method_id" 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="setshipping_method_id">';
+            $object->fetch_delivery_methods();
+            print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+            print '</form>';
+        }
+        else
+        {
+            if ($object->shipping_method_id > 0)
+            {
+                // Get code using getLabelFromKey
+                $code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+                print $langs->trans("SendingMethod".strtoupper($code));
+            }
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Tracking Number
+
+        print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->reception->creer).'</td><td colspan="3">';
+        print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->reception->creer,'string',$object->tracking_number);
+        print '</td></tr>';
+
+        // 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->reception->creer) print '<a href="'.DOL_URL_ROOT.'/reception/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>';
+        }
+
+        print "</table>";
+
+        print '</div>';
+        print '</div>';
+        print '</div>';
+
+        print '<div class="clearboth"></div>';
+
+
+        // Lines of products
+        if ($action == 'editline')
+        {
+            print '<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
 			<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
 			<input type="hidden" name="action" value="updateline">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="' . $object->id . '">';
-		}
-		print '<br>';
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		// #
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-		{
-			print '<td width="5" align="center">&nbsp;</td>';
-		}
-		// Product/Service
-		print '<td>'.$langs->trans("Products").'</td>';
-		// Comment
-		print '<td>'.$langs->trans("Description").'</td>';
-		// Qty
-		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-		if ($origin && $origin_id > 0)
-		{
-			print '<td align="center">'.$langs->trans("QtyInOtherReceptions").'</td>';
-		}
-		if ($action == 'editline')
-		{
-			$editColspan = 3;
-			if (empty($conf->stock->enabled)) $editColspan--;
-			if (empty($conf->productbatch->enabled)) $editColspan--;
-			print '<td align="center" colspan="'. $editColspan . '">';
-			if ($object->statut <= 1)
-			{
-				print $langs->trans("QtyToReceive").' - ';
-			}
-			else
-			{
-				print $langs->trans("QtyReceived").' - ';
-			}
-			if (! empty($conf->stock->enabled))
-			{
-				print $langs->trans("WarehouseSource").' - ';
-			}
-			if (! empty($conf->productbatch->enabled))
-			{
-				print $langs->trans("Batch");
-			}
-			print '</td>';
-		}
-		else
-		{
-			if ($object->statut <= 1)
-			{
-				print '<td align="center">'.$langs->trans("QtyToReceive").'</td>';
-			}
-			else
-			{
-				print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
-			}
-			if (! empty($conf->stock->enabled))
-			{
-				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
-			}
-
-			if (! empty($conf->productbatch->enabled))
-			{
-				print '<td align="left">'.$langs->trans("Batch").'</td>';
-			}
-		}
-		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
-		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
-		//print '<td align="center">'.$langs->trans("Size").'</td>';
-		if ($object->statut == 0)
-		{
-			print '<td class="linecoledit"></td>';
-			print '<td class="linecoldelete" width="10"></td>';
-		}
-		print "</tr>\n";
-
-		$var=false;
-
-		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-		{
-			$object->fetch_thirdparty();
-			$outputlangs = $langs;
-			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-		}
-
-		// Get list of products already sent for same source object into $alreadysent
-		$alreadysent = array();
-
-		$origin = 'commande_fournisseur';
-
-		if ($origin && $origin_id > 0)
-		{
-    		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql.= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
-    		$sql.= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
-    		//if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-    		$sql.= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
-    		$sql.= ', p.description as product_desc';
-    		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-    		$sql.= ", ".MAIN_DB_PREFIX."reception as e";
-    		$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-    		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql.= " WHERE e.entity IN (".getEntity('reception').")";
-    		$sql.= " AND obj.fk_commande = ".$origin_id;
-    		$sql.= " AND obj.rowid = ed.fk_commandefourndet";
-    		$sql.= " AND ed.fk_reception = e.rowid";
-    		$sql.= " AND ed.fk_reception !=".$object->id;
-    		//if ($filter) $sql.= $filter;
-    		$sql.= " ORDER BY obj.fk_product";
-
-    		dol_syslog("get list of reception lines", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    		    $num = $db->num_rows($resql);
-    		    $i = 0;
-
-    		    while($i < $num)
-    		    {
-        		    $obj = $db->fetch_object($resql);
-        		    if ($obj)
-        		    {
-        		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->receptionline_id]=array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
-        		    }
-        		    $i++;
-    		    }
-    		}
-    		//var_dump($alreadysent);
-		}
-
-		// Loop on each product to send/sent
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
-			print '<tr class="oddeven">';
-
-			// #
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-			{
-				print '<td align="center">'.($i+1).'</td>';
-			}
-
-			// Predefined product or service
-			if ($lines[$i]->fk_product > 0)
-			{
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-				{
-					$prod = new Product($db);
-					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
-				}
-				else
-					$label = (! empty($lines[$i]->product->label)?$lines[$i]->product->label:$lines[$i]->product->product_label);
-
-				print '<td>';
-
-
-
-				$text=$lines[$i]->product->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->product->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
-					print (! empty($lines[$i]->product->description) && $lines[$i]->description!=$lines[$i]->product->description)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
-				}
-				print "</td>\n";
-			}
-			else
-			{
-				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
-
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
-				} else {
-					print $text.' '.nl2br($lines[$i]->description);
-				}
-
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				print "</td>\n";
-			}
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
-			}
-			else
-			{
-				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
-			}
-
-
-			// Qty ordered
-			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
-
-			// Qty in other receptions (with reception and warehouse used)
-    		if ($origin && $origin_id > 0)
-    		{
-    			print '<td align="center" class="nowrap">';
-    			foreach ($alreadysent as $key => $val)
-    			{
-    			    if ($lines[$i]->fk_commandefourndet == $key)
-    			    {
-    			        $j = 0;
-    			        foreach($val as $receptionline_id=> $receptionline_var)
-    			        {
-    			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
-
-    			            $j++;
-    			            if ($j > 1) print '<br>';
-    			            $reception_static->fetch($receptionline_var['reception_id']);
-    			            print $reception_static->getNomUrl(1);
-    			            print ' - '.$receptionline_var['qty'];
-
-    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($receptionline_var['date_valid'], 'dayhour'));
-    			            if (! empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
-    			            {
-    			                $warehousestatic->fetch($receptionline_var['warehouse']);
-    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
-    			            }
-    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-    			        }
-    			    }
-    			}
-    		}
-			print '</td>';
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				// edit mode
-				print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
-				if (! empty($conf->stock->enabled))
-				{
-					if ($lines[$i]->fk_product > 0)
-					{
-						print '<!-- case edit 1 -->';
-						print '<tr>';
-						// Qty to receive or received
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
-						// Warehouse source
-						print '<td>' . $formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
-						// Batch number managment
-						if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch))
-						{
-							print '<td>  <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
-							print $langs->trans('EatByDate').' : ';
-							print $form->select_date($lines[$i]->eatby,'dlc' .$line_id, '', '', 1, ""). '</br>';
-							print $langs->trans('SellByDate').' : ';
-							print $form->select_date($lines[$i]->sellby,'dluo' .$line_id, '', '', 1, "");
-							print '</td>';
-						}
-						print '</tr>';
-					}
-					else
-					{
-						print '<!-- case edit 2 -->';
-						print '<tr>';
-						// Qty to receive or received
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
-						// Warehouse source
-						print '<td>' . '</td>';
-						// Batch number managment
-						print '<td>' . '</td>';
-						print '</tr>';
-					}
-				}
-				print '</table></td>';
-			}
-			else
-			{
-				// Qty to receive or received
-				print '<td align="center">'.$lines[$i]->qty.'</td>';
-
-				// Warehouse source
-				if (! empty($conf->stock->enabled))
-				{
-					print '<td align="left">';
-
-					if ($lines[$i]->fk_entrepot > 0)
-					{
-						$entrepot = new Entrepot($db);
-						$entrepot->fetch($lines[$i]->fk_entrepot);
-						print $entrepot->getNomUrl(1);
-					}
-
-					print '</td>';
-				}
-
-				// Batch number managment
-				if (! empty($conf->productbatch->enabled))
-				{
-					if (isset($lines[$i]->batch))
-					{
-						print '<!-- Detail of lot -->';
-						print '<td>';
-						$detail ='';
-						if ($lines[$i]->product->status_batch)
-						{
-								$detail.= $langs->trans("Batch").': '.$lines[$i]->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby,"day");
-
-								$detail.= '<br>';
-
-							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-						}
-						else
-						{
-							print $langs->trans("NA");
-						}
-						print '</td>';
-					} else {
-						print '<td></td>';
-					}
-				}
-			}
-
-			// Weight
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units,"weight");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Volume
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units,"volume");
-			else print '&nbsp;';
-			print '</td>';
-
-
-			if ($action == 'editline' && $lines[$i]->id == $line_id)
-			{
-				print '<td align="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
-			}
-			else if ($object->statut == 0)
-			{
-				// edit-delete buttons
-				print '<td class="linecoledit" align="center">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
-				print '</td>';
-				print '<td class="linecoldelete" width="10">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
-				print '</td>';
-
-				// Display lines extrafields
-				if (! empty($rowExtrafieldsStart))
-				{
-					print $rowExtrafieldsStart;
-					print $rowExtrafieldsView;
-					print $rowEnd;
-				}
-			}
-			print "</tr>";
-
-			// Display lines extrafields
-			if (is_array($extralabelslines) && count($extralabelslines)>0) {
-				$colspan= empty($conf->productbatch->enabled) ? 8 : 9;
-				$line = new CommandeFournisseurDispatch($db);
-				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
-				print '<tr class="oddeven">';
-				if ($action == 'editline' && $lines[$i]->id == $line_id)
-				{
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				else
-				{
-					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				print '</tr>';
-			}
-		}
-
-		// TODO Show also lines ordered but not delivered
-
-		print "</table>\n";
-		print '</div>';
-	}
-
-
-	dol_fiche_end();
-
-
-	$object->fetchObjectLinked($object->id,$object->element);
-
-
-	/*
+        }
+        print '<br>';
+
+        print '<div class="div-table-responsive-no-min">';
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        // #
+        if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+        {
+            print '<td width="5" align="center">&nbsp;</td>';
+        }
+        // Product/Service
+        print '<td>'.$langs->trans("Products").'</td>';
+        // Comment
+        print '<td>'.$langs->trans("Description").'</td>';
+        // Qty
+        print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+        if ($origin && $origin_id > 0)
+        {
+            print '<td align="center">'.$langs->trans("QtyInOtherReceptions").'</td>';
+        }
+        if ($action == 'editline')
+        {
+            $editColspan = 3;
+            if (empty($conf->stock->enabled)) $editColspan--;
+            if (empty($conf->productbatch->enabled)) $editColspan--;
+            print '<td align="center" colspan="'. $editColspan . '">';
+            if ($object->statut <= 1)
+            {
+                print $langs->trans("QtyToReceive").' - ';
+            }
+            else
+            {
+                print $langs->trans("QtyReceived").' - ';
+            }
+            if (! empty($conf->stock->enabled))
+            {
+                print $langs->trans("WarehouseSource").' - ';
+            }
+            if (! empty($conf->productbatch->enabled))
+            {
+                print $langs->trans("Batch");
+            }
+            print '</td>';
+        }
+        else
+        {
+            if ($object->statut <= 1)
+            {
+                print '<td align="center">'.$langs->trans("QtyToReceive").'</td>';
+            }
+            else
+            {
+                print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
+            }
+            if (! empty($conf->stock->enabled))
+            {
+                print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
+            }
+
+            if (! empty($conf->productbatch->enabled))
+            {
+                print '<td align="left">'.$langs->trans("Batch").'</td>';
+            }
+        }
+        print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
+        print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
+        //print '<td align="center">'.$langs->trans("Size").'</td>';
+        if ($object->statut == 0)
+        {
+            print '<td class="linecoledit"></td>';
+            print '<td class="linecoldelete" width="10"></td>';
+        }
+        print "</tr>\n";
+
+        $var=false;
+
+        if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+        {
+            $object->fetch_thirdparty();
+            $outputlangs = $langs;
+            $newlang='';
+            if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+            if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+            if (! empty($newlang))
+            {
+                $outputlangs = new Translate("",$conf);
+                $outputlangs->setDefaultLang($newlang);
+            }
+        }
+
+        // Get list of products already sent for same source object into $alreadysent
+        $alreadysent = array();
+
+        $origin = 'commande_fournisseur';
+
+        if ($origin && $origin_id > 0)
+        {
+            $sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
+            $sql.= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
+            $sql.= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
+            //if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+            $sql.= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+            $sql.= ', p.description as product_desc';
+            $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+            $sql.= ", ".MAIN_DB_PREFIX."reception as e";
+            $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+            //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+            $sql.= " WHERE e.entity IN (".getEntity('reception').")";
+            $sql.= " AND obj.fk_commande = ".$origin_id;
+            $sql.= " AND obj.rowid = ed.fk_commandefourndet";
+            $sql.= " AND ed.fk_reception = e.rowid";
+            $sql.= " AND ed.fk_reception !=".$object->id;
+            //if ($filter) $sql.= $filter;
+            $sql.= " ORDER BY obj.fk_product";
+
+            dol_syslog("get list of reception lines", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+                $i = 0;
+
+                while($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    if ($obj)
+                    {
+                        // $obj->rowid is rowid in $origin."det" table
+                        $alreadysent[$obj->rowid][$obj->receptionline_id]=array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+                    }
+                    $i++;
+                }
+            }
+            //var_dump($alreadysent);
+        }
+
+        // Loop on each product to send/sent
+        for ($i = 0 ; $i < $num_prod ; $i++)
+        {
+            print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+            print '<tr class="oddeven">';
+
+            // #
+            if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+            {
+                print '<td align="center">'.($i+1).'</td>';
+            }
+
+            // Predefined product or service
+            if ($lines[$i]->fk_product > 0)
+            {
+                // Define output language
+                if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+                {
+                    $prod = new Product($db);
+                    $prod->fetch($lines[$i]->fk_product);
+                    $label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
+                }
+                else
+                    $label = (! empty($lines[$i]->product->label)?$lines[$i]->product->label:$lines[$i]->product->product_label);
+
+                print '<td>';
+
+
+
+                $text=$lines[$i]->product->getNomUrl(1);
+                $text.= ' - '.$label;
+                $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->product->description));
+                print $form->textwithtooltip($text,$description,3,'','',$i);
+                print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+                if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                {
+                    print (! empty($lines[$i]->product->description) && $lines[$i]->description!=$lines[$i]->product->description)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
+                }
+                print "</td>\n";
+            }
+            else
+            {
+                print "<td>";
+                if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
+                else $text = img_object($langs->trans('Product'),'product');
+
+                if (! empty($lines[$i]->label)) {
+                    $text.= ' <strong>'.$lines[$i]->label.'</strong>';
+                    print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+                } else {
+                    print $text.' '.nl2br($lines[$i]->description);
+                }
+
+                print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+                print "</td>\n";
+            }
+
+            if ($action == 'editline' && $lines[$i]->id == $line_id)
+            {
+                print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
+            }
+            else
+            {
+                print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
+            }
+
+
+            // Qty ordered
+            print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
+
+            // Qty in other receptions (with reception and warehouse used)
+            if ($origin && $origin_id > 0)
+            {
+                print '<td align="center" class="nowrap">';
+                foreach ($alreadysent as $key => $val)
+                {
+                    if ($lines[$i]->fk_commandefourndet == $key)
+                    {
+                        $j = 0;
+                        foreach($val as $receptionline_id=> $receptionline_var)
+                        {
+                            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
+
+                            $j++;
+                            if ($j > 1) print '<br>';
+                            $reception_static->fetch($receptionline_var['reception_id']);
+                            print $reception_static->getNomUrl(1);
+                            print ' - '.$receptionline_var['qty'];
+
+                            $htmltext=$langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($receptionline_var['date_valid'], 'dayhour'));
+                            if (! empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
+                            {
+                                $warehousestatic->fetch($receptionline_var['warehouse']);
+                                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+                            }
+                            print ' '.$form->textwithpicto('', $htmltext, 1);
+                        }
+                    }
+                }
+            }
+            print '</td>';
+
+            if ($action == 'editline' && $lines[$i]->id == $line_id)
+            {
+                // edit mode
+                print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
+                if (! empty($conf->stock->enabled))
+                {
+                    if ($lines[$i]->fk_product > 0)
+                    {
+                        print '<!-- case edit 1 -->';
+                        print '<tr>';
+                        // Qty to receive or received
+                        print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
+                        // Warehouse source
+                        print '<td>' . $formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+                        // Batch number managment
+                        if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch))
+                        {
+                            print '<td>  <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
+                            print $langs->trans('EatByDate').' : ';
+                            print $form->select_date($lines[$i]->eatby,'dlc' .$line_id, '', '', 1, ""). '</br>';
+                            print $langs->trans('SellByDate').' : ';
+                            print $form->select_date($lines[$i]->sellby,'dluo' .$line_id, '', '', 1, "");
+                            print '</td>';
+                        }
+                        print '</tr>';
+                    }
+                    else
+                    {
+                        print '<!-- case edit 2 -->';
+                        print '<tr>';
+                        // Qty to receive or received
+                        print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
+                        // Warehouse source
+                        print '<td>' . '</td>';
+                        // Batch number managment
+                        print '<td>' . '</td>';
+                        print '</tr>';
+                    }
+                }
+                print '</table></td>';
+            }
+            else
+            {
+                // Qty to receive or received
+                print '<td align="center">'.$lines[$i]->qty.'</td>';
+
+                // Warehouse source
+                if (! empty($conf->stock->enabled))
+                {
+                    print '<td align="left">';
+
+                    if ($lines[$i]->fk_entrepot > 0)
+                    {
+                        $entrepot = new Entrepot($db);
+                        $entrepot->fetch($lines[$i]->fk_entrepot);
+                        print $entrepot->getNomUrl(1);
+                    }
+
+                    print '</td>';
+                }
+
+                // Batch number managment
+                if (! empty($conf->productbatch->enabled))
+                {
+                    if (isset($lines[$i]->batch))
+                    {
+                        print '<!-- Detail of lot -->';
+                        print '<td>';
+                        $detail ='';
+                        if ($lines[$i]->product->status_batch)
+                        {
+                                $detail.= $langs->trans("Batch").': '.$lines[$i]->batch;
+                                $detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby,"day");
+                                $detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby,"day");
+
+                                $detail.= '<br>';
+
+                            print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+                        }
+                        else
+                        {
+                            print $langs->trans("NA");
+                        }
+                        print '</td>';
+                    } else {
+                        print '<td></td>';
+                    }
+                }
+            }
+
+            // Weight
+            print '<td align="center">';
+            if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units,"weight");
+            else print '&nbsp;';
+            print '</td>';
+
+            // Volume
+            print '<td align="center">';
+            if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units,"volume");
+            else print '&nbsp;';
+            print '</td>';
+
+
+            if ($action == 'editline' && $lines[$i]->id == $line_id)
+            {
+                print '<td align="center" colspan="2" valign="middle">';
+                print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
+                print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+            }
+            else if ($object->statut == 0)
+            {
+                // edit-delete buttons
+                print '<td class="linecoledit" align="center">';
+                print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+                print '</td>';
+                print '<td class="linecoldelete" width="10">';
+                print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+                print '</td>';
+
+                // Display lines extrafields
+                if (! empty($rowExtrafieldsStart))
+                {
+                    print $rowExtrafieldsStart;
+                    print $rowExtrafieldsView;
+                    print $rowEnd;
+                }
+            }
+            print "</tr>";
+
+            // Display lines extrafields
+            if (is_array($extralabelslines) && count($extralabelslines)>0) {
+                $colspan= empty($conf->productbatch->enabled) ? 8 : 9;
+                $line = new CommandeFournisseurDispatch($db);
+                $line->fetch_optionals($lines[$i]->id,$extralabelslines);
+                print '<tr class="oddeven">';
+                if ($action == 'editline' && $lines[$i]->id == $line_id)
+                {
+                    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                }
+                else
+                {
+                    print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+                }
+                print '</tr>';
+            }
+        }
+
+        // TODO Show also lines ordered but not delivered
+
+        print "</table>\n";
+        print '</div>';
+    }
+
+
+    dol_fiche_end();
+
+
+    $object->fetchObjectLinked($object->id,$object->element);
+
+
+    /*
 	 *    Boutons actions
 	 */
 
-	if (($user->societe_id == 0) && ($action!='presend'))
-	{
-		print '<div class="tabsAction">';
-
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-
-			if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0)
-			{
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
-					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
-				}
-			}
-			// Edit
-			if ($object->statut == Reception::STATUS_VALIDATED && $user->rights->reception->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
-			}
-
-			// TODO add alternative status
-			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
-			if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer)
-			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else
-				{
-			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-			}
-
-			// Send
-			if ($object->statut > 0)
-			{
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
-				}
-				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
-			}
-
-			// Create bill
-			if (! empty($conf->fournisseur->enabled) && ($object->statut == Reception::STATUS_VALIDATED || $object->statut == Reception::STATUS_CLOSED))
-			{
-				if ($user->rights->fournisseur->facture->creer)
-				{
-					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
-					// If we do that, we must also make this option official.
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
-				}
-			}
-
-
-			// Close
-			if ($object->statut == Reception::STATUS_VALIDATED)
-			{
-				if ($user->rights->reception->creer && $object->statut > 0 && ! $object->billed)
-				{
-					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
-					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
-					if (! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-					{
-					    $label="ClassifyBilled";
-					    $paramaction='classifybilled';
-					}
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
-				}
-			}
-
-			if ($user->rights->reception->supprimer)
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-			}
-		}
-
-		print '</div>';
-	}
-
-
-	/*
+    if (($user->societe_id == 0) && ($action!='presend'))
+    {
+        print '<div class="tabsAction">';
+
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook))
+        {
+
+            if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0)
+            {
+                if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
+                   || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+                }
+                else
+                {
+                    print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
+                }
+            }
+            // Edit
+            if ($object->statut == Reception::STATUS_VALIDATED && $user->rights->reception->creer) {
+                print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
+            }
+
+            // TODO add alternative status
+            // 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
+            if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer)
+            {
+                if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
+                }
+                else
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+                }
+            }
+
+            // Send
+            if ($object->statut > 0)
+            {
+                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
+                }
+                else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+            }
+
+            // Create bill
+            if (! empty($conf->fournisseur->enabled) && ($object->statut == Reception::STATUS_VALIDATED || $object->statut == Reception::STATUS_CLOSED))
+            {
+                if ($user->rights->fournisseur->facture->creer)
+                {
+                    // TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
+                    // If we do that, we must also make this option official.
+                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+                }
+            }
+
+
+            // Close
+            if ($object->statut == Reception::STATUS_VALIDATED)
+            {
+                if ($user->rights->reception->creer && $object->statut > 0 && ! $object->billed)
+                {
+                    $label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
+                    // Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
+                    if (! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+                    {
+                        $label="ClassifyBilled";
+                        $paramaction='classifybilled';
+                    }
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
+                }
+            }
+
+            if ($user->rights->reception->supprimer)
+            {
+                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+            }
+        }
+
+        print '</div>';
+    }
+
+
+    /*
 	 * Documents generated
 	 */
 
-	if ($action != 'presend' && $action != 'editline')
-	{
+    if ($action != 'presend' && $action != 'editline')
+    {
         print '<div class="fichecenter"><div class="fichehalfleft">';
 
         $objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->reception->dir_output . "/" .$objectref;
+        $filedir = $conf->reception->dir_output . "/" .$objectref;
 
-		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+        $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-		$genallowed=$user->rights->reception->lire;
-		$delallowed=$user->rights->reception->creer;
+        $genallowed=$user->rights->reception->lire;
+        $delallowed=$user->rights->reception->creer;
 
-		print $formfile->showdocuments('reception',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+        print $formfile->showdocuments('reception',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
 
-		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-		$somethingshown = $form->showLinkedObjectBlock($object, '');
+        // Show links to link elements
+        //$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+        $somethingshown = $form->showLinkedObjectBlock($object, '');
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-	}
+        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    }
 
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->reception->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('receptions');
-		}
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$object->error,$object->errors);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->reception->dir_output . '/reception/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendReceptionByEMail'));
-		dol_fiche_head('');
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+    if ($action == 'presend')
+    {
+        $ref = dol_sanitizeFileName($object->ref);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $fileparams = dol_most_recent_file($conf->reception->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+        $file=$fileparams['fullname'];
+        // Define output language
+        $outputlangs = $langs;
+        $newlang = '';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+            $newlang = $_REQUEST['lang_id'];
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+            $newlang = $object->thirdparty->default_lang;
+        if (!empty($newlang))
+        {
+            $outputlangs = new Translate('', $conf);
+            $outputlangs->setDefaultLang($newlang);
+            $outputlangs->load('receptions');
+        }
+        // Build document if it not exists
+        if (! $file || ! is_readable($file))
+        {
+            $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if ($result <= 0)
+            {
+                dol_print_error($db,$object->error,$object->errors);
+                exit;
+            }
+            $fileparams = dol_most_recent_file($conf->reception->dir_output . '/reception/' . $ref, preg_quote($ref, '/').'[^\-]+');
+            $file=$fileparams['fullname'];
+        }
+        print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+        print '<div class="clearboth"></div>';
+        print '<br>';
+        print load_fiche_titre($langs->trans('SendReceptionByEMail'));
+        dol_fiche_head('');
+        // Cree l'objet formulaire mail
+        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+        $formmail = new FormMail($db);
+        $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
         $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
         if($formmail->fromtype === 'user'){
             $formmail->fromid = $user->id;
         }
-		$formmail->trackid='shi'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$outputlangs->trans('SendReceptionRef','__RECEPTIONREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object,$langs);
-		$formmail->substit['__RECEPTIONREF__']=$object->ref;
-		$formmail->substit['__RECEPTIONTRACKNUM__']=$object->tracking_number;
-		$formmail->substit['__RECEPTIONTRACKNUMURL__']=$object->tracking_url;
-		//Find the good contact adress
-		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);
-		}
-		$custcontact='';
-		$contactarr=array();
-		if (is_object($objectsrc))    // For the case the reception was created without orders
-		{
-    		$contactarr=$objectsrc->liste_contact(-1,'external');
-		}
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='reception_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['receptionid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-		// Show form
-		print $formmail->get_form();
-		dol_fiche_end();
-	}
+        $formmail->trackid='shi'.$object->id;
+        if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+        {
+            include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+            $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
+        }
+        $formmail->withfrom=1;
+        $liste=array();
+        foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+        $formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+        $formmail->withtocc=$liste;
+        $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+        $formmail->withtopic=$outputlangs->trans('SendReceptionRef','__RECEPTIONREF__');
+        $formmail->withfile=2;
+        $formmail->withbody=1;
+        $formmail->withdeliveryreceipt=1;
+        $formmail->withcancel=1;
+        // Tableau des substitutions
+        $formmail->setSubstitFromObject($object,$langs);
+        $formmail->substit['__RECEPTIONREF__']=$object->ref;
+        $formmail->substit['__RECEPTIONTRACKNUM__']=$object->tracking_number;
+        $formmail->substit['__RECEPTIONTRACKNUMURL__']=$object->tracking_url;
+        //Find the good contact adress
+        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);
+        }
+        $custcontact='';
+        $contactarr=array();
+        if (is_object($objectsrc))    // For the case the reception was created without orders
+        {
+            $contactarr=$objectsrc->liste_contact(-1,'external');
+        }
+        if (is_array($contactarr) && count($contactarr)>0) {
+            foreach($contactarr as $contact) {
+                if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
+                    require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+                    $contactstatic=new Contact($db);
+                    $contactstatic->fetch($contact['id']);
+                    $custcontact=$contactstatic->getFullName($langs,1);
+                }
+            }
+            if (!empty($custcontact)) {
+                $formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+            }
+        }
+        // Tableau des parametres complementaires
+        $formmail->param['action']='send';
+        $formmail->param['models']='reception_send';
+        $formmail->param['models_id']=GETPOST('modelmailselected','int');
+        $formmail->param['receptionid']=$object->id;
+        $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+        // Init list of files
+        if (GETPOST("mode")=='init')
+        {
+            $formmail->clear_attached_files();
+            $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+        }
+        // Show form
+        print $formmail->get_form();
+        dol_fiche_end();
+    }
 }
 
 

Braces +315 added lines, -187 removed lines

@@ -44,13 +44,19 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
 if (! empty($conf->fournisseur->enabled)){
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 }
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (! empty($conf->productbatch->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.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';
@@ -58,29 +64,49 @@ 
 
 $langs->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal'));
 
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
+if (!empty($conf->incoterm->enabled)) {
+    $langs->load('incoterm');
+}
+if (! empty($conf->productbatch->enabled)) {
+    $langs->load('productbatch');
+}
 
 $origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'reception';   // Example: commande, propal
 $origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
 $id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('originid','int');    // Id of order or propal
+if (empty($origin_id)) {
+    $origin_id  = GETPOST('origin_id','int');
+}
+// Id of order or propal
+if (empty($origin_id)) {
+    $origin_id  = GETPOST('object_id','int');
+}
+// Id of order or propal
+if (empty($origin_id)) {
+    $origin_id  = GETPOST('originid','int');
+}
+// Id of order or propal
 $ref=GETPOST('ref','alpha');
 $line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
 
 // Security check
 $socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 
-if ($origin == 'reception') $result=restrictedArea($user, $origin, $id);
-else {
+if ($origin == 'reception') {
+    $result=restrictedArea($user, $origin, $id);
+} else {
 	$result=restrictedArea($user, 'reception');
 	if($origin == 'supplierorder'){
-		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
-}
+		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) {
+		    accessforbidden();
+		}
+	} else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+	    accessforbidden();
+	}
+	}
 
 $action		= GETPOST('action','alpha');
 //Select mail models is same action as presend
@@ -122,7 +148,9 @@ 
 
 $parameters=array();
 $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 ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -152,8 +180,12 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+				    $newlang = GETPOST('lang_id','aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				    $newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -193,7 +225,9 @@ 
 	    // 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 ($ret < 0) {
+	        $error++;
+	    }
 
 	    if (! $error)
 	    {
@@ -209,12 +243,14 @@ 
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-	        } else if ($reshook < 0)
-	            $error++;
+	        } else if ($reshook < 0) {
+	        	            $error++;
+	        }
 	    }
 
-	    if ($error)
-	        $action = 'edit_extras';
+	    if ($error) {
+	    	        $action = 'edit_extras';
+	    }
 	}
 
 	// Create reception
@@ -242,10 +278,11 @@ 
 		// On va boucler sur chaque ligne du document d'origine pour completer objet reception
 		// avec info diverses + qte a livrer
 
-		if ($object->origin == "supplierorder")
-			$classname = 'CommandeFournisseur';
-		else
-			$classname = ucfirst($object->origin);
+		if ($object->origin == "supplierorder") {
+					$classname = 'CommandeFournisseur';
+		} else {
+					$classname = ucfirst($object->origin);
+		}
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($object->origin_id);
 
@@ -297,8 +334,9 @@ 
 
 				//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//reception line for product with no batch management and no multiple stock location
-			if (GETPOST($qty, 'int') > 0)
-				$totalqty += GETPOST($qty, 'int');
+			if (GETPOST($qty, 'int') > 0) {
+							$totalqty += GETPOST($qty, 'int');
+			}
 
 
 			// Extrafields
@@ -307,14 +345,19 @@ 
 		}
 
 
-		if ($totalqty > 0)  // There is at least one thing to ship
+		if ($totalqty > 0) {
+		    // There is at least one thing to ship
 		{
 			//var_dump($_POST);exit;
-			for ($i = 1; $i <= $num; $i++)
+			for ($i = 1;
+		}
+		$i <= $num; $i++)
 			{
 				$lineToTest = '';
 				foreach($objectsrc->lines as $linesrc){
-					if($linesrc->id == GETPOST($idl, 'int'))$lineToTest=$linesrc;
+					if($linesrc->id == GETPOST($idl, 'int')) {
+					    $lineToTest=$linesrc;
+					}
 				}
 				$qty = "qtyl".$i;
 				$comment = "comment".$i;
@@ -334,10 +377,12 @@ 
 
 					$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
 
-					if ($entrepot_id < 0)
-						$entrepot_id = '';
-					if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-						$entrepot_id = 0;
+					if ($entrepot_id < 0) {
+											$entrepot_id = '';
+					}
+					if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+											$entrepot_id = 0;
+					}
 					$eatby = GETPOST($eatby, 'alpha');
 					$sellby = GETPOST($sellby, 'alpha');
 					$eatbydate = str_replace('/','-',$eatby);
@@ -356,7 +401,9 @@ 
 
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	        if ($ret < 0) $error++;
+	        if ($ret < 0) {
+	            $error++;
+	        }
 	        if (! $error)
 	        {
 	            $ret=$object->create($user);		// This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
@@ -367,8 +414,7 @@ 
 	                $error++;
 	            }
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
@@ -379,16 +425,13 @@ 
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else
+	    } else
 	    {
 	        $db->rollback();
 	        $_GET["commande_id"]=GETPOST('commande_id','int');
 	        $action='create';
 	    }
-	}
-
-	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} else if ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
        	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
 	)
@@ -401,16 +444,19 @@ 
 	    {
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
+	    } else
 	    {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+	    		    $newlang = GETPOST('lang_id','aZ09');
+	    		}
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+	    		    $newlang = $object->thirdparty->default_lang;
+	    		}
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
 	    			$outputlangs->setDefaultLang($newlang);
@@ -419,20 +465,19 @@ 
 	    		$ret = $object->fetch($id); // Reload to get new records
 
 	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
+	    		if ($result < 0) {
+	    		    dol_print_error($db,$result);
+	    		}
 	    	}
 	    }
-	}
-
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+	} else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
 	{
 	    $result = $object->delete($user);
 	    if ($result > 0)
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
 	        exit;
-	    }
-	    else
+	    } else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
@@ -470,19 +515,29 @@ 
 	{
 	    $error=0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
+	    if ($action == 'settracking_number') {
+	        $object->tracking_number = trim(GETPOST('tracking_number','alpha'));
+	    }
+	    if ($action == 'settracking_url') {
+	        $object->tracking_url = trim(GETPOST('tracking_url','int'));
+	    }
 	    if ($action == 'settrueWeight')	{
 	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
 			$object->weight_units = GETPOST('weight_units','int');
 	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
+	    if ($action == 'settrueWidth') {
+	        $object->trueWidth = trim(GETPOST('trueWidth','int'));
+	    }
 	    if ($action == 'settrueHeight'){
 	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
 						$object->size_units = GETPOST('size_units','int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    if ($action == 'settrueDepth') {
+	        $object->trueDepth = trim(GETPOST('trueDepth','int'));
+	    }
+	    if ($action == 'setshipping_method_id') {
+	        $object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    }
 
 	    if (! $error)
 	    {
@@ -498,16 +553,22 @@ 
 	}
 
 	// Build document
-	else if ($action == 'builddoc')	// En get ou en post
+	else if ($action == 'builddoc') {
+	    // En get ou en post
 	{
 		// Save last template used to generate document
 		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+	}
 
 	    // Define output language
 	    $outputlangs = $langs;
 	    $newlang='';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$reception->thirdparty->default_lang;
+	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+	        $newlang=GETPOST('lang_id','aZ09');
+	    }
+	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+	        $newlang=$reception->thirdparty->default_lang;
+	    }
 	    if (! empty($newlang))
 	    {
 	        $outputlangs = new Translate("",$conf);
@@ -529,11 +590,12 @@ 
 		$upload_dir =	$conf->reception->dir_output ;
 		$file =	$upload_dir	. '/' .	GETPOST('file');
 		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
-	elseif ($action == 'classifybilled')
+		if ($ret) {
+		    setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+		    setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -541,9 +603,7 @@ 
 	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 	    	exit();
 	    }
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -580,8 +640,7 @@ 
 		if(! $error) {
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 			exit();
-		}
-		else
+		} else
 		{
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
@@ -601,9 +660,11 @@ 
 		$num_prod = count($lines);
 		for ($i = 0; $i < $num_prod; $i++)
 		{
-			if ($lines[$i]->id == $line_id)  // we have found line to update
+			if ($lines[$i]->id == $line_id) {
+			    // we have found line to update
 			{
 				$line = new CommandeFournisseurDispatch($db);
+			}
 				$line->fetch($line_id);
 				// Extrafields Lines
 				$extrafieldsline = new ExtraFields($db);
@@ -645,8 +706,7 @@ 
 						setEventMessages($line->error, $line->errors, 'errors');
 						$error++;
 					}
-				}
-				else // Product no predefined
+				} else // Product no predefined
 				{
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
@@ -669,10 +729,12 @@ 
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+									$newlang = GETPOST('lang_id','aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+									$newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -681,15 +743,12 @@ 
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
+		} else
 		{
 			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
-	}
-
-	else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
+	} else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
 		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -697,7 +756,9 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id=$facid;
+	if (empty($id)) {
+	    $id=$facid;
+	}
 	$trigger_name='RECEPTION_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromreception';
@@ -741,19 +802,26 @@ 
 
     if ($origin)
     {
-		if($origin == 'supplierorder')$classname = 'CommandeFournisseur';
-        else $classname = ucfirst($origin);
+		if($origin == 'supplierorder') {
+		    $classname = 'CommandeFournisseur';
+		} else {
+            $classname = ucfirst($origin);
+        }
 
         $object = new $classname($db);
-        if ($object->fetch($origin_id))	// This include the fetch_lines
+        if ($object->fetch($origin_id)) {
+            // This include the fetch_lines
         {
             $soc = new Societe($db);
+        }
             $soc->fetch($object->socid);
 
             $author = new User($db);
             $author->fetch($object->user_author_id);
 
-            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+            if (! empty($conf->stock->enabled)) {
+                $entrepot = new Entrepot($db);
+            }
 
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -784,8 +852,11 @@ 
             print "</tr>\n";
             // Ref client
             print '<tr><td>';
-            if ($origin == 'supplier_order') print $langs->trans('RefSupplierOrder');
-            else print $langs->trans('RefSupplier');
+            if ($origin == 'supplier_order') {
+                print $langs->trans('RefSupplierOrder');
+            } else {
+                print $langs->trans('RefSupplier');
+            }
             print '</td><td colspan="3">';
             print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
             print '</td>';
@@ -800,8 +871,12 @@ 
             if (! empty($conf->projet->enabled))
             {
                 $projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
-                if(empty($projectid) && ! empty($object->fk_project)) $projectid = $object->fk_project;
-                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+                if(empty($projectid) && ! empty($object->fk_project)) {
+                    $projectid = $object->fk_project;
+                }
+                if ($origin == 'project') {
+                    $projectid = ($originid ? $originid : 0);
+                }
 
                 $langs->load("projects");
                 print '<tr>';
@@ -863,7 +938,9 @@ 
             print '<td colspan="3">';
             $recept->fetch_delivery_methods();
             print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id','int'),1,0,0,"",1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print "</td></tr>\n";
 
             // Tracking number
@@ -1030,17 +1107,23 @@ 
                 $type=$line->product_type?$line->product_type:$line->fk_product_type;
                 // Try to enhance type detection using date_start and date_end for free lines where type
                 // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
+                if (! empty($line->date_start)) {
+                    $type=1;
+                }
+                if (! empty($line->date_end)) {
+                    $type=1;
+                }
 
                 print '<!-- line '.$line->rowid.' for product -->'."\n";
                 print '<tr class="oddeven">'."\n";
 
 
                 // Product label
-                if ($line->fk_product > 0)  // If predefined product
+                if ($line->fk_product > 0) {
+                    // If predefined product
                 {
                     $product->fetch($line->fk_product);
+                }
                     $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
                     //var_dump($product->stock_warehouse[1]);
 
@@ -1068,12 +1151,14 @@ 
                     }
 
                     print '</td>';
-                }
-                else
+                } else
 				{
 				    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
+                    if ($type==1) {
+                        $text = img_object($langs->trans('Service'),'service');
+                    } else {
+                        $text = img_object($langs->trans('Product'),'product');
+                    }
 
                     if (! empty($line->label)) {
                     	$text.= ' <strong>'.$line->label.'</strong>';
@@ -1108,8 +1193,7 @@ 
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$quantityToBeDelivered = 0;
-				}
-				else
+				} else
 				{
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
@@ -1117,9 +1201,11 @@ 
 
 
 				$warehouseObject = null;
-				if ( !empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+				if ( !empty($conf->stock->enabled)) {
+				    // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
 				    print '<!-- Case warehouse already known or product not a predefined product -->';
+				}
 
 					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
 					$deliverableQty=$dispatchLines[$indiceAsked]['qty'];
@@ -1130,21 +1216,26 @@ 
 						print '<td align="center">';
 						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) {
+                                $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            }
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+						} else {
+						    print $langs->trans("NA");
 						}
-						else print $langs->trans("NA");
 						print '</td>';
 
 						// Stock
 						if (! empty($conf->stock->enabled))
 						{
 							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							    // Type of product need stock change ?
 							{
 								// Show warehouse combo list
 								$ent = "entl".$indiceAsked;
+							}
 								$idl = "idl".$indiceAsked;
 								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
 								if ($line->fk_product > 0)
@@ -1152,8 +1243,7 @@ 
 									print '<!-- Show warehouse selection -->';
 									print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
 								}
-							}
-							else
+							} else
 							{
 								print $langs->trans("Service");
 							}
@@ -1171,8 +1261,7 @@ 
 								print '<td>';
 								print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
 								print '</td>';
-							}
-							else {
+							} else {
 								print '<td colspan="3"></td>';
 							}
 						}
@@ -1183,7 +1272,9 @@ 
 				if (is_array($extralabelslines) && count($extralabelslines)>0)
 				{
 					$colspan=5;
-					if($conf->productbatch->enabled)$colspan+=3;
+					if($conf->productbatch->enabled) {
+					    $colspan+=3;
+					}
 					$orderLineExtrafields = new Extrafields($db);
 					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
 					$srcLine = new CommandeFournisseurLigne($db);
@@ -1212,21 +1303,20 @@ 
             print '</form>';
 
             print '<br>';
-        }
-        else
+        } else
 		{
             dol_print_error($db);
         }
     }
-}
-else if ($id || $ref)
-/* *************************************************************************** */
+} else if ($id || $ref) {
+    /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
 /*                                                                             */
 /* *************************************************************************** */
 {
 	$lines = $object->lines;
+}
 
 	$num_prod = count($lines);
 
@@ -1264,8 +1354,7 @@ 
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
+			} else
 			{
 				$numref = $object->ref;
 			}
@@ -1292,8 +1381,11 @@ 
 		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;
+		    if (empty($reshook)) {
+		        $formconfirm.=$hookmanager->resPrint;
+		    } elseif ($reshook > 0) {
+		        $formconfirm=$hookmanager->resPrint;
+		    }
 		}
 
 		// Print form confirm
@@ -1419,7 +1511,9 @@ 
 		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>';
+		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')
@@ -1430,8 +1524,7 @@ 
 			print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
 		}
@@ -1454,8 +1547,7 @@ 
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
@@ -1464,11 +1556,15 @@ 
         // Calculated
 		if ($totalWeight > 0)
 		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+			if (!empty($object->trueWeight)) {
+			    print ' ('.$langs->trans("SumOfProductWeights").': ';
+			}
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
 			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');
 			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
-			if (!empty($object->trueWeight)) print ')';
+			if (!empty($object->trueWeight)) {
+			    print ')';
+			}
 		}
 		print '</td></tr>';
 
@@ -1491,8 +1587,7 @@ 
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
@@ -1525,16 +1620,21 @@ 
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
+			} else {
+			    print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 		}
 		if ($totalVolume > 0)
 		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			if ($calculatedVolume) {
+			    print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			}
 			//print $totalVolume.' '.measuring_units_string(0,"volume");
 			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');
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) print ')';
+			if ($calculatedVolume) {
+			    print ')';
+			}
 		}
 		print "</td>\n";
 		print '</tr>';
@@ -1559,7 +1659,9 @@ 
 		print $langs->trans('ReceptionMethod');
 		print '</td>';
 
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'),1).'</a></td>';
+		if ($action != 'editshipping_method_id') {
+		    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'),1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshipping_method_id')
@@ -1569,11 +1671,12 @@ 
 			print '<input type="hidden" name="action" value="setshipping_method_id">';
 			$object->fetch_delivery_methods();
 			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			if ($object->shipping_method_id > 0)
 			{
@@ -1598,16 +1701,18 @@ 
 	        print '<table width="100%" class="nobordernopadding"><tr><td>';
 	        print $langs->trans('IncotermLabel');
 	        print '<td><td align="right">';
-	        if ($user->rights->reception->creer) print '<a href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-	        else print '&nbsp;';
+	        if ($user->rights->reception->creer) {
+	            print '<a href="'.DOL_URL_ROOT.'/reception/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
+			} 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);
 			}
@@ -1655,14 +1760,17 @@ 
 		if ($action == 'editline')
 		{
 			$editColspan = 3;
-			if (empty($conf->stock->enabled)) $editColspan--;
-			if (empty($conf->productbatch->enabled)) $editColspan--;
+			if (empty($conf->stock->enabled)) {
+			    $editColspan--;
+			}
+			if (empty($conf->productbatch->enabled)) {
+			    $editColspan--;
+			}
 			print '<td align="center" colspan="'. $editColspan . '">';
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToReceive").' - ';
-			}
-			else
+			} else
 			{
 				print $langs->trans("QtyReceived").' - ';
 			}
@@ -1675,14 +1783,12 @@ 
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
+		} else
 		{
 			if ($object->statut <= 1)
 			{
 				print '<td align="center">'.$langs->trans("QtyToReceive").'</td>';
-			}
-			else
+			} else
 			{
 				print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
 			}
@@ -1713,8 +1819,12 @@ 
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
 			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+			if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+			    $newlang=GETPOST('lang_id','aZ09');
+			}
+			if (empty($newlang)) {
+			    $newlang=$object->thirdparty->default_lang;
+			}
 			if (! empty($newlang))
 			{
 				$outputlangs = new Translate("",$conf);
@@ -1790,9 +1900,9 @@ 
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
 					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
+				} else {
+									$label = (! empty($lines[$i]->product->label)?$lines[$i]->product->label:$lines[$i]->product->product_label);
 				}
-				else
-					$label = (! empty($lines[$i]->product->label)?$lines[$i]->product->label:$lines[$i]->product->product_label);
 
 				print '<td>';
 
@@ -1808,12 +1918,14 @@ 
 					print (! empty($lines[$i]->product->description) && $lines[$i]->description!=$lines[$i]->product->description)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
 				}
 				print "</td>\n";
-			}
-			else
+			} else
 			{
 				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
+				    $text = img_object($langs->trans('Service'),'service');
+				} else {
+				    $text = img_object($langs->trans('Product'),'product');
+				}
 
 				if (! empty($lines[$i]->label)) {
 					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
@@ -1829,8 +1941,7 @@ 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
-			}
-			else
+			} else
 			{
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
@@ -1850,10 +1961,15 @@ 
     			        $j = 0;
     			        foreach($val as $receptionline_id=> $receptionline_var)
     			        {
-    			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
+    			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) {
+    			                continue;
+    			            }
+    			            // We want to show only "other receptions"
 
     			            $j++;
-    			            if ($j > 1) print '<br>';
+    			            if ($j > 1) {
+    			                print '<br>';
+    			            }
     			            $reception_static->fetch($receptionline_var['reception_id']);
     			            print $reception_static->getNomUrl(1);
     			            print ' - '.$receptionline_var['qty'];
@@ -1896,8 +2012,7 @@ 
 							print '</td>';
 						}
 						print '</tr>';
-					}
-					else
+					} else
 					{
 						print '<!-- case edit 2 -->';
 						print '<tr>';
@@ -1911,8 +2026,7 @@ 
 					}
 				}
 				print '</table></td>';
-			}
-			else
+			} else
 			{
 				// Qty to receive or received
 				print '<td align="center">'.$lines[$i]->qty.'</td>';
@@ -1949,8 +2063,7 @@ 
 								$detail.= '<br>';
 
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-						}
-						else
+						} else
 						{
 							print $langs->trans("NA");
 						}
@@ -1963,14 +2076,20 @@ 
 
 			// Weight
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units,"weight");
-			else print '&nbsp;';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			    print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units,"weight");
+			} else {
+			    print '&nbsp;';
+			}
 			print '</td>';
 
 			// Volume
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units,"volume");
-			else print '&nbsp;';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			    print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units,"volume");
+			} else {
+			    print '&nbsp;';
+			}
 			print '</td>';
 
 
@@ -1979,8 +2098,7 @@ 
 				print '<td align="center" colspan="2" valign="middle">';
 				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
 				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
-			}
-			else if ($object->statut == 0)
+			} else if ($object->statut == 0)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit" align="center">';
@@ -2009,8 +2127,7 @@ 
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				else
+				} else
 				{
 					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				}
@@ -2050,8 +2167,7 @@ 
 	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
+				} else
 				{
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
@@ -2065,11 +2181,12 @@ 
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer)
 			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {
+				    // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
-				else
+				} else
 				{
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
@@ -2081,8 +2198,9 @@ 
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
+				} else {
+				    print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 				}
-				else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
 
 			// Create bill
@@ -2104,9 +2222,11 @@ 
 				{
 					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
-					if (! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					if (! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {
+					    // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
 					    $label="ClassifyBilled";
+					}
 					    $paramaction='classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
@@ -2157,10 +2277,12 @@ 
 		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) {
+					$newlang = $_REQUEST['lang_id'];
+		}
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					$newlang = $object->thirdparty->default_lang;
+		}
 		if (!empty($newlang))
 		{
 			$outputlangs = new Translate('', $conf);
@@ -2193,14 +2315,18 @@ 
             $formmail->fromid = $user->id;
         }
 		$formmail->trackid='shi'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {
+		    // If bit 2 is set
 		{
 			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		}
 			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
 		}
 		$formmail->withfrom=1;
 		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) {
+		    $liste[$key]=$value;
+		}
 		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
 		$formmail->withtocc=$liste;
 		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
@@ -2225,10 +2351,12 @@ 
 		}
 		$custcontact='';
 		$contactarr=array();
-		if (is_object($objectsrc))    // For the case the reception was created without orders
+		if (is_object($objectsrc)) {
+		    // For the case the reception was created without orders
 		{
     		$contactarr=$objectsrc->liste_contact(-1,'external');
 		}
+		}
 		if (is_array($contactarr) && count($contactarr)>0) {
 			foreach($contactarr as $contact) {
 				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {

Spacing +421 added lines, -421 removed lines

@@ -36,7 +36,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
@@ -48,56 +48,56 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->fournisseur->enabled)){
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->fournisseur->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 }
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.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->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal'));
+$langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
+if (!empty($conf->productbatch->enabled)) $langs->load('productbatch');
 
-$origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'reception';   // Example: commande, propal
-$origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
+$origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
+$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
 $id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('originid','int');    // Id of order or propal
-$ref=GETPOST('ref','alpha');
-$line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
+if (empty($origin_id)) $origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
+if (empty($origin_id)) $origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+if (empty($origin_id)) $origin_id  = GETPOST('originid', 'int'); // Id of order or propal
+$ref = GETPOST('ref', 'alpha');
+$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 
 // Security check
-$socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = '';
+if ($user->societe_id) $socid = $user->societe_id;
 
-if ($origin == 'reception') $result=restrictedArea($user, $origin, $id);
+if ($origin == 'reception') $result = restrictedArea($user, $origin, $id);
 else {
-	$result=restrictedArea($user, 'reception');
-	if($origin == 'supplierorder'){
+	$result = restrictedArea($user, 'reception');
+	if ($origin == 'supplierorder') {
 		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+	} else if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
-$action		= GETPOST('action','alpha');
+$action		= GETPOST('action', 'alpha');
 //Select mail models is same action as presend
 if (GETPOST('modelselected')) {
 	$action = 'presend';
 }
-$confirm	= GETPOST('confirm','alpha');
-$cancel     = GETPOST('cancel','alpha');
+$confirm	= GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
 //PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
 $object = new Reception($db);
 $extrafields = new ExtraFields($db);
@@ -107,16 +107,16 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // fetch optionals attributes lines and labels
-$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+$extralabelslines = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
 
 // Load object. Make an object->fetch
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('receptioncard','globalcard'));
+$hookmanager->initHooks(array('receptioncard', 'globalcard'));
 
-$permissiondellink=$user->rights->reception->creer;	// Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
 //var_dump($object->lines[0]->detail_batch);
 
 
@@ -124,8 +124,8 @@ 
  * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$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))
@@ -136,7 +136,7 @@ 
 		$object->fetch($id); // show reception also after canceling modification
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Reopen
 	if ($action == 'reopen' && $user->rights->reception->creer)
@@ -156,13 +156,13 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model=$object->modelpdf;
+				$model = $object->modelpdf;
 				$ret = $object->fetch($id); // Reload to get new records
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -182,7 +182,7 @@ 
             setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier','alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
+        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
         if ($result < 0) {
             setEventMessages($object->error, $object->errors, 'errors');
             $action = 'editref_supplier';
@@ -199,7 +199,7 @@ 
 	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
 	    if ($ret < 0) $error++;
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        // Actions on extra fields (by external module or standard code)
 	        // TODO le hook fait double emploi avec le trigger !!
@@ -258,7 +258,7 @@ 
 		$object->socid = $objectsrc->socid;
 		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 		$object->model_pdf = GETPOST('model');
-		$object->date_delivery = $date_delivery;	 // Date delivery planed
+		$object->date_delivery = $date_delivery; // Date delivery planed
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
 		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
@@ -317,8 +317,8 @@ 
 			for ($i = 1; $i <= $num; $i++)
 			{
 				$lineToTest = '';
-				foreach($objectsrc->lines as $linesrc){
-					if($linesrc->id == GETPOST($idl, 'int'))$lineToTest=$linesrc;
+				foreach ($objectsrc->lines as $linesrc) {
+					if ($linesrc->id == GETPOST($idl, 'int'))$lineToTest = $linesrc;
 				}
 				$qty = "qtyl".$i;
 				$comment = "comment".$i;
@@ -344,11 +344,11 @@ 
 						$entrepot_id = 0;
 					$eatby = GETPOST($eatby, 'alpha');
 					$sellby = GETPOST($sellby, 'alpha');
-					$eatbydate = str_replace('/','-',$eatby);
-					$sellbydate = str_replace('/','-',$sellby);
+					$eatbydate = str_replace('/', '-', $eatby);
+					$sellbydate = str_replace('/', '-', $sellby);
 
 
-					$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate),strtotime($sellbydate), GETPOST($batch, 'alpha'));
+					$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
 					if ($ret < 0)
 					{
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -361,9 +361,9 @@ 
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	        if ($ret < 0) $error++;
-	        if (! $error)
+	        if (!$error)
 	        {
-	            $ret=$object->create($user);		// This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
+	            $ret = $object->create($user); // This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
 
 	            if ($ret <= 0)
 	            {
@@ -374,11 +374,11 @@ 
 	    }
 	    else
 	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
@@ -387,14 +387,14 @@ 
 	    else
 	    {
 	        $db->rollback();
-	        $_GET["commande_id"]=GETPOST('commande_id','int');
-	        $action='create';
+	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
+	        $action = 'create';
 	    }
 	}
 
 	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
-        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
+        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 	)
 	{
 	    $object->fetch_thirdparty();
@@ -413,17 +413,17 @@ 
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	    		if (! empty($newlang)) {
+	    		if (!empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
 	    			$outputlangs->setDefaultLang($newlang);
 	    		}
-	    		$model=$object->modelpdf;
+	    		$model = $object->modelpdf;
 	    		$ret = $object->fetch($id); // Reload to get new records
 
-	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
+	    		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
 	}
@@ -454,10 +454,10 @@ 
 	else if ($action == 'setdate_livraison' && $user->rights->reception->creer)
 	{
 	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 	    $object->fetch($id);
-	    $result=$object->set_date_livraison($user,$datedelivery);
+	    $result = $object->set_date_livraison($user, $datedelivery);
 	    if ($result < 0)
 	    {
 	        setEventMessages($object->error, $object->errors, 'errors');
@@ -472,23 +472,23 @@ 
 	|| $action == 'settrueDepth'
 	|| $action == 'setshipping_method_id')
 	{
-	    $error=0;
+	    $error = 0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
-	    if ($action == 'settrueWeight')	{
-	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
-			$object->weight_units = GETPOST('weight_units','int');
+	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
+	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+	    if ($action == 'settrueWeight') {
+	    	$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
+			$object->weight_units = GETPOST('weight_units', 'int');
 	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
-	    if ($action == 'settrueHeight'){
-	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
-						$object->size_units = GETPOST('size_units','int');
+	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+	    if ($action == 'settrueHeight') {
+	    				$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+						$object->size_units = GETPOST('size_units', 'int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	        if ($object->update($user) >= 0)
 	        {
@@ -498,30 +498,30 @@ 
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 
-	    $action="";
+	    $action = "";
 	}
 
 	// Build document
 	else if ($action == 'builddoc')	// En get ou en post
 	{
 		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
 
 	    // Define output language
 	    $outputlangs = $langs;
-	    $newlang='';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$reception->thirdparty->default_lang;
-	    if (! empty($newlang))
+	    $newlang = '';
+	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $reception->thirdparty->default_lang;
+	    if (!empty($newlang))
 	    {
-	        $outputlangs = new Translate("",$conf);
+	        $outputlangs = new Translate("", $conf);
 	        $outputlangs->setDefaultLang($newlang);
 	    }
 		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result <= 0)
 	    {
 			setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
+	        $action = '';
 	    }
 	}
 
@@ -530,9 +530,9 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$upload_dir =	$conf->reception->dir_output ;
-		$file =	$upload_dir	. '/' .	GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
+		$upload_dir = $conf->reception->dir_output;
+		$file = $upload_dir.'/'.GETPOST('file');
+		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
@@ -541,8 +541,8 @@ 
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	    if ($result >= 0) {
+	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
 	}
@@ -551,8 +551,8 @@ 
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
-	    if($result >= 0) {
-	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+	    if ($result >= 0) {
+	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
 	}
@@ -560,20 +560,20 @@ 
 	/*
 	 *  delete a line
 	 */
-	elseif ($action == 'deleteline' && ! empty($line_id))
+	elseif ($action == 'deleteline' && !empty($line_id))
 	{
 		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new CommandeFournisseurDispatch($db);
 
 		$num_prod = count($lines);
-		for ($i = 0 ; $i < $num_prod ; $i++)
+		for ($i = 0; $i < $num_prod; $i++)
 		{
 			if ($lines[$i]->id == $line_id)
 			{
 					// delete single warehouse line
 					$line->id = $line_id;
-					if (! $error && $line->delete($user) < 0)
+					if (!$error && $line->delete($user) < 0)
 					{
 						$error++;
 					}
@@ -581,8 +581,8 @@ 
 			unset($_POST["lineid"]);
 		}
 
-		if(! $error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+		if (!$error) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		else
@@ -631,14 +631,14 @@ 
 					$line->qty = GETPOST($qty, 'int');
 					$line->comment = GETPOST($comment, 'alpha');
 
-					if(!empty($conf->productbatch->enabled)){
+					if (!empty($conf->productbatch->enabled)) {
 						$batch = "batch".$line_id;
 						$dlc = "dlc".$line_id;
 						$dluo = "dluo".$line_id;
 						$eatby = GETPOST($dlc, 'alpha');
-						$eatbydate = str_replace('/','-',$eatby);
+						$eatbydate = str_replace('/', '-', $eatby);
 						$sellby = GETPOST($dluo, 'alpha');
-						$sellbydate = str_replace('/','-',$sellby);
+						$sellbydate = str_replace('/', '-', $sellby);
 						$line->batch = GETPOST($batch, 'alpha');
 						$line->eatby = strtotime($eatbydate);
 						$line->sellby = strtotime($sellbydate);
@@ -668,16 +668,16 @@ 
 
 		unset($_POST["lineid"]);
 
-		if (! $error) {
+		if (!$error) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					$newlang = GETPOST('lang_id', 'aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -688,24 +688,24 @@ 
 		}
 		else
 		{
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
 	}
 
-	else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+	else if ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id=$facid;
-	$trigger_name='RECEPTION_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromreception';
-	$trackid='shi'.$object->id;
+	if (empty($id)) $id = $facid;
+	$trigger_name = 'RECEPTION_SENTBYMAIL';
+	$paramname = 'id';
+	$mode = 'emailfromreception';
+	$trackid = 'shi'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
@@ -714,12 +714,12 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Reception'),'Reception');
+llxHeader('', $langs->trans('Reception'), 'Reception');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 $product_static = new Product($db);
 $reception_static = new Reception($db);
@@ -729,7 +729,7 @@ 
 {
     print load_fiche_titre($langs->trans("CreateReception")).'<br>';
     print $langs->trans("ReceptionCreationIsDoneFromOrder");
-    $action=''; $id=''; $ref='';
+    $action = ''; $id = ''; $ref = '';
 }
 
 // Mode creation.
@@ -738,14 +738,14 @@ 
     $recept = new Reception($db);
 
     print load_fiche_titre($langs->trans("CreateReception"));
-    if (! $origin)
+    if (!$origin)
     {
         setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
     }
 
     if ($origin)
     {
-		if($origin == 'supplierorder')$classname = 'CommandeFournisseur';
+		if ($origin == 'supplierorder')$classname = 'CommandeFournisseur';
         else $classname = ucfirst($origin);
 
         $object = new $classname($db);
@@ -757,7 +757,7 @@ 
             $author = new User($db);
             $author->fetch($object->user_author_id);
 
-            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+            if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -765,9 +765,9 @@ 
             print '<input type="hidden" name="origin" value="'.$origin.'">';
             print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
             print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-            if (GETPOST('entrepot_id','int'))
+            if (GETPOST('entrepot_id', 'int'))
             {
-                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id','int').'">';
+                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
             }
 
             dol_fiche_head('');
@@ -776,13 +776,13 @@ 
 
             // Ref
             print '<tr><td class="titlefieldcreate fieldrequired">';
-            if ($origin == 'supplierorder' && ! empty($conf->fournisseur->enabled))
+            if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
             {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref;
+                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
             }
-            if ($origin == 'propal' && ! empty($conf->propal->enabled))
+            if ($origin == 'propal' && !empty($conf->propal->enabled))
             {
-                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
+                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
             }
             print '</a></td>';
             print "</tr>\n";
@@ -801,17 +801,17 @@ 
             print '</tr>';
 
             // Project
-            if (! empty($conf->projet->enabled))
+            if (!empty($conf->projet->enabled))
             {
-                $projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
-                if(empty($projectid) && ! empty($object->fk_project)) $projectid = $object->fk_project;
+                $projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+                if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
                 if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
                 $langs->load("projects");
                 print '<tr>';
-                print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+                print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
                 $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">' . $langs->trans("AddProject") . '</a>';
+                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">'.$langs->trans("AddProject").'</a>';
                 print '</td>';
                 print '</tr>';
             }
@@ -820,8 +820,8 @@ 
             print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
             print '<td colspan="3">';
             //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
-            $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
-            print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1,1);
+            $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+            print $form->select_date($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
             print "</td>\n";
             print '</tr>';
 
@@ -833,7 +833,7 @@ 
             print "</td></tr>";
 
             // Note Private
-            if ($object->note_private && ! $user->societe_id)
+            if ($object->note_private && !$user->societe_id)
             {
                 print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
                 print '<td colspan="3">';
@@ -845,20 +845,20 @@ 
             // Weight
             print '<tr><td>';
             print $langs->trans("Weight");
-            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight','int').'"> ';
-            $text=$formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
-            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
+            $text = $formproduct->select_measuring_units("weight_units", "weight", GETPOST('weight_units', 'int'));
+            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
             // Dim
             print '<tr><td>';
             print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW','int').'">';
-            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH','int').'">';
-            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS','int').'">';
+            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
+            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
+            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
             print ' ';
-            $text=$formproduct->select_measuring_units("size_units","size");
-            $htmltext=$langs->trans("KeepEmptyForAutoCalculation");
+            $text = $formproduct->select_measuring_units("size_units", "size");
+            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
             print $form->textwithpicto($text, $htmltext);
             print '</td></tr>';
 
@@ -866,22 +866,22 @@ 
             print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
             print '<td colspan="3">';
             $recept->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id','int'),1,0,0,"",1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print "</td></tr>\n";
 
             // Tracking number
             print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
             print '<td colspan="3">';
-            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
+            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
             print "</td></tr>\n";
 
             // Other attributes
             $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$recept,$action);    // Note that $action and $object may have been modified by hook
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
-			if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+			if (empty($reshook) && !empty($extrafields->attribute_label)) {
 				// copy from order
 				$orderExtrafields = new Extrafields($db);
 				$orderExtrafieldLabels = $orderExtrafields->fetch_name_optionals_label($object->table_element);
@@ -898,12 +898,12 @@ 
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->libelle_incoterms, 1).'</label></td>';
 		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
+		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
             // Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/reception/modules_reception.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 			$liste = ModelePdfReception::liste_modeles($db);
 
 			if (count($liste) > 1)
@@ -920,14 +920,14 @@ 
 
 
             // Reception lines
-			$numAsked=0;
+			$numAsked = 0;
 			$dispatchLines = array();
 			foreach ($_POST as $key => $value)
 			{
 				// without batch module enabled
 				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
 				{
-					$numAsked ++;
+					$numAsked++;
 
 					// $numline=$reg[2] + 1; // line of product
 					$numline = $numAsked;
@@ -936,7 +936,7 @@ 
 					$ent = "entrepot_".$reg[1].'_'.$reg[2];
 					$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
 					$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
-					$dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
+					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
 				}
 
 				// with batch module enabled
@@ -955,7 +955,7 @@ 
 					$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1].'_'.$reg[2].'month'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'day'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'year']);
 					$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1].'_'.$reg[2].'month'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'day'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'year']);
 					$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
-					$dispatchLines[$numAsked]=array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'),'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'),'DLC'=> $dDLC,'DLUO'=> $dDLUO,'lot'=> GETPOST($lot, 'alpha'));
+					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' =>GETPOST($qty), 'ent' =>GETPOST($ent, 'int'), 'pu' =>GETPOST($pu), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
 				}
 			}
 
@@ -963,16 +963,16 @@ 
             print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    	$i=1;
-    	    	while($i <= $numAsked)
+    	    	$i = 1;
+    	    	while ($i <= $numAsked)
     	    	{
     	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
     	    		$i++;
     	    	}
         		print '});
 	            jQuery("#autoreset").click(function() {';
-    	    	$i=1;
-    	    	while($i <= $numAsked)
+    	    	$i = 1;
+    	    	while ($i <= $numAsked)
     	    	{
     	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
     	    		$i++;
@@ -1004,7 +1004,7 @@ 
 	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
 				}
                 print '</td>';
-                if (! empty($conf->stock->enabled))
+                if (!empty($conf->stock->enabled))
                 {
 					print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
                 }
@@ -1017,13 +1017,13 @@ 
                 print "</tr>\n";
             }
 
-            $var=true;
-            $indiceAsked =1;
+            $var = true;
+            $indiceAsked = 1;
             while ($indiceAsked <= $numAsked)
             {
                 $product = new Product($db);
-				foreach($object->lines as $supplierLine){
-					if($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id){
+				foreach ($object->lines as $supplierLine) {
+					if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
 						$line = $supplierLine;
 						break;
 					}
@@ -1031,11 +1031,11 @@ 
 
 
                 // Show product and description
-                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+                $type = $line->product_type ? $line->product_type : $line->fk_product_type;
                 // Try to enhance type detection using date_start and date_end for free lines where type
                 // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
+                if (!empty($line->date_start)) $type = 1;
+                if (!empty($line->date_end)) $type = 1;
 
                 print '<!-- line '.$line->rowid.' for product -->'."\n";
                 print '<tr class="oddeven">'."\n";
@@ -1045,30 +1045,30 @@ 
                 if ($line->fk_product > 0)  // If predefined product
                 {
                     $product->fetch($line->fk_product);
-                    $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
+                    $product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
                     //var_dump($product->stock_warehouse[1]);
 
                     print '<td>';
                     print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
                     // Show product and description
-                    $product_static->type=$line->fk_product_type;
-                    $product_static->id=$line->fk_product;
-                    $product_static->ref=$line->ref;
-                    $product_static->status_batch=$line->product_tobatch;
+                    $product_static->type = $line->fk_product_type;
+                    $product_static->id = $line->fk_product;
+                    $product_static->ref = $line->ref;
+                    $product_static->status_batch = $line->product_tobatch;
 
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
+                    $text = $product_static->getNomUrl(1);
+                    $text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
+                    $description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+                    print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
                     // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
                     // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                    if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
                     {
-                        print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
+                        print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
                     }
 
                     print '</td>';
@@ -1076,18 +1076,18 @@ 
                 else
 				{
 				    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
+                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+                    else $text = img_object($langs->trans('Product'), 'product');
 
-                    if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+                    if (!empty($line->label)) {
+                    	$text .= ' <strong>'.$line->label.'</strong>';
+                    	print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
                     } else {
                     	print $text.' '.nl2br($line->desc);
                     }
 
                     // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
                     print "</td>\n";
                 }
 
@@ -1097,7 +1097,7 @@ 
 				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
                 print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
                 print '</td>';
-                $qtyProdCom=$line->qty;
+                $qtyProdCom = $line->qty;
 
                 // Qty already received
                 print '<td align="center">';
@@ -1121,20 +1121,20 @@ 
 
 
 				$warehouseObject = null;
-				if ( !empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+				if (!empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
 				    print '<!-- Case warehouse already known or product not a predefined product -->';
 
 					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
-					$deliverableQty=$dispatchLines[$indiceAsked]['qty'];
+					$deliverableQty = $dispatchLines[$indiceAsked]['qty'];
 
 
 
 						// Quantity to send
 						print '<td align="center">';
-						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+						if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 						}
@@ -1142,15 +1142,15 @@ 
 						print '</td>';
 
 						// Stock
-						if (! empty($conf->stock->enabled))
+						if (!empty($conf->stock->enabled))
 						{
 							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
 							{
 								// Show warehouse combo list
 								$ent = "entl".$indiceAsked;
 								$idl = "idl".$indiceAsked;
-								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
+								$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
 								if ($line->fk_product > 0)
 								{
 									print '<!-- Show warehouse selection -->';
@@ -1170,10 +1170,10 @@ 
 							{
 								print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
 								print '<td>';
-								print $form->select_date($dispatchLines[$indiceAsked]['DLC'],'dlc' . $indiceAsked, '', '', 1, "");
+								print $form->select_date($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
 								print '</td>';
 								print '<td>';
-								print $form->select_date($dispatchLines[$indiceAsked]['DLUO'],'dluo' . $indiceAsked, '', '', 1, "");
+								print $form->select_date($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
 								print '</td>';
 							}
 							else {
@@ -1184,19 +1184,19 @@ 
 				}
 
 				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines)>0)
+				if (is_array($extralabelslines) && count($extralabelslines) > 0)
 				{
-					$colspan=5;
-					if($conf->productbatch->enabled)$colspan+=3;
+					$colspan = 5;
+					if ($conf->productbatch->enabled)$colspan += 3;
 					$orderLineExtrafields = new Extrafields($db);
 					$orderLineExtrafieldLabels = $orderLineExtrafields->fetch_name_optionals_label($object->table_element_line);
 					$srcLine = new CommandeFournisseurLigne($db);
-					$srcLine->fetch_optionals($line->id,$orderLineExtrafieldLabels); // fetch extrafields also available in orderline
+					$srcLine->fetch_optionals($line->id, $orderLineExtrafieldLabels); // fetch extrafields also available in orderline
 					$line = new CommandeFournisseurDispatch($db);
-					$line->fetch_optionals($object->id,$extralabelslines);
+					$line->fetch_optionals($object->id, $extralabelslines);
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 					print '<tr class="oddeven">';
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 					print '</tr>';
 				}
 
@@ -1210,7 +1210,7 @@ 
             print '<div class="center">';
             print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
             print '&nbsp; ';
-            print '<input type="'.($backtopage?"submit":"button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage?'':' onclick="javascript:history.go(-1)"').'>';	// Cancel for create does not post form if we don't know the backtopage
+            print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
             print '</div>';
 
             print '</form>';
@@ -1242,7 +1242,7 @@ 
 			$typeobject = $object->origin;
 			$origin = $object->origin;
 			$origin_id = $object->origin_id;
-			$object->fetch_origin();         // Load property $object->commande, $object->propal, ...
+			$object->fetch_origin(); // Load property $object->commande, $object->propal, ...
 		}
 
 		$soc = new Societe($db);
@@ -1250,15 +1250,15 @@ 
 
 		$res = $object->fetch_optionals($object->id, $extralabels);
 
-		$head=reception_prepare_head($object);
+		$head = reception_prepare_head($object);
 		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'reception');
 
-		$formconfirm='';
+		$formconfirm = '';
 
 		// Confirm deleteion
 		if ($action == 'delete')
 		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteReception'),$langs->trans("ConfirmDeleteReception",$object->ref),'confirm_delete','',0,1);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteReception'), $langs->trans("ConfirmDeleteReception", $object->ref), 'confirm_delete', '', 0, 1);
 		}
 
 		// Confirmation validation
@@ -1274,30 +1274,30 @@ 
 				$numref = $object->ref;
 			}
 
-			$text = $langs->trans("ConfirmValidateReception",$numref);
+			$text = $langs->trans("ConfirmValidateReception", $numref);
 
-			if (! empty($conf->notification->enabled))
+			if (!empty($conf->notification->enabled))
 			{
-				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-				$notify=new Notify($db);
-				$text.='<br>';
-				$text.=$notify->confirmMessage('RECEPTION_VALIDATE',$object->socid, $object);
+				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+				$notify = new Notify($db);
+				$text .= '<br>';
+				$text .= $notify->confirmMessage('RECEPTION_VALIDATE', $object->socid, $object);
 			}
 
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateReception'),$text,'confirm_valid','',0,1);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateReception'), $text, 'confirm_valid', '', 0, 1);
 		}
 
 		// Confirm cancelation
 		if ($action == 'annuler')
 		{
-			$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelReception'),$langs->trans("ConfirmCancelReception",$object->ref),'confirm_cancel','',0,1);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelReception'), $langs->trans("ConfirmCancelReception", $object->ref), 'confirm_cancel', '', 0, 1);
 		}
 
-		if (! $formconfirm) {
+		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;
+		    if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+		    elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 		}
 
 		// Print form confirm
@@ -1306,64 +1306,64 @@ 
 
 		// Calculate totalWeight and totalVolume for all products
 		// by adding weight and volume of each product line.
-		$tmparray=$object->getTotalWeightVolume();
-		$totalWeight=$tmparray['weight'];
-		$totalVolume=$tmparray['volume'];
+		$tmparray = $object->getTotalWeightVolume();
+		$totalWeight = $tmparray['weight'];
+		$totalVolume = $tmparray['volume'];
 
 
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
-		    $objectsrc=new Commande($db);
+		    $objectsrc = new Commande($db);
 		    $objectsrc->fetch($object->$typeobject->id);
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
-		    $objectsrc=new Propal($db);
+		    $objectsrc = new Propal($db);
 		    $objectsrc->fetch($object->$typeobject->id);
 		}
-		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
+		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 		{
-		    $objectsrc=new CommandeFournisseur($db);
+		    $objectsrc = new CommandeFournisseur($db);
 		    $objectsrc->fetch($object->$typeobject->id);
 		}
 		// Reception card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
-		$morehtmlref='<div class="refidno">';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$morehtmlref = '<div class="refidno">';
 		// Ref customer reception
 
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 
 		// Thirdparty
-        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
         // Project
-        if (! empty($conf->projet->enabled))
+        if (!empty($conf->projet->enabled))
         {
             $langs->load("projects");
-            $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
             if (0) {    // Do not change on reception
                 if ($action != 'classify') {
-                    $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    $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 .= '<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 .= '<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 .= '<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);
+                    $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 reception, so we will use the project or source object instead
                 // TODO Add project on reception
                 $morehtmlref .= ' : ';
-                if (! empty($objectsrc->fk_project)) {
+                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 .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                     $morehtmlref .= $proj->ref;
                     $morehtmlref .= '</a>';
                 } else {
@@ -1371,7 +1371,7 @@ 
                 }
             }
         }
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 		$object->picto = 'sending';
     	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -1384,37 +1384,37 @@ 
         print '<table class="border" width="100%">';
 
 		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
 			print '<tr><td>';
 			print $langs->trans("RefOrder").'</td>';
 			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'commande');
+			print $objectsrc->getNomUrl(1, 'commande');
 			print "</td>\n";
 			print '</tr>';
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
 			print '<tr><td>';
 			print $langs->trans("RefProposal").'</td>';
 			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'reception');
+			print $objectsrc->getNomUrl(1, 'reception');
 			print "</td>\n";
 			print '</tr>';
 		}
-		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
 			print '<tr><td>';
 			print $langs->trans("RefSupplierOrder").'</td>';
 			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'reception');
+			print $objectsrc->getNomUrl(1, 'reception');
 			print "</td>\n";
 			print '</tr>';
 		}
 
 		// Date creation
 		print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation,"dayhour")."</td>\n";
+		print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
 		print '</tr>';
 
 		// Delivery date planned
@@ -1423,7 +1423,7 @@ 
 		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>';
+		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')
@@ -1431,30 +1431,30 @@ 
 			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="setdate_livraison">';
-			print $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison",1,0,1);
+			print $form->select_date($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0, 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
 		else
 		{
-			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
+			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
 		print '</tr>';
 
 		// Weight
 		print '<tr><td>';
-		print $form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->reception->creer);
+		print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->reception->creer);
 		print '</td><td colspan="3">';
 
-		if ($action=='edittrueWeight')
+		if ($action == 'edittrueWeight')
 		{
 			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueWeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
-			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
+			print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
@@ -1462,7 +1462,7 @@ 
 		else
 		{
 			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
+			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuring_units_string($object->weight_units, "weight") : '';
 		}
 
         // Calculated
@@ -1470,28 +1470,28 @@ 
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
-			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 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');
 			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
 			if (!empty($object->trueWeight)) print ')';
 		}
 		print '</td></tr>';
 
 		// Width
-		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->reception->creer);
-		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
+		print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer);
+		print ($object->trueWidth && $object->width_units != '') ? ' '.measuring_units_string($object->width_units, "size") : '';
 		print '</td></tr>';
 
 		// Height
-		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight')
+		print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->reception->creer).'</td><td colspan="3">';
+		if ($action == 'edittrueHeight')
 		{
 			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueHeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
-			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
+			print $formproduct->select_measuring_units("size_units", "size", $object->size_units);
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
@@ -1499,15 +1499,15 @@ 
 		else
 		{
 			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
+			print ($object->trueHeight && $object->height_units != '') ? ' '.measuring_units_string($object->height_units, "size") : '';
 		}
 
 		print '</td></tr>';
 
 		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->reception->creer);
-		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
+		print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer);
+		print ($object->trueDepth && $object->depth_units != '') ? ' '.measuring_units_string($object->depth_units, "size") : '';
 		print '</td></tr>';
 
 		// Volume
@@ -1515,12 +1515,12 @@ 
 		print $langs->trans("Volume");
 		print '</td>';
 		print '<td colspan="3">';
-		$calculatedVolume=0;
-		$volumeUnit=0;
+		$calculatedVolume = 0;
+		$volumeUnit = 0;
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit=$object->size_units * 3;
+		    $calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		    $volumeUnit = $object->size_units * 3;
 		}
 		// If reception volume not defined we use sum of products
 		if ($calculatedVolume > 0)
@@ -1528,15 +1528,15 @@ 
 			if ($volumeUnit < 50)
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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 showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
 			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
+			else print $calculatedVolume.' '.measuring_units_string($volumeUnit, "volume");
 		}
 		if ($totalVolume > 0)
 		{
 			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
 			//print $totalVolume.' '.measuring_units_string(0,"volume");
-			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 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');
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
 			if ($calculatedVolume) print ')';
 		}
@@ -1546,7 +1546,7 @@ 
 		// Other attributes
 		$cols = 2;
 
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
@@ -1563,7 +1563,7 @@ 
 		print $langs->trans('ReceptionMethod');
 		print '</td>';
 
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'),1).'</a></td>';
+		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshipping_method_id')
@@ -1572,8 +1572,8 @@ 
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setshipping_method_id">';
 			$object->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		}
@@ -1582,7 +1582,7 @@ 
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
-				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+				$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 				print $langs->trans("SendingMethod".strtoupper($code));
 			}
 		}
@@ -1591,8 +1591,8 @@ 
 
 		// Tracking Number
 
-		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->reception->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->reception->creer,'string',$object->tracking_number);
+		print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->reception->creer).'</td><td colspan="3">';
+		print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->reception->creer, 'string', $object->tracking_number);
 		print '</td></tr>';
 
 		// Incoterms
@@ -1613,7 +1613,7 @@ 
 			}
 			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 $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>';
 		}
@@ -1630,11 +1630,11 @@ 
 		// Lines of products
 		if ($action == 'editline')
 		{
-			print '<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
-			<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+			print '<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
+			<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
 			<input type="hidden" name="action" value="updateline">
 			<input type="hidden" name="mode" value="">
-			<input type="hidden" name="id" value="' . $object->id . '">';
+			<input type="hidden" name="id" value="' . $object->id.'">';
 		}
 		print '<br>';
 
@@ -1642,7 +1642,7 @@ 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		// #
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 		{
 			print '<td width="5" align="center">&nbsp;</td>';
 		}
@@ -1661,7 +1661,7 @@ 
 			$editColspan = 3;
 			if (empty($conf->stock->enabled)) $editColspan--;
 			if (empty($conf->productbatch->enabled)) $editColspan--;
-			print '<td align="center" colspan="'. $editColspan . '">';
+			print '<td align="center" colspan="'.$editColspan.'">';
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToReceive").' - ';
@@ -1670,11 +1670,11 @@ 
 			{
 				print $langs->trans("QtyReceived").' - ';
 			}
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
 				print $langs->trans("WarehouseSource").' - ';
 			}
-			if (! empty($conf->productbatch->enabled))
+			if (!empty($conf->productbatch->enabled))
 			{
 				print $langs->trans("Batch");
 			}
@@ -1690,12 +1690,12 @@ 
 			{
 				print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
 			}
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
 				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
-			if (! empty($conf->productbatch->enabled))
+			if (!empty($conf->productbatch->enabled))
 			{
 				print '<td align="left">'.$langs->trans("Batch").'</td>';
 			}
@@ -1710,18 +1710,18 @@ 
 		}
 		print "</tr>\n";
 
-		$var=false;
+		$var = false;
 
-		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 		{
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
-			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-			if (! empty($newlang))
+			$newlang = '';
+			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+			if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+			if (!empty($newlang))
 			{
-				$outputlangs = new Translate("",$conf);
+				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
 		}
@@ -1734,23 +1734,23 @@ 
 		if ($origin && $origin_id > 0)
 		{
     		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql.= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
-    		$sql.= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
+    		$sql .= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
+    		$sql .= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
     		//if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-    		$sql.= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
-    		$sql.= ', p.description as product_desc';
-    		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-    		$sql.= ", ".MAIN_DB_PREFIX."reception as e";
-    		$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+    		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+    		$sql .= ', p.description as product_desc';
+    		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+    		$sql .= ", ".MAIN_DB_PREFIX."reception as e";
+    		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
     		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-    		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql.= " WHERE e.entity IN (".getEntity('reception').")";
-    		$sql.= " AND obj.fk_commande = ".$origin_id;
-    		$sql.= " AND obj.rowid = ed.fk_commandefourndet";
-    		$sql.= " AND ed.fk_reception = e.rowid";
-    		$sql.= " AND ed.fk_reception !=".$object->id;
+    		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+    		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
+    		$sql .= " AND obj.fk_commande = ".$origin_id;
+    		$sql .= " AND obj.rowid = ed.fk_commandefourndet";
+    		$sql .= " AND ed.fk_reception = e.rowid";
+    		$sql .= " AND ed.fk_reception !=".$object->id;
     		//if ($filter) $sql.= $filter;
-    		$sql.= " ORDER BY obj.fk_product";
+    		$sql .= " ORDER BY obj.fk_product";
 
     		dol_syslog("get list of reception lines", LOG_DEBUG);
     		$resql = $db->query($sql);
@@ -1759,13 +1759,13 @@ 
     		    $num = $db->num_rows($resql);
     		    $i = 0;
 
-    		    while($i < $num)
+    		    while ($i < $num)
     		    {
         		    $obj = $db->fetch_object($resql);
         		    if ($obj)
         		    {
         		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->receptionline_id]=array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+        		        $alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
         		    }
         		    $i++;
     		    }
@@ -1774,59 +1774,59 @@ 
 		}
 
 		// Loop on each product to send/sent
-		for ($i = 0 ; $i < $num_prod ; $i++)
+		for ($i = 0; $i < $num_prod; $i++)
 		{
 		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			// #
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 			{
-				print '<td align="center">'.($i+1).'</td>';
+				print '<td align="center">'.($i + 1).'</td>';
 			}
 
 			// Predefined product or service
 			if ($lines[$i]->fk_product > 0)
 			{
 				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 				{
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
 				}
 				else
-					$label = (! empty($lines[$i]->product->label)?$lines[$i]->product->label:$lines[$i]->product->product_label);
+					$label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 
 				print '<td>';
 
 
 
-				$text=$lines[$i]->product->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->product->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+				$text = $lines[$i]->product->getNomUrl(1);
+				$text .= ' - '.$label;
+				$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->product->description));
+				print $form->textwithtooltip($text, $description, 3, '', '', $i);
+				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 				{
-					print (! empty($lines[$i]->product->description) && $lines[$i]->description!=$lines[$i]->product->description)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
+					print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 				}
 				print "</td>\n";
 			}
 			else
 			{
 				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
+				else $text = img_object($langs->trans('Product'), 'product');
 
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+				if (!empty($lines[$i]->label)) {
+					$text .= ' <strong>'.$lines[$i]->label.'</strong>';
+					print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
 				} else {
 					print $text.' '.nl2br($lines[$i]->description);
 				}
 
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
 				print "</td>\n";
 			}
 
@@ -1852,7 +1852,7 @@ 
     			    if ($lines[$i]->fk_commandefourndet == $key)
     			    {
     			        $j = 0;
-    			        foreach($val as $receptionline_id=> $receptionline_var)
+    			        foreach ($val as $receptionline_id=> $receptionline_var)
     			        {
     			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
 
@@ -1862,8 +1862,8 @@ 
     			            print $reception_static->getNomUrl(1);
     			            print ' - '.$receptionline_var['qty'];
 
-    			            $htmltext=$langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid'])?$langs->trans("Draft"):dol_print_date($receptionline_var['date_valid'], 'dayhour'));
-    			            if (! empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
+    			            $htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
+    			            if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
     			            {
     			                $warehousestatic->fetch($receptionline_var['warehouse']);
     			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
@@ -1879,24 +1879,24 @@ 
 			{
 				// edit mode
 				print '<td colspan="'.$editColspan.'" align="center"><table class="nobordernopadding">';
-				if (! empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled))
 				{
 					if ($lines[$i]->fk_product > 0)
 					{
 						print '<!-- case edit 1 -->';
 						print '<tr>';
 						// Qty to receive or received
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
+						print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">'.'</td>';
 						// Warehouse source
-						print '<td>' . $formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+						print '<td>'.$formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 						// Batch number managment
 						if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch))
 						{
 							print '<td>  <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
 							print $langs->trans('EatByDate').' : ';
-							print $form->select_date($lines[$i]->eatby,'dlc' .$line_id, '', '', 1, ""). '</br>';
+							print $form->select_date($lines[$i]->eatby, 'dlc'.$line_id, '', '', 1, "").'</br>';
 							print $langs->trans('SellByDate').' : ';
-							print $form->select_date($lines[$i]->sellby,'dluo' .$line_id, '', '', 1, "");
+							print $form->select_date($lines[$i]->sellby, 'dluo'.$line_id, '', '', 1, "");
 							print '</td>';
 						}
 						print '</tr>';
@@ -1906,11 +1906,11 @@ 
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
-						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">' . '</td>';
+						print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">'.'</td>';
 						// Warehouse source
-						print '<td>' . '</td>';
+						print '<td>'.'</td>';
 						// Batch number managment
-						print '<td>' . '</td>';
+						print '<td>'.'</td>';
 						print '</tr>';
 					}
 				}
@@ -1922,7 +1922,7 @@ 
 				print '<td align="center">'.$lines[$i]->qty.'</td>';
 
 				// Warehouse source
-				if (! empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled))
 				{
 					print '<td align="left">';
 
@@ -1937,22 +1937,22 @@ 
 				}
 
 				// Batch number managment
-				if (! empty($conf->productbatch->enabled))
+				if (!empty($conf->productbatch->enabled))
 				{
 					if (isset($lines[$i]->batch))
 					{
 						print '<!-- Detail of lot -->';
 						print '<td>';
-						$detail ='';
+						$detail = '';
 						if ($lines[$i]->product->status_batch)
 						{
-								$detail.= $langs->trans("Batch").': '.$lines[$i]->batch;
-								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby,"day");
-								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby,"day");
+								$detail .= $langs->trans("Batch").': '.$lines[$i]->batch;
+								$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby, "day");
+								$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby, "day");
 
-								$detail.= '<br>';
+								$detail .= '<br>';
 
-							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
 						}
 						else
 						{
@@ -1967,13 +1967,13 @@ 
 
 			// Weight
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units,"weight");
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight * $lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units, "weight");
 			else print '&nbsp;';
 			print '</td>';
 
 			// Volume
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units,"volume");
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume * $lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units, "volume");
 			else print '&nbsp;';
 			print '</td>';
 
@@ -1981,21 +1981,21 @@ 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td align="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+				print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 			}
 			else if ($object->statut == 0)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit" align="center">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 				print '</td>';
 				print '<td class="linecoldelete" width="10">';
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 				print '</td>';
 
 				// Display lines extrafields
-				if (! empty($rowExtrafieldsStart))
+				if (!empty($rowExtrafieldsStart))
 				{
 					print $rowExtrafieldsStart;
 					print $rowExtrafieldsView;
@@ -2005,18 +2005,18 @@ 
 			print "</tr>";
 
 			// Display lines extrafields
-			if (is_array($extralabelslines) && count($extralabelslines)>0) {
-				$colspan= empty($conf->productbatch->enabled) ? 8 : 9;
+			if (is_array($extralabelslines) && count($extralabelslines) > 0) {
+				$colspan = empty($conf->productbatch->enabled) ? 8 : 9;
 				$line = new CommandeFournisseurDispatch($db);
-				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
+				$line->fetch_optionals($lines[$i]->id, $extralabelslines);
 				print '<tr class="oddeven">';
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
-					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 				}
 				else
 				{
-					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan), $indiceAsked);
 				}
 				print '</tr>';
 			}
@@ -2032,14 +2032,14 @@ 
 	dol_fiche_end();
 
 
-	$object->fetchObjectLinked($object->id,$object->element);
+	$object->fetchObjectLinked($object->id, $object->element);
 
 
 	/*
 	 *    Boutons actions
 	 */
 
-	if (($user->societe_id == 0) && ($action!='presend'))
+	if (($user->societe_id == 0) && ($action != 'presend'))
 	{
 		print '<div class="tabsAction">';
 
@@ -2050,8 +2050,8 @@ 
 
 			if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0)
 			{
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->creer))
-	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->reception->reception_advance->validate)))
+				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				}
@@ -2062,14 +2062,14 @@ 
 			}
 			// Edit
 			if ($object->statut == Reception::STATUS_VALIDATED && $user->rights->reception->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a></div>';
 			}
 
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer)
 			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
@@ -2090,7 +2090,7 @@ 
 			}
 
 			// Create bill
-			if (! empty($conf->fournisseur->enabled) && ($object->statut == Reception::STATUS_VALIDATED || $object->statut == Reception::STATUS_CLOSED))
+			if (!empty($conf->fournisseur->enabled) && ($object->statut == Reception::STATUS_VALIDATED || $object->statut == Reception::STATUS_CLOSED))
 			{
 				if ($user->rights->fournisseur->facture->creer)
 				{
@@ -2104,14 +2104,14 @@ 
 			// Close
 			if ($object->statut == Reception::STATUS_VALIDATED)
 			{
-				if ($user->rights->reception->creer && $object->statut > 0 && ! $object->billed)
+				if ($user->rights->reception->creer && $object->statut > 0 && !$object->billed)
 				{
-					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
+					$label = "Close"; $paramaction = 'classifyclosed'; // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
-					if (! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
-					    $label="ClassifyBilled";
-					    $paramaction='classifybilled';
+					    $label = "ClassifyBilled";
+					    $paramaction = 'classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
@@ -2136,14 +2136,14 @@ 
         print '<div class="fichecenter"><div class="fichehalfleft">';
 
         $objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->reception->dir_output . "/" .$objectref;
+		$filedir = $conf->reception->dir_output."/".$objectref;
 
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-		$genallowed=$user->rights->reception->lire;
-		$delallowed=$user->rights->reception->creer;
+		$genallowed = $user->rights->reception->lire;
+		$delallowed = $user->rights->reception->creer;
 
-		print $formfile->showdocuments('reception',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+		print $formfile->showdocuments('reception', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
@@ -2156,12 +2156,12 @@ 
 	{
 		$ref = dol_sanitizeFileName($object->ref);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->reception->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
+		$fileparams = dol_most_recent_file($conf->reception->dir_output.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
 		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
 			$newlang = $_REQUEST['lang_id'];
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 			$newlang = $object->thirdparty->default_lang;
@@ -2172,16 +2172,16 @@ 
 			$outputlangs->load('receptions');
 		}
 		// Build document if it not exists
-		if (! $file || ! is_readable($file))
+		if (!$file || !is_readable($file))
 		{
-			$result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument(GETPOST('model') ?GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0)
 			{
-				dol_print_error($db,$object->error,$object->errors);
+				dol_print_error($db, $object->error, $object->errors);
 				exit;
 			}
-			$fileparams = dol_most_recent_file($conf->reception->dir_output . '/reception/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
+			$fileparams = dol_most_recent_file($conf->reception->dir_output.'/reception/'.$ref, preg_quote($ref, '/').'[^\-]+');
+			$file = $fileparams['fullname'];
 		}
 		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print '<div class="clearboth"></div>';
@@ -2191,72 +2191,72 @@ 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-        if($formmail->fromtype === 'user'){
+		$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
+        $formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+        if ($formmail->fromtype === 'user') {
             $formmail->fromid = $user->id;
         }
-		$formmail->trackid='shi'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+		$formmail->trackid = 'shi'.$object->id;
+		if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 		{
 			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
+			$formmail->frommail = dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
 		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$outputlangs->trans('SendReceptionRef','__RECEPTIONREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
+		$formmail->withfrom = 1;
+		$liste = array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key] = $value;
+		$formmail->withto = GETPOST("sendto") ?GETPOST("sendto") : $liste;
+		$formmail->withtocc = $liste;
+		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+		$formmail->withtopic = $outputlangs->trans('SendReceptionRef', '__RECEPTIONREF__');
+		$formmail->withfile = 2;
+		$formmail->withbody = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withcancel = 1;
 		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object,$langs);
-		$formmail->substit['__RECEPTIONREF__']=$object->ref;
-		$formmail->substit['__RECEPTIONTRACKNUM__']=$object->tracking_number;
-		$formmail->substit['__RECEPTIONTRACKNUMURL__']=$object->tracking_url;
+		$formmail->setSubstitFromObject($object, $langs);
+		$formmail->substit['__RECEPTIONREF__'] = $object->ref;
+		$formmail->substit['__RECEPTIONTRACKNUM__'] = $object->tracking_number;
+		$formmail->substit['__RECEPTIONTRACKNUMURL__'] = $object->tracking_url;
 		//Find the good contact adress
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))	{
-			$objectsrc=new Commande($db);
+		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);
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
+			$objectsrc = new Propal($db);
 			$objectsrc->fetch($object->$typeobject->id);
 		}
-		$custcontact='';
-		$contactarr=array();
+		$custcontact = '';
+		$contactarr = array();
 		if (is_object($objectsrc))    // For the case the reception was created without orders
 		{
-    		$contactarr=$objectsrc->liste_contact(-1,'external');
+    		$contactarr = $objectsrc->liste_contact(-1, 'external');
 		}
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
+		if (is_array($contactarr) && count($contactarr) > 0) {
+			foreach ($contactarr as $contact) {
+				if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+					$contactstatic = new Contact($db);
 					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
+					$custcontact = $contactstatic->getFullName($langs, 1);
 				}
 			}
 			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
 			}
 		}
 		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='reception_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['receptionid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'reception_send';
+		$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+		$formmail->param['receptionid'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"].'?id='.$object->id;
 		// Init list of files
-		if (GETPOST("mode")=='init')
+		if (GETPOST("mode") == 'init')
 		{
 			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
 		}
 		// Show form
 		print $formmail->get_form();

dolibarr/htdocs/reception/tpl/linkedobjectblock.tpl.php

Indentation +9 added lines, -9 removed lines

@@ -43,20 +43,20 @@
         <td></td>
     	<td align="center"><?php echo dol_print_date($objectlink->date_delivery,'day'); ?></td>
     	<td align="right"><?php
-    		if ($user->rights->reception->lire) {
-    			$total = $total + $objectlink->total_ht;
-    			echo price($objectlink->total_ht);
-    		} ?></td>
+            if ($user->rights->reception->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, receptions must stay linked to order, so link is not deletable
-    		if($object->element != 'order_supplier') {
-    			?>
+            // For now, receptions must stay linked to order, so link is not deletable
+            if($object->element != 'order_supplier') {
+                ?>
     			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
-    		}
-    		?>
+            }
+            ?>
     </tr>
 <?php
 }

Spacing +8 added lines, -8 removed lines

@@ -28,20 +28,20 @@ 
 
 $langs->load("receptions");
 
-$total=0; $ilink=0;
-$var=true;
-foreach($linkedObjectBlock as $key => $objectlink)
+$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';
+    $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("Reception"); ?></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="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td align="right"><?php
     		if ($user->rights->reception->lire) {
     			$total = $total + $objectlink->total_ht;
@@ -51,7 +51,7 @@ 
     	<td align="right">
     		<?php
     		// For now, receptions must stay linked to order, so link is not deletable
-    		if($object->element != 'order_supplier') {
+    		if ($object->element != 'order_supplier') {
     			?>
     			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
@@ -63,7 +63,7 @@ 
 if (count($linkedObjectBlock) > 1)
 {
     ?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
     	<td align="center"></td>

Braces +4 added lines, -2 removed lines

@@ -35,8 +35,10 @@
     $ilink++;
 
     $trclass=($var?'pair':'impair');
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
-?>
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+        $trclass.=' liste_sub_total';
+    }
+    ?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("Reception"); ?></td>
         <td><?php echo $objectlink->getNomUrl(1); ?></td>

dolibarr/htdocs/reception/note.php

Indentation +13 added lines, -13 removed lines

@@ -98,19 +98,19 @@ 
 if ($id > 0 || ! empty($ref))
 {
 
-	$head=reception_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'sending');
+    $head=reception_prepare_head($object);
+    dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'sending');
 
 
-	// Reception card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
+    // Reception card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer reception
-	$morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref='<div class="refidno">';
+    // Ref customer reception
+    $morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
     // Project
     if (! empty($conf->projet->enabled)) {
         $langs->load("projects");
@@ -153,10 +153,10 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass='titlefield';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 

Braces +3 added lines, -1 removed lines

@@ -48,7 +48,9 @@
 
 // Security check
 $socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user, $origin, $origin_id);
 
 $object = new Reception($db);

Spacing +33 added lines, -33 removed lines

@@ -27,12 +27,12 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 dol_include_once('/fourn/class/fournisseur.commande.class.php');
-if (! empty($conf->projet->enabled)) {
+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';
 }
@@ -46,17 +46,17 @@ 
 $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');
+$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);
+$socid = '';
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, $origin, $origin_id);
 
 $object = new Reception($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -69,79 +69,79 @@ 
     }
 
     // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
     {
-        $objectsrc=new Commande($db);
+        $objectsrc = new Commande($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
 
-$permissionnote=$user->rights->reception->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->reception->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
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 /*
  * View
  */
 
-llxHeader('','Reception');
+llxHeader('', 'Reception');
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 
-	$head=reception_prepare_head($object);
+	$head = reception_prepare_head($object);
 	dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'sending');
 
 
 	// Reception card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
-	$morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on reception
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $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 .= '<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 .= '<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 .= '<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);
+                $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 reception, so we will use the project or source object instead
             // TODO Add project on reception
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            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 .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -149,7 +149,7 @@ 
             }
         }
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
     $object->picto = 'sending';
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -157,7 +157,7 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
+	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	dol_fiche_end();

dolibarr/htdocs/reception/index.php

Indentation +130 added lines, -130 removed lines

@@ -73,9 +73,9 @@ 
 $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.= " 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('reception').")";
@@ -84,34 +84,34 @@ 
 $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("ReceptionsToValidate").'</th></tr>';
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$reception->id=$obj->rowid;
-			$reception->ref=$obj->ref;
-			$reception->ref_supplier=$obj->ref_supplier;
-
-			print '<tr class="oddeven"><td class="nowrap">';
-			print $reception->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_fournisseur_id) print '<a href="'.DOL_URL_ROOT.'/commande_fournisseur/card.php?id='.$obj->commande_fournisseur_id.'">'.$obj->commande_fournisseur_ref.'</a>';
-			print '</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("ReceptionsToValidate").'</th></tr>';
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $reception->id=$obj->rowid;
+            $reception->ref=$obj->ref;
+            $reception->ref_supplier=$obj->ref_supplier;
+
+            print '<tr class="oddeven"><td class="nowrap">';
+            print $reception->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_fournisseur_id) print '<a href="'.DOL_URL_ROOT.'/commande_fournisseur/card.php?id='.$obj->commande_fournisseur_id.'">'.$obj->commande_fournisseur_ref.'</a>';
+            print '</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 
 
@@ -131,43 +131,43 @@ 
 $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("SuppliersOrdersToProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$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>";
-	}
+    $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("SuppliersOrdersToProcess").'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $orderstatic->id=$obj->rowid;
+            $orderstatic->ref=$obj->ref;
+            $orderstatic->ref_supplier=$obj->ref_supplier;
+            $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>";
+    }
 }
 
 
@@ -191,42 +191,42 @@ 
 $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("SuppliersOrdersInProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$orderstatic->statut=$obj->status;
+    $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("SuppliersOrdersInProcess").'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $orderstatic->id=$obj->rowid;
+            $orderstatic->ref=$obj->ref;
+            $orderstatic->ref_supplier=$obj->ref_supplier;
+            $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>';
+            $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>";
-	}
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 else dol_print_error($db);
 
@@ -253,39 +253,39 @@ 
 $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("LastReceptions", $num).'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$reception->id=$obj->rowid;
-			$reception->ref=$obj->ref;
-			$reception->ref_supplier=$obj->ref_supplier;
-
-			print '<tr class="oddeven"><td>';
-			print $reception->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_fournisseur_id > 0)
-			{
-				$orderstatic->id=$obj->commande_fournisseur_id;
-				$orderstatic->ref=$obj->commande_fournisseur_ref;
-				print $orderstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
-			print '</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
-	$db->free($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("LastReceptions", $num).'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $reception->id=$obj->rowid;
+            $reception->ref=$obj->ref;
+            $reception->ref_supplier=$obj->ref_supplier;
+
+            print '<tr class="oddeven"><td>';
+            print $reception->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_fournisseur_id > 0)
+            {
+                $orderstatic->id=$obj->commande_fournisseur_id;
+                $orderstatic->ref=$obj->commande_fournisseur_ref;
+                print $orderstatic->getNomUrl(1);
+            }
+            else print '&nbsp;';
+            print '</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
+    $db->free($resql);
 }
 else dol_print_error($db);
 

Braces +42 added lines, -15 removed lines

@@ -48,9 +48,11 @@ 
 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
+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>';
@@ -79,7 +81,9 @@ 
 }
 $sql.= $clause." e.fk_statut = 0";
 $sql.= " AND e.entity IN (".getEntity('reception').")";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
 
 $resql=$db->query($sql);
 if ($resql)
@@ -106,7 +110,9 @@ 
 			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
 			print '</td>';
 			print '<td>';
-			if ($obj->commande_fournisseur_id) print '<a href="'.DOL_URL_ROOT.'/commande_fournisseur/card.php?id='.$obj->commande_fournisseur_id.'">'.$obj->commande_fournisseur_ref.'</a>';
+			if ($obj->commande_fournisseur_id) {
+			    print '<a href="'.DOL_URL_ROOT.'/commande_fournisseur/card.php?id='.$obj->commande_fournisseur_id.'">'.$obj->commande_fournisseur_ref.'</a>';
+			}
 			print '</td></tr>';
 			$i++;
 		}
@@ -121,12 +127,18 @@ 
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+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 = 3";//Commandé
-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;
+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)
@@ -181,12 +193,18 @@ 
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+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 IN (4)";
-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;
+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 )
@@ -227,8 +245,9 @@ 
 		}
 		print "</table><br>";
 	}
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 /*
@@ -241,11 +260,17 @@ 
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
 $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";
+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('reception').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
+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;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
 $sql.= " ORDER BY e.date_delivery DESC";
 
 $sql.= $db->plimit(5, 0);
@@ -278,16 +303,18 @@ 
 				$orderstatic->id=$obj->commande_fournisseur_id;
 				$orderstatic->ref=$obj->commande_fournisseur_ref;
 				print $orderstatic->getNomUrl(1);
+			} else {
+			    print '&nbsp;';
 			}
-			else print '&nbsp;';
 			print '</td></tr>';
 			$i++;
 		}
 		print "</table><br>";
 	}
 	$db->free($resql);
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 print '</div></div></div>';

Spacing +77 added lines, -77 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
@@ -39,12 +39,12 @@ 
  *	View
  */
 
-$orderstatic=new CommandeFournisseur($db);
-$companystatic=new Societe($db);
-$reception=new Reception($db);
+$orderstatic = new CommandeFournisseur($db);
+$companystatic = new Societe($db);
+$reception = new Reception($db);
 
-$helpurl='EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
-llxHeader('',$langs->trans("Reception"),$helpurl);
+$helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
+llxHeader('', $langs->trans("Reception"), $helpurl);
 
 print load_fiche_titre($langs->trans("ReceptionsArea"));
 
@@ -52,7 +52,7 @@ 
 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
+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'].'">';
@@ -69,23 +69,23 @@ 
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."reception as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur 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;
+	$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('reception').")";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+$sql .= $clause." e.fk_statut = 0";
+$sql .= " AND e.entity IN (".getEntity('reception').")";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -99,9 +99,9 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$reception->id=$obj->rowid;
-			$reception->ref=$obj->ref;
-			$reception->ref_supplier=$obj->ref_supplier;
+			$reception->id = $obj->rowid;
+			$reception->ref = $obj->ref;
+			$reception->ref_supplier = $obj->ref_supplier;
 
 			print '<tr class="oddeven"><td class="nowrap">';
 			print $reception->getNomUrl(1);
@@ -123,16 +123,16 @@ 
  * CommandeFournisseurs a traiter
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur 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 = 3";//Commandé
-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);
+$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur 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 = 3"; //Commandé
+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);
@@ -148,21 +148,21 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->facturee=0;
+			$orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_supplier = $obj->ref_supplier;
+			$orderstatic->statut = $obj->fk_statut;
+			$orderstatic->facturee = 0;
 
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+			$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 $companystatic->getNomUrl(1, 'customer', 32);
 			print '</td>';
 			print '<td align="right">';
 			print $orderstatic->getLibStatut(3);
@@ -183,17 +183,17 @@ 
  * CommandeFournisseurs en traitement
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur 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 IN (4)";
-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 .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur 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 IN (4)";
+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 )
+if ($resql)
 {
 	$langs->load("orders");
 
@@ -208,20 +208,20 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$orderstatic->statut=$obj->status;
-            $orderstatic->facturee=$obj->billed;
+		    $orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_supplier = $obj->ref_supplier;
+			$orderstatic->statut = $obj->status;
+            $orderstatic->facturee = $obj->billed;
 
-            $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+            $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 $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
             print '<td align="right">';
             print $orderstatic->getLibStatut(3);
@@ -239,20 +239,20 @@ 
  * Last receptions
  */
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."reception as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
-$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('reception').")";
-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);
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
+$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('reception').")";
+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)
@@ -268,19 +268,19 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$reception->id=$obj->rowid;
-			$reception->ref=$obj->ref;
-			$reception->ref_supplier=$obj->ref_supplier;
+			$reception->id = $obj->rowid;
+			$reception->ref = $obj->ref;
+			$reception->ref_supplier = $obj->ref_supplier;
 
 			print '<tr class="oddeven"><td>';
 			print $reception->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><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_fournisseur_id > 0)
 			{
-				$orderstatic->id=$obj->commande_fournisseur_id;
-				$orderstatic->ref=$obj->commande_fournisseur_ref;
+				$orderstatic->id = $obj->commande_fournisseur_id;
+				$orderstatic->ref = $obj->commande_fournisseur_ref;
 				print $orderstatic->getNomUrl(1);
 			}
 			else print '&nbsp;';

dolibarr/htdocs/reception/contact.php

Indentation +95 added lines, -95 removed lines

@@ -58,7 +58,7 @@ 
         $origin = $object->origin;
 
         $object->fetch_origin();
-		$typeobject = $object->origin;
+        $typeobject = $object->origin;
     }
 
     // Linked documents
@@ -83,26 +83,26 @@ 
 {
     if ($result > 0 && $id > 0)
     {
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+            $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');
-	}
+    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
@@ -114,16 +114,16 @@ 
 // Efface un contact
 else if ($action == 'deletecontact' && $user->rights->reception->creer)
 {
-	$result = $objectsrc->delete_contact(GETPOST("lineid"));
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else {
-		dol_print_error($db);
-	}
+    $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->reception->creer)
@@ -155,20 +155,20 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$langs->trans("OrderCard");
+    $langs->trans("OrderCard");
 
-	$head = reception_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'sending');
+    $head = reception_prepare_head($object);
+    dol_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'sending');
 
 
-	// Reception card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
+    // Reception card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer reception
-	$morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
+    $morehtmlref='<div class="refidno">';
+    // Ref customer reception
+    $morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
     $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
     // Project
     if (! empty($conf->projet->enabled)) {
@@ -204,69 +204,69 @@ 
             }
         }
     }
-	$morehtmlref.='</div>';
+    $morehtmlref.='</div>';
 
-	$object->picto = 'sending';
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+    $object->picto = 'sending';
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	print '<div class="fichecenter">';
+    print '<div class="fichecenter">';
     //print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border centpercent">';
     // Linked documents
-	if ($origin == 'order_supplier' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
-	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc=new CommandeFournisseur($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,'reception');
-	    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;
-	}
+    if ($origin == 'order_supplier' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
+    {
+        print '<tr><td class="titlefield">';
+        $objectsrc=new CommandeFournisseur($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,'reception');
+        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();

Braces +8 added lines, -6 removed lines

@@ -44,7 +44,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'reception', $id,'');
 
 $object = new Reception($db);
@@ -90,8 +92,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
@@ -120,8 +121,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -265,7 +265,9 @@ 
 	foreach($dirtpls as $reldir)
 	{
 		$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+		    break;
+		}
 	}
 }
 

Spacing +40 added lines, -40 removed lines

@@ -26,7 +26,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
@@ -34,7 +34,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.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)) {
+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';
 }
@@ -43,16 +43,16 @@ 
 $langs->load("receptions");
 $langs->load("companies");
 
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$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, 'reception', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'reception', $id, '');
 
 $object = new Reception($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -66,14 +66,14 @@ 
     }
 
     // Linked documents
-    if ($origin == 'order_supplier' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
+    if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
     {
-        $objectsrc=new CommandeFournisseur($db);
+        $objectsrc = new CommandeFournisseur($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
@@ -112,7 +112,7 @@ 
 // bascule du statut d'un contact
 else if ($action == 'swapstatut' && $user->rights->reception->creer)
 {
-    $result=$objectsrc->swapContactStatus(GETPOST('ligne'));
+    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -142,13 +142,13 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Reception'),'EN:Customers_Orders|FR:receptions_Clients|ES:Pedidos de clientes');
+llxHeader('', $langs->trans('Reception'), 'EN:Customers_Orders|FR:receptions_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);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -157,7 +157,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$langs->trans("OrderCard");
 
@@ -168,39 +168,39 @@ 
 	// Reception card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
-	$morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on reception
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $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 .= '<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 .= '<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 .= '<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);
+                $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 reception, so we will use the project or source object instead
             // TODO Add project on reception
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            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 .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -208,7 +208,7 @@ 
             }
         }
     }
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 	$object->picto = 'sending';
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -220,25 +220,25 @@ 
 
     print '<table class="border centpercent">';
     // Linked documents
-	if ($origin == 'order_supplier' && $object->$typeobject->id && ! empty($conf->fournisseur->enabled))
+	if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new CommandeFournisseur($db);
+	    $objectsrc = new CommandeFournisseur($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefOrder").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'commande');
+	    print $objectsrc->getNomUrl(1, 'commande');
 	    print "</td>\n";
 	    print '</tr>';
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Propal($db);
+	    $objectsrc = new Propal($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefProposal").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'reception');
+	    print $objectsrc->getNomUrl(1, 'reception');
 	    print "</td>\n";
 	    print '</tr>';
 	}
@@ -265,10 +265,10 @@ 
 	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)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir)
 	{
-		$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		if ($res) break;
 	}
 }

dolibarr/htdocs/reception/list.php

Indentation +660 added lines, -660 removed lines

@@ -138,271 +138,271 @@ 
 // 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_supplier='';
+    $search_ref_supplier='';
     $search_ref_rcp='';
     $search_ref_liv='';
     $search_company='';
     $search_town='';
-	$search_zip="";
+    $search_zip="";
     $search_state="";
-	$search_type='';
-	$search_country='';
-	$search_type_thirdparty='';
-	$search_billed='';
+    $search_type='';
+    $search_country='';
+    $search_type_thirdparty='';
+    $search_billed='';
     $viewstatut='';
     $search_array_options=array();
 }
 
 if (empty($reshook))
 {
-	if ($massaction == 'confirm_createbills') {
-
-    	$receptions = GETPOST('toselect','array');
-    	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-    	$validate_invoices = GETPOST('valdate_invoices', 'int');
-
-    	$TFact = array();
-    	$TFactThird = array();
-
-    	$nb_bills_created = 0;
-
-    	$db->begin();
-		$errors =array();
-    	foreach($receptions as $id_reception)
-    	{
-    		$rcp = new Reception($db);
-			 // On ne facture que les réceptions validées
-    		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1){
-				$errors[]=$langs->trans('StatusMustBeValidate',$rcp->ref);
-				$error++;
-				continue;
-			}
-
-    		$object = new FactureFournisseur($db);
-    		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){
-				$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
-				if(empty($object->rowid)&&$object->id != null)$object->rowid = $object->id;
-				if(!empty($object->rowid))$object->fetchObjectLinked();
-				$rcp->fetchObjectLinked();
-
-				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
-				{
-					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
-					{
-						if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
-							$object->add_object_linked('order_supplier', $value); // add supplier order linked object
-					}
-				}
-			}
-    		else {
-    			$object->socid = $rcp->socid;
-    			$object->type = FactureFournisseur::TYPE_STANDARD;
-    			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
-    			$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
-				$object->fk_account         = !empty($rcp->thirdparty->fk_account)?$rcp->thirdparty->fk_account:0;
-				$object->remise_percent 	= !empty($rcp->thirdparty->remise_percent)?$rcp->thirdparty->remise_percent:0;
-				$object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue)?$rcp->thirdparty->remise_absolue:0;
-
-    			$object->fk_project			= $rcp->fk_project;
-    			$object->ref_supplier		= $rcp->ref_supplier;
-
-    			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'),GETPOST('reday'), GETPOST('reyear'));
-    			if (empty($datefacture))
-    			{
-    				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-    			}
-
-    			$object->date = $datefacture;
-    			$object->origin    = 'reception';
-    			$object->origin_id = $id_reception;
-
-				$rcp->fetchObjectLinked();
-				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
-				{
-					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
-					{
-						$object->linked_objects['order_supplier'] = $value;
-					}
-				}
-
-    			$res = $object->create($user);
-				//var_dump($object->error);exit;
-    			if($res > 0){
-					$nb_bills_created++;
-					$object->id = $res;
-				}else {
-					$errors[]=$rcp->ref.' : '.$langs->trans($object->error);
-					$error++;
-				}
-    		}
-
-    		if ($object->id > 0)
-    		{
-				if(!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){ //cause function create already add object linked for facturefournisseur
-					$res = $object->add_object_linked($object->origin,$id_reception);
-
-					if ($res==0)
-					{
-						$errors[]=$object->error;
-						$error++;
-					}
-				}
-
-    			if (! $error)
-    			{
-	    			$lines = $rcp->lines;
-	    			if (empty($lines) && method_exists($rcp, 'fetch_lines'))
-	    			{
-	    				$rcp->fetch_lines();
-	    				$lines = $rcp->lines;
-	    			}
-
-	    			$fk_parent_line=0;
-	    			$num=count($lines);
-
-	    			for ($i=0;$i<$num;$i++)
-	    			{
-	    				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
-	    				if ($lines[$i]->subprice < 0)
-	    				{
-	    					// Negative line, we create a discount line
-	    					$discount = new DiscountAbsolute($db);
-	    					$discount->fk_soc=$object->socid;
-	    					$discount->amount_ht=abs($lines[$i]->total_ht);
-	    					$discount->amount_tva=abs($lines[$i]->total_tva);
-	    					$discount->amount_ttc=abs($lines[$i]->total_ttc);
-	    					$discount->tva_tx=$lines[$i]->tva_tx;
-	    					$discount->fk_user=$user->id;
-	    					$discount->description=$desc;
-	    					$discountid=$discount->create($user);
-	    					if ($discountid > 0)
-	    					{
-	    						$result=$object->insert_discount($discountid);
-	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					}
-	    					else
-	    					{
-	    						setEventMessages($discount->error, $discount->errors, 'errors');
-	    						$error++;
-	    						break;
-	    					}
-	    				}
-	    				else
-	    				{
-	    					// Positive line
-	    					$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-	    					// Date start
-	    					$date_start=false;
-	    					if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-	    					if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-	    					if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
-	    					//Date end
-	    					$date_end=false;
-	    					if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-	    					if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-	    					if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-	    					// Reset fk_parent_line for no child products and special product
-	    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = 0;
-	    					}
-	    					$result = $object->addline(
-	    							$desc,
-	    							$lines[$i]->subprice,
-	    							$lines[$i]->tva_tx,
-	    							$lines[$i]->localtax1_tx,
-	    							$lines[$i]->localtax2_tx,
-									$lines[$i]->qty,
-	    							$lines[$i]->fk_product,
-	    							$lines[$i]->remise_percent,
-	    							$date_start,
-	    							$date_end,
-	    							0,
-	    							$lines[$i]->info_bits,
-	    							'HT',
-	    							$product_type,
-	    							$i,
-	    							false,
-									0,
-									null,
-	    							$lines[$i]->rowid,
-									0,
-									$lines[$i]->ref_supplier
-
-	    					);
-
-							$rcp->add_object_linked('facture_fourn_det',$result);
-
-	    					if ($result > 0)
-	    					{
-	    						$lineid=$result;
-	    					}
-	    					else
-	    					{
-	    						$lineid=0;
-	    						$error++;
-	    						break;
-	    					}
-	    					// Defined the new fk_parent_line
-	    					if ($result > 0 && $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = $result;
-	    					}
-	    				}
-	    			}
-    			}
-    		}
-
-    		//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
-
-    		if(!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
-    		else $TFact[$object->id] = $object;
-    	}
-
-    	// Build doc with all invoices
-    	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-    	$toselect = array();
-
-    	if (! $error && $validate_invoices)
-    	{
-    		$massaction = $action = 'builddoc';
-    		foreach($TAllFact as &$object)
-    		{
-    			$result = $object->validate($user);
-    			if ($result <= 0)
-    			{
-    				$error++;
-    				setEventMessages($object->error, $object->errors, 'errors');
-    				break;
-    			}
-
-    			$id = $object->id; // For builddoc action
-
-    			// Fac builddoc
-    			$donotredirect = 1;
-    			$upload_dir = $conf->fournisseur->facture->dir_output;
-    		    $permissioncreate=$user->rights->fournisseur->facture->creer;
-    		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-    		}
-
-    		$massaction = $action = 'confirm_createbills';
-    	}
-
-    	if (! $error)
-    	{
-    		$db->commit();
-    		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	}
-    	else
-    	{
-
-    		$db->rollback();
-    		$action='create';
-    		$_GET["origin"]=$_POST["origin"];
-    		$_GET["originid"]=$_POST["originid"];
-    		setEventMessages($object->error, $errors, 'errors');
-    		$error++;
-    	}
+    if ($massaction == 'confirm_createbills') {
+
+        $receptions = GETPOST('toselect','array');
+        $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+        $validate_invoices = GETPOST('valdate_invoices', 'int');
+
+        $TFact = array();
+        $TFactThird = array();
+
+        $nb_bills_created = 0;
+
+        $db->begin();
+        $errors =array();
+        foreach($receptions as $id_reception)
+        {
+            $rcp = new Reception($db);
+                // On ne facture que les réceptions validées
+            if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1){
+                $errors[]=$langs->trans('StatusMustBeValidate',$rcp->ref);
+                $error++;
+                continue;
+            }
+
+            $object = new FactureFournisseur($db);
+            if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){
+                $object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
+                if(empty($object->rowid)&&$object->id != null)$object->rowid = $object->id;
+                if(!empty($object->rowid))$object->fetchObjectLinked();
+                $rcp->fetchObjectLinked();
+
+                if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
+                {
+                    foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
+                    {
+                        if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
+                            $object->add_object_linked('order_supplier', $value); // add supplier order linked object
+                    }
+                }
+            }
+            else {
+                $object->socid = $rcp->socid;
+                $object->type = FactureFournisseur::TYPE_STANDARD;
+                $object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
+                $object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
+                $object->fk_account         = !empty($rcp->thirdparty->fk_account)?$rcp->thirdparty->fk_account:0;
+                $object->remise_percent 	= !empty($rcp->thirdparty->remise_percent)?$rcp->thirdparty->remise_percent:0;
+                $object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue)?$rcp->thirdparty->remise_absolue:0;
+
+                $object->fk_project			= $rcp->fk_project;
+                $object->ref_supplier		= $rcp->ref_supplier;
+
+                $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'),GETPOST('reday'), GETPOST('reyear'));
+                if (empty($datefacture))
+                {
+                    $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+                }
+
+                $object->date = $datefacture;
+                $object->origin    = 'reception';
+                $object->origin_id = $id_reception;
+
+                $rcp->fetchObjectLinked();
+                if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
+                {
+                    foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
+                    {
+                        $object->linked_objects['order_supplier'] = $value;
+                    }
+                }
+
+                $res = $object->create($user);
+                //var_dump($object->error);exit;
+                if($res > 0){
+                    $nb_bills_created++;
+                    $object->id = $res;
+                }else {
+                    $errors[]=$rcp->ref.' : '.$langs->trans($object->error);
+                    $error++;
+                }
+            }
+
+            if ($object->id > 0)
+            {
+                if(!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){ //cause function create already add object linked for facturefournisseur
+                    $res = $object->add_object_linked($object->origin,$id_reception);
+
+                    if ($res==0)
+                    {
+                        $errors[]=$object->error;
+                        $error++;
+                    }
+                }
+
+                if (! $error)
+                {
+                    $lines = $rcp->lines;
+                    if (empty($lines) && method_exists($rcp, 'fetch_lines'))
+                    {
+                        $rcp->fetch_lines();
+                        $lines = $rcp->lines;
+                    }
+
+                    $fk_parent_line=0;
+                    $num=count($lines);
+
+                    for ($i=0;$i<$num;$i++)
+                    {
+                        $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+                        if ($lines[$i]->subprice < 0)
+                        {
+                            // Negative line, we create a discount line
+                            $discount = new DiscountAbsolute($db);
+                            $discount->fk_soc=$object->socid;
+                            $discount->amount_ht=abs($lines[$i]->total_ht);
+                            $discount->amount_tva=abs($lines[$i]->total_tva);
+                            $discount->amount_ttc=abs($lines[$i]->total_ttc);
+                            $discount->tva_tx=$lines[$i]->tva_tx;
+                            $discount->fk_user=$user->id;
+                            $discount->description=$desc;
+                            $discountid=$discount->create($user);
+                            if ($discountid > 0)
+                            {
+                                $result=$object->insert_discount($discountid);
+                                //$result=$discount->link_to_invoice($lineid,$id);
+                            }
+                            else
+                            {
+                                setEventMessages($discount->error, $discount->errors, 'errors');
+                                $error++;
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            // Positive line
+                            $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+                            // Date start
+                            $date_start=false;
+                            if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+                            if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+                            if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+                            //Date end
+                            $date_end=false;
+                            if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+                            if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+                            if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+                            // Reset fk_parent_line for no child products and special product
+                            if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+                            {
+                                $fk_parent_line = 0;
+                            }
+                            $result = $object->addline(
+                                    $desc,
+                                    $lines[$i]->subprice,
+                                    $lines[$i]->tva_tx,
+                                    $lines[$i]->localtax1_tx,
+                                    $lines[$i]->localtax2_tx,
+                                    $lines[$i]->qty,
+                                    $lines[$i]->fk_product,
+                                    $lines[$i]->remise_percent,
+                                    $date_start,
+                                    $date_end,
+                                    0,
+                                    $lines[$i]->info_bits,
+                                    'HT',
+                                    $product_type,
+                                    $i,
+                                    false,
+                                    0,
+                                    null,
+                                    $lines[$i]->rowid,
+                                    0,
+                                    $lines[$i]->ref_supplier
+
+                            );
+
+                            $rcp->add_object_linked('facture_fourn_det',$result);
+
+                            if ($result > 0)
+                            {
+                                $lineid=$result;
+                            }
+                            else
+                            {
+                                $lineid=0;
+                                $error++;
+                                break;
+                            }
+                            // Defined the new fk_parent_line
+                            if ($result > 0 && $lines[$i]->product_type == 9)
+                            {
+                                $fk_parent_line = $result;
+                            }
+                        }
+                    }
+                }
+            }
+
+            //$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+
+            if(!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
+            else $TFact[$object->id] = $object;
+        }
+
+        // Build doc with all invoices
+        $TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+        $toselect = array();
+
+        if (! $error && $validate_invoices)
+        {
+            $massaction = $action = 'builddoc';
+            foreach($TAllFact as &$object)
+            {
+                $result = $object->validate($user);
+                if ($result <= 0)
+                {
+                    $error++;
+                    setEventMessages($object->error, $object->errors, 'errors');
+                    break;
+                }
+
+                $id = $object->id; // For builddoc action
+
+                // Fac builddoc
+                $donotredirect = 1;
+                $upload_dir = $conf->fournisseur->facture->dir_output;
+                $permissioncreate=$user->rights->fournisseur->facture->creer;
+                include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+            }
+
+            $massaction = $action = 'confirm_createbills';
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+        }
+        else
+        {
+
+            $db->rollback();
+            $action='create';
+            $_GET["origin"]=$_POST["origin"];
+            $_GET["originid"]=$_POST["originid"];
+            setEventMessages($object->error, $errors, 'errors');
+            $error++;
+        }
     }
 }
 
@@ -442,20 +442,20 @@ 
 $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.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql.= " WHERE e.entity IN (".getEntity('reception').")";
 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;
+    $sql.= " AND e.fk_soc = sc.fk_soc";
+    $sql.= " AND sc.fk_user = " .$user->id;
 }
 if ($socid)
 {
-	$sql.= " AND e.fk_soc = ".$socid;
+    $sql.= " AND e.fk_soc = ".$socid;
 }
 if ($viewstatut <> '' && $viewstatut >= 0) {
-	$sql.= " AND e.fk_statut = ".$viewstatut;
+    $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);
@@ -502,47 +502,47 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	$reception = new Reception($db);
+    $reception = new Reception($db);
 
-	$arrayofselected=is_array($toselect)?$toselect:array();
+    $arrayofselected=is_array($toselect)?$toselect:array();
 
-	$param='';
+    $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_rcp) $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
-	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;
-	if ($search_billed != '' && $search_billed >= 0)$param.= "&amp;search_billed=".$search_billed;
-	if ($search_town)  $param.= "&amp;search_town=".$search_town;
-	if ($search_zip)  $param.= "&amp;search_zip=".$search_zip;
-	if ($search_state) $param.= "&amp;search_state=".$search_state;
-	if ($viewstatut) $param.= "&amp;viewstatut=".$viewstatut;
-	if ($search_country) $param.= "&amp;search_country=".$search_country;
-	if ($search_type_thirdparty) $param.= "&amp;search_type_thirdparty=".$search_type_thirdparty;
-	if ($search_ref_supplier) $param.= "&amp;search_ref_supplier=".$search_ref_supplier;
-	// 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);
-	}
-
-
-	$arrayofmassactions =  array(
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    if ($sall) $param.= "&amp;sall=".$sall;
+    if ($search_ref_rcp) $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
+    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;
+    if ($search_billed != '' && $search_billed >= 0)$param.= "&amp;search_billed=".$search_billed;
+    if ($search_town)  $param.= "&amp;search_town=".$search_town;
+    if ($search_zip)  $param.= "&amp;search_zip=".$search_zip;
+    if ($search_state) $param.= "&amp;search_state=".$search_state;
+    if ($viewstatut) $param.= "&amp;viewstatut=".$viewstatut;
+    if ($search_country) $param.= "&amp;search_country=".$search_country;
+    if ($search_type_thirdparty) $param.= "&amp;search_type_thirdparty=".$search_type_thirdparty;
+    if ($search_ref_supplier) $param.= "&amp;search_ref_supplier=".$search_ref_supplier;
+    // 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);
+    }
+
+
+    $arrayofmassactions =  array(
 //    'presend'=>$langs->trans("SendByMail"),
 );
 
-	if($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisSupplier");
-	if($massaction == 'createbills') $arrayofmassactions=array();
-	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+    if($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisSupplier");
+    if($massaction == 'createbills') $arrayofmassactions=array();
+    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+    //$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
-	$i = 0;
+    $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'].'">';
@@ -552,56 +552,56 @@ 
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num, $nbtotalofrecords, '', 0, '', '', $limit);
-
-
-	if ($massaction == 'createbills')
-	{
-		//var_dump($_REQUEST);
-		print '<input type="hidden" name="massaction" value="confirm_createbills">';
-
-		print '<table class="noborder" width="100%" >';
-		print '<tr>';
-		print '<td class="titlefieldmiddle">';
-		print $langs->trans('DateInvoice');
-		print '</td>';
-		print '<td>';
-		print $form->select_date('', '', '', '', '', '', 1, 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('CreateOneBillByThird');
-		print '</td>';
-		print '<td>';
-		print $form->selectyesno('createbills_onebythird', '', 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('ValidateInvoices');
-		print '</td>';
-		print '<td>';
-		if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
-		    print $form->selectyesno('valdate_invoices', 0, 1, 1);
-		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
-		{
+    print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num, $nbtotalofrecords, '', 0, '', '', $limit);
+
+
+    if ($massaction == 'createbills')
+    {
+        //var_dump($_REQUEST);
+        print '<input type="hidden" name="massaction" value="confirm_createbills">';
+
+        print '<table class="noborder" width="100%" >';
+        print '<tr>';
+        print '<td class="titlefieldmiddle">';
+        print $langs->trans('DateInvoice');
+        print '</td>';
+        print '<td>';
+        print $form->select_date('', '', '', '', '', '', 1, 1);
+        print '</td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td>';
+        print $langs->trans('CreateOneBillByThird');
+        print '</td>';
+        print '<td>';
+        print $form->selectyesno('createbills_onebythird', '', 1);
+        print '</td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td>';
+        print $langs->trans('ValidateInvoices');
+        print '</td>';
+        print '<td>';
+        if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+        {
+            print $form->selectyesno('valdate_invoices', 0, 1, 1);
+            print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
+        }
+        else
+        {
             print $form->selectyesno('valdate_invoices', 0, 1);
-		}
-		print '</td>';
-		print '</tr>';
-		print '</table>';
-
-		print '<br>';
-		print '<div class="center">';
-		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisSupplier').'">  ';
-		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
-		print '</div>';
-		print '<br>';
-	}
+        }
+        print '</td>';
+        print '</tr>';
+        print '</table>';
+
+        print '<br>';
+        print '<div class="center">';
+        print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisSupplier').'">  ';
+        print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+        print '</div>';
+        print '<br>';
+    }
 
     if ($sall)
     {
@@ -622,282 +622,282 @@ 
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 
     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_rcp" value="'.$search_ref_rcp.'">';
+    // 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_rcp" value="'.$search_ref_rcp.'">';
+        print '</td>';
+    }
+    // Ref customer
+    if (! empty($arrayfields['e.ref_supplier']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
         print '</td>';
-	}
-	// Ref customer
-	if (! empty($arrayfields['e.ref_supplier']['checked']))
-	{
-	    print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
+    }
+    // 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>';
-	}
-	// 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
+    }
+    // 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>';
+        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>';
+        print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+        print '</td>';
     }
-	// Company type
+    // 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>';
+        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('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')),$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>';
     }
-	// 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('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')),$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;
+    // 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_supplier']['checked']))   print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"],"e.ref_supplier","",$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);
-
-    	$reception->id=$obj->rowid;
-    	$reception->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 $reception->getNomUrl(1);
-    		$filename=dol_sanitizeFileName($reception->ref);
-    		$filedir=$conf->reception->dir_output . '/' . dol_sanitizeFileName($reception->ref);
-    		$urlsource=$_SERVER['PHP_SELF'].'?id='.$reception->rowid;
-    		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
-    		print "</td>\n";
-
-    		if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Ref customer
-		if (! empty($arrayfields['e.ref_supplier']['checked']))
-		{
-		    print "<td>";
-		    print $obj->ref_supplier;
-		    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();
+    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_supplier']['checked']))   print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"],"e.ref_supplier","",$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);
+
+        $reception->id=$obj->rowid;
+        $reception->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 $reception->getNomUrl(1);
+            $filename=dol_sanitizeFileName($reception->ref);
+            $filedir=$conf->reception->dir_output . '/' . dol_sanitizeFileName($reception->ref);
+            $urlsource=$_SERVER['PHP_SELF'].'?id='.$reception->rowid;
+            print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
+            print "</td>\n";
+
+            if (! $i) $totalarray['nbfield']++;
+        }
+
+        // Ref customer
+        if (! empty($arrayfields['e.ref_supplier']['checked']))
+        {
+            print "<td>";
+            print $obj->ref_supplier;
+            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_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
     		}*/
-    		print "</td>\n";
-		}
+            print "</td>\n";
+        }
 
-		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+        if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
         {
-		    $reception->fetchObjectLinked($reception->id,$reception->element);
+            $reception->fetchObjectLinked($reception->id,$reception->element);
             $receiving='';
             if (count($reception->linkedObjects['delivery']) > 0) $receiving=reset($reception->linkedObjects['delivery']);
 
-    		if (! empty($arrayfields['l.ref']['checked']))
+            if (! empty($arrayfields['l.ref']['checked']))
             {
                 // Ref
                 print '<td>';
@@ -905,90 +905,90 @@ 
                 print '</td>';
             }
 
-    		if (! empty($arrayfields['l.date_delivery']['checked']))
+            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";
+                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">'.$reception->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 align="center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        }
+
+        // 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">'.$reception->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 align="center">';
+        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+            if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+            print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         }
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
 
-		print "</tr>\n";
+        print "</tr>\n";
 
-		$i++;
-	}
+        $i++;
+    }
 
-	print "</table>";
-	print "</div>";
-	print '</form>';
-	$db->free($resql);
+    print "</table>";
+    print "</div>";
+    print '</form>';
+    $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 llxFooter();

Braces +290 added lines, -109 removed lines

@@ -45,7 +45,9 @@ 
 
 // Security check
 $receptionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'reception',$receptionid,'');
 
 $diroutputmassaction=$conf->reception->dir_output . '/temp/massgeneration/'.$user->id;
@@ -67,8 +69,12 @@ 
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
+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;
@@ -93,7 +99,9 @@ 
     's.nom'=>"ThirdParty",
     'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) {
+    $fieldstosearchall["e.note_private"]="NotePrivate";
+}
 
 $checkedtypetiers=0;
 $arrayfields=array(
@@ -131,14 +139,18 @@ 
 
 $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 ($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
+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_supplier='';
+}
     $search_ref_rcp='';
     $search_ref_liv='';
     $search_company='';
@@ -181,20 +193,26 @@ 
     		$object = new FactureFournisseur($db);
     		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){
 				$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
-				if(empty($object->rowid)&&$object->id != null)$object->rowid = $object->id;
-				if(!empty($object->rowid))$object->fetchObjectLinked();
+				if(empty($object->rowid)&&$object->id != null) {
+				    $object->rowid = $object->id;
+				}
+				if(!empty($object->rowid)) {
+				    $object->fetchObjectLinked();
+				}
 				$rcp->fetchObjectLinked();
 
 				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
 				{
 					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
 					{
-						if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
-							$object->add_object_linked('order_supplier', $value); // add supplier order linked object
+						if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier'])) {
+						    //Dont try to link if already linked
+							$object->add_object_linked('order_supplier', $value);
+						}
+						// add supplier order linked object
 					}
 				}
-			}
-    		else {
+			} else {
     			$object->socid = $rcp->socid;
     			$object->type = FactureFournisseur::TYPE_STANDARD;
     			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
@@ -230,7 +248,7 @@ 
     			if($res > 0){
 					$nb_bills_created++;
 					$object->id = $res;
-				}else {
+				} else {
 					$errors[]=$rcp->ref.' : '.$langs->trans($object->error);
 					$error++;
 				}
@@ -279,28 +297,38 @@ 
 	    					{
 	    						$result=$object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					}
-	    					else
+	    					} else
 	    					{
 	    						setEventMessages($discount->error, $discount->errors, 'errors');
 	    						$error++;
 	    						break;
 	    					}
-	    				}
-	    				else
+	    				} else
 	    				{
 	    					// Positive line
 	    					$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
 	    					// Date start
 	    					$date_start=false;
-	    					if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-	    					if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-	    					if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+	    					if ($lines[$i]->date_debut_prevue) {
+	    					    $date_start=$lines[$i]->date_debut_prevue;
+	    					}
+	    					if ($lines[$i]->date_debut_reel) {
+	    					    $date_start=$lines[$i]->date_debut_reel;
+	    					}
+	    					if ($lines[$i]->date_start) {
+	    					    $date_start=$lines[$i]->date_start;
+	    					}
 	    					//Date end
 	    					$date_end=false;
-	    					if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-	    					if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-	    					if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+	    					if ($lines[$i]->date_fin_prevue) {
+	    					    $date_end=$lines[$i]->date_fin_prevue;
+	    					}
+	    					if ($lines[$i]->date_fin_reel) {
+	    					    $date_end=$lines[$i]->date_fin_reel;
+	    					}
+	    					if ($lines[$i]->date_end) {
+	    					    $date_end=$lines[$i]->date_end;
+	    					}
 	    					// Reset fk_parent_line for no child products and special product
 	    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
 	    					{
@@ -336,8 +364,7 @@ 
 	    					if ($result > 0)
 	    					{
 	    						$lineid=$result;
-	    					}
-	    					else
+	    					} else
 	    					{
 	    						$lineid=0;
 	    						$error++;
@@ -355,8 +382,11 @@ 
 
     		//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-    		if(!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
-    		else $TFact[$object->id] = $object;
+    		if(!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) {
+    		    $TFactThird[$rcp->socid] = $object;
+    		} else {
+    		    $TFact[$object->id] = $object;
+    		}
     	}
 
     	// Build doc with all invoices
@@ -392,8 +422,7 @@ 
     	{
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	}
-    	else
+    	} else
     	{
 
     		$db->rollback();
@@ -427,27 +456,35 @@ 
 $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 : '');
+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."reception as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."reception_extrafields as ef on (e.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."reception_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 = 'reception' 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
+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('reception').")";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+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)
@@ -457,17 +494,39 @@ 
 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_rcp) $sql .= natural_search('e.ref', $search_ref_rcp);
-if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_ref_supplier) $sql .= natural_search('e.ref_supplier', $search_ref_supplier);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+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_rcp) {
+    $sql .= natural_search('e.ref', $search_ref_rcp);
+}
+if ($search_ref_liv) {
+    $sql .= natural_search('l.ref', $search_ref_liv);
+}
+if ($search_company) {
+    $sql .= natural_search('s.nom', $search_company);
+}
+if ($search_ref_supplier) {
+    $sql .= natural_search('e.ref_supplier', $search_ref_supplier);
+}
+if ($sall) {
+    $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
 
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
@@ -476,8 +535,14 @@ 
     $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 (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);
@@ -509,27 +574,59 @@ 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
 	$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_rcp) $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
-	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;
-	if ($search_billed != '' && $search_billed >= 0)$param.= "&amp;search_billed=".$search_billed;
-	if ($search_town)  $param.= "&amp;search_town=".$search_town;
-	if ($search_zip)  $param.= "&amp;search_zip=".$search_zip;
-	if ($search_state) $param.= "&amp;search_state=".$search_state;
-	if ($viewstatut) $param.= "&amp;viewstatut=".$viewstatut;
-	if ($search_country) $param.= "&amp;search_country=".$search_country;
-	if ($search_type_thirdparty) $param.= "&amp;search_type_thirdparty=".$search_type_thirdparty;
-	if ($search_ref_supplier) $param.= "&amp;search_ref_supplier=".$search_ref_supplier;
+    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_rcp) {
+	    $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
+	}
+	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;
+	}
+	if ($search_billed != '' && $search_billed >= 0) {
+	    $param.= "&amp;search_billed=".$search_billed;
+	}
+	if ($search_town) {
+	    $param.= "&amp;search_town=".$search_town;
+	}
+	if ($search_zip) {
+	    $param.= "&amp;search_zip=".$search_zip;
+	}
+	if ($search_state) {
+	    $param.= "&amp;search_state=".$search_state;
+	}
+	if ($viewstatut) {
+	    $param.= "&amp;viewstatut=".$viewstatut;
+	}
+	if ($search_country) {
+	    $param.= "&amp;search_country=".$search_country;
+	}
+	if ($search_type_thirdparty) {
+	    $param.= "&amp;search_type_thirdparty=".$search_type_thirdparty;
+	}
+	if ($search_ref_supplier) {
+	    $param.= "&amp;search_ref_supplier=".$search_ref_supplier;
+	}
 	// 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);
+	    if ($val != '') {
+	        $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	    }
 	}
 
 
@@ -537,14 +634,20 @@ 
 //    'presend'=>$langs->trans("SendByMail"),
 );
 
-	if($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisSupplier");
-	if($massaction == 'createbills') $arrayofmassactions=array();
+	if($user->rights->fournisseur->facture->creer) {
+	    $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisSupplier");
+	}
+	if($massaction == 'createbills') {
+	    $arrayofmassactions=array();
+	}
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 	//$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.'">';
+    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">';
@@ -586,8 +689,7 @@ 
 		{
 		    print $form->selectyesno('valdate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
+		} else
 		{
             print $form->selectyesno('valdate_invoices', 0, 1);
 		}
@@ -605,7 +707,9 @@ 
 
     if ($sall)
     {
-        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        foreach($fieldstosearchall as $key => $val) {
+            $fieldstosearchall[$key]=$langs->trans($val);
+        }
         print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
 
@@ -652,9 +756,13 @@ 
     	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>';
+	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>';
+	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']))
     {
@@ -708,8 +816,12 @@ 
 	                $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';
+	                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>';
@@ -754,17 +866,39 @@ 
 	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_supplier']['checked']))   print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"],"e.ref_supplier","",$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);
+	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_supplier']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"],"e.ref_supplier","",$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))
 	{
@@ -774,7 +908,9 @@ 
 	        {
 	            $align=$extrafields->getAlignFlag($key);
     			$sortonfield = "ef.".$key;
-    			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+    			if (! empty($extrafields->attribute_computed[$key])) {
+    			    $sortonfield='';
+    			}
     			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 	        }
 	    }
@@ -783,10 +919,18 @@ 
 	$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);
+	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";
 
@@ -818,7 +962,9 @@ 
     		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
     		print "</td>\n";
 
-    		if (! $i) $totalarray['nbfield']++;
+    		if (! $i) {
+    		    $totalarray['nbfield']++;
+    		}
 		}
 
 		// Ref customer
@@ -827,7 +973,9 @@ 
 		    print "<td>";
 		    print $obj->ref_supplier;
 		    print "</td>\n";
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 
 		// Third party
@@ -836,7 +984,9 @@ 
     		print '<td>';
     		print $companystatic->getNomUrl(1);
     		print '</td>';
-    		if (! $i) $totalarray['nbfield']++;
+    		if (! $i) {
+    		    $totalarray['nbfield']++;
+    		}
 		}
 		// Town
 		if (! empty($arrayfields['s.town']['checked']))
@@ -844,7 +994,9 @@ 
 		    print '<td class="nocellnopadd">';
 		    print $obj->town;
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// Zip
 		if (! empty($arrayfields['s.zip']['checked']))
@@ -852,13 +1004,17 @@ 
 		    print '<td class="nocellnopadd">';
 		    print $obj->zip;
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// State
 		if (! empty($arrayfields['state.nom']['checked']))
 		{
 		    print "<td>".$obj->state_name."</td>\n";
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// Country
 		if (! empty($arrayfields['country.code_iso']['checked']))
@@ -867,16 +1023,22 @@ 
 		    $tmparray=getCountry($obj->fk_pays,'all');
 		    print $tmparray['label'];
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    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);
+		    if (count($typenArray)==0) {
+		        $typenArray = $formcompany->typent_array(1);
+		    }
 		    print $typenArray[$obj->typent_code];
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 
 		// Date delivery planed
@@ -895,7 +1057,9 @@ 
         {
 		    $reception->fetchObjectLinked($reception->id,$reception->element);
             $receiving='';
-            if (count($reception->linkedObjects['delivery']) > 0) $receiving=reset($reception->linkedObjects['delivery']);
+            if (count($reception->linkedObjects['delivery']) > 0) {
+                $receiving=reset($reception->linkedObjects['delivery']);
+            }
 
     		if (! empty($arrayfields['l.ref']['checked']))
             {
@@ -923,12 +1087,16 @@ 
 		        {
 		            print '<td class="tdofextrafield"';
 		            $align=$extrafields->getAlignFlag($key);
-		            if ($align) print ' align="'.$align.'"';
+		            if ($align) {
+		                print ' align="'.$align.'"';
+		            }
 		            print '>';
 		            $tmpkey='options_'.$key;
 		            print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 		            print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
+		            if (! $i) {
+		                $totalarray['nbfield']++;
+		            }
 		        }
 		    }
 		}
@@ -942,7 +1110,9 @@ 
 		    print '<td align="center" class="nowrap">';
 		    print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// Date modification
 		if (! empty($arrayfields['e.tms']['checked']))
@@ -950,31 +1120,43 @@ 
 		    print '<td align="center" class="nowrap">';
 		    print dol_print_date($db->jdate($obj->date_update), 'dayhour');
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// Status
 		if (! empty($arrayfields['e.fk_statut']['checked']))
 		{
 		    print '<td align="right" class="nowrap">'.$reception->LibStatut($obj->fk_statut,5).'</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (! $i) {
+		        $totalarray['nbfield']++;
+		    }
 		}
 		// Billed
 		if (! empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Action column
 		print '<td align="center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		if ($massactionbutton || $massaction) {
+		    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected=0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		}
+    		if (in_array($obj->rowid, $arrayofselected)) {
+    		    $selected=1;
+    		}
     		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
         }
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 
@@ -985,8 +1167,7 @@ 
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +298 added lines, -298 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -43,45 +43,45 @@ 
 $langs->load('companies');
 $langs->load('bills');
 
-$socid=GETPOST('socid','int');
-$massaction=GETPOST('massaction','alpha');
+$socid = GETPOST('socid', 'int');
+$massaction = GETPOST('massaction', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
 // Security check
-$receptionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'reception',$receptionid,'');
+$receptionid = GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'reception', $receptionid, '');
 
-$diroutputmassaction=$conf->reception->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->reception->dir_output.'/temp/massgeneration/'.$user->id;
 
 $search_ref_rcp = GETPOST("search_ref_rcp");
 $search_ref_liv = GETPOST('search_ref_liv');
 $search_ref_supplier = GETPOST('search_ref_supplier');
 $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');
+$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";
+$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='receptionlist';
+$contextpage = 'receptionlist';
 
-$viewstatut=GETPOST('viewstatut');
+$viewstatut = GETPOST('viewstatut');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('receptionlist'));
@@ -89,7 +89,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('reception');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -97,10 +97,10 @@ 
     's.nom'=>"ThirdParty",
     'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
-$checkedtypetiers=0;
-$arrayfields=array(
+$checkedtypetiers = 0;
+$arrayfields = array(
     'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
     's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
@@ -119,9 +119,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
+    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]);
+        $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
     }
 }
 
@@ -130,38 +130,38 @@ 
  * Actions
  */
 
-if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction') && $massaction != 'confirm_createbills') { $massaction=''; }
+if (GETPOST('cancel')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction') && $massaction != 'confirm_createbills') { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$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
+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_supplier='';
-    $search_ref_rcp='';
-    $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();
+	$search_ref_supplier = '';
+    $search_ref_rcp = '';
+    $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))
 {
 	if ($massaction == 'confirm_createbills') {
 
-    	$receptions = GETPOST('toselect','array');
+    	$receptions = GETPOST('toselect', 'array');
     	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
     	$validate_invoices = GETPOST('valdate_invoices', 'int');
 
@@ -171,29 +171,29 @@ 
     	$nb_bills_created = 0;
 
     	$db->begin();
-		$errors =array();
-    	foreach($receptions as $id_reception)
+		$errors = array();
+    	foreach ($receptions as $id_reception)
     	{
     		$rcp = new Reception($db);
 			 // On ne facture que les réceptions validées
-    		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1){
-				$errors[]=$langs->trans('StatusMustBeValidate',$rcp->ref);
+    		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
+				$errors[] = $langs->trans('StatusMustBeValidate', $rcp->ref);
 				$error++;
 				continue;
 			}
 
     		$object = new FactureFournisseur($db);
-    		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){
+    		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
 				$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
-				if(empty($object->rowid)&&$object->id != null)$object->rowid = $object->id;
-				if(!empty($object->rowid))$object->fetchObjectLinked();
+				if (empty($object->rowid) && $object->id != null)$object->rowid = $object->id;
+				if (!empty($object->rowid))$object->fetchObjectLinked();
 				$rcp->fetchObjectLinked();
 
 				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
 				{
 					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
 					{
-						if(empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
+						if (empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
 							$object->add_object_linked('order_supplier', $value); // add supplier order linked object
 					}
 				}
@@ -203,14 +203,14 @@ 
     			$object->type = FactureFournisseur::TYPE_STANDARD;
     			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
     			$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
-				$object->fk_account         = !empty($rcp->thirdparty->fk_account)?$rcp->thirdparty->fk_account:0;
-				$object->remise_percent 	= !empty($rcp->thirdparty->remise_percent)?$rcp->thirdparty->remise_percent:0;
-				$object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue)?$rcp->thirdparty->remise_absolue:0;
+				$object->fk_account = !empty($rcp->thirdparty->fk_account) ? $rcp->thirdparty->fk_account : 0;
+				$object->remise_percent 	= !empty($rcp->thirdparty->remise_percent) ? $rcp->thirdparty->remise_percent : 0;
+				$object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue) ? $rcp->thirdparty->remise_absolue : 0;
 
     			$object->fk_project			= $rcp->fk_project;
-    			$object->ref_supplier		= $rcp->ref_supplier;
+    			$object->ref_supplier = $rcp->ref_supplier;
 
-    			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'),GETPOST('reday'), GETPOST('reyear'));
+    			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
     			if (empty($datefacture))
     			{
     				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
@@ -231,28 +231,28 @@ 
 
     			$res = $object->create($user);
 				//var_dump($object->error);exit;
-    			if($res > 0){
+    			if ($res > 0) {
 					$nb_bills_created++;
 					$object->id = $res;
-				}else {
-					$errors[]=$rcp->ref.' : '.$langs->trans($object->error);
+				} else {
+					$errors[] = $rcp->ref.' : '.$langs->trans($object->error);
 					$error++;
 				}
     		}
 
     		if ($object->id > 0)
     		{
-				if(!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])){ //cause function create already add object linked for facturefournisseur
-					$res = $object->add_object_linked($object->origin,$id_reception);
+				if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) { //cause function create already add object linked for facturefournisseur
+					$res = $object->add_object_linked($object->origin, $id_reception);
 
-					if ($res==0)
+					if ($res == 0)
 					{
-						$errors[]=$object->error;
+						$errors[] = $object->error;
 						$error++;
 					}
 				}
 
-    			if (! $error)
+    			if (!$error)
     			{
 	    			$lines = $rcp->lines;
 	    			if (empty($lines) && method_exists($rcp, 'fetch_lines'))
@@ -261,27 +261,27 @@ 
 	    				$lines = $rcp->lines;
 	    			}
 
-	    			$fk_parent_line=0;
-	    			$num=count($lines);
+	    			$fk_parent_line = 0;
+	    			$num = count($lines);
 
-	    			for ($i=0;$i<$num;$i++)
+	    			for ($i = 0; $i < $num; $i++)
 	    			{
-	    				$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+	    				$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 	    				if ($lines[$i]->subprice < 0)
 	    				{
 	    					// Negative line, we create a discount line
 	    					$discount = new DiscountAbsolute($db);
-	    					$discount->fk_soc=$object->socid;
-	    					$discount->amount_ht=abs($lines[$i]->total_ht);
-	    					$discount->amount_tva=abs($lines[$i]->total_tva);
-	    					$discount->amount_ttc=abs($lines[$i]->total_ttc);
-	    					$discount->tva_tx=$lines[$i]->tva_tx;
-	    					$discount->fk_user=$user->id;
-	    					$discount->description=$desc;
-	    					$discountid=$discount->create($user);
+	    					$discount->fk_soc = $object->socid;
+	    					$discount->amount_ht = abs($lines[$i]->total_ht);
+	    					$discount->amount_tva = abs($lines[$i]->total_tva);
+	    					$discount->amount_ttc = abs($lines[$i]->total_ttc);
+	    					$discount->tva_tx = $lines[$i]->tva_tx;
+	    					$discount->fk_user = $user->id;
+	    					$discount->description = $desc;
+	    					$discountid = $discount->create($user);
 	    					if ($discountid > 0)
 	    					{
-	    						$result=$object->insert_discount($discountid);
+	    						$result = $object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
 	    					}
 	    					else
@@ -294,17 +294,17 @@ 
 	    				else
 	    				{
 	    					// Positive line
-	    					$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 	    					// Date start
-	    					$date_start=false;
-	    					if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-	    					if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-	    					if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+	    					$date_start = false;
+	    					if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
+	    					if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
+	    					if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
 	    					//Date end
-	    					$date_end=false;
-	    					if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-	    					if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-	    					if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+	    					$date_end = false;
+	    					if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
+	    					if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
+	    					if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
 	    					// Reset fk_parent_line for no child products and special product
 	    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
 	    					{
@@ -335,15 +335,15 @@ 
 
 	    					);
 
-							$rcp->add_object_linked('facture_fourn_det',$result);
+							$rcp->add_object_linked('facture_fourn_det', $result);
 
 	    					if ($result > 0)
 	    					{
-	    						$lineid=$result;
+	    						$lineid = $result;
 	    					}
 	    					else
 	    					{
-	    						$lineid=0;
+	    						$lineid = 0;
 	    						$error++;
 	    						break;
 	    					}
@@ -359,7 +359,7 @@ 
 
     		//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-    		if(!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
+    		if (!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
     		else $TFact[$object->id] = $object;
     	}
 
@@ -367,10 +367,10 @@ 
     	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
     	$toselect = array();
 
-    	if (! $error && $validate_invoices)
+    	if (!$error && $validate_invoices)
     	{
     		$massaction = $action = 'builddoc';
-    		foreach($TAllFact as &$object)
+    		foreach ($TAllFact as &$object)
     		{
     			$result = $object->validate($user);
     			if ($result <= 0)
@@ -385,14 +385,14 @@ 
     			// Fac builddoc
     			$donotredirect = 1;
     			$upload_dir = $conf->fournisseur->facture->dir_output;
-    		    $permissioncreate=$user->rights->fournisseur->facture->creer;
+    		    $permissioncreate = $user->rights->fournisseur->facture->creer;
     		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
     		}
 
     		$massaction = $action = 'confirm_createbills';
     	}
 
-    	if (! $error)
+    	if (!$error)
     	{
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
@@ -401,9 +401,9 @@ 
     	{
 
     		$db->rollback();
-    		$action='create';
-    		$_GET["origin"]=$_POST["origin"];
-    		$_GET["originid"]=$_POST["originid"];
+    		$action = 'create';
+    		$_GET["origin"] = $_POST["origin"];
+    		$_GET["originid"] = $_POST["originid"];
     		setEventMessages($object->error, $errors, 'errors');
     		$error++;
     	}
@@ -415,56 +415,56 @@ 
  * View
  */
 
-$form=new Form($db);
-$companystatic=new Societe($db);
-$reception=new Reception($db);
-$formcompany=new FormCompany($db);
+$form = new Form($db);
+$companystatic = new Societe($db);
+$reception = new Reception($db);
+$formcompany = new FormCompany($db);
 $formfile = new FormFile($db);
 
 
-$helpurl='EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
-llxHeader('',$langs->trans('ListOfReceptions'),$helpurl);
+$helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
+llxHeader('', $langs->trans('ListOfReceptions'), $helpurl);
 
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier, e.date_reception as date_reception, 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';
+$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 : '');
+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."reception as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."reception_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 = 'reception' AND ee.targettype = 'delivery'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$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."reception as e";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception_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 = 'reception' 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 .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
-$sql.= " WHERE e.entity IN (".getEntity('reception').")";
+$sql .= " WHERE e.entity IN (".getEntity('reception').")";
 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;
+	$sql .= " AND e.fk_soc = sc.fk_soc";
+	$sql .= " AND sc.fk_user = ".$user->id;
 }
 if ($socid)
 {
-	$sql.= " AND e.fk_soc = ".$socid;
+	$sql .= " AND e.fk_soc = ".$socid;
 }
 if ($viewstatut <> '' && $viewstatut >= 0) {
-	$sql.= " AND e.fk_statut = ".$viewstatut;
+	$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_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_rcp) $sql .= natural_search('e.ref', $search_ref_rcp);
@@ -476,21 +476,21 @@ 
 // 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'))
+    $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;
+$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))
@@ -499,51 +499,51 @@ 
     $nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
 	$reception = new Reception($db);
 
-	$arrayofselected=is_array($toselect)?$toselect:array();
-
-	$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_rcp) $param.= "&amp;search_ref_rcp=".$search_ref_rcp;
-	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;
-	if ($search_billed != '' && $search_billed >= 0)$param.= "&amp;search_billed=".$search_billed;
-	if ($search_town)  $param.= "&amp;search_town=".$search_town;
-	if ($search_zip)  $param.= "&amp;search_zip=".$search_zip;
-	if ($search_state) $param.= "&amp;search_state=".$search_state;
-	if ($viewstatut) $param.= "&amp;viewstatut=".$viewstatut;
-	if ($search_country) $param.= "&amp;search_country=".$search_country;
-	if ($search_type_thirdparty) $param.= "&amp;search_type_thirdparty=".$search_type_thirdparty;
-	if ($search_ref_supplier) $param.= "&amp;search_ref_supplier=".$search_ref_supplier;
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$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_rcp) $param .= "&amp;search_ref_rcp=".$search_ref_rcp;
+	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;
+	if ($search_billed != '' && $search_billed >= 0)$param .= "&amp;search_billed=".$search_billed;
+	if ($search_town)  $param .= "&amp;search_town=".$search_town;
+	if ($search_zip)  $param .= "&amp;search_zip=".$search_zip;
+	if ($search_state) $param .= "&amp;search_state=".$search_state;
+	if ($viewstatut) $param .= "&amp;viewstatut=".$viewstatut;
+	if ($search_country) $param .= "&amp;search_country=".$search_country;
+	if ($search_type_thirdparty) $param .= "&amp;search_type_thirdparty=".$search_type_thirdparty;
+	if ($search_ref_supplier) $param .= "&amp;search_ref_supplier=".$search_ref_supplier;
 	// 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);
+	    $crit = $val;
+	    $tmpkey = preg_replace('/search_options_/', '', $key);
+	    if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
 
-	$arrayofmassactions =  array(
+	$arrayofmassactions = array(
 //    'presend'=>$langs->trans("SendByMail"),
 );
 
-	if($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisSupplier");
-	if($massaction == 'createbills') $arrayofmassactions=array();
-	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	if ($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
+	if ($massaction == 'createbills') $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
 	$i = 0;
@@ -556,7 +556,7 @@ 
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$massactionbutton,$num, $nbtotalofrecords, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 
 	if ($massaction == 'createbills')
@@ -586,7 +586,7 @@ 
 		print $langs->trans('ValidateInvoices');
 		print '</td>';
 		print '<td>';
-		if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
 		{
 		    print $form->selectyesno('valdate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
@@ -609,90 +609,90 @@ 
 
     if ($sall)
     {
-        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
+        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
     }
 
-    $moreforfilter='';
-    if (! empty($moreforfilter))
+    $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
+        $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
-	$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    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']))
+	if (!empty($arrayfields['e.ref']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
         print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['e.ref_supplier']['checked']))
+	if (!empty($arrayfields['e.ref_supplier']['checked']))
 	{
 	    print '<td class="liste_titre">';
     	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
         print '</td>';
 	}
 	// Thirdparty
-	if (! empty($arrayfields['s.nom']['checked']))
+	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>';
+	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>';
+	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']))
+    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']))
+    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 $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
     	print '</td>';
     }
 	// Company type
-    if (! empty($arrayfields['typent.code']['checked']))
+    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 $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']))
+	if (!empty($arrayfields['e.date_delivery']['checked']))
 	{
     	print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (! empty($arrayfields['l.ref']['checked']))
+	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']))
+	if (!empty($arrayfields['l.date_delivery']['checked']))
 	{
 	    // Date received
 		print '<td class="liste_titre">&nbsp;</td>';
@@ -700,51 +700,51 @@ 
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	    foreach($extrafields->attribute_label as $key => $val)
+	    foreach ($extrafields->attribute_label as $key => $val)
 	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        if (!empty($arrayfields["ef.".$key]['checked']))
 	        {
-	            $align=$extrafields->getAlignFlag($key);
-	            $typeofextrafield=$extrafields->attribute_type[$key];
-	            print '<td class="liste_titre'.($align?' '.$align:'').'">';
+	            $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]).'">';
+	                $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
+	$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']))
+	if (!empty($arrayfields['e.datec']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
 	}
 	// Date modification
-	if (! empty($arrayfields['e.tms']['checked']))
+	if (!empty($arrayfields['e.tms']['checked']))
 	{
 	    print '<td class="liste_titre">';
 	    print '</td>';
 	}
 	// Status
-	if (! empty($arrayfields['e.fk_statut']['checked']))
+	if (!empty($arrayfields['e.fk_statut']['checked']))
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-	    print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')),$viewstatut,1);
+	    print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $viewstatut, 1);
 	    print '</td>';
 	}
 	// Status billed
-	if (! empty($arrayfields['e.billed']['checked']))
+	if (!empty($arrayfields['e.billed']['checked']))
 	{
 	    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 	    print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
@@ -752,142 +752,142 @@ 
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$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_supplier']['checked']))   print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"],"e.ref_supplier","",$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);
+	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_supplier']['checked']))   print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"], "e.ref_supplier", "", $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)
+	    foreach ($extrafields->attribute_label as $key => $val)
 	    {
-	        if (! empty($arrayfields["ef.".$key]['checked']))
+	        if (!empty($arrayfields["ef.".$key]['checked']))
 	        {
-	            $align=$extrafields->getAlignFlag($key);
+	            $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);
+    			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
+	$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 ');
+	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))
+	$i = 0;
+	$var = true;
+	$totalarray = array();
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-    	$reception->id=$obj->rowid;
-    	$reception->ref=$obj->ref;
+    	$reception->id = $obj->rowid;
+    	$reception->ref = $obj->ref;
 
-    	$companystatic->id=$obj->socid;
-    	$companystatic->ref=$obj->name;
-    	$companystatic->name=$obj->name;
+    	$companystatic->id = $obj->socid;
+    	$companystatic->ref = $obj->name;
+    	$companystatic->name = $obj->name;
 
 
     	print '<tr class="oddeven">';
 
 		// Ref
-		if (! empty($arrayfields['e.ref']['checked']))
+		if (!empty($arrayfields['e.ref']['checked']))
 		{
     		print "<td>";
     		print $reception->getNomUrl(1);
-    		$filename=dol_sanitizeFileName($reception->ref);
-    		$filedir=$conf->reception->dir_output . '/' . dol_sanitizeFileName($reception->ref);
-    		$urlsource=$_SERVER['PHP_SELF'].'?id='.$reception->rowid;
+    		$filename = dol_sanitizeFileName($reception->ref);
+    		$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
+    		$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->rowid;
     		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
     		print "</td>\n";
 
-    		if (! $i) $totalarray['nbfield']++;
+    		if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Ref customer
-		if (! empty($arrayfields['e.ref_supplier']['checked']))
+		if (!empty($arrayfields['e.ref_supplier']['checked']))
 		{
 		    print "<td>";
 		    print $obj->ref_supplier;
 		    print "</td>\n";
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
-		if (! empty($arrayfields['s.nom']['checked']))
+		if (!empty($arrayfields['s.nom']['checked']))
 		{
     		print '<td>';
     		print $companystatic->getNomUrl(1);
     		print '</td>';
-    		if (! $i) $totalarray['nbfield']++;
+    		if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
-		if (! empty($arrayfields['s.town']['checked']))
+		if (!empty($arrayfields['s.town']['checked']))
 		{
 		    print '<td class="nocellnopadd">';
 		    print $obj->town;
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Zip
-		if (! empty($arrayfields['s.zip']['checked']))
+		if (!empty($arrayfields['s.zip']['checked']))
 		{
 		    print '<td class="nocellnopadd">';
 		    print $obj->zip;
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// State
-		if (! empty($arrayfields['state.nom']['checked']))
+		if (!empty($arrayfields['state.nom']['checked']))
 		{
 		    print "<td>".$obj->state_name."</td>\n";
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Country
-		if (! empty($arrayfields['country.code_iso']['checked']))
+		if (!empty($arrayfields['country.code_iso']['checked']))
 		{
 		    print '<td align="center">';
-		    $tmparray=getCountry($obj->fk_pays,'all');
+		    $tmparray = getCountry($obj->fk_pays, 'all');
 		    print $tmparray['label'];
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Type ent
-		if (! empty($arrayfields['typent.code']['checked']))
+		if (!empty($arrayfields['typent.code']['checked']))
 		{
 		    print '<td align="center">';
-		    if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		    if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
 		    print $typenArray[$obj->typent_code];
 		    print '</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Date delivery planed
-		if (! empty($arrayfields['e.date_delivery']['checked']))
+		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
     		print '<td align="center">';
-    		print dol_print_date($db->jdate($obj->date_livraison),"day");
+    		print dol_print_date($db->jdate($obj->date_livraison), "day");
     		/*$now = time();
     		if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
@@ -895,13 +895,13 @@ 
     		print "</td>\n";
 		}
 
-		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
         {
-		    $reception->fetchObjectLinked($reception->id,$reception->element);
-            $receiving='';
-            if (count($reception->linkedObjects['delivery']) > 0) $receiving=reset($reception->linkedObjects['delivery']);
+		    $reception->fetchObjectLinked($reception->id, $reception->element);
+            $receiving = '';
+            if (count($reception->linkedObjects['delivery']) > 0) $receiving = reset($reception->linkedObjects['delivery']);
 
-    		if (! empty($arrayfields['l.ref']['checked']))
+    		if (!empty($arrayfields['l.ref']['checked']))
             {
                 // Ref
                 print '<td>';
@@ -909,11 +909,11 @@ 
                 print '</td>';
             }
 
-    		if (! empty($arrayfields['l.date_delivery']['checked']))
+    		if (!empty($arrayfields['l.date_delivery']['checked']))
             {
                 // Date received
             	print '<td align="center">';
-    			print dol_print_date($db->jdate($obj->date_reception),"day");
+    			print dol_print_date($db->jdate($obj->date_reception), "day");
     			print '</td>'."\n";
             }
 		}
@@ -921,64 +921,64 @@ 
 		// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		    foreach($extrafields->attribute_label as $key => $val)
+		    foreach ($extrafields->attribute_label as $key => $val)
 		    {
-		        if (! empty($arrayfields["ef.".$key]['checked']))
+		        if (!empty($arrayfields["ef.".$key]['checked']))
 		        {
 		            print '<td class="tdofextrafield"';
-		            $align=$extrafields->getAlignFlag($key);
+		            $align = $extrafields->getAlignFlag($key);
 		            if ($align) print ' align="'.$align.'"';
 		            print '>';
-		            $tmpkey='options_'.$key;
+		            $tmpkey = 'options_'.$key;
 		            print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
 		            print '</td>';
-		            if (! $i) $totalarray['nbfield']++;
+		            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
+		$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']))
+		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']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Date modification
-		if (! empty($arrayfields['e.tms']['checked']))
+		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']++;
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Status
-		if (! empty($arrayfields['e.fk_statut']['checked']))
+		if (!empty($arrayfields['e.fk_statut']['checked']))
 		{
-		    print '<td align="right" class="nowrap">'.$reception->LibStatut($obj->fk_statut,5).'</td>';
-		    if (! $i) $totalarray['nbfield']++;
+		    print '<td align="right" class="nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
+		    if (!$i) $totalarray['nbfield']++;
 		}
 		// Billed
-		if (! empty($arrayfields['e.billed']['checked']))
+		if (!empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Action column
 		print '<td align="center">';
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
-            $selected=0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+            $selected = 0;
+    		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
         }
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";