Dolibarr / dolibarr

htdocs/expedition/class/expedition.class.php

Spacing +34 added lines, -34 removed lines

@@ -372,7 +372,7 @@ 
 		if (getDolGlobalString('EXPEDITION_ADDON_NUMBER')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER') . ".php";
+			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER').".php";
 			$classname = getDolGlobalString('EXPEDITION_ADDON_NUMBER');
 
 			// Include file with class
@@ -707,7 +707,7 @@ 
 				$this->ref_ext		    = $obj->ref_ext;
 				$this->status               = $obj->fk_statut;
 				$this->statut               = $this->status; // Deprecated
-				$this->signed_status		= $obj->signed_status;
+				$this->signed_status = $obj->signed_status;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->fk_user_author       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
@@ -1047,7 +1047,7 @@ 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
 		// If this happen, we may have a bug in card.php page
 		if (isModEnabled('productbatch') && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
-			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$orderline->fk_product;	//
+			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$orderline->fk_product; //
 			return -4;
 		}
 
@@ -1625,8 +1625,8 @@ 
 							$this->db->commit();
 
 							// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-							$this->deleteEcmFiles(0);	 // Deleting files physically is done later with the dol_delete_dir_recursive
-							$this->deleteEcmFiles(1);	 // Deleting files physically is done later with the dol_delete_dir_recursive
+							$this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+							$this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
@@ -1700,7 +1700,7 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND ed.fk_elementdet = cd.rowid";
-		$sql .= " ORDER BY cd.rang, ed.fk_elementdet";		// We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
+		$sql .= " ORDER BY cd.rang, ed.fk_elementdet"; // We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1729,13 +1729,13 @@ 
 
 
 				if ($originline > 0 && $originline == $obj->fk_elementdet) {
-					'@phan-var-force ExpeditionLigne $line';  // $line from previous loop
+					'@phan-var-force ExpeditionLigne $line'; // $line from previous loop
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
-					$line = new ExpeditionLigne($this->db);		// new group to start
-					$line->entrepot_id    	= $obj->fk_entrepot;	// this is a property of a shipment line
-					$line->qty_shipped    	= $obj->qty_shipped;	// this is a property of a shipment line
+					$line = new ExpeditionLigne($this->db); // new group to start
+					$line->entrepot_id    	= $obj->fk_entrepot; // this is a property of a shipment line
+					$line->qty_shipped    	= $obj->qty_shipped; // this is a property of a shipment line
 				}
 
 				$detail_entrepot              = new stdClass();
@@ -1748,13 +1748,13 @@ 
 				$line->rowid            = $obj->line_id; // TODO deprecated
 				$line->id               = $obj->line_id;
 
-				$line->fk_origin = 'orderline';	// TODO deprecated, we already have element_type that can be use to guess type of line
+				$line->fk_origin = 'orderline'; // TODO deprecated, we already have element_type that can be use to guess type of line
 
-				$line->fk_element 		= $obj->fk_element;
-				$line->origin_id 		= $obj->fk_element;
-				$line->fk_elementdet 	= $obj->fk_elementdet;
-				$line->origin_line_id 	= $obj->fk_elementdet;
-				$line->element_type 	= $obj->element_type;
+				$line->fk_element = $obj->fk_element;
+				$line->origin_id = $obj->fk_element;
+				$line->fk_elementdet = $obj->fk_elementdet;
+				$line->origin_line_id = $obj->fk_elementdet;
+				$line->element_type = $obj->element_type;
 
 				$line->fk_expedition    = $this->id; // id of parent
 
@@ -1764,8 +1764,8 @@ 
 				$line->ref = $obj->product_ref; // TODO deprecated
 				$line->product_ref = $obj->product_ref;
 				$line->product_label = $obj->product_label;
-				$line->libelle        	= $obj->product_label; // TODO deprecated
-				$line->product_barcode  = $obj->product_barcode; // Barcode number product
+				$line->libelle = $obj->product_label; // TODO deprecated
+				$line->product_barcode = $obj->product_barcode; // Barcode number product
 				$line->product_tosell = $obj->product_tosell;
 				$line->product_tobuy = $obj->product_tobuy;
 				$line->product_tobatch = $obj->product_tobatch;
@@ -2015,7 +2015,7 @@ 
 		}
 		$result .= $linkend;
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -2064,9 +2064,9 @@ 
 			$statusType = 'status9';
 		}
 
