--- /tmp/dsg/dolibarr/htdocs/commande/github_card.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_card.php
@@ -67,7 +67,7 @@
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));

 $ref = GETPOST('ref', 'alpha');

 $socid = GETPOST('socid', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $cancel = GETPOST('cancel', 'alpha');

 $confirm = GETPOST('confirm', 'alpha');

 $lineid = GETPOST('lineid', 'int');

@@ -120,8 +120,6 @@
 

 $error = 0;

 

-$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));

-

 

 /*

  * Actions

@@ -156,7 +154,9 @@
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))

 		{

 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');

-		} else {

+		}

+		else

+		{

 			if ($object->id > 0)

 			{

 				// Because createFromClone modifies the object, we must clone it so that we can restore it later

@@ -167,7 +167,9 @@
 				{

 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);

 					exit;

-				} else {

+				}

+				else

+				{

 					setEventMessages($object->error, $object->errors, 'errors');

 					$object = $orig;

 					$action = '';

@@ -185,7 +187,9 @@
 			if ($result > 0)

 			{

 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);

-			} else {

+			}

+			else

+			{

 				setEventMessages($object->error, $object->errors, 'errors');

 			}

 		}

@@ -199,7 +203,9 @@
 		{

 			header('Location: list.php?restore_lastsearch_values=1');

 			exit;

-		} else {

+		}

+		else

+		{

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

 	}

@@ -223,12 +229,14 @@
 			}

 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {

 				$ret = $object->fetch($object->id); // Reload to get new records

-				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

 			}

 

 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);

 			exit;

-		} else {

+		}

+		else

+		{

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

 	}

@@ -243,8 +251,8 @@
 	elseif ($action == 'add' && $usercancreate)

 	{

 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));

-		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));

-		$selectedLines = GETPOST('toselect', 'array');

+		$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));

+        $selectedLines = GETPOST('toselect', 'array');

 

 		if ($datecommande == '') {

 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');

@@ -265,23 +273,22 @@
 			$db->begin();

 

 			$object->date_commande = $datecommande;

-			$object->note_private = GETPOST('note_private', 'restricthtml');

-			$object->note_public = GETPOST('note_public', 'restricthtml');

+			$object->note_private = GETPOST('note_private', 'none');

+			$object->note_public = GETPOST('note_public', 'none');

 			$object->source = GETPOST('source_id');

 			$object->fk_project = GETPOST('projectid', 'int');

 			$object->ref_client = GETPOST('ref_client', 'alpha');

-			$object->model_pdf = GETPOST('model');

+			$object->modelpdf = GETPOST('model');

 			$object->cond_reglement_id = GETPOST('cond_reglement_id');

 			$object->mode_reglement_id = GETPOST('mode_reglement_id');

 			$object->fk_account = GETPOST('fk_account', 'int');

 			$object->availability_id = GETPOST('availability_id');

 			$object->demand_reason_id = GETPOST('demand_reason_id');

-			$object->date_livraison = $date_delivery; // deprecated

-			$object->delivery_date = $date_delivery;

+			$object->date_livraison = $datelivraison;

 			$object->shipping_method_id = GETPOST('shipping_method_id', 'int');

 			$object->warehouse_id = GETPOST('warehouse_id', 'int');

 			$object->fk_delivery_address = GETPOST('fk_address');

-			$object->contact_id = GETPOST('contactid');

+			$object->contactid = GETPOST('contactid');

 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');

 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');

 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');

@@ -352,7 +359,7 @@
 

 							for ($i = 0; $i < $num; $i++)

 							{

-								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines

+                                if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines

 

 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');

 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');

@@ -420,7 +427,7 @@
 						        $originidforcontact=$srcobject->origin_id;

 						    }

 						    $sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";

-						    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";

+						    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";

 

 						    $resqlcontact = $db->query($sqlcontact);

 						    if ($resqlcontact)

@@ -453,14 +460,26 @@
 				if (!$error)

 				{

 					$object_id = $object->create($user);

+

+					// If some invoice's lines already known

+					$NBLINES = 8;

+					for ($i = 1; $i <= $NBLINES; $i++) {

+						if ($_POST['idprod'.$i]) {

+							$xid = 'idprod'.$i;

+							$xqty = 'qty'.$i;

+							$xremise = 'remise_percent'.$i;

+							$object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);

+						}

+					}

 				}

 			}

 

 			// Insert default contacts if defined

 			if ($object_id > 0)

 			{

-				if (GETPOST('contactid', 'int')) {

-					$result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');

+				if (GETPOST('contactid'))

+				{

+					$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');

 					if ($result < 0) {

 						setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');

 						$error++;

@@ -483,14 +502,17 @@
 				setEventMessages($object->error, $object->errors, 'errors');

 			}

 		}

-	} elseif ($action == 'classifybilled' && $usercancreate)

+	}

+

+	elseif ($action == 'classifybilled' && $usercancreate)

 	{

 		$ret = $object->classifyBilled($user);

 

 		if ($ret < 0) {

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'classifyunbilled' && $usercancreate)

+	}

+	elseif ($action == 'classifyunbilled' && $usercancreate)

 	{

 		$ret = $object->classifyUnBilled();

 		if ($ret < 0) {

@@ -505,13 +527,17 @@
 		{

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'setremise' && $usercancreate) {

+	}

+

+	elseif ($action == 'setremise' && $usercancreate) {

 		$result = $object->set_remise($user, GETPOST('remise'));

 		if ($result < 0)

 		{

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'setabsolutediscount' && $usercancreate) {

+	}

+

+	elseif ($action == 'setabsolutediscount' && $usercancreate) {

 		if (GETPOST('remise_id')) {

 			if ($object->id > 0) {

 				$object->insert_discount(GETPOST('remise_id'));

@@ -519,7 +545,9 @@
 				dol_print_error($db, $object->error);

 			}

 		}

-	} elseif ($action == 'setdate' && $usercancreate) {

+	}

+

+	elseif ($action == 'setdate' && $usercancreate) {

 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];

 		$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));

 

@@ -527,16 +555,19 @@
 		if ($result < 0) {

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'setdate_livraison' && $usercancreate) {

+	}

+

+	elseif ($action == 'setdate_livraison' && $usercancreate) {

 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];

-		$date_delivery = 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->setDeliveryDate($user, $date_delivery);

+		$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));

+

+		$result = $object->set_date_livraison($user, $datelivraison);

 		if ($result < 0) {

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'setmode' && $usercancreate) {

+	}

+

+	elseif ($action == 'setmode' && $usercancreate) {

 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));

 		if ($result < 0)

 			setEventMessages($object->error, $object->errors, 'errors');

@@ -549,16 +580,22 @@
 

 	// Multicurrency rate

 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {

-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));

-	} elseif ($action == 'setavailability' && $usercancreate) {

+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));

+	}

+

+	elseif ($action == 'setavailability' && $usercancreate) {

 		$result = $object->availability(GETPOST('availability_id'));

 		if ($result < 0)

 			setEventMessages($object->error, $object->errors, 'errors');

-	} elseif ($action == 'setdemandreason' && $usercancreate) {

+	}

+

+	elseif ($action == 'setdemandreason' && $usercancreate) {

 		$result = $object->demand_reason(GETPOST('demand_reason_id'));

 		if ($result < 0)

 			setEventMessages($object->error, $object->errors, 'errors');

-	} elseif ($action == 'setconditions' && $usercancreate) {

+	}

+

+	elseif ($action == 'setconditions' && $usercancreate) {

 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));

 		if ($result < 0) {

 			dol_print_error($db, $object->error);

@@ -575,7 +612,7 @@
 				}

 

 				$ret = $object->fetch($object->id); // Reload to get new records

-				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

 			}

 		}

 	}

@@ -611,44 +648,41 @@
 		if ($result < 0) {

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'setremisepercent' && $usercancreate) {

+	}

+

+	elseif ($action == 'setremisepercent' && $usercancreate) {

 		$result = $object->set_remise($user, GETPOST('remise_percent'));

-	} elseif ($action == 'setremiseabsolue' && $usercancreate) {

+	}

+

+	elseif ($action == 'setremiseabsolue' && $usercancreate) {

 		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));

-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '') {

-		// Define vat_rate

-		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);

-		$vat_rate = str_replace('*', '', $vat_rate);

-		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);

-		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);

-		foreach ($object->lines as $line) {

-			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);

-		}

-	} elseif ($action == 'addline' && $usercancreate)		// Add a new line

+	}

+

+	// Add a new line

+	elseif ($action == 'addline' && $usercancreate)

 	{

 		$langs->load('errors');

 		$error = 0;

 

 		// Set if we used free entry or predefined product

 		$predef = '';

-		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');

-		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);

-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);

+		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');

+		$price_ht = GETPOST('price_ht');

+		$price_ht_devise = GETPOST('multicurrency_price_ht');

 		$prod_entry_mode = GETPOST('prod_entry_mode');

 		if ($prod_entry_mode == 'free')

 		{

 			$idprod = 0;

 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);

-		} else {

+		}

+		else

+		{

 			$idprod = GETPOST('idprod', 'int');

 			$tva_tx = '';

 		}

 

-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');

-		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha')) : 0);

-		if (empty($remise_percent)) {

-			$remise_percent = 0;

-		}

+		$qty = GETPOST('qty'.$predef);

+		$remise_percent = (GETPOST('remise_percent'.$predef) != '' ? GETPOST('remise_percent'.$predef) : 0);

 

 		// Extrafields

 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

@@ -690,7 +724,9 @@
 

 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {

 					$idprod = $res->fk_product_child;

-				} else {

+				}

+				else

+				{

 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');

 					$error++;

 				}

@@ -732,8 +768,8 @@
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];

 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility

 					{

-						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];

-						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];

+					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];

+					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];

 					}

 				}

 				// If price per customer

@@ -752,14 +788,15 @@
 						{

 							$pu_ht = price($prodcustprice->lines[0]->price);

 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);

-							$price_min =  price($prodcustprice->lines[0]->price_min);

 							$price_base_type = $prodcustprice->lines[0]->price_base_type;

 							$tva_tx = $prodcustprice->lines[0]->tva_tx;

 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';

 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;

 							if (empty($tva_tx)) $tva_npr = 0;

 						}

-					} else {

+					}

+					else

+					{

 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');

 					}

 				}

@@ -779,7 +816,9 @@
 							if ($priceforthequantityarray['price_base_type'] == 'HT')

 							{

 								$pu_ht = $priceforthequantityarray['unitprice'];

-							} else {

+							}

+							else

+							{

 								$pu_ttc = $priceforthequantityarray['unitprice'];

 							}

 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.

@@ -802,7 +841,9 @@
 							if ($priceforthequantityarray['price_base_type'] == 'HT')

 							{

 								$pu_ht = $priceforthequantityarray['unitprice'];

-							} else {

+							}

+							else

+							{

 								$pu_ttc = $priceforthequantityarray['unitprice'];

 							}

 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.

@@ -815,7 +856,7 @@
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));

 

 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?

-				if (!empty($price_ht) || $price_ht === '0') {

+				if (!empty($price_ht)) {

 					$pu_ht = price2num($price_ht, 'MU');

 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');

 				}

@@ -923,7 +964,6 @@
 

 				if ($result > 0) {

 					$ret = $object->fetch($object->id); // Reload to get new records

-					$object->fetch_thirdparty();

 

 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {

 						// Define output language

@@ -936,7 +976,7 @@
 							$outputlangs->setDefaultLang($newlang);

 						}

 

-						$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+						$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

 					}

 

 					unset($_POST['prod_entry_mode']);

@@ -988,16 +1028,15 @@
 		$date_end = '';

 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));

 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));

-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));

-		$pu_ht = price2num(GETPOST('price_ht'), '', 2);

+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none'));

+		$pu_ht = GETPOST('price_ht');

 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);

-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);

+		$pu_ht_devise = GETPOST('multicurrency_subprice');

 

 		// Define info_bits

 		$info_bits = 0;

-		if (preg_match('/\*/', $vat_rate)) {

