alxarafe / alixar

dolibarr/htdocs/expedition/class/expeditionbatch.class.php

Braces +4 added lines, -8 removed lines

@@ -90,8 +90,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -135,8 +134,7 @@ 
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet=$id_line_expdet;
 			return $this->id;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -166,8 +164,7 @@ 
 		if ($db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -230,8 +227,7 @@ 
 			}
 			$db->free($resql);
 			return $ret;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;

dolibarr/htdocs/expedition/class/expedition.class.php

Braces +258 added lines, -185 removed lines

@@ -35,9 +35,15 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->productbatch->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+}
 
 
 /**
@@ -243,14 +249,12 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
+		} else
 		{
 			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 			return "";
@@ -276,7 +280,9 @@ 
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
+		if (empty($this->fk_project)) {
+		    $this->fk_project = 0;
+		}
 
 		$this->user = $user;
 
@@ -357,8 +363,7 @@ 
 						{
 							$error++;
 						}
-					}
-					else
+					} else
 					{	// with batch management
 						if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
 						{
@@ -397,8 +402,7 @@ 
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
+					} else
 					{
 						foreach($this->errors as $errmsg)
 						{
@@ -408,24 +412,21 @@ 
 						$this->db->rollback();
 						return -1*$error;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->error()." - sql=$sql";
@@ -491,24 +492,28 @@ 
 			if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
 			{
 				$error++;
-			}
-			else
+			} else
 			{
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
 					if ($detbatch->entrepot_id == $stockLocation){
-						if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
+						if (! ($detbatch->create($line_id) >0)) {
+						    // Create an expeditionlinebatch
 						{
 							$error++;
 						}
+						}
 					}
 				}
 			}
 		}
 
-		if (! $error) return 1;
-		else return -1;
+		if (! $error) {
+		    return 1;
+		} else {
+		    return -1;
+		}
 	}
 
 	/**
@@ -525,7 +530,9 @@ 
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) {
+		    return -1;
+		}
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet, e.billed";
 		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
@@ -541,10 +548,18 @@ 
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-		if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		if ($id) {
+		    $sql.= " AND e.rowid=".$id;
+		}
+		if ($ref) {
+		    $sql.= " AND e.ref='".$this->db->escape($ref)."'";
+		}
+		if ($ref_ext) {
+		    $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+		    $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -601,7 +616,9 @@ 
 
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+				    $this->brouillon = 1;
+				}
 
 				// Tracking url
 				$this->getUrlTrackingStatus($obj->tracking_number);
@@ -624,15 +641,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error='Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -681,11 +696,12 @@ 
 		$result=$soc->set_as_client();
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+		    // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
-		else
+		} else
 		{
 			$numref = "EXP".$this->id;
 		}
@@ -737,12 +753,13 @@ 
 					if (empty($obj->edbrowid))
 					{
 						$qty = $obj->qty;
-					}
-					else
+					} else
 					{
 						$qty = $obj->edbqty;
 					}
-					if ($qty <= 0) continue;
+					if ($qty <= 0) {
+					    continue;
+					}
 					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 					//var_dump($this->lines[$i]);
@@ -761,8 +778,7 @@ 
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// line with batch detail
 
@@ -777,8 +793,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error();
@@ -848,8 +863,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -885,16 +899,17 @@ 
 				if ($result > 0)
 				{
 					return $result;
-				}
-				else
+				} else
 				{
 					$this->error=$delivery->error;
 					return $result;
 				}
+			} else {
+			    return 0;
 			}
-			else return 0;
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -942,9 +957,9 @@ 
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
+				} else {
+									$product_stock = $product->stock_reel;
 				}
-				else
-					$product_stock = $product->stock_reel;
 
 				$product_type=$product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -965,8 +980,10 @@ 
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+		    // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
+		}
 
 		$this->lines[$num] = $line;
 	}
@@ -1032,8 +1049,10 @@ 
 			$line->detail_batch=$tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+			    // For avoid conflicts if trigger used
 				$line->array_options = $array_options;
+			}
 
 			//var_dump($line);
 			$this->lines[$num] = $line;
@@ -1055,25 +1074,63 @@ 
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) {
+		    $this->ref=trim($this->ref);
+		}
+		if (isset($this->entity)) {
+		    $this->entity=trim($this->entity);
+		}
+		if (isset($this->ref_customer)) {
+		    $this->ref_customer=trim($this->ref_customer);
+		}
+		if (isset($this->socid)) {
+		    $this->socid=trim($this->socid);
+		}
+		if (isset($this->fk_user_author)) {
+		    $this->fk_user_author=trim($this->fk_user_author);
+		}
+		if (isset($this->fk_user_valid)) {
+		    $this->fk_user_valid=trim($this->fk_user_valid);
+		}
+		if (isset($this->fk_delivery_address)) {
+		    $this->fk_delivery_address=trim($this->fk_delivery_address);
+		}
+		if (isset($this->shipping_method_id)) {
+		    $this->shipping_method_id=trim($this->shipping_method_id);
+		}
+		if (isset($this->tracking_number)) {
+		    $this->tracking_number=trim($this->tracking_number);
+		}
+		if (isset($this->statut)) {
+		    $this->statut=(int) $this->statut;
+		}
+		if (isset($this->trueDepth)) {
+		    $this->trueDepth=trim($this->trueDepth);
+		}
+		if (isset($this->trueWidth)) {
+		    $this->trueWidth=trim($this->trueWidth);
+		}
+		if (isset($this->trueHeight)) {
+		    $this->trueHeight=trim($this->trueHeight);
+		}
+		if (isset($this->size_units)) {
+		    $this->size_units=trim($this->size_units);
+		}
+		if (isset($this->weight_units)) {
+		    $this->weight_units=trim($this->weight_units);
+		}
+		if (isset($this->trueWeight)) {
+		    $this->weight=trim($this->trueWeight);
+		}
+		if (isset($this->note_private)) {
+		    $this->note=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+		    $this->note=trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+		    $this->modelpdf=trim($this->modelpdf);
+		}
 
 
 
@@ -1138,8 +1195,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1230,8 +1286,7 @@ 
 							$error++;$this->errors=$this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// We increment stock of batches
 						// We use warehouse selected for each line
@@ -1244,11 +1299,13 @@ 
 								break;
 							}
 						}
-						if ($error) break; // break for loop incase of error
+						if ($error) {
+						    break;
+						}
+						// break for loop incase of error
 					}
 				}
-			}
-			else
+			} else
 			{
 				$error++;$this->errors[]="Error ".$this->db->lasterror();
 			}
@@ -1272,7 +1329,9 @@ 
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
+				if ($res < 0) {
+				    $error++;
+				}
 
 				if (! $error)
 				{
@@ -1285,10 +1344,12 @@ 
 						{
 							$this->fetch_origin();
 							$origin=$this->origin;
-							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
+							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS) {
+							    // If order source of shipment is "shipment in progress"
 							{
 								// Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
 								$this->$origin->loadExpeditions();
+							}
 								//var_dump($this->$origin->expeditions);exit;
 								if (count($this->$origin->expeditions) <= 0)
 								{
@@ -1325,35 +1386,30 @@ 
 							}
 
 							return 1;
-						}
-						else
+						} else
 						{
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1506,8 +1562,7 @@ 
 						if ($originline != $obj->fk_origin_line)
 						{
 							$line->detail_batch = $newdetailbatch;
-						}
-						else
+						} else
 						{
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 						}
@@ -1518,8 +1573,7 @@ 
 				{
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
-				}
-				else
+				} else
 				{
 					$line->total_ht			+= $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
@@ -1533,8 +1587,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -3;
@@ -1567,14 +1620,12 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error='ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
@@ -1604,14 +1655,20 @@ 
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+		    return $url;
+		}
 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+			    $add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+			    $url.='&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose='';
@@ -1630,8 +1687,12 @@ 
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1663,33 +1724,49 @@ 
 
 		if ($mode==0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			elseif ($statut==1) return $langs->trans($this->statuts[$statut]);
-			elseif ($statut==2) return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode==1)
-		{
-			if ($statut==0) return $langs->trans($this->statutshorts[$statut]);
-			elseif ($statut==1) return $langs->trans($this->statutshorts[$statut]);
-			elseif ($statut==2) return $langs->trans($this->statutshorts[$statut]);
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut==0) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			elseif ($statut==1) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			elseif ($statut==2) return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut==0) {
+			    return $langs->trans($this->statuts[$statut]);
+			} elseif ($statut==1) {
+			    return $langs->trans($this->statuts[$statut]);
+			} elseif ($statut==2) {
+			    return $langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode==1)
+		{
+			if ($statut==0) {
+			    return $langs->trans($this->statutshorts[$statut]);
+			} elseif ($statut==1) {
+			    return $langs->trans($this->statutshorts[$statut]);
+			} elseif ($statut==2) {
+			    return $langs->trans($this->statutshorts[$statut]);
+			}
+		} elseif ($mode == 3)
+		{
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			} elseif ($statut==2) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			}
+		} elseif ($mode == 4)
+		{
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			} elseif ($statut==2) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode == 5)
+		{
+			if ($statut==0) {
+			    return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			} elseif ($statut==1) {
+			    return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			} elseif ($statut==2) {
+			    return $langs->trans($this->statutshorts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			}
 		}
 	}
 
@@ -1795,14 +1872,12 @@ 
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -1853,7 +1928,9 @@ 
 
 		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		if ($id!='') $sql.= " WHERE em.rowid=".$id;
+		if ($id!='') {
+		    $sql.= " WHERE em.rowid=".$id;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1888,8 +1965,7 @@ 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
 			$sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
-		}
-		else
+		} else
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
 			$sql.= " code='".$this->db->escape($this->update['code'])."'";
@@ -1899,7 +1975,9 @@ 
 			$sql.= " WHERE rowid=".$id;
 			$resql = $this->db->query($sql);
 		}
-		if ($resql < 0) dol_print_error($this->db,'');
+		if ($resql < 0) {
+		    dol_print_error($this->db,'');
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1965,8 +2043,7 @@ 
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
-		}
-		else
+		} else
 		{
 			$this->tracking_url = $value;
 		}
@@ -2051,12 +2128,13 @@ 
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
+						} else
 						{
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+						    continue;
+						}
 						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						$mouvS = new MouvementStock($this->db);
@@ -2073,8 +2151,7 @@ 
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -2087,8 +2164,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -2103,8 +2179,7 @@ 
 					$error++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$error++;
@@ -2114,8 +2189,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2158,8 +2232,7 @@ 
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2223,12 +2296,13 @@ 
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
+						} else
 						{
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+						    continue;
+						}
 						dol_syslog(get_class($this)."::reopen expedition movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						//var_dump($this->lines[$i]);
@@ -2246,8 +2320,7 @@ 
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -2260,8 +2333,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -2285,8 +2357,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2533,8 +2604,7 @@ 
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->errors[] = $this->db->lasterror();
 			$this->error = $this->db->lasterror();
@@ -2562,7 +2632,9 @@ 
 			return -1;
 		}
 		// Clean parameters
-		if (empty($this->entrepot_id)) $this->entrepot_id='null';
+		if (empty($this->entrepot_id)) {
+		    $this->entrepot_id='null';
+		}
 
 		$this->db->begin();
 
@@ -2617,8 +2689,7 @@ 
 
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$error++;
 		}
@@ -2658,9 +2729,11 @@ 
 		if (! $error && $this->db->query($sql))
 		{
 			// Remove extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			    // For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$this->errors[]=$this->error;
@@ -2678,8 +2751,7 @@ 
 				}
 				// End call triggers
 			}
-		}
-		else
+		} else
 		{
 			$this->errors[]=$this->db->lasterror()." - sql=$sql";
 			$error++;
@@ -2688,8 +2760,7 @@ 
 		if (! $error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -2719,21 +2790,24 @@ 
 		$this->db->begin();
 
 		// Clean parameters
-		if (empty($this->qty)) $this->qty=0;
+		if (empty($this->qty)) {
+		    $this->qty=0;
+		}
 		$qty=price2num($this->qty);
 		$remainingQty = 0;
 		$batch = null;
 		$batch_id = null;
 		$expedition_batch_id = null;
-		if (is_array($this->detail_batch)) 	// array of ExpeditionLineBatch
+		if (is_array($this->detail_batch)) {
+		    // array of ExpeditionLineBatch
 		{
 			if (count($this->detail_batch) > 1)
 			{
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
+		}
 				$this->errors[]='ErrorBadParameters';
 				$error++;
-			}
-			else
+			} else
 			{
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
@@ -2746,8 +2820,7 @@ 
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
-		}
-		else if (! empty($this->detail_batch))
+		} else if (! empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
@@ -2788,8 +2861,7 @@ 
 			{
 				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
-			}
-			else
+			} else
 			{
 				// caculate new total line qty
 				foreach ($lotArray as $lot)
@@ -2862,9 +2934,11 @@ 
 
 		if (! $error)
 		{
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			    // For avoid conflicts if trigger used
 			{
 				$result=$this->insertExtraFields();
+			}
 				if ($result < 0)
 				{
 					$this->errors[]=$this->error;
@@ -2887,8 +2961,7 @@ 
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{

dolibarr/htdocs/expedition/class/expeditionstats.class.php

Braces +15 added lines, -5 removed lines

@@ -73,12 +73,16 @@ 
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where.= " AND c.entity = ".$conf->entity;
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+		    $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		}
 		if ($this->socid)
 		{
 			$this->where.=" AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid;
+        if ($this->userid > 0) {
+            $this->where.=' AND c.fk_user_author = '.$this->userid;
+        }
     }
 
     /**
@@ -94,7 +98,9 @@ 
 
         $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql.= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql.= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm";
@@ -116,7 +122,9 @@ 
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql.= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY dm";
         $sql.= $this->db->order('dm','DESC');
@@ -135,7 +143,9 @@ 
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql.= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY year";
         $sql.= $this->db->order('year','DESC');

dolibarr/htdocs/expedition/class/api_shipments.class.php

Braces +30 added lines, -15 removed lines

@@ -110,18 +110,33 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+            $search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."expedition as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
 
         $sql.= ' WHERE t.entity IN ('.getEntity('expedition').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+            $sql.= " AND t.fk_soc = sc.fk_soc";
+        }
+        if ($socids) {
+            $sql.= " AND t.fk_soc IN (".$socids.")";
+        }
+        if ($search_sale > 0) {
+            $sql.= " AND t.rowid = sc.fk_soc";
+        }
+        // Join for the needed table to filter by sale
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -166,8 +181,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -397,8 +411,7 @@ 
     	$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else
+    	} else
     	{
     		throw new RestException(405, $this->shipment->error);
     	}
@@ -427,15 +440,16 @@ 
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+                continue;
+            }
             $this->shipment->$field = $value;
         }
 
         if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
+        } else
         {
         	throw new RestException(500, $this->shipment->error);
         }
@@ -658,8 +672,9 @@ 
     {
         $shipment = array();
         foreach (Shipments::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $shipment[$field] = $data[$field];
         }
         return $shipment;

dolibarr/htdocs/expedition/card.php

Braces +328 added lines, -226 removed lines

@@ -44,10 +44,18 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->productbatch->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+}
 if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -56,26 +64,41 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array("sendings","companies","bills",'deliveries','orders','stocks','other','propal'));
 
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
+if (!empty($conf->incoterm->enabled)) {
+    $langs->load('incoterm');
+}
+if (! empty($conf->productbatch->enabled)) {
+    $langs->load('productbatch');
+}
 
 $origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'expedition';   // Example: commande, propal
 $origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
 $id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
+if (empty($origin_id)) {
+    $origin_id  = GETPOST('origin_id','int');
+}
+// Id of order or propal
+if (empty($origin_id)) {
+    $origin_id  = GETPOST('object_id','int');
+}
+// Id of order or propal
 $ref=GETPOST('ref','alpha');
 $line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
 
 // Security check
 $socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 
-if ($origin == 'expedition') $result=restrictedArea($user, $origin, $id);
-else {
+if ($origin == 'expedition') {
+    $result=restrictedArea($user, $origin, $id);
+} else {
 	$result=restrictedArea($user, 'expedition');
-	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
-}
+	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+	    accessforbidden();
+	}
+	}
 
 $action		= GETPOST('action','alpha');
 $confirm	= GETPOST('confirm','alpha');
@@ -113,7 +136,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -167,7 +192,9 @@ 
 		// Fill array 'array_options' with data from update form
 	    $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 	    $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-	    if ($ret < 0) $error++;
+	    if ($ret < 0) {
+	        $error++;
+	    }
 
 	    if (! $error)
 	    {
@@ -180,8 +207,9 @@ 
 			}
 	    }
 
-	    if ($error)
-	        $action = 'edit_extras';
+	    if ($error) {
+	    	        $action = 'edit_extras';
+	    }
 	}
 
 	// Create shipment
@@ -243,12 +271,14 @@ 
 			$stockLocation="ent1".$i."_0";
 	    	$qty = "qtyl".$i;
 
-			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
+			if ($objectsrc->lines[$i]->product_tobatch) {
+			    // If product need a batch number
 			{
 			    if (isset($_POST[$batch]))
 			    {
     				//shipment line with batch-enable product
     				$qty .= '_'.$j;
+			}
     				while (isset($_POST[$batch]))
     				{
     					// save line of detail into sub_qty
@@ -268,8 +298,7 @@ 
     				$batch_line[$i]['ix_l']=GETPOST($idl,'int');
 
     				$totalqty+=$subtotalqty;
-			    }
-			    else
+			    } else
 			    {
 			        // No detail were provided for lots
 			        if (! empty($_POST[$qty]))
@@ -280,8 +309,7 @@ 
     			        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
 			        }
 			    }
-			}
-			else if (isset($_POST[$stockLocation]))
+			} else if (isset($_POST[$stockLocation]))
 			{
 			    //shipment line from multiple stock locations
 			    $qty .= '_'.$j;
@@ -298,12 +326,13 @@ 
 			        $stockLocation="ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
 			    }
-			}
-			else
+			} else
 			{
 			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
+				if (GETPOST($qty,'int') > 0) {
+				    $totalqty+=GETPOST($qty,'int');
+				}
 			}
 
 			// Extrafields
@@ -320,10 +349,13 @@ 
 
 	    //var_dump($batch_line[2]);
 
-	    if ($totalqty > 0)		// There is at least one thing to ship
+	    if ($totalqty > 0) {
+	        // There is at least one thing to ship
 	    {
 	        //var_dump($_POST);exit;
-	        for ($i = 0; $i < $num; $i++)
+	        for ($i = 0;
+	    }
+	    $i < $num; $i++)
 	        {
 	            $qty = "qtyl".$i;
 				if (! isset($batch_line[$i]))
@@ -345,16 +377,19 @@ 
     					        }
     					    }
     					}
-					}
-					else
+					} else
 					{
 						if (GETPOST($qty,'int') > 0 || (GETPOST($qty,'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
 							$idl = "idl".$i;
 							$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-							if ($entrepot_id < 0) $entrepot_id='';
-							if (! ($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
+							if ($entrepot_id < 0) {
+							    $entrepot_id='';
+							}
+							if (! ($objectsrc->lines[$i]->fk_product > 0)) {
+							    $entrepot_id = 0;
+							}
 
 							$ret=$object->addline($entrepot_id, GETPOST($idl,'int'), GETPOST($qty,'int'), $array_options[$i]);
 							if ($ret < 0)
@@ -364,8 +399,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					// batch mode
 					if ($batch_line[$i]['qty']>0)
@@ -381,7 +415,9 @@ 
 	        }
 	        // Fill array 'array_options' with data from add form
 	        $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	        if ($ret < 0) $error++;
+	        if ($ret < 0) {
+	            $error++;
+	        }
 
 	        if (! $error)
 	        {
@@ -392,8 +428,7 @@ 
 	                $error++;
 	            }
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
@@ -404,8 +439,7 @@ 
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else
+	    } else
 	    {
 	        $db->rollback();
 	        $_GET["commande_id"]=GETPOST('commande_id','int');
@@ -423,14 +457,11 @@ 
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
 	        exit;
-	    }
-	    else
+	    } else
 	    {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	else if ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} else if ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
        	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
 	)
@@ -443,16 +474,19 @@ 
 	    {
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
+	    } else
 	    {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
 	    		$outputlangs = $langs;
 	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+	    		    $newlang = GETPOST('lang_id','aZ09');
+	    		}
+	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+	    		    $newlang = $object->thirdparty->default_lang;
+	    		}
 	    		if (! empty($newlang)) {
 	    			$outputlangs = new Translate("", $conf);
 	    			$outputlangs->setDefaultLang($newlang);
@@ -461,20 +495,19 @@ 
 	    		$ret = $object->fetch($id); // Reload to get new records
 
 	    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db,$result);
+	    		if ($result < 0) {
+	    		    dol_print_error($db,$result);
+	    		}
 	    	}
 	    }
-	}
-
-	else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+	} else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 	    $result = $object->delete();
 	    if ($result > 0)
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 	        exit;
-	    }
-	    else
+	    } else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
@@ -516,19 +549,29 @@ 
 	{
 	    $error=0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number','alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url','int'));
+	    if ($action == 'settracking_number') {
+	        $object->tracking_number = trim(GETPOST('tracking_number','alpha'));
+	    }
+	    if ($action == 'settracking_url') {
+	        $object->tracking_url = trim(GETPOST('tracking_url','int'));
+	    }
 	    if ($action == 'settrueWeight')	{
 	    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
 			$object->weight_units = GETPOST('weight_units','int');
 	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
+	    if ($action == 'settrueWidth') {
+	        $object->trueWidth = trim(GETPOST('trueWidth','int'));
+	    }
 	    if ($action == 'settrueHeight'){
 	    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
 						$object->size_units = GETPOST('size_units','int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    if ($action == 'settrueDepth') {
+	        $object->trueDepth = trim(GETPOST('trueDepth','int'));
+	    }
+	    if ($action == 'setshipping_method_id') {
+	        $object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+	    }
 
 	    if (! $error)
 	    {
@@ -541,9 +584,7 @@ 
 	    }
 
 	    $action="";
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -551,9 +592,7 @@ 
 	    	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 	    	exit();
 	    }
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -587,8 +626,7 @@ 
 							$error++;
 						}
 					}
-				}
-				else
+				} else
 				{
 					// delete single warehouse line
 					$line->id = $line_id;
@@ -604,8 +642,7 @@ 
 		if(! $error) {
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 			exit();
-		}
-		else
+		} else
 		{
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
@@ -625,9 +662,11 @@ 
 		$num_prod = count($lines);
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			if ($lines[$i]->id == $line_id)		// we have found line to update
+			if ($lines[$i]->id == $line_id) {
+			    // we have found line to update
 			{
 				$line = new ExpeditionLigne($db);
+			}
 				// Extrafields Lines
 				$extrafieldsline = new ExtraFields($db);
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -651,16 +690,20 @@ 
 						$batch_qty = GETPOST($qty, 'int');
 						if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
 						{
-							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
+							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0) {
+							    // $line is ExpeditionLine
 							{
 								if ($lines[$i]->entrepot_id != 0)
 								{
 									// allow update line entrepot_id if not multi warehouse shipping
 									$line->entrepot_id = $lotStock->warehouseid;
+							}
 								}
 
 								// detail_batch can be an object with keys, or an array of ExpeditionLineBatch
-								if (empty($line->detail_batch)) $line->detail_batch=new stdClass();
+								if (empty($line->detail_batch)) {
+								    $line->detail_batch=new stdClass();
+								}
 
 								$line->detail_batch->fk_origin_stock = $batch_id;
 								$line->detail_batch->batch = $lotStock->batch;
@@ -671,8 +714,7 @@ 
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
+							} else
 							{
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
@@ -700,8 +742,7 @@ 
 								{
 									$lineIdToAddLot = $line_id;
 								}
-							}
-							else if (count($lines[$i]->details_entrepot) > 1)
+							} else if (count($lines[$i]->details_entrepot) > 1)
 							{
 								// multi warehouse shipment lines
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -725,14 +766,12 @@ 
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									}
-								}
-								else
+								} else
 								{
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
+							} else
 							{
 								// create new line with new lot
 								$line->origin_line_id = $lines[$i]->origin_line_id;
@@ -748,15 +787,13 @@ 
 									$error++;
 								}
 							}
-						}
-						else
+						} else
 						{
 							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 							$error++;
 						}
 					}
-				}
-				else
+				} else
 				{
 					if ($lines[$i]->fk_product > 0)
 					{
@@ -775,8 +812,7 @@ 
 							}
 							unset($_POST[$stockLocation]);
 							unset($_POST[$qty]);
-						}
-						else if (count($lines[$i]->details_entrepot) > 1)
+						} else if (count($lines[$i]->details_entrepot) > 1)
 						{
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -800,8 +836,7 @@ 
 								}
 							}
 						}
-					}
-					else	// Product no predefined
+					} else	// Product no predefined
 					{
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
@@ -824,10 +859,12 @@ 
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+									$newlang = GETPOST('lang_id','aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+									$newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -836,15 +873,12 @@ 
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
+		} else
 		{
 			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
-	}
-
-	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
+	} else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
 		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -852,7 +886,9 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id=$facid;
+	if (empty($id)) {
+	    $id=$facid;
+	}
 	$trigger_name='SHIPPING_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromshipment';
@@ -899,15 +935,19 @@ 
         $classname = ucfirst($origin);
 
         $object = new $classname($db);
-        if ($object->fetch($origin_id))	// This include the fetch_lines
+        if ($object->fetch($origin_id)) {
+            // This include the fetch_lines
         {
             $soc = new Societe($db);
+        }
             $soc->fetch($object->socid);
 
             $author = new User($db);
             $author->fetch($object->user_author_id);
 
-            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+            if (! empty($conf->stock->enabled)) {
+                $entrepot = new Entrepot($db);
+            }
 
             print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -939,9 +979,13 @@ 
 
             // Ref client
             print '<tr><td>';
-            if ($origin == 'commande') print $langs->trans('RefCustomerOrder');
-            else if ($origin == 'propal') print $langs->trans('RefCustomerOrder');
-            else print $langs->trans('RefCustomer');
+            if ($origin == 'commande') {
+                print $langs->trans('RefCustomerOrder');
+            } else if ($origin == 'propal') {
+                print $langs->trans('RefCustomerOrder');
+            } else {
+                print $langs->trans('RefCustomer');
+            }
             print '</td><td colspan="3">';
             print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
             print '</td>';
@@ -956,8 +1000,12 @@ 
             if (! empty($conf->projet->enabled))
             {
                 $projectid = GETPOST('projectid','int')?GETPOST('projectid','int'):0;
-                if(empty($projectid) && ! empty($object->fk_project)) $projectid = $object->fk_project;
-                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+                if(empty($projectid) && ! empty($object->fk_project)) {
+                    $projectid = $object->fk_project;
+                }
+                if ($origin == 'project') {
+                    $projectid = ($originid ? $originid : 0);
+                }
 
                 $langs->load("projects");
                 print '<tr>';
@@ -1019,7 +1067,9 @@ 
             print '<td colspan="3">';
             $expe->fetch_delivery_methods();
             print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id','int'),1,0,0,"",1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
             print "</td></tr>\n";
 
             // Tracking number
@@ -1123,8 +1173,7 @@ 
 					if (empty($conf->productbatch->enabled))
 					{
                     	print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-					}
-					else
+					} else
 					{
 						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
@@ -1144,16 +1193,22 @@ 
                 $type=$line->product_type?$line->product_type:$line->fk_product_type;
                 // Try to enhance type detection using date_start and date_end for free lines where type
                 // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
+                if (! empty($line->date_start)) {
+                    $type=1;
+                }
+                if (! empty($line->date_end)) {
+                    $type=1;
+                }
 
                 print '<!-- line '.$line->rowid.' for product -->'."\n";
                 print '<tr class="oddeven">'."\n";
 
                 // Product label
-                if ($line->fk_product > 0)  // If predefined product
+                if ($line->fk_product > 0) {
+                    // If predefined product
                 {
                     $product->fetch($line->fk_product);
+                }
                     $product->load_stock('warehouseopen');	// Load all $product->stock_warehouse[idwarehouse]->detail_batch
                     //var_dump($product->stock_warehouse[1]);
 
@@ -1180,12 +1235,14 @@ 
                     }
 
                     print '</td>';
-                }
-                else
+                } else
 				{
 				    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
+                    if ($type==1) {
+                        $text = img_object($langs->trans('Service'),'service');
+                    } else {
+                        $text = img_object($langs->trans('Product'),'product');
+                    }
 
                     if (! empty($line->label)) {
                     	$text.= ' <strong>'.$line->label.'</strong>';
@@ -1217,42 +1274,50 @@ 
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$quantityToBeDelivered = 0;
-				}
-				else
+				} else
 				{
 					$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 				}
                 $warehouse_id = GETPOST('entrepot_id','int');
 
 				$warehouseObject = null;
-				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
+				if ($warehouse_id > 0 || ! ($line->fk_product > 0) || empty($conf->stock->enabled)) {
+				    // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
 				    print '<!-- Case warehouse already known or product not a predefined product -->';
+				}
 					//ship from preselected location
 					$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
 					$deliverableQty=min($quantityToBeDelivered, $stock);
-					if ($deliverableQty < 0) $deliverableQty = 0;
+					if ($deliverableQty < 0) {
+					    $deliverableQty = 0;
+					}
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
 					{
 						// Quantity to send
 						print '<td align="center">';
 						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
-                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            if (GETPOST('qtyl'.$indiceAsked, 'int')) {
+                                $deliverableQty=GETPOST('qtyl'.$indiceAsked, 'int');
+                            }
                             print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+						} else {
+						    print $langs->trans("NA");
 						}
-						else print $langs->trans("NA");
 						print '</td>';
 
 						// Stock
 						if (! empty($conf->stock->enabled))
 						{
 							print '<td align="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
+							if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							    // Type of product need stock change ?
 							{
 								// Show warehouse combo list
 								$ent = "entl".$indiceAsked;
+							}
 								$idl = "idl".$indiceAsked;
 								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
 								if ($line->fk_product > 0)
@@ -1268,8 +1333,7 @@ 
 										}
 									}
 								}
-							}
-							else
+							} else
 							{
 								print $langs->trans("Service");
 							}
@@ -1300,15 +1364,16 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 					    // Product need lot
 						print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
 						print '<!-- Case product need lot -->';
 
 						$staticwarehouse=new Entrepot($db);
-						if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
+						if ($warehouse_id > 0) {
+						    $staticwarehouse->fetch($warehouse_id);
+						}
 
 						$subj=0;
 						// Define nb of lines suggested for this order line
@@ -1323,10 +1388,13 @@ 
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
 						{
-							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
+							foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) {
+							    // $dbatch is instance of Productbatch
 							{
 								//var_dump($dbatch);
-								$batchStock = + $dbatch->qty;		// To get a numeric
+								$batchStock = + $dbatch->qty;
+							}
+							// To get a numeric
 								$deliverableQty = min($quantityToBeDelivered,$batchStock);
 								print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'>';
 								print '<td colspan="3" ></td><td align="center">';
@@ -1356,8 +1424,7 @@ 
 								$subj++;
 								print '</td></tr>';
 							}
-						}
-						else
+						} else
 						{
 						    print '<!-- Case there is no details of lot at all -->';
 						    print '<tr class="oddeven"><td colspan="3"></td><td align="center">';
@@ -1369,8 +1436,7 @@ 
 							print '</td></tr>';
 						}
 					}
-				}
-				else
+				} else
 				{
 					// ship from multiple locations
 					if (empty($conf->productbatch->enabled) || ! $product->hasbatch())
@@ -1390,9 +1456,11 @@ 
 						    }
 						}
 						$tmpwarehouseObject=new Entrepot($db);
-						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
+						foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse) {
+						    // $stock_warehouse is product_stock
 						{
 							$tmpwarehouseObject->fetch($warehouse_id);
+						}
 							if ($stock_warehouse->real > 0)
 							{
 								$stock = + $stock_warehouse->real; // Convert it to number
@@ -1405,8 +1473,9 @@ 
 								{
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
+								} else {
+								    print $langs->trans("NA");
 								}
-								else print $langs->trans("NA");
 								print '</td>';
 
 								// Stock
@@ -1419,8 +1488,7 @@ 
 
 										print '<!-- Show details of stock -->';
 										print '('.$stock.')';
-									}
-									else
+									} else
 									{
 										print $langs->trans("Service");
 									}
@@ -1459,8 +1527,7 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 					    print '<!-- Case warehouse not already known and product need lot -->';
 					    print '<td></td><td></td></tr>';	// end line and start a new one for lot/serial
@@ -1490,7 +1557,9 @@ 
 									//var_dump($dbatch);
 									$batchStock = + $dbatch->qty;		// To get a numeric
 									$deliverableQty = min($quantityToBeDelivered,$batchStock);
-									if ($deliverableQty < 0) $deliverableQty = 0;
+									if ($deliverableQty < 0) {
+									    $deliverableQty = 0;
+									}
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested)?$bc[$var]:'').'><td colspan="3"></td><td align="center">';
 									print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
@@ -1505,8 +1574,11 @@ 
 									//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
 									print $langs->trans("Batch").': ';
 									$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-									if ($result > 0) print $productlotObject->getNomUrl(1);
-									else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+									if ($result > 0) {
+									    print $productlotObject->getNomUrl(1);
+									} else {
+									    print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+									}
 									print ' ('.$dbatch->qty.')';
 									$quantityToBeDelivered -= $deliverableQty;
 									if ($quantityToBeDelivered < 0)
@@ -1520,9 +1592,11 @@ 
 							}
 						}
 					}
-					if ($subj == 0) // Line not shown yet, we show it
+					if ($subj == 0) {
+					    // Line not shown yet, we show it
 					{
 					    print '<!-- line not shown yet, we show it -->';
+					}
 						print '<tr class="oddeven"><td colspan="3" ></td><td align="center">';
 						if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
 						{
@@ -1532,8 +1606,7 @@ 
                                 $disabled='disabled="disabled"';
 						    }
     						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled?' '.$disabled:'').'> ';
-						}
-						else
+						} else
 						{
 						    print $langs->trans("NA");
 						}
@@ -1548,14 +1621,15 @@ 
     							$warehouseObject=new Entrepot($db);
     							$warehouseObject->fetch($warehouse_selected_id);
     							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->libelle);
-    						}
-    						else
+    						} else
     						{
-    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
-    						    else print '';
+    						    if ($line->fk_product) {
+    						        print img_warning().' '.$langs->trans("StockTooLow");
+    						    } else {
+    						        print '';
+    						    }
     						}
-						}
-						else
+						} else
 						{
 						    print $langs->trans("Service");
 						}
@@ -1597,21 +1671,20 @@ 
             print '</form>';
 
             print '<br>';
-        }
-        else
+        } else
 		{
             dol_print_error($db);
         }
     }
-}
-else if ($id || $ref)
-/* *************************************************************************** */
+} else if ($id || $ref) {
+    /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
 /*                                                                             */
 /* *************************************************************************** */
 {
 	$lines = $object->lines;
+}
 
 	$num_prod = count($lines);
 
@@ -1648,8 +1721,7 @@ 
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
+			} else
 			{
 				$numref = $object->ref;
 			}