-		$signed_label = ' (' . $this->getLibSignedStatus() . ')';
-		$status_label = $this->signed_status ? $labelStatus . $signed_label : $labelStatus;
-		$status_label_short = $this->signed_status ? $labelStatusShort . $signed_label : $labelStatusShort;
+		$signed_label = ' ('.$this->getLibSignedStatus().')';
+		$status_label = $this->signed_status ? $labelStatus.$signed_label : $labelStatus;
+		$status_label_short = $this->signed_status ? $labelStatusShort.$signed_label : $labelStatusShort;
 
 		return dolGetStatus($status_label, $status_label_short, '', $statusType, $mode);
 	}
@@ -2165,7 +2165,7 @@ 
 			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
 
 			$line->weight = 1.123456;
-			$line->weight_units = 0;		// kg
+			$line->weight_units = 0; // kg
 
 			$line->volume = 2.34567;
 			$line->volume_unit = 0;
@@ -2355,12 +2355,12 @@ 
 				if ($shipments_match_order) {
 					dol_syslog("Qty for the ".count($order->lines)." lines of the origin order is same than qty for lines in the shipment we close (shipments_match_order is true), with new status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
 					// We close the order
-					$order->cloture($user);		// Note this may also create an invoice if module workflow ask it
+					$order->cloture($user); // Note this may also create an invoice if module workflow ask it
 				}
 			}
 
-			$this->statut = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
-			$this->status = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->statut = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->status = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
 
 			// If stock increment is done on closing
 			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
@@ -2409,7 +2409,7 @@ 
 
 		$error = 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 		$langs->load("agenda");
 
@@ -2419,14 +2419,14 @@ 
 		$sql .= " e.ref,";
 		$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock,";
 		$sql .= " cd.rowid as cdid, ed.rowid as edid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd,";
-		$sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expedition as e ON ed.fk_expedition = e.rowid";
-		$sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+		$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expedition as e ON ed.fk_expedition = e.rowid";
+		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND cd.rowid = ed.fk_elementdet";
 
-		dol_syslog(get_class($this) . "::valid select details", LOG_DEBUG);
+		dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$cpt = $this->db->num_rows($resql);
@@ -2440,7 +2440,7 @@ 
 				if ($qty <= 0 || ($qty < 0 && !getDolGlobalInt('SHIPMENT_ALLOW_NEGATIVE_QTY'))) {
 					continue;
 				}
-				dol_syslog(get_class($this) . "::valid movement index " . $i . " ed.rowid=" . $obj->rowid . " edb.rowid=" . $obj->edbrowid);
+				dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 				$mouvS = new MouvementStock($this->db);
 				$mouvS->origin = &$this;

htdocs/comm/action/card.php

Spacing +17 added lines, -17 removed lines

@@ -82,7 +82,7 @@ 
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOSTINT('actioncommsendmodel_mail');
-$complete = GETPOST('complete', 'alpha');	// 'na' must be allowed
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
 $private = GETPOST('private', 'alphanohtml');
 if ($complete == 'na' || $complete == -2) {
 	$complete = -1;
@@ -340,7 +340,7 @@ 
 		$datef = dol_mktime(GETPOSTINT("p2hour"), GETPOSTINT("p2min"), GETPOSTINT("apsec"), GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), 'tzuserrel');
 	}
 	//set end date to now if percentage is set to 100 and end date not set