+		if (preg_match('/\*/', $vat_rate))

 			$info_bits |= 0x01;

-		}

 

 		// Define vat_rate

 		$vat_rate = str_replace('*', '', $vat_rate);

@@ -1081,7 +1120,7 @@
 					}

 

 					$ret = $object->fetch($object->id); // Reload to get new records

-					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

 				}

 

 				unset($_POST['qty']);

@@ -1114,10 +1153,12 @@
 				setEventMessages($object->error, $object->errors, 'errors');

 			}

 		}

-	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {

+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {

 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition

 		exit();

-	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)

+	}

+

+	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)

 	{

 		$idwarehouse = GETPOST('idwarehouse', 'int');

 

@@ -1125,7 +1166,9 @@
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-		} else {

+		}

+		else

+		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 		}

 

@@ -1155,12 +1198,14 @@
 						$outputlangs = new Translate("", $conf);

 						$outputlangs->setDefaultLang($newlang);

 					}

-					$model = $object->model_pdf;

+					$model = $object->modelpdf;

 					$ret = $object->fetch($id); // Reload to get new records

 

 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);

 				}

-			} else {

+			}

+			else

+			{

 				setEventMessages($object->error, $object->errors, 'errors');

 			}

 		}

@@ -1174,7 +1219,9 @@
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-		} else {

+		}

+		else

+		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 		}

 

@@ -1204,19 +1251,23 @@
 						$outputlangs = new Translate("", $conf);

 						$outputlangs->setDefaultLang($newlang);

 					}

-					$model = $object->model_pdf;

+					$model = $object->modelpdf;

 					$ret = $object->fetch($id); // Reload to get new records

 

 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);

 				}

 			}

 		}

-	} elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {

+	}

+

+	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {

 		$result = $object->cloture($user);

 		if ($result < 0) {

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

-	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)

+	}

+

+	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)

 	{

 		$idwarehouse = GETPOST('idwarehouse', 'int');

 

@@ -1224,7 +1275,9 @@
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-		} else {

+		}

+		else

+		{

 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 		}

 

@@ -1253,7 +1306,7 @@
 		$object->oldcopy = dol_clone($object);

 

 		// Fill array 'array_options' with data from update form

-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));

+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));

 		if ($ret < 0) $error++;

 

 		if (!$error)

@@ -1270,84 +1323,95 @@
 		if ($error) $action = 'edit_extras';

 	}

 

+	if ($action == 'set_thirdparty' && $usercancreate)

+	{

+		$object->fetch($id);

+		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');

+

+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);

+		exit();

+	}

+

 	// add lines from objectlinked

 	if ($action == 'import_lines_from_object'

-		&& $usercancreate

-		&& $object->statut == Commande::STATUS_DRAFT

+	    && $usercancreate

+	    && $object->statut == Commande::STATUS_DRAFT

 	  )

 	{

-		$fromElement = GETPOST('fromelement');

-		$fromElementid = GETPOST('fromelementid');

-		$importLines = GETPOST('line_checkbox');

-

-		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))

-		{

-			if ($fromElement == 'commande')

-			{

-				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');

-				$lineClassName = 'OrderLine';

-			} elseif ($fromElement == 'propal')

-			{

-				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');

-				$lineClassName = 'PropaleLigne';

-			}

-			$nextRang = count($object->lines) + 1;

-			$importCount = 0;

-			$error = 0;

-			foreach ($importLines as $lineId)

-			{

-				$lineId = intval($lineId);

-				$originLine = new $lineClassName($db);

-				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)

-				{

-					$originLine->fetch_optionals();

-					$desc = $originLine->desc;

-					$pu_ht = $originLine->subprice;

-					$qty = $originLine->qty;

-					$txtva = $originLine->tva_tx;

-					$txlocaltax1 = $originLine->localtax1_tx;

-					$txlocaltax2 = $originLine->localtax2_tx;

-					$fk_product = $originLine->fk_product;

-					$remise_percent = $originLine->remise_percent;

-					$date_start = $originLine->date_start;

-					$date_end = $originLine->date_end;

-					$ventil = 0;

-					$info_bits = $originLine->info_bits;

-					$fk_remise_except = $originLine->fk_remise_except;

-					$price_base_type = 'HT';

-					$pu_ttc = 0;

-					$type = $originLine->product_type;

-					$rang = $nextRang++;

-					$special_code = $originLine->special_code;

-					$origin = $originLine->element;

-					$origin_id = $originLine->id;

-					$fk_parent_line = 0;

-					$fk_fournprice = $originLine->fk_fournprice;

-					$pa_ht = $originLine->pa_ht;

-					$label = $originLine->label;

-					$array_options = $originLine->array_options;

-					$situation_percent = 100;

-					$fk_prev_id = '';

-					$fk_unit = $originLine->fk_unit;

-					$pu_ht_devise = $originLine->multicurrency_subprice;

-

-					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);

-

-					if ($res > 0) {

-						$importCount++;

-					} else {

-						$error++;

-					}

-				} else {

-					$error++;

-				}

-			}

-

-			if ($error)

-			{

-				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');

-			}

-		}

+	    $fromElement = GETPOST('fromelement');

+	    $fromElementid = GETPOST('fromelementid');

+	    $importLines = GETPOST('line_checkbox');

+

+	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))

+	    {

+	        if ($fromElement == 'commande')

+	        {

+	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');

+	            $lineClassName = 'OrderLine';

+	        }

+	        elseif ($fromElement == 'propal')

+	        {

+	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');

+	            $lineClassName = 'PropaleLigne';

+	        }

+	        $nextRang = count($object->lines) + 1;

+	        $importCount = 0;

+	        $error = 0;

+	        foreach ($importLines as $lineId)

+	        {

+	            $lineId = intval($lineId);

+	            $originLine = new $lineClassName($db);

+	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)

+	            {

+	                $originLine->fetch_optionals();

+	                $desc = $originLine->desc;

+	                $pu_ht = $originLine->subprice;

+	                $qty = $originLine->qty;

+	                $txtva = $originLine->tva_tx;

+	                $txlocaltax1 = $originLine->localtax1_tx;

+	                $txlocaltax2 = $originLine->localtax2_tx;

+	                $fk_product = $originLine->fk_product;

+	                $remise_percent = $originLine->remise_percent;

+	                $date_start = $originLine->date_start;

+	                $date_end = $originLine->date_end;

+	                $ventil = 0;

+	                $info_bits = $originLine->info_bits;

+	                $fk_remise_except = $originLine->fk_remise_except;

+	                $price_base_type = 'HT';

+	                $pu_ttc = 0;

+	                $type = $originLine->product_type;

+	                $rang = $nextRang++;

+	                $special_code = $originLine->special_code;

+	                $origin = $originLine->element;

+	                $origin_id = $originLine->id;

+	                $fk_parent_line = 0;

+	                $fk_fournprice = $originLine->fk_fournprice;

+	                $pa_ht = $originLine->pa_ht;

+	                $label = $originLine->label;

+	                $array_options = $originLine->array_options;

+	                $situation_percent = 100;

+	                $fk_prev_id = '';

+	                $fk_unit = $originLine->fk_unit;

+	                $pu_ht_devise = $originLine->multicurrency_subprice;

+

+	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);

+

+	                if ($res > 0) {

+	                    $importCount++;

+	                } else {

+	                    $error++;

+	                }

+	            }

+	            else {

+	                $error++;

+	            }

+	        }

+

+	        if ($error)

+	        {

+	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');

+	        }

+	    }

 	}

 

 	// Actions when printing a doc from card

@@ -1372,8 +1436,7 @@
 		{

 			if ($object->id > 0) {

 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));