@@ -1675,8 +1747,11 @@ 
 		// Call Hook formConfirm
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		if (empty($reshook)) {
+		    $formconfirm.=$hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+		    $formconfirm=$hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -1785,7 +1860,9 @@ 
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		if ($action != 'editdate_livraison') {
+		    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editdate_livraison')
@@ -1796,8 +1873,7 @@ 
 			print $form->selectDate($object->date_delivery?$object->date_delivery:-1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
 		}
@@ -1820,8 +1896,7 @@ 
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
@@ -1830,11 +1905,15 @@ 
         // Calculated
 		if ($totalWeight > 0)
 		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+			if (!empty($object->trueWeight)) {
+			    print ' ('.$langs->trans("SumOfProductWeights").': ';
+			}
 			//print $totalWeight.' '.measuring_units_string(0,"weight");
 			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
 			//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
-			if (!empty($object->trueWeight)) print ')';
+			if (!empty($object->trueWeight)) {
+			    print ')';
+			}
 		}
 		print '</td></tr>';
 
@@ -1857,8 +1936,7 @@ 
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
@@ -1891,16 +1969,21 @@ 
 			{
 			    //print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+			} else {
+			    print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 			}
-			else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
 		}
 		if ($totalVolume > 0)
 		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			if ($calculatedVolume) {
+			    print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			}
 			//print $totalVolume.' '.measuring_units_string(0,"volume");
 			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) print ')';
