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

Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php

htdocs/comm/propal/card.php

@@ -839,6 +839,7 @@ if (empty($reshook))
 
 		$qty = GETPOST('qty' . $predef);
 		$remise_percent = GETPOST('remise_percent' . $predef);
+		if (empty($remise_percent)) $remise_percent=0;
 
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);

htdocs/compta/facture/card.php

@@ -1543,14 +1543,16 @@ if (empty($reshook))
 			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 			if (empty($datefacture)) {
 				$error++;
-				$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->trans("Date")) . '</div>';
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->trans("Date"));
+                setEventMessages($mesg, null, 'errors');
 			}
 
 			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
 
 			if (!($_POST['situations'] > 0)) {
 				$error++;
-				$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceSituation")) . '</div>';
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceSituation"));
+                setEventMessages($mesg, null, 'errors');
 			}
 
 			if (!$error) {
@@ -2192,11 +2194,13 @@ $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GET
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (!is_null(GETPOST('all_progress')) && GETPOST('all_progress') != "")
 		{
+            $all_progress = GETPOST('all_progress', 'int');
 			foreach ($object->lines as $line)
 			{
 				$percent = $line->get_prev_progress($object->id);
-				if (GETPOST('all_progress') < $percent) {
+				if (floatval($all_progress) < floatval($percent)) {
-					$mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
+                    $mesg = $langs->trans("Line") . ' ' . $i . ' '. $line->ref .' : ' . $langs->trans("CantBeLessThanMinPercent");
+                    setEventMessages($mesg, null, 'warnings');
 					$result = -1;
 				} else
 					$object->update_percent($line, $_POST['all_progress']);

htdocs/core/lib/sendings.lib.php

@@ -51,7 +51,7 @@ function shipping_prepare_head($object)
 	{
 		// delivery link
 		$object->fetchObjectLinked($object->id, $object->element);
-		if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
+		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0)        // If there is a delivery
 		{
 		    // Take first one element of array
 		    $tmp = reset($object->linkedObjectsIds['delivery']);
@@ -176,7 +176,7 @@ function delivery_prepare_head($object)
  */
 function show_list_sending_receive($origin, $origin_id, $filter = '')
 {
-	global $db, $conf, $langs, $bc;
+	global $db, $conf, $langs;
 	global $form;
 
 	$product_static=new Product($db);
@@ -218,8 +218,8 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '<table class="liste" width="100%">';
 			print '<tr class="liste_titre">';
 			//print '<td class="left">'.$langs->trans("QtyOrdered").'</td>';
-			print '<td class="left">'.$langs->trans("SendingSheet").'</td>';
+			print '<td>'.$langs->trans("SendingSheet").'</td>';
-			print '<td class="left">'.$langs->trans("Description").'</td>';
+			print '<td>'.$langs->trans("Description").'</td>';
 			print '<td class="center">'.$langs->trans("DateCreation").'</td>';
 			print '<td class="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td class="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';

htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

@@ -307,7 +307,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		$diff_array=array_diff_assoc($qtyordred, $qtyshipped);
         		if (count($diff_array)==0) {
         			//No diff => mean everythings is shipped
-        			$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
+        			$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
         			if ($ret<0) {
         				$this->error=$object->error; $this->errors=$object->errors;
         				return $ret;

htdocs/langs/en_US/admin.lang

@@ -1819,7 +1819,7 @@ ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address on PDF
+SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).

htdocs/theme/eldy/global.inc.php

@@ -2225,6 +2225,10 @@ div.tabBar table.tableforservicepart2:last-child {
 	height: unset;
     padding-top: 0 !important;
 }
+/* Payment Screen : Pointer cursor in the autofill image */
+table.noborder .AutoFillAmout {
+	cursor:pointer;
+}
 
 div.popuptabset {
 	padding: 6px;