-				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

-				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));

+				$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));

 			}

 

 			if ($result >= 0) {

@@ -1469,10 +1532,12 @@
 			// For compatibility

 			if ($element == 'order' || $element == 'commande') {

 				$element = $subelement = 'commande';

-			} elseif ($element == 'propal') {

+			}

+			elseif ($element == 'propal') {

 				$element = 'comm/propal';

 				$subelement = 'propal';

-			} elseif ($element == 'contract') {

+			}

+			elseif ($element == 'contract') {

 				$element = $subelement = 'contrat';

 			}

 

@@ -1504,8 +1569,7 @@
 			$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));

 			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';

 

-			$date_delivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');

-			if (empty($date_delivery)) $date_delivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');

+			$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');

 

 			if (!empty($conf->multicurrency->enabled))

 			{

@@ -1519,7 +1583,9 @@
 			// Object source contacts list

 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);

 		}

-	} else {

+	}

+	else

+	{

 		$cond_reglement_id  = $soc->cond_reglement_id;

 		$mode_reglement_id  = $soc->mode_reglement_id;

 		$fk_account         = $soc->fk_account;

@@ -1546,7 +1612,7 @@
 	print '<input type="hidden" name="originid" value="'.$originid.'">';

 	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';

 

-	print dol_get_fiche_head('');

+	dol_fiche_head('');

 

 	print '<table class="border centpercent">';

 

@@ -1557,7 +1623,8 @@
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';

 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid))

 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';

-	else print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';

+	else

+		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';

 	print '</tr>';

 

 	// Thirdparty

@@ -1570,14 +1637,13 @@
 		print '</td>';

 	} else {

 		print '<td>';

-		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');

+		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');

 		// reload page to retrieve customer informations

-		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))

+		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))

 		{

 			print '<script type="text/javascript">

 			$(document).ready(function() {

 				$("#socid").change(function() {

-					console.log("We have changed the company - Reload page");

 					var socid = $(this).val();

 					// reload page

 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();

@@ -1615,13 +1681,15 @@
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date

 	print '</td></tr>';

 

-	// Date delivery planned

-	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';

-	print '<td colspan="3">';

-	$date_delivery = ($date_delivery ? $date_delivery : $object->date_delivery);

-	print $form->selectDate($date_delivery ? $date_delivery : -1, 'liv_', 1, 1, 1);

-	print "</td>\n";

-	print '</tr>';

+	// Delivery date planed

+	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td>';

+	if (empty($datedelivery))

+	{

+		if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);

+		else $datedelivery = empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY) ?-1 : '';

+	}

+	print $form->selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);

+	print "</td></tr>";

 

 	// terms of the settlement

 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';

@@ -1658,7 +1726,7 @@
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';

 		$formproduct = new FormProduct($db);

 		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';

-		print img_picto('', 'stock').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth175 maxwidth500 widthcentpercentminusxx');

+		print $formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1);

 		print '</td></tr>';

 	}

 

@@ -1675,8 +1743,7 @@
 		$langs->load("projects");

 		print '<tr>';

 		print '<td>'.$langs->trans("Project").'</td><td>';

-		print img_picto('', 'project');

-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth175 maxwidth500 widthcentpercentminusxx');

+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');

 		print ' <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).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';

 		print '</td>';

 		print '</tr>';

@@ -1705,7 +1772,7 @@
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);

 	print $hookmanager->resPrint;

 	if (empty($reshook)) {

-		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) {

+		if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER)) {

 			// copy from thirdparty

 			$tpExtrafields = new Extrafields($db);

 			$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);

@@ -1722,8 +1789,7 @@
 	print '<td>';

 	include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';

 	$liste = ModelePDFCommandes::liste_modeles($db);

-	$preselected = $conf->global->COMMANDE_ADDON_PDF;

-	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);

+	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);

 	print "</td></tr>";

 

 	// Multicurrency

@@ -1820,13 +1886,13 @@
 

 	print '</table>';

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 

 	// Button "Create Draft"

 	print '<div class="center">';

 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';

 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-	print '<input type="button" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';

+	print '<input type="button" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';

 	print '</div>';

 

 	// Show origin lines

@@ -1841,7 +1907,7 @@
 		print '</table>';

 	}

 

-	print '</form>';

+    print '</form>';

 } else {

 	// Mode view

 	$now = dol_now();

@@ -1855,11 +1921,10 @@
 		$author = new User($db);

 		$author->fetch($object->user_author_id);

 

-		$object->fetch_thirdparty();

 		$res = $object->fetch_optionals();

 

 		$head = commande_prepare_head($object);

-		print dol_get_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');

+		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), -1, 'order');

 

 		$formconfirm = '';

 

@@ -1892,7 +1957,9 @@
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-			} else {

+			}

+			else

+			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 			}

 

@@ -1922,7 +1989,9 @@
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-			} else {

+			}

+			else

+			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 			}

 

@@ -1962,7 +2031,9 @@
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))

 			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);

-			} else {

+			}

+			else

+			{

 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);

 			}

 

@@ -1983,7 +2054,7 @@
 				);

 			}

 

-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("Cancel"), $text, 'confirm_cancel', $formquestion, 0, 1);

+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1);

 		}

 

 		// Confirmation to delete line

@@ -1996,7 +2067,7 @@
 		if ($action == 'clone') {

 			// Create an array for form

 			$formquestion = array(

-				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client = 2 OR s.client=3)'))

+				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=3)'))

 			);

 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);

 		}

@@ -2015,6 +2086,7 @@
 		// Order card

 

 		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';

+

 

 		$morehtmlref = '<div class="refidno">';

 		// Ref customer

@@ -2137,12 +2209,12 @@
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';

 			print '<input type="hidden" name="token" value="'.newToken().'">';

 			print '<input type="hidden" name="action" value="setdate_livraison">';

-			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);