+			if ($calculatedVolume) {
+			    print ')';
+			}
 		}
 		print "</td>\n";
 		print '</tr>';
@@ -1924,7 +2007,9 @@ 
 		print $langs->trans('SendingMethod');
 		print '</td>';
 
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
+		if ($action != 'editshipping_method_id') {
+		    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshipping_method_id')
@@ -1934,11 +2019,12 @@ 
 			print '<input type="hidden" name="action" value="setshipping_method_id">';
 			$object->fetch_delivery_methods();
 			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			if ($object->shipping_method_id > 0)
 			{
@@ -1962,16 +2048,18 @@ 
 	        print '<table width="100%" class="nobordernopadding"><tr><td>';
 	        print $langs->trans('IncotermLabel');
 	        print '<td><td align="right">';
-	        if ($user->rights->expedition->creer) print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-	        else print '&nbsp;';
+	        if ($user->rights->expedition->creer) {
+	            print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+	        } else {
+	            print '&nbsp;';
+	        }
 	        print '</td></tr></table>';
 	        print '</td>';
 	        print '<td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-			}
-			else
+			} else
 			{
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
@@ -2019,14 +2107,17 @@ 
 		if ($action == 'editline')
 		{
 			$editColspan = 3;
-			if (empty($conf->stock->enabled)) $editColspan--;
-			if (empty($conf->productbatch->enabled)) $editColspan--;
+			if (empty($conf->stock->enabled)) {
+			    $editColspan--;
+			}
+			if (empty($conf->productbatch->enabled)) {
+			    $editColspan--;
+			}
 			print '<td align="center" colspan="'. $editColspan . '">';
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToShip").' - ';
-			}
-			else
+			} else
 			{
 				print $langs->trans("QtyShipped").' - ';
 			}
@@ -2039,14 +2130,12 @@ 
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
+		} else
 		{
 			if ($object->statut <= 1)
 			{
 				print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
-			}
-			else
+			} else
 			{
 				print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
 			}