-	$datef = (!$datef && $percentage == 100)?dol_now():$datef;
+	$datef = (!$datef && $percentage == 100) ?dol_now() : $datef;
 
 	// Check parameters
 	if (!$datef && $percentage == 100) {
@@ -450,7 +450,7 @@ 
 	if (GETPOSTISSET("contactid")) {
 		$object->contact_id = GETPOSTINT("contactid");
 
-		$object->contact = $contact;	// For backward compatibility
+		$object->contact = $contact; // For backward compatibility
 	}
 
 	if (GETPOSTINT('socid') > 0) {
@@ -630,12 +630,12 @@ 
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
 				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
 				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd'); //We begin the week after
 				$dayoffset = 7;
 				$monthoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the week after
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth"); //We begin the week after
 				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$dayoffset = 0;
 				$monthoffset = 1;
@@ -740,9 +740,9 @@ 
 
 				// increment date for recurrent events
 				$datep = dol_time_plus_duree($datep, $dayoffset, 'd');
-				$datep = dol_time_plus_duree($datep, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 				$datef = dol_time_plus_duree($datef, $dayoffset, 'd');
-				$datef = dol_time_plus_duree($datef, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 			}
 		}
 		if (!empty($backtopage) && !$error) {
@@ -1085,7 +1085,7 @@ 
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 	$error = 0;
 
-	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
+	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
 	$smin = (int) dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
@@ -1259,7 +1259,7 @@ 
 								if (new_startdate > old_enddate) {
 									var timeDiff = old_enddate - old_startdate;
 									var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 									$("#p2day").val(new_enddate.getDate());
 									$("#p2month").val(new_enddate.getMonth() + 1);
 									$("#p2year").val(new_enddate.getFullYear());
@@ -1317,7 +1317,7 @@ 
 		$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
 		$selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
-		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
+		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 
@@ -1650,7 +1650,7 @@ 
 		}
 		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
 
-		if (! in_array($origin, array('societe', 'project', 'task', 'user'))) {
+		if (!in_array($origin, array('societe', 'project', 'task', 'user'))) {
 			// We do not use link for object that already contains a hard coded field to make links with agenda events
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 			print '<td colspan="3">';
@@ -1739,7 +1739,7 @@ 
 						$("#addreminder").prop("checked", true);
 
 						// Set period with default reminder period
-						$("[name=\"offsetvalue\"]").val("' . $reminderDefaultOffset . '");
+						$("[name=\"offsetvalue\"]").val("' . $reminderDefaultOffset.'");
 						$("#select_offsetunittype_duration").select2("destroy");
 						$("#select_offsetunittype_duration").val("'.$reminderDefaultUnit.'");
 						$("#select_offsetunittype_duration").select2();
@@ -1836,7 +1836,7 @@ 
 			$object->socpeopleassigned[$id] = array('id' => $tmpid);
 		}
 		$object->contact_id   = GETPOSTINT("contactid");
-		$object->fk_project  = GETPOSTINT("projectid");
+		$object->fk_project = GETPOSTINT("projectid");
 
 		$object->note_private = GETPOST("note", 'restricthtml');
 	}
@@ -1910,7 +1910,7 @@ 
 									if (new_startdate > old_enddate) {
 										var timeDiff = old_enddate - old_startdate;
 										var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 										$("#p2day").val(new_enddate.getDate());
 										$("#p2month").val(new_enddate.getMonth() + 1);
 										$("#p2year").val(new_enddate.getFullYear());
@@ -1935,7 +1935,7 @@ 
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
-		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 		}
 
@@ -2357,7 +2357,7 @@ 
 					});
 			   })';
 			print '</script>'."\n";
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();
@@ -2629,7 +2629,7 @@ 
 
 		// Priority
 		if (getDolGlobalString('AGENDA_SUPPORT_PRIORITY_IN_EVENTS')) {
-			print '<tr><td class="nowrap" class="titlefield">' . $langs->trans("Priority") . '</td><td>';
+			print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
 			print($object->priority ? $object->priority : '');
 			print '</td></tr>';
 		}