+			print $form->selectDate($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");

 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';

 			print '</form>';

 		} else {

-			print $object->delivery_date ? dol_print_date($object->delivery_date, 'dayhour') : '&nbsp;';

-			if ($object->hasDelay() && !empty($object->delivery_date)) {

+			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';

+			if ($object->hasDelay() && !empty($object->date_livraison)) {

 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");

 			}

 		}

@@ -2315,7 +2387,9 @@
 			if ($action != 'editincoterm')

 			{

 				print $form->textwithpicto($object->display_incoterms(), $object->label_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);

 			}

 			print '</td></tr>';

@@ -2465,7 +2539,7 @@
 

 		print "</form>\n";

 

-		print dol_get_fiche_end();

+		dol_fiche_end();

 

 		/*

 		 * Buttons for actions

@@ -2487,7 +2561,8 @@
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {

 						if ($usercansend) {

 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';

-						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';

+						} else

+							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';

 					}

 				}

 

@@ -2547,7 +2622,7 @@
 					$numshipping = $object->nb_expedition();

 

 					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {

-						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)) {

+						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) {

 							if ($user->rights->expedition->creer) {

 								print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id.'">'.$langs->trans('CreateShipment').'</a>';

 							} else {

@@ -2564,6 +2639,7 @@
 				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {

 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=shipped">'.$langs->trans('ClassifyShipped').'</a></div>';

 				}

+

 				// Create bill and Classify billed

 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"

 				if ($object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {

@@ -2587,13 +2663,13 @@
 				// Cancel order

 				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel)))

 				{

-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a></div>';

+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans('Cancel').'</a></div>';

 				}

 

 				// Delete order

 				if ($usercandelete) {

 					if ($numshipping == 0) {

-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';

+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';

 					} else {

 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a></div>';

 					}

@@ -2618,7 +2694,7 @@
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;

 			$genallowed = $usercanread;

 			$delallowed = $usercancreate;

-			print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);

+			print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);

 

 

 			// Show links to link elements

@@ -2626,9 +2702,9 @@
 

 			$compatibleImportElementsList = false;

 			if ($usercancreate

-				&& $object->statut == Commande::STATUS_DRAFT)

-			{

-				$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements

+			    && $object->statut == Commande::STATUS_DRAFT)

+			{

+			    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements

 			}

 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);

 

--- /tmp/dsg/dolibarr/htdocs/commande/github_contact.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_contact.php
@@ -33,11 +33,11 @@
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

 // Load translation files required by the page

-$langs->loadLangs(array('orders', 'sendings', 'companies', 'bills'));

+$langs->loadLangs(array('orders', 'sendings', 'companies'));

 

 $id = GETPOST('id', 'int');

 $ref = GETPOST('ref', 'alpha');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 

 // Security check

 if ($user->socid) $socid = $user->socid;

@@ -53,23 +53,26 @@
 {

 	$result = $object->fetch($id);

 

-	if ($result > 0 && $id > 0)

-	{

-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));

-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));

-	}

+    if ($result > 0 && $id > 0)

+    {

+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));

+  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);

+    }

 

 	if ($result >= 0)

 	{

 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

 		exit;

-	} else {

+	}

+	else

+	{

 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 		{

 			$langs->load("errors");

 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');

-		} else {

+		}

+		else

+		{

 			setEventMessages($object->error, $object->errors, 'errors');

 		}

 	}

@@ -80,8 +83,10 @@
 {

 	if ($object->fetch($id))

 	{

-		$result = $object->swapContactStatus(GETPOST('ligne'));

-	} else {

+	    $result = $object->swapContactStatus(GETPOST('ligne'));

+	}

+	else

+	{

 		dol_print_error($db);

 	}

 }

@@ -96,7 +101,8 @@
 	{

 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

 		exit;

-	} else {

+	}

+	else {

 		dol_print_error($db);

 	}

 }

@@ -134,10 +140,10 @@
 

 	if ($object->fetch($id, $ref) > 0)

 	{

-		$object->fetch_thirdparty();

+	    $object->fetch_thirdparty();

 

 		$head = commande_prepare_head($object);

-		print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');

+		dol_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');

 

 

 		// Order card

@@ -151,45 +157,45 @@
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);

 		// Thirdparty

 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

-		// Project

-		if (!empty($conf->projet->enabled))

-		{

-			$langs->load("projects");

-			$morehtmlref .= '<br>'.$langs->trans('Project').' ';

-			if ($user->rights->commande->creer)

-			{

-				if ($action != 'classify') {

-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+	    // Project

+	    if (!empty($conf->projet->enabled))

+	    {

+	        $langs->load("projects");

+	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+	        if ($user->rights->commande->creer)

+	        {

+	            if ($action != 'classify') {

+	            	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

 					$morehtmlref .= ' : ';

-				}

-				if ($action == 'classify') {

-					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

-					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

-					$morehtmlref .= '<input type="hidden" name="action" value="classin">';

-					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

-					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

-					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

-					$morehtmlref .= '</form>';

-				} else {

-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

-				}

-			} else {

-				if (!empty($object->fk_project)) {

-					$proj = new Project($db);

-					$proj->fetch($object->fk_project);

-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

-					$morehtmlref .= $proj->ref;

-					$morehtmlref .= '</a>';

-				} else {

-					$morehtmlref .= '';

-				}

-			}

-		}

+                }

+	            if ($action == 'classify') {

+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+	                $morehtmlref .= '</form>';

+	            } else {

+	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

+	            }

+	        } else {

+	            if (!empty($object->fk_project)) {

+	                $proj = new Project($db);

+	                $proj->fetch($object->fk_project);

+	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+	                $morehtmlref .= $proj->ref;

+	                $morehtmlref .= '</a>';

+	            } else {

+	                $morehtmlref .= '';

+	            }

+	        }

+	    }

 		$morehtmlref .= '</div>';

 

 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);

 

-		print dol_get_fiche_end();

+		dol_fiche_end();

 

 		print '<br>';

 

@@ -197,10 +203,12 @@
 		$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;

+		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');

+		    if ($res) break;

 		}

-	} else {

+	}

+	else

+	{

 		// Contact not found

 		print "ErrorRecordNotFound";

 	}

--- /tmp/dsg/dolibarr/htdocs/commande/github_customer.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_customer.php
@@ -164,7 +164,7 @@
 

 		$result = '';

 		$link = $linkend = '';

-		$link = '<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$obj->rowid.'">';

+		$link = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php', 1).'?socid='.$obj->rowid.'">';

 		$linkend = '</a>';

 		$name = $obj->name;

 		$result .= ($link.img_object($langs->trans("ShowCompany").': '.$name, 'company').$linkend);

@@ -184,7 +184,9 @@
 	print '</form>';

 

 	$db->free($resql);

-} else {

+}

+else

+{

 	dol_print_error($db);

 }

 

--- /tmp/dsg/dolibarr/htdocs/commande/github_document.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_document.php
@@ -37,7 +37,7 @@
 }

 

 // Load translation files required by the page

-$langs->loadLangs(array('companies', 'other', 'bills'));

+$langs->loadLangs(array('companies', 'other'));

 

 $action		= GETPOST('action', 'aZ09');

 $confirm	= GETPOST('confirm');

@@ -100,14 +100,14 @@
 		$upload_dir = $conf->commande->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

 

 		$head = commande_prepare_head($object);

-		print dol_get_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');

+		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');

 

 		// Build file list

 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

 		$totalsize = 0;

 		foreach ($filearray as $key => $file)

 		{

-			$totalsize += $file['size'];

+		    $totalsize += $file['size'];

 		}

 

 		// Order card

@@ -124,36 +124,36 @@
 		// Project

 		if (!empty($conf->projet->enabled))

 		{

-			$langs->load("projects");

-			$morehtmlref .= '<br>'.$langs->trans('Project').' ';

-			if ($user->rights->commande->creer)

-			{

-				if ($action != 'classify') {

-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+		    $langs->load("projects");

+		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+		    if ($user->rights->commande->creer)

+		    {

+		        if ($action != 'classify') {

+		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

 					$morehtmlref .= ' : ';

 				}

-				if ($action == 'classify') {

-					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

-					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

-					$morehtmlref .= '<input type="hidden" name="action" value="classin">';

-					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

-					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

-					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

-					$morehtmlref .= '</form>';

-				} else {

-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

-				}

-			} else {

-				if (!empty($object->fk_project)) {

-					$proj = new Project($db);

-					$proj->fetch($object->fk_project);

-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

-					$morehtmlref .= $proj->ref;

-					$morehtmlref .= '</a>';

-				} else {

-					$morehtmlref .= '';

-				}

-			}

+	            if ($action == 'classify') {

+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+	                $morehtmlref .= '</form>';

+	            } else {

+	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

+	            }

+		    } else {

+		        if (!empty($object->fk_project)) {

+		            $proj = new Project($db);

+		            $proj->fetch($object->fk_project);

+		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+		            $morehtmlref .= $proj->ref;

+		            $morehtmlref .= '</a>';

+		        } else {

+		            $morehtmlref .= '';

+		        }

+		    }

 		}

 		$morehtmlref .= '</div>';

 

@@ -175,17 +175,21 @@
 

 		print "</div>\n";

 

-		print dol_get_fiche_end();

+		dol_fiche_end();

 

 		$modulepart = 'commande';

 		$permission = $user->rights->commande->creer;

 		$permtoedit = $user->rights->commande->creer;

 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);

 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

-	} else {

+	}

+	else

+	{

 		dol_print_error($db);

 	}

-} else {

+}

+else

+{

 	header('Location: index.php');

 	exit;

 }

--- /tmp/dsg/dolibarr/htdocs/commande/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_index.php
@@ -71,15 +71,15 @@
 

 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo

 {

-	// Search customer orders

-	print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder nohover centpercent">';

-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';

-	print '<tr class="oddeven"><td>';

-	print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';

-	print "</table></div></form><br>\n";

+    // Search customer orders

+    print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+    print '<div class="div-table-responsive-no-min">';

+    print '<table class="noborder nohover centpercent">';

+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';

+    print '<tr class="oddeven"><td>';

+    print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';

+    print "</table></div></form><br>\n";

 }

 

 

@@ -100,81 +100,83 @@
 $resql = $db->query($sql);

 if ($resql)

 {

-	$num = $db->num_rows($resql);

-	$i = 0;

-

-	$total = 0;

-	$totalinprocess = 0;

-	$dataseries = array();

-	$colorseries = array();

-	$vals = array();

-	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)

-	while ($i < $num)

-	{

-		$row = $db->fetch_row($resql);

-		if ($row)

-		{

-			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))

-			{

-				if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;

-				$vals[$row[1]] += $row[0];

-				$totalinprocess += $row[0];

-			}

-			$total += $row[0];

-		}

-		$i++;

-	}

-	$db->free($resql);

-

-	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-

-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder nohover centpercent">';

-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";

-	$listofstatus = array(0, 1, 2, 3, -1);

-	foreach ($listofstatus as $status)

-	{

-		$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

-		if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;

-		if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;

-		if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;

-		if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;

-		if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;

-		if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;

-

-		if (empty($conf->use_javascript_ajax))

-		{

-			print '<tr class="oddeven">';

-			print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';

-			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';

-			print $commandestatic->LibStatut($status, 0, 3, 1);

-			print '</a></td>';

-			print "</tr>\n";

-		}

-	}

-	if ($conf->use_javascript_ajax)

-	{

-		print '<tr class="impair"><td align="center" colspan="2">';

-

-		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

-		$dolgraph = new DolGraph();

-		$dolgraph->SetData($dataseries);

-		$dolgraph->SetDataColor(array_values($colorseries));

-		$dolgraph->setShowLegend(2);

-		$dolgraph->setShowPercent(1);

-		$dolgraph->SetType(array('pie'));

-		$dolgraph->setHeight('200');

-		$dolgraph->draw('idgraphstatus');

-		print $dolgraph->show($total ? 0 : 1);

-

-		print '</td></tr>';

-	}

-

-	//if ($totalinprocess != $total)

-	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';

-	print "</table></div><br>";

-} else {

-	dol_print_error($db);

+    $num = $db->num_rows($resql);

+    $i = 0;

+

+    $total = 0;

+    $totalinprocess = 0;

+    $dataseries = array();

+    $colorseries = array();

+    $vals = array();

+    // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)

+    while ($i < $num)

+    {

+        $row = $db->fetch_row($resql);

+        if ($row)

+        {

+            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))

+            {

+                if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;

+                $vals[$row[1]] += $row[0];

+                $totalinprocess += $row[0];

+            }

+            $total += $row[0];

+        }

+        $i++;

+    }

+    $db->free($resql);

+

+    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

+

+    print '<div class="div-table-responsive-no-min">';

+    print '<table class="noborder nohover centpercent">';

+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";

+    $listofstatus = array(0, 1, 2, 3, -1);

+    foreach ($listofstatus as $status)

+    {

+    	$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

+    	if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;

+    	if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;

+    	if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;

+    	if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;

+    	if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;

+    	if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;

+

+    	if (empty($conf->use_javascript_ajax))

+    	{

+    		print '<tr class="oddeven">';

+    		print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';

+    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';

+    		print $commandestatic->LibStatut($status, 0, 3, 1);

+    		print '</a></td>';

+    		print "</tr>\n";

+    	}

+    }

+    if ($conf->use_javascript_ajax)

+    {

+        print '<tr class="impair"><td align="center" colspan="2">';

+

+        include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

+        $dolgraph = new DolGraph();

+        $dolgraph->SetData($dataseries);

+        $dolgraph->SetDataColor(array_values($colorseries));

+        $dolgraph->setShowLegend(2);

+        $dolgraph->setShowPercent(1);

+        $dolgraph->SetType(array('pie'));

+        $dolgraph->setHeight('200');

+        $dolgraph->draw('idgraphstatus');

+        print $dolgraph->show($total ? 0 : 1);

+

+        print '</td></tr>';

+    }

+

+    //if ($totalinprocess != $total)

+    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';

+    print "</table></div><br>";

+}

+else

+{

+    dol_print_error($db);

 }

 

 

@@ -184,9 +186,9 @@
 if (!empty($conf->commande->enabled))

 {

 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";

-	$sql .= ", s.client";

-	$sql .= ", s.code_client";

-	$sql .= ", s.canvas";

+    $sql .= ", s.client";

+    $sql .= ", s.code_client";

+    $sql .= ", s.canvas";

 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";

 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";

 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -199,7 +201,7 @@
 	$resql = $db->query($sql);

 	if ($resql)

 	{

-		print '<div class="div-table-responsive-no-min">';

+        print '<div class="div-table-responsive-no-min">';

 		print '<table class="noborder centpercent">';

 		print '<tr class="liste_titre">';

 		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';

@@ -212,8 +214,8 @@
 			{

 				$obj = $db->fetch_object($resql);

 

-				$commandestatic->id = $obj->rowid;

-				$commandestatic->ref = $obj->ref;

+                $commandestatic->id = $obj->rowid;

+                $commandestatic->ref = $obj->ref;

 

 				$companystatic->id = $obj->socid;

 				$companystatic->name = $obj->name;

@@ -224,13 +226,15 @@
 				print '<tr class="oddeven">';

 				print '<td class="nowrap">';

 				print $commandestatic->getNomUrl(1);

-				print "</td>";

-				print '<td class="nowrap">';

+                print "</td>";

+                print '<td class="nowrap">';

 				print $companystatic->getNomUrl(1, 'company', 16);

-				print '</td></tr>';

+                print '</td></tr>';

 				$i++;

 			}

-		} else {

+		}

+		else

+		{

 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';

 		}

 		print "</table></div><br>";

@@ -266,7 +270,7 @@
 $resql = $db->query($sql);

 if ($resql)

 {

-	print '<div class="div-table-responsive-no-min">';

+    print '<div class="div-table-responsive-no-min">';

 	print '<table class="noborder centpercent">';

 	print '<tr class="liste_titre">';

 	print '<th colspan="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';

@@ -310,8 +314,8 @@
 			print '</td>';

 

 			print '<td class="nowrap">';

-			print $companystatic->getNomUrl(1, 'company', 16);

-			print '</td>';

+            print $companystatic->getNomUrl(1, 'company', 16);

+            print '</td>';

 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';

 			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';

 			print '</tr>';

@@ -319,7 +323,8 @@
 		}

 	}

 	print "</table></div><br>";

-} else dol_print_error($db);

+}

+else dol_print_error($db);

 

 $max = 10;

 

@@ -329,9 +334,9 @@
 if (!empty($conf->commande->enabled))

 {

 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";

-	$sql .= ", s.client";

-	$sql .= ", s.code_client";

-	$sql .= ", s.canvas";

+    $sql .= ", s.client";

+    $sql .= ", s.code_client";

+    $sql .= ", s.canvas";

 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";

 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";

 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -347,7 +352,7 @@
 	{

 		$num = $db->num_rows($resql);

 

-		print '<div class="div-table-responsive-no-min">';

+        print '<div class="div-table-responsive-no-min">';

 		print '<table class="noborder centpercent">';

 		print '<tr class="liste_titre">';

 		print '<th colspan="4">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_VALIDATED.'"><span class="badge">'.$num.'</span></a></th></tr>';

@@ -389,10 +394,10 @@
 				print '</td>';

 

 				print '<td class="nowrap">';

-				print $companystatic->getNomUrl(1, 'company', 24);

-				print '</td>';

-

-				print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";

+                print $companystatic->getNomUrl(1, 'company', 24);

+                print '</td>';

+

+                print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";

 

 				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';

 

@@ -405,7 +410,8 @@
 		}

 

 		print "</table></div><br>";

-	} else dol_print_error($db);

+	}

+	else dol_print_error($db);

 }

 

 /*

@@ -414,9 +420,9 @@
 if (!empty($conf->commande->enabled))

 {

 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";

-	$sql .= ", s.client";

-	$sql .= ", s.code_client";

-	$sql .= ", s.canvas";

+    $sql .= ", s.client";

+    $sql .= ", s.code_client";

+    $sql .= ", s.canvas";

 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";

 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";

 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -432,7 +438,7 @@
 	{

 		$num = $db->num_rows($resql);

 

-		print '<div class="div-table-responsive-no-min">';

+        print '<div class="div-table-responsive-no-min">';

 		print '<table class="noborder centpercent">';

 		print '<tr class="liste_titre">';

 		print '<th colspan="4">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_ACCEPTED.'"><span class="badge">'.$num.'</span></a></th></tr>';

@@ -489,7 +495,8 @@
 			}

 		}

 		print "</table></div><br>";

-	} else dol_print_error($db);

+	}

+	else dol_print_error($db);

 }

 

 

--- /tmp/dsg/dolibarr/htdocs/commande/github_info.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_info.php
@@ -34,7 +34,7 @@
 if (!$user->rights->commande->lire)	accessforbidden();

 

 // Load translation files required by the page

-$langs->loadLangs(array('orders', 'sendings', 'bills'));

+$langs->loadLangs(array('orders', 'sendings'));

 

 $socid = 0;

 $comid = GETPOST("id", 'int');

@@ -48,8 +48,8 @@
 $object = new Commande($db);

 if (!$object->fetch($id, $ref) > 0)

 {

-	dol_print_error($db);

-	exit;

+    dol_print_error($db);

+    exit;

 }

 

 

@@ -65,7 +65,7 @@
 $object->info($object->id);

 

 $head = commande_prepare_head($object);

-print dol_get_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');

+dol_fiche_head($head, 'info', $langs->trans("CustomerOrder"), -1, 'order');

 

 // Order card

 

@@ -80,36 +80,36 @@
 // Project

 if (!empty($conf->projet->enabled))

 {

-	$langs->load("projects");

-	$morehtmlref .= '<br>'.$langs->trans('Project').' ';

-	if ($user->rights->commande->creer)

-	{

-		if ($action != 'classify') {

-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

-			$morehtmlref .= ' : ';

-		}

-		if ($action == 'classify') {

-			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

-			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

-			$morehtmlref .= '<input type="hidden" name="action" value="classin">';

-			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

-			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

-			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

-			$morehtmlref .= '</form>';

-		} else {

-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

-		}

-	} else {

-		if (!empty($object->fk_project)) {

-			$proj = new Project($db);

-			$proj->fetch($object->fk_project);

-			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

-			$morehtmlref .= $proj->ref;

-			$morehtmlref .= '</a>';

-		} else {

-			$morehtmlref .= '';

-		}

-	}

+    $langs->load("projects");

+    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+    if ($user->rights->commande->creer)

+    {

+        if ($action != 'classify') {

+            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+            $morehtmlref .= ' : ';

+        }

+        if ($action == 'classify') {

+            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+            $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+            $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+            $morehtmlref .= '</form>';

+        } else {

+            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);

+        }

+    } else {

+        if (!empty($object->fk_project)) {

+            $proj = new Project($db);

+            $proj->fetch($object->fk_project);

+            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+            $morehtmlref .= $proj->ref;

+            $morehtmlref .= '</a>';

+        } else {

+            $morehtmlref .= '';

+        }

+    }

 }

 $morehtmlref .= '</div>';

 

@@ -127,7 +127,7 @@
 

 print '</div>';

 

-print dol_get_fiche_end();

+dol_fiche_end();

 

 // End of page

 llxFooter();

--- /tmp/dsg/dolibarr/htdocs/commande/github_list.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_list.php
@@ -46,7 +46,7 @@
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

 // Load translation files required by the page

-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks', 'products'));

+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills'));

 

 $action = GETPOST('action', 'aZ09');

 $massaction = GETPOST('massaction', 'alpha');

@@ -55,24 +55,20 @@
 $toselect = GETPOST('toselect', 'array');

 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';

 

-$search_datecloture_start = GETPOST('search_datecloture_start', 'int');

-if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));

-$search_datecloture_end = GETPOST('search_datecloture_end', 'int');

-if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));

-$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));

-$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));

-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));

-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));

+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_startmonth', 'int'), GETPOST('search_dateorder_startday', 'int'), GETPOST('search_dateorder_startyear', 'int'));

+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_endmonth', 'int'), GETPOST('search_dateorder_endday', 'int'), GETPOST('search_dateorder_endyear', 'int'));

+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));

+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));

 $search_product_category = GETPOST('search_product_category', 'int');

 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');

 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');

 $search_company = GETPOST('search_company', 'alpha');

 $search_town = GETPOST('search_town', 'alpha');

 $search_zip = GETPOST('search_zip', 'alpha');

-$search_state = GETPOST("search_state", 'alpha');

+$search_state = trim(GETPOST("search_state"));

 $search_country = GETPOST("search_country", 'int');

 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');

-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));

+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));

 $socid = GETPOST('socid', 'int');

 $search_user = GETPOST('search_user', 'int');

 $search_sale = GETPOST('search_sale', 'int');

@@ -86,16 +82,14 @@
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');

 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');

 $search_login = GETPOST('search_login', 'alpha');

-$search_categ_cus = GETPOST("search_categ_cus", 'int');

+$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));

 $optioncss = GETPOST('optioncss', 'alpha');

-$search_billed = GETPOSTISSET('search_billed') ? GETPOST('search_billed', 'int') : GETPOST('billed', 'int');

+$billed = GETPOST('billed', 'int');

 $search_status = GETPOST('search_status', 'int');

 $search_btn = GETPOST('button_search', 'alpha');

 $search_remove_btn = GETPOST('button_removefilter', 'alpha');

 $search_project_ref = GETPOST('search_project_ref', 'alpha');

 $search_project = GETPOST('search_project', 'alpha');

-$search_shippable = GETPOST('search_shippable', 'aZ09');

-

 

 // Security check

 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));

@@ -109,22 +103,20 @@
 $sortfield = GETPOST("sortfield", 'alpha');

 $sortorder = GETPOST("sortorder", 'alpha');

 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');

-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters

+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1

 $offset = $limit * $page;

 $pageprev = $page - 1;

 $pagenext = $page + 1;

 if (!$sortfield) $sortfield = 'c.ref';

 if (!$sortorder) $sortorder = 'DESC';

 

-$show_shippable_command = GETPOST('show_shippable_command', 'aZ09');

-

 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

 $object = new Commande($db);

 $hookmanager->initHooks(array('orderlist'));

 $extrafields = new ExtraFields($db);

 

 // fetch optionals attributes and labels

-$extrafields->fetch_name_optionals_label($object->table_element);

+$extrafields->fetch_name_optionals_label('commande');

 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');

 

 // List of fields to search into when doing a "search in all"

@@ -142,39 +134,42 @@
 

 $checkedtypetiers = 0;

 $arrayfields = array(

-	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),

-	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),

-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),

-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25),

-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),

-	's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35),

-	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40),

-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),

-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),

-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),

-	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),

-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),

-	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),

-	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),

-	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),

-	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90),

-	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95),

-	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),

-	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),

-	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),

-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10, 'position'=>115),

-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500, 'position'=>120),

-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500, 'position'=>125),

-	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500, 'position'=>130),

-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),

-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),

-	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145),

-	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150),

-	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155)

+	'c.ref'=>array('label'=>"Ref", 'checked'=>1),

+	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>1),

+    'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),

+    'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),

+    's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),

+	's.town'=>array('label'=>"Town", 'checked'=>1),

+	's.zip'=>array('label'=>"Zip", 'checked'=>1),

+	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),

+	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),

+	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),

+	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1),

+	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)),

+	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),

+	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),

+	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),

+	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),

+	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),

+	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),

+    'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),

+	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),

+	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))

 );

 // Extra fields

-include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';

-

+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)

+{

+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)

+	{

+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))

+			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));

+	}

+}

 $object->fields = dol_sort_array($object->fields, 'position');

 $arrayfields = dol_sort_array($arrayfields, 'position');

 

@@ -215,7 +210,6 @@
 		$search_total_ht = '';

 		$search_total_vat = '';

 		$search_total_ttc = '';

-		$search_warehouse = '';

 		$search_multicurrency_code = '';

 		$search_multicurrency_tx = '';

 		$search_multicurrency_montant_ht = '';

@@ -229,12 +223,10 @@
 		$search_project_ref = '';

 		$search_project = '';

 		$search_status = '';

-		$search_billed = '';

+		$billed = '';

 		$toselect = '';

 		$search_array_options = array();

 		$search_categ_cus = 0;

-		$search_datecloture_start = '';

-		$search_datecloture_end = '';

 	}

 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

 	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))

@@ -271,13 +263,13 @@
 // llxHeader('',$title,$help_url);

 

 $sql = 'SELECT';

-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';

+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';

 $sql .= ' s.rowid as socid, s.nom as name, s.email, 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 .= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';

 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';

-$sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';

+$sql .= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';

 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';

 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";

 $sql .= " u.login";

@@ -316,7 +308,7 @@
 if ($search_ref) $sql .= natural_search('c.ref', $search_ref);

 if ($search_ref_customer) $sql .= natural_search('c.ref_client', $search_ref_customer);

 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);

-if ($search_billed != '' && $search_billed >= 0) $sql .= ' AND c.facture = '.$search_billed;

+if ($billed != '' && $billed >= 0) $sql .= ' AND c.facture = '.$billed;

 if ($search_status <> '')

 {

 	if ($search_status < 4 && $search_status > -3)

@@ -341,8 +333,6 @@
 	}

 }

 

-if ($search_datecloture_start)               $sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";

-if ($search_datecloture_end)                 $sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";

 if ($search_dateorder_start)                 $sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";

 if ($search_dateorder_end)                   $sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";

 if ($search_datedelivery_start)              $sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";

@@ -405,7 +395,9 @@
 		$soc->fetch($socid);

 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;

 		if (empty($search_company)) $search_company = $soc->name;

-	} else {

+	}

+	else

+	{

 		$title = $langs->trans('ListOfOrders');

 	}

 	if (strval($search_status) == '0')

@@ -446,12 +438,10 @@
 	if ($sall)						$param .= '&sall='.urlencode($sall);

 	if ($socid > 0)					$param .= '&socid='.urlencode($socid);

 	if ($search_status != '')		$param .= '&search_status='.urlencode($search_status);

-	if ($search_datecloture_start)  $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);

-	if ($search_datecloture_end)    $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);

-	if ($search_dateorder_start) 	$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');

-	if ($search_dateorder_end) 		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');

-	if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');

-	if ($search_datedelivery_end) 	$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');

+	if ($search_dateorder_start)    $param .= '&search_dateorder_start='.urlencode($search_dateorder_start);

+	if ($search_dateorder_end)      $param .= '&search_dateorder_end='.urlencode($search_dateorder_end);

+	if ($search_datedelivery_start) $param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);

+	if ($search_datedelivery_end)   $param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);

 	if ($search_ref)      			$param .= '&search_ref='.urlencode($search_ref);

 	if ($search_company)  			$param .= '&search_company='.urlencode($search_company);

 	if ($search_ref_customer)		$param .= '&search_ref_customer='.urlencode($search_ref_customer);

@@ -477,7 +467,7 @@
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);

 	if ($show_files)            	$param .= '&show_files='.urlencode($show_files);

 	if ($optioncss != '')       	$param .= '&optioncss='.urlencode($optioncss);

-	if ($search_billed != '')		$param .= '&search_billed='.urlencode($search_billed);

+	if ($billed != '')				$param .= '&billed='.urlencode($billed);

 

 	// Add $param from extra fields

 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

@@ -487,16 +477,18 @@
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),

 		'builddoc'=>$langs->trans("PDFMerge"),

 		'cancelorders'=>$langs->trans("Cancel"),

-		'presend'=>$langs->trans("SendByMail"),

+	    'presend'=>$langs->trans("SendByMail"),

 	);

 	if ($user->rights->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");

 	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");

 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();

 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);

 

-	$url = DOL_URL_ROOT.'/commande/card.php?action=create';

-	if (!empty($socid)) $url .= '&socid='.$socid;

-	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $user->rights->commande->creer);

+	$newcardbutton = '';

+	if ($contextpage == 'orderlist' && $user->rights->commande->creer)

+	{

+        $newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/commande/card.php?action=create');

+    }

 

 	// Lines of title fields

 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';

@@ -549,7 +541,9 @@
 		{

 			print $form->selectyesno('validate_invoices', 0, 1, 1);

 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';

-		} else {

+		}

+		else

+		{

 			print $form->selectyesno('validate_invoices', 0, 1);

 		}

 		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';

@@ -561,7 +555,7 @@
 		print '<br>';

 		print '<div class="center">';

 		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';

-		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';

+		print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';

 		print '</div>';

 		print '<br>';

 	}

@@ -592,7 +586,7 @@
 	 	$moreforfilter .= '</div>';

 	}

 	// If the user can view prospects other than his'

-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))

+	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))

 	{

 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 		$moreforfilter .= '<div class="divsearchfield">';

@@ -601,7 +595,7 @@
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);

 		$moreforfilter .= '</div>';

 	}

-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)

+	if (!empty($conf->categorie->enabled))

 	{

 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 		$moreforfilter .= '<div class="divsearchfield">';

@@ -633,16 +627,6 @@
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

 

-	if (GETPOST('autoselectall', 'int')) {

-		$selectedfields .= '<script>';

-		$selectedfields .= '   $(document).ready(function() {';

-		$selectedfields .= '        console.log("Autoclick on checkforselects");';

-		$selectedfields .= '   		$("#checkforselects").click();';

-		$selectedfields .= '        $("#massaction").val("createbills").change();';

-		$selectedfields .= '   });';

-		$selectedfields .= '</script>';

-	}

-

 	print '<div class="div-table-responsive">';

 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

 

@@ -651,37 +635,37 @@
 	if (!empty($arrayfields['c.ref']['checked']))

 	{

 		print '<td class="liste_titre">';

-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';

+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';

 		print '</td>';

 	}

 	// Ref customer

 	if (!empty($arrayfields['c.ref_client']['checked']))

 	{

 		print '<td class="liste_titre" align="left">';

-		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';

+		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';

 		print '</td>';

 	}

 	// Project ref

 	if (!empty($arrayfields['p.ref']['checked']))

 	{

-		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';

+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';

 	}

 	// Project title

 	if (!empty($arrayfields['p.title']['checked']))

 	{

-		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';

+	    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.$search_project.'"></td>';

 	}

 	// Thirpdarty

 	if (!empty($arrayfields['s.nom']['checked']))

 	{

 		print '<td class="liste_titre" align="left">';

-		print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';

+		print '<input class="flat" type="text" name="search_company" value="'.$search_company.'">';

 		print '</td>';

 	}

 	// Town

-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';

+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" 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="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';

+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';

 	// State

 	if (!empty($arrayfields['state.nom']['checked']))

 	{

@@ -708,10 +692,12 @@
 	{

 		print '<td class="liste_titre center">';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('From').' ';

+		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1);

 		print '</div>';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

+		print $langs->trans('to').' ';

+		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1);

 		print '</div>';

 		print '</td>';

 	}

@@ -719,10 +705,12 @@
 	{

 		print '<td class="liste_titre center">';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('From').' ';

+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);

 		print '</div>';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

+		print $langs->trans('to').' ';

+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);

 		print '</div>';

 		print '</td>';

 	}

@@ -730,14 +718,14 @@
 	{

 		// Amount

 		print '<td class="liste_titre right">';

-		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.dol_escape_htmltag($search_total_ht).'">';

+		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.$search_total_ht.'">';

 		print '</td>';

 	}

 	if (!empty($arrayfields['c.total_vat']['checked']))

 	{

 		// Amount

 		print '<td class="liste_titre right">';

-		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';

+		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.$search_total_vat.'">';

 		print '</td>';

 	}

 	if (!empty($arrayfields['c.total_ttc']['checked']))

@@ -770,7 +758,7 @@
 	}

 	if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))

 	{

-		// Amount VAT

+		// Amount

 		print '<td class="liste_titre right">';

 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';

 		print '</td>';

@@ -810,51 +798,13 @@
 	// Date cloture

 	if (!empty($arrayfields['c.date_cloture']['checked']))

 	{

-		print '<td class="liste_titre center">';

-		print '<div class="nowrap">';

-		print $form->selectDate($search_datecloture_start ? $search_datecloture_start : -1, 'search_datecloture_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

-		print '</div>';

-		print '<div class="nowrap">';

-		print $form->selectDate($search_datecloture_end ? $search_datecloture_end : -1, 'search_datecloture_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

-		print '</div>';

-		print '</td>';

-	}

-	// Note public

-	if (!empty($arrayfields['c.note_public']['checked']))

-	{

 		print '<td class="liste_titre">';

-		print '</td>';

-	}

-	// Note private

-	if (!empty($arrayfields['c.note_private']['checked']))

-	{

-		print '<td class="liste_titre">';

-		print '</td>';

-	}

-	// Shippable

-	if (!empty($arrayfields['shippable']['checked']))

-	{

-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';

-		//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);

-		if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {

-			print '<input type="checkbox" name="show_shippable_command" value="1"'.($show_shippable_command ? ' checked' : '').'>';

-			print $langs->trans('ShowShippableStatus');

-		} else {

-			$show_shippable_command = 1;

-		}

-		print '</td>';

-	}

-	// Status billed

-	if (!empty($arrayfields['c.facture']['checked']))

-	{

-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';

-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);

 		print '</td>';

 	}

 	// Status

 	if (!empty($arrayfields['c.fk_statut']['checked']))

 	{

-		print '<td class="liste_titre maxwidthonsmartphone center">';

+		print '<td class="liste_titre maxwidthonsmartphone right">';

 		$liststatus = array(

 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),

 			Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),

@@ -863,7 +813,14 @@
 			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),

 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")

 		);

-		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);

+		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');

+		print '</td>';

+	}

+	// Status billed

+	if (!empty($arrayfields['c.facture']['checked']))

+	{

+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';

+		print $form->selectyesno('billed', $billed, 1, 0, 1);

 		print '</td>';

 	}

 	// Action column

@@ -878,8 +835,8 @@
 	print '<tr class="liste_titre">';

 	if (!empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);

 	if (!empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);

-	if (!empty($arrayfields['p.ref']['checked'])) 	         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);

-	if (!empty($arrayfields['p.title']['checked'])) 	     print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['p.ref']['checked'])) 	          print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['p.title']['checked'])) 	      print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);

 	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $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);

@@ -907,18 +864,14 @@
 	if (!empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

 	if (!empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

 	if (!empty($arrayfields['c.date_cloture']['checked']))       print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

-	if (!empty($arrayfields['c.note_public']['checked'])) print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');

-	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');

-	if (!empty($arrayfields['shippable']['checked']))   print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');

+	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');

 	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');

-	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');

 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');

 	print '</tr>'."\n";

 

 	$total = 0;

 	$subtotal = 0;

 	$productstat_cache = array();

-	$productstat_cachevirtual = array();

 	$getNomUrl_cache = array();

 

 	$generic_commande = new Commande($db);

@@ -936,13 +889,13 @@
 		$text_warning = '';

 		$nbprod = 0;

 

-		$companystatic->id = $obj->socid;

+        $companystatic->id = $obj->socid;

 		$companystatic->code_client = $obj->code_client;

 		$companystatic->name = $obj->name;

 		$companystatic->client = $obj->client;

 		$companystatic->email = $obj->email;

 		if (!isset($getNomUrl_cache[$obj->socid])) {

-			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');

+		    $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');

 		}

 

 		$generic_commande->id = $obj->rowid;

@@ -950,8 +903,7 @@
 		$generic_commande->statut = $obj->fk_statut;

 		$generic_commande->billed = $obj->billed;

 		$generic_commande->date = $db->jdate($obj->date_commande);

-		$generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated

-		$generic_commande->delivery_date = $db->jdate($obj->date_delivery);

+		$generic_commande->date_livraison = $db->jdate($obj->date_delivery);

 		$generic_commande->ref_client = $obj->ref_client;

 		$generic_commande->total_ht = $obj->total_ht;

 		$generic_commande->total_tva = $obj->total_tva;

@@ -969,265 +921,20 @@
 		if (!empty($arrayfields['c.ref']['checked']))

 		{

 			print '<td class="nowraponall">';

+

+			$generic_commande->getLinesArray(); // This set ->lines

+

 			print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);

 

-			// Warning late icon and note

-			if ($generic_commande->hasDelay()) {

-				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");

-			}

-

-			$filename = dol_sanitizeFileName($obj->ref);

-			$filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref);

-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

-			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);

-

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Ref customer

-		if (!empty($arrayfields['c.ref_client']['checked']))

-		{

-			print '<td class="nowrap tdoverflowmax200">'.$obj->ref_client.'</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Project ref

-		if (!empty($arrayfields['p.ref']['checked']))

-		{

-			print '<td class="nowrap">';

-			if ($obj->project_id > 0)

+			// Show shippable Icon (create subloop, so may be slow)

+			if ($conf->stock->enabled)

 			{

-				print $projectstatic->getNomUrl(1);

-			}

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Project label

-		if (!empty($arrayfields['p.title']['checked']))

-		{

-			print '<td class="nowrap">';

-			if ($obj->project_id > 0)

-			{

-				print $projectstatic->title;

-			}

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Third party

-		if (!empty($arrayfields['s.nom']['checked']))

-		{

-			print '<td class="tdoverflowmax200">';

-			print $getNomUrl_cache[$obj->socid];

-

-			// If module invoices enabled and user with invoice creation permissions

-			if (!empty($conf->facture->enabled) && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))

-			{

-				if ($user->rights->facture->creer)

+				$langs->load("stocks");

+				if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))

 				{

-					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0))

+					$numlines = count($generic_commande->lines); // Loop on each line of order

+					for ($lig = 0; $lig < $numlines; $lig++)

 					{

-						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';

-						print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';

-					}

-				}

-			}

-			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 class="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 class="center">';

-			if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);

-			print $typenArray[$obj->typent_code];

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Order date

-		if (!empty($arrayfields['c.date_commande']['checked']))

-		{

-			print '<td class="center">';

-			print dol_print_date($db->jdate($obj->date_commande), 'day');

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-		// Plannned date of delivery

-		if (!empty($arrayfields['c.date_delivery']['checked']))

-		{

-			print '<td class="center">';

-			print dol_print_date($db->jdate($obj->date_delivery), 'dayhour');

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-		// Amount HT

-		if (!empty($arrayfields['c.total_ht']['checked']))

-		{

-			  print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";

-			  if (!$i) $totalarray['nbfield']++;

-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';

-			  $totalarray['val']['c.total_ht'] += $obj->total_ht;

-		}

-		// Amount VAT

-		if (!empty($arrayfields['c.total_vat']['checked']))

-		{

-			print '<td class="nowrap right">'.price($obj->total_tva)."</td>\n";

-			if (!$i) $totalarray['nbfield']++;

-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';

-			$totalarray['val']['c.total_tva'] += $obj->total_tva;

-		}

-		// Amount TTC

-		if (!empty($arrayfields['c.total_ttc']['checked']))

-		{

-			print '<td class="nowrap right">'.price($obj->total_ttc)."</td>\n";

-			if (!$i) $totalarray['nbfield']++;

-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';

-			$totalarray['val']['c.total_ttc'] += $obj->total_ttc;

-		}

-

-		// Currency

-		if (!empty($arrayfields['c.multicurrency_code']['checked']))

-		{

-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";

-			  if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Currency rate

-		if (!empty($arrayfields['c.multicurrency_tx']['checked']))

-		{

-			  print '<td class="nowrap">';

-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);

-			  print "</td>\n";

-			  if (!$i) $totalarray['nbfield']++;

-		}

-		// Amount HT

-		if (!empty($arrayfields['c.multicurrency_total_ht']['checked']))

-		{

-			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";

-			  if (!$i) $totalarray['nbfield']++;

-		}

-		// Amount VAT

-		if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))

-		{

-			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";

-			if (!$i) $totalarray['nbfield']++;

-		}

-		// Amount TTC

-		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))

-		{

-			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		$userstatic->id = $obj->fk_user_author;

-		$userstatic->login = $obj->login;

-

-		// Author

-		if (!empty($arrayfields['u.login']['checked']))

-		{

-			print '<td align="center">';

-			if ($userstatic->id) print $userstatic->getLoginUrl(1);

-			else print '&nbsp;';

-			print "</td>\n";

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Extra fields

-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-		// Fields from hook

-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);

-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

-		print $hookmanager->resPrint;

-

-		// Date creation

-		if (!empty($arrayfields['c.datec']['checked']))

-		{

-			print '<td align="center" class="nowrap">';

-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Date modification

-		if (!empty($arrayfields['c.tms']['checked']))

-		{

-			print '<td align="center" class="nowrap">';

-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Date cloture

-		if (!empty($arrayfields['c.date_cloture']['checked']))

-		{

-			print '<td align="center" class="nowrap">';

-			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Note public

-		if (!empty($arrayfields['c.note_public']['checked']))

-		{

-			print '<td align="center" class="nowrap">';

-			print dol_escape_htmltag($obj->note_public);

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Note private

-		if (!empty($arrayfields['c.note_private']['checked']))

-		{

-			print '<td align="center" class="nowrap">';

-			print dol_escape_htmltag($obj->note_private);

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

-		// Show shippable Icon (this creates subloops, so may be slow)

-		if (!empty($arrayfields['shippable']['checked']))

-		{

-			print '<td class="center">';

-			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {

-				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {

-					$generic_commande->getLinesArray(); // This set ->lines

-

-					$numlines = count($generic_commande->lines); // Loop on each line of order

-					for ($lig = 0; $lig < $numlines; $lig++) {

 						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service

 						{

 							$nbprod++; // order contains real products

@@ -1235,7 +942,8 @@
 

 							// Get local and virtual stock and store it into cache

 							if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {

-								$generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()

+								$generic_product->load_stock('nobatch');

+								//$generic_product->load_virtual_stock();   Already included into load_stock

 								$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;

 								$productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;

 							} else {

@@ -1243,26 +951,26 @@
 								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;

 							}

 

-							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default should be this case.

+							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default is when this option is not set, setting it create strange result

 							{

-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);

-								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';

-								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';

+								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);

+								$text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;

+								$text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;

 								$text_info .= '<br>';

 

-								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) {

+								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)

+								{

 									$notshippable++;

 								}

-							} else {  // BUGGED CODE.

-								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.

-								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE

-								// Detailed virtual stock, looks bugged, uncomplete and need heavy load.

+							}

+							else {  // Detailed code, looks bugged

 								// stock order and stock order_supplier

 								$stock_order = 0;

 								$stock_order_supplier = 0;

 								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))    // What about other options ?

 								{

-									if (!empty($conf->commande->enabled)) {

+									if (!empty($conf->commande->enabled))

+									{

 										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {

 											$generic_product->load_stats_commande(0, '1,2');

 											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];

@@ -1271,7 +979,8 @@
 										}

 										$stock_order = $generic_product->stats_commande['qty'];

 									}

-									if (!empty($conf->fournisseur->enabled)) {

+									if (!empty($conf->fournisseur->enabled))

+									{

 										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {

 											$generic_product->load_stats_commande_fournisseur(0, '3');

 											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];

@@ -1310,16 +1019,246 @@
 					}

 				}

 

-				if ($nbprod) {

+				if ($nbprod)

+				{

 					print $form->textwithtooltip('', $text_info, 2, 1, $text_icon, '', 2);

 				}

 				if ($warning) {     // Always false in default mode

 					print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders').'<br>'.$text_warning, 2, 1, img_picto('', 'error'), '', 2);

 				}

 			}

+

+			// Warning late icon and note

+			if ($generic_commande->hasDelay()) {

+				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");

+			}

+

+			$filename = dol_sanitizeFileName($obj->ref);

+			$filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref);

+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

+			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);

+

 			print '</td>';

-		}

-

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Ref customer

+		if (!empty($arrayfields['c.ref_client']['checked']))

+		{

+			print '<td class="nowrap tdoverflowmax200">'.$obj->ref_client.'</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Project ref

+		if (!empty($arrayfields['p.ref']['checked']))

+		{

+			print '<td class="nowrap">';

+			if ($obj->project_id > 0)

+			{

+			    print $projectstatic->getNomUrl(1);

+			}

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Project label

+		if (!empty($arrayfields['p.title']['checked']))

+		{

+		    print '<td class="nowrap">';

+		    if ($obj->project_id > 0)

+		    {

+		        print $projectstatic->title;

+		    }

+		    print '</td>';

+		    if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Third party

+		if (!empty($arrayfields['s.nom']['checked']))

+		{

+			print '<td class="tdoverflowmax200">';

+			print $getNomUrl_cache[$obj->socid];

+

+			// If module invoices enabled and user with invoice creation permissions

+			if (!empty($conf->facture->enabled) && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))

+			{

+				if ($user->rights->facture->creer)

+				{

+					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0))

+					{

+						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">';

+						print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';

+					}

+				}

+			}

+			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 class="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 class="center">';

+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);

+			print $typenArray[$obj->typent_code];

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Order date

+		if (!empty($arrayfields['c.date_commande']['checked']))

+		{

+			print '<td class="center">';

+			print dol_print_date($db->jdate($obj->date_commande), 'day');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Plannned date of delivery

+		if (!empty($arrayfields['c.date_delivery']['checked']))

+		{

+			print '<td class="center">';

+			print dol_print_date($db->jdate($obj->date_delivery), 'day');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount HT

+		if (!empty($arrayfields['c.total_ht']['checked']))

+		{

+			  print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';

+			  $totalarray['val']['c.total_ht'] += $obj->total_ht;

+		}

+		// Amount VAT

+		if (!empty($arrayfields['c.total_vat']['checked']))

+		{

+			print '<td class="nowrap right">'.price($obj->total_tva)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';

+			$totalarray['val']['c.total_tva'] += $obj->total_tva;

+		}

+		// Amount TTC

+		if (!empty($arrayfields['c.total_ttc']['checked']))

+		{

+			print '<td class="nowrap right">'.price($obj->total_ttc)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';

+			$totalarray['val']['c.total_ttc'] += $obj->total_ttc;

+		}

+

+		// Currency

+		if (!empty($arrayfields['c.multicurrency_code']['checked']))

+		{

+			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Currency rate

+		if (!empty($arrayfields['c.multicurrency_tx']['checked']))

+		{

+			  print '<td class="nowrap">';

+			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);

+			  print "</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount HT

+		if (!empty($arrayfields['c.multicurrency_total_ht']['checked']))

+		{

+			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount VAT

+		if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))

+		{

+			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount TTC

+		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))

+		{

+			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		$userstatic->id = $obj->fk_user_author;

+		$userstatic->login = $obj->login;

+

+		// Author

+		if (!empty($arrayfields['u.login']['checked']))

+		{

+			print '<td align="center">';

+			if ($userstatic->id) print $userstatic->getLoginUrl(1);

+			else print '&nbsp;';

+			print "</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Extra fields

+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+		// Fields from hook

+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);

+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

+		print $hookmanager->resPrint;

+		// Date creation

+		if (!empty($arrayfields['c.datec']['checked']))

+		{

+			print '<td align="center" class="nowrap">';

+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Date modification

+		if (!empty($arrayfields['c.tms']['checked']))

+		{

+			print '<td align="center" class="nowrap">';

+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Date cloture

+		if (!empty($arrayfields['c.date_cloture']['checked']))

+		{

+			print '<td align="center" class="nowrap">';

+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Status

+		if (!empty($arrayfields['c.fk_statut']['checked']))

+		{

+			print '<td class="nowrap right">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

 		// Billed

 		if (!empty($arrayfields['c.facture']['checked']))

 		{

@@ -1327,15 +1266,8 @@
 			if (!$i) $totalarray['nbfield']++;

 		}

 

-		// Status

-		if (!empty($arrayfields['c.fk_statut']['checked']))

-		{

-			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-

 		// Action column

-		print '<td class="nowrap center">';

+		print '<td class="nowrap" 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;

@@ -1378,7 +1310,9 @@
 	$delallowed = $user->rights->commande->creer;

 

 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);

-} else {

+}

+else

+{

 	dol_print_error($db);

 }

 

--- /tmp/dsg/dolibarr/htdocs/commande/github_note.php
+++ /tmp/dsg/dolibarr/htdocs/commande/client_note.php
@@ -38,7 +38,7 @@
 $id = GETPOST('id', 'int');

 $ref = GETPOST('ref', 'alpha');

 $socid = GETPOST('socid', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 

 // Security check

 $socid = 0;

@@ -77,7 +77,7 @@
 

 	$head = commande_prepare_head($object);

 

-	print dol_get_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');

+	dol_fiche_head($head, 'note', $langs->trans("CustomerOrder"), -1, 'order');

 

 	// Order card

 

@@ -93,36 +93,36 @@
 	// Project

 	if (!empty($conf->projet->enabled))

 	{

-		$langs->load("projects");

-		$morehtmlref .= '<br>'.$langs->trans('Project').' ';

-		if ($user->rights->commande->creer)

-		{

-			if ($action != 'classify') {

-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+	    $langs->load("projects");

+	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+	    if ($user->rights->commande->creer)

+	    {

+	        if ($action != 'classify') {

+	            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

 				$morehtmlref .= ' : ';

-			}

-			if ($action == 'classify') {

-				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

-				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

-				$morehtmlref .= '<input type="hidden" name="action" value="classin">';

-				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

-				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

-				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

-				$morehtmlref .= '</form>';

-			} else {

-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

-			}

-		} else {

-			if (!empty($object->fk_project)) {

-				$proj = new Project($db);

-				$proj->fetch($object->fk_project);

-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

-				$morehtmlref .= $proj->ref;

-				$morehtmlref .= '</a>';

-			} else {

-				$morehtmlref .= '';

-			}

-		}

+            }

+            if ($action == 'classify') {

+                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+                $morehtmlref .= '</form>';

+            } else {

+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+            }

+	    } else {

+	        if (!empty($object->fk_project)) {

+	            $proj = new Project($db);

+	            $proj->fetch($object->fk_project);

+	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+	            $morehtmlref .= $proj->ref;

+	            $morehtmlref .= '</a>';

+	        } else {

+	            $morehtmlref .= '';

+	        }

+	    }

 	}

 	$morehtmlref .= '</div>';

 

@@ -139,7 +139,7 @@
 

 	print '</div>';

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 }