@@ -2077,8 +2166,12 @@ 
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
 			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-			if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+			if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+			    $newlang=GETPOST('lang_id','aZ09');
+			}
+			if (empty($newlang)) {
+			    $newlang=$object->thirdparty->default_lang;
+			}
 			if (! empty($newlang))
 			{
 				$outputlangs = new Translate("",$conf);
@@ -2150,9 +2243,9 @@ 
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
 					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+				} else {
+									$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
 				}
-				else
-					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
 
 				print '<td>';
 
@@ -2171,12 +2264,14 @@ 
 					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
 				}
 				print "</td>\n";
-			}
-			else
+			} else
 			{
 				print "<td>";
-				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+				if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
+				    $text = img_object($langs->trans('Service'),'service');
+				} else {
+				    $text = img_object($langs->trans('Product'),'product');
+				}
 
 				if (! empty($lines[$i]->label)) {
 					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
@@ -2203,10 +2298,15 @@ 
     			        $j = 0;
     			        foreach($val as $shipmentline_id=> $shipmentline_var)
     			        {
-    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
+    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
+    			                continue;
+    			            }
+    			            // We want to show only "other shipments"
 
     			            $j++;
-    			            if ($j > 1) print '<br>';
+    			            if ($j > 1) {
+    			                print '<br>';
+    			            }
     			            $shipment_static->fetch($shipmentline_var['shipment_id']);
     			            print $shipment_static->getNomUrl(1);
     			            print ' - '.$shipmentline_var['qty_shipped'];
@@ -2252,8 +2352,7 @@ 
 					// Batch number managment
 					print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
 					print '</tr>';
-				}
-				else if (! empty($conf->stock->enabled))
+				} else if (! empty($conf->stock->enabled))
 				{
 					if ($lines[$i]->fk_product > 0)
 					{
@@ -2268,8 +2367,7 @@ 
 							// Batch number managment
 							print '<td> - ' . $langs->trans("NA") . '</td>';
 							print '</tr>';
-						}
-						else if (count($lines[$i]->details_entrepot) > 1)
+						} else if (count($lines[$i]->details_entrepot) > 1)
 						{
 							print '<!-- case edit 3 -->';
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2283,14 +2381,12 @@ 
 								print '<td> - ' . $langs->trans("NA") . '</td>';
 								print '</tr>';
 							}
-						}
-						else
+						} else
 						{
 							print '<!-- case edit 4 -->';
 							print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 						}
-					}
-					else
+					} else
 					{
 						print '<!-- case edit 5 -->';
 						print '<tr>';
@@ -2304,8 +2400,7 @@ 
 					}
 				}
 				print '</table></td>';
-			}
-			else
+			} else
 			{
 				// Qty to ship or shipped
 				print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
@@ -2319,8 +2414,7 @@ 
 						$entrepot = new Entrepot($db);
 						$entrepot->fetch($lines[$i]->entrepot_id);
 						print $entrepot->getNomUrl(1);
-					}
-					else if (count($lines[$i]->details_entrepot) > 1)
+					} else if (count($lines[$i]->details_entrepot) > 1)
 					{
 						$detail = '';
 						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2347,17 +2441,18 @@ 
 						if ($lines[$i]->product_tobatch)
 						{
 							$detail = '';
-							foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
+							foreach ($lines[$i]->detail_batch as $dbatch) {
+							    // $dbatch is instance of ExpeditionLineBatch
 							{
 								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
+							}
 								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
 								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
 								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 								$detail.= '<br>';
 							}
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-						}
-						else
+						} else
 						{
 							print $langs->trans("NA");
 						}
@@ -2370,14 +2465,20 @@ 
 
 			// Weight
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
-			else print '&nbsp;';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			    print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
+			} else {
+			    print '&nbsp;';
+			}
 			print '</td>';
 
 			// Volume
 			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
-			else print '&nbsp;';
+			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			    print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
+			} else {
+			    print '&nbsp;';
+			}
 			print '</td>';
 
 			// Size
@@ -2388,8 +2489,7 @@ 
 				print '<td align="center" colspan="2" valign="middle">';
 				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
 				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
-			}
-			else if ($object->statut == 0)
+			} else if ($object->statut == 0)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit" align="center">';
@@ -2418,8 +2518,7 @@ 
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
-				}
-				else
+				} else
 				{
 					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				}
@@ -2460,8 +2559,7 @@ 
 	  		     || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
+				} else
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
@@ -2471,11 +2569,12 @@ 
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer)
 			{
-				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+				if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+				    // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				}
-				else
+				} else
 				{
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
@@ -2487,8 +2586,9 @@ 
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 				{
 					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>';
 			}
 
 			// Create bill
@@ -2515,9 +2615,11 @@ 
 				{
 					$label="Close"; $paramaction='classifyclosed';       // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-					if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+					    // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
 					    $label="ClassifyBilled";
+					}
 					    $paramaction='classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';

dolibarr/htdocs/expedition/tpl/linkedobjectblock.tpl.php

Braces +4 added lines, -2 removed lines

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

dolibarr/htdocs/expedition/shipment.php

Braces +105 added lines, -67 removed lines

@@ -37,9 +37,15 @@ 
 	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
-if (! empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (! empty($conf->stock->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+}
+if (! empty($conf->propal->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm'));
@@ -50,7 +56,9 @@ 
 
 // Security check
 $socid=0;
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'commande',$id);
 
 $object = new Commande($db);
@@ -71,7 +79,9 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -107,8 +117,9 @@ 
     	$object = new Commande($db);
     	$object->fetch($id);
     	$result=$object->set_date_livraison($user,$datelivraison);
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+    	if ($result < 0) {
+    	    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
     }
     /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
@@ -125,24 +136,27 @@ 
     	$object = new Commande($db);
     	$object->fetch($id);
     	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+    	if ($result < 0) {
+    	    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
     }
 
     if ($action == 'setavailability' && $user->rights->commande->creer) {
         $object = new Commande($db);
         $object->fetch($id);
         $result=$object->availability(GETPOST('availability_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
+        if ($result < 0) {
+                    setEventMessages($object->error, $object->errors, 'errors');
+        }
     }
 
     if ($action == 'setdemandreason' && $user->rights->commande->creer) {
         $object = new Commande($db);
         $object->fetch($id);
         $result=$object->demand_reason(GETPOST('demand_reason_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
+        if ($result < 0) {
+                    setEventMessages($object->error, $object->errors, 'errors');
+        }
     }
 
     if ($action == 'setconditions' && $user->rights->commande->creer)
@@ -150,8 +164,9 @@ 
     	$object = new Commande($db);
     	$object->fetch($id);
     	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+    	if ($result < 0) {
+    	    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
     }
 
     // Set incoterm
@@ -168,8 +183,9 @@ 
         $object = new Commande($db);
         $object->fetch($id);
         $result=$object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
+    	if ($result < 0) {
+    	    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
     }
 
     // warehouse
@@ -177,8 +193,9 @@ 
         $object = new Commande($db);
         $object->fetch($id);
         $result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
+        if ($result < 0) {
+                    setEventMessages($object->error, $object->errors, 'errors');
+        }
     }
 
     if ($action == 'update_extras')
@@ -188,7 +205,9 @@ 
     	// Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
-        if ($ret < 0) $error++;
+        if ($ret < 0) {
+            $error++;
+        }
 
         if (! $error)
         {
@@ -201,8 +220,9 @@ 
 			}
         }
 
-        if ($error)
-            $action = 'edit_extras';
+        if ($error) {
+                    $action = 'edit_extras';
+        }
     }
 
     if ($action == 'set_thirdparty' && $user->rights->commande->creer)
@@ -261,8 +281,11 @@ 
 		// Call Hook formConfirm
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+		if (empty($reshook)) {
+		    $formconfirm.=$hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+		    $formconfirm=$hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -286,8 +309,9 @@ 
 	        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	        if ($user->rights->commande->creer)
 	        {
-	            if ($action != 'classify')
-	                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            if ($action != 'classify') {
+	            	                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	            }
 	                if ($action == 'classify') {
 	                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 	                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -362,7 +386,9 @@ 
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		if ($action != 'editdate_livraison') {
+		    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editdate_livraison')
@@ -373,8 +399,7 @@ 
 			print $form->selectDate($object->date_livraison>0?$object->date_livraison:-1, 'liv_', '', '', '', "setdatedelivery");
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			print dol_print_date($object->date_livraison,'daytext');
 			if ($object->hasDelay() && ! empty($object->date_livraison)) {
@@ -393,8 +418,9 @@ 
         print '<table width="100%" class="nobordernopadding"><tr><td>';
         print $langs->trans('SendingMethod');
         print '</td>';
-        if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+        if ($action != 'editshippingmethod' && $user->rights->expedition->creer) {
+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+        }
         print '</tr></table>';
         print '</td><td colspan="2">';
         if ($action == 'editshippingmethod') {
@@ -413,8 +439,9 @@ 
             print '<table width="100%" class="nobordernopadding"><tr><td>';
             print $langs->trans('Warehouse');
             print '</td>';
-            if ($action != 'editwarehouse' && $user->rights->commande->creer)
-                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'),1).'</a></td>';
+            if ($action != 'editwarehouse' && $user->rights->commande->creer) {
+                            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'),1).'</a></td>';
+            }
             print '</tr></table>';
             print '</td><td colspan="2">';
             if ($action == 'editwarehouse') {
@@ -469,8 +496,9 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('AvailabilityPeriod');
 		print '</td>';
-		if ($action != 'editavailability')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+		if ($action != 'editavailability') {
+					print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editavailability') {
@@ -485,8 +513,9 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Source');
 		print '</td>';
-		if ($action != 'editdemandreason')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+		if ($action != 'editdemandreason') {
+					print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdemandreason') {
@@ -519,16 +548,18 @@ 
 		    print '<table width="100%" class="nobordernopadding"><tr><td>';
 		    print $langs->trans('IncotermLabel');
 		    print '<td><td align="right">';
-		    if ($user->rights->commande->creer) print '<a href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		    else print '&nbsp;';
+		    if ($user->rights->commande->creer) {
+		        print '<a href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		    } else {
+		        print '&nbsp;';
+		    }
 		    print '</td></tr></table>';
 		    print '</td>';
 		    print '<td colspan="3">';
 		    if ($action != 'editincoterm')
 		    {
 		        print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
-		    }
-		    else
+		    } else
 		    {
 		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		    }
@@ -576,14 +607,18 @@ 
 		print '</tr>';
 
 		// Amount Local Taxes
-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
+		    // Localtax1
 		{
 		    print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+		}
 		    print '<td>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 		}
-		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
+		    // Localtax2 IRPF
 		{
 		    print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+		}
 		    print '<td>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 		}
 
@@ -634,8 +669,7 @@ 
 			if (! empty($conf->stock->enabled))
 			{
 				print '<td align="center">'.$langs->trans("RealStock").'</td>';
-			}
-			else
+			} else
 			{
 				print '<td>&nbsp;</td>';
 			}
@@ -653,8 +687,12 @@ 
 
 				// Try to enhance type detection using date_start and date_end for free lines where type
 				// was not saved.
-				if (! empty($objp->date_start)) $type=1;
-				if (! empty($objp->date_end)) $type=1;
+				if (! empty($objp->date_start)) {
+				    $type=1;
+				}
+				if (! empty($objp->date_end)) {
+				    $type=1;
+				}
 
 				print '<tr class="oddeven">';
 
@@ -673,8 +711,12 @@ 
 
 						$outputlangs = $langs;
 						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) {
+						    $newlang=$_REQUEST['lang_id'];
+						}
+						if (empty($newlang)) {
+						    $newlang=$object->thirdparty->default_lang;
+						}
 						if (! empty($newlang))
 						{
 							$outputlangs = new Translate("",$conf);
@@ -682,9 +724,9 @@ 
 						}
 
 						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+					} else {
+											$label = (! empty($objp->label)?$objp->label:$objp->product_label);
 					}
-					else
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
 
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -710,12 +752,14 @@ 
 					}
 
 					print '</td>';
-				}
-				else
+				} else
 				{
 					print "<td>";
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($type==1) {
+					    $text = img_object($langs->trans('Service'),'service');
+					} else {
+					    $text = img_object($langs->trans('Product'),'product');
+					}
 
 					if (! empty($objp->label)) {
 						$text.= ' <strong>'.$objp->label.'</strong>';
@@ -747,8 +791,7 @@ 
 					$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 					$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 					print $toBeShipped[$objp->fk_product];
-				}
-				else
+				} else
 				{
 					print '0 ('.$langs->trans("Service").')';
 				}
@@ -770,8 +813,7 @@ 
 						print ' '.img_warning($langs->trans("StockTooLow"));
 					}
 					print '</td>';
-				}
-				else
+				} else
 				{
 					print '<td>&nbsp;</td>';
 				}
@@ -815,8 +857,7 @@ 
 			}
 
 			print "</table>";
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
@@ -842,8 +883,7 @@ 
 					{
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
-				}
-				else
+				} else
 				{
 					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				}
@@ -906,8 +946,7 @@ 
 				print '</div>';
 
 				$somethingshown=1;
-			}
-			else
+			} else
 			{
 				print '<div class="tabsAction">';
 				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
@@ -916,8 +955,7 @@ 
 		}
 
 		show_list_sending_receive('commande',$object->id);
-	}
-	else
+	} else
 	{
 		/* Order not found */
 		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');

dolibarr/htdocs/expedition/document.php

Braces +8 added lines, -6 removed lines

@@ -60,8 +60,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 $object = new Expedition($db);
 
@@ -175,12 +179,10 @@ 
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id=' . $object->id;
 		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;
 }

dolibarr/htdocs/expedition/note.php

Braces +3 added lines, -1 removed lines

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