Completed
Branch develop (66a443)
by
unknown
18:15
created
htdocs/product/stock/class/mouvementstock.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 				'skip_batch'       => &$skip_batch,
199 199
 				'id_product_batch' => &$id_product_batch
200 200
 			);
201
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
201
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
202 202
 
203 203
 			if ($reshook < 0) {
204 204
 				if (!empty($hookmanager->resPrint)) {
@@ -665,8 +665,8 @@  discard block
 block discarded – undo
665 665
 				$this->price = $obj->price;
666 666
 				$this->fk_user_author = $obj->fk_user_author;
667 667
 				$this->label = $obj->label;
668
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
669
-				$this->origintype = $obj->origin_type;	// For backward compatibility
668
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
669
+				$this->origintype = $obj->origin_type; // For backward compatibility
670 670
 				$this->origin_id = $obj->origin_id;
671 671
 				$this->origin_type = $obj->origin_type;
672 672
 				$this->inventorycode = $obj->inventorycode;
@@ -894,8 +894,8 @@  discard block
 block discarded – undo
894 894
 			} else {					// product_batch record not found
895 895
 				$pdluo->fk_product_stock = $vfk_product_stock;
896 896
 				$pdluo->qty = $qty;
897
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
898
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
897
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
898
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
899 899
 				$pdluo->batch = $vbatchnumber;
900 900
 
901 901
 				$result = $pdluo->create($user, 1);
@@ -1205,8 +1205,8 @@  discard block
 block discarded – undo
1205 1205
 		$sql = "SELECT sum(pb.qty) as cpt";
1206 1206
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
1207 1207
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
1208
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
1209
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
1208
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
1209
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
1210 1210
 
1211 1211
 		$result = $this->db->query($sql);
1212 1212
 		if ($result) {
Please login to merge, or discard this patch.
htdocs/install/step5.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -214,8 +214,8 @@
 block discarded – undo
214 214
 			$newuser->admin = 1;
215 215
 			$newuser->entity = 0;
216 216
 
217
-			$conf->global->USER_MAIL_REQUIRED = 0; 			// Force global option to be sure to create a new user with no email
218
-			$conf->global->USER_PASSWORD_GENERATED = '';	// To not use any rule for password validation
217
+			$conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
218
+			$conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
219 219
 
220 220
 			$result = $newuser->create($createuser, 1);
221 221
 			if ($result > 0) {
Please login to merge, or discard this patch.
htdocs/paypal/lib/paypal.lib.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -503,7 +503,7 @@
 block discarded – undo
503 503
 	// Turning on or off the ssl target certificate
504 504
 	if ($ssl_verifypeer < 0) {
505 505
 		global $dolibarr_main_prod;
506
-		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
506
+		$ssl_verifypeer = ($dolibarr_main_prod ? true : false);
507 507
 	}
508 508
 	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
509 509
 		$ssl_verifypeer = 0;
Please login to merge, or discard this patch.
htdocs/don/class/don.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -954,7 +954,7 @@
 block discarded – undo
954 954
 		}
955 955
 		$result .= $linkend;
956 956
 		global $action;
957
-		$hookmanager->initHooks(array($this->element . 'dao'));
957
+		$hookmanager->initHooks(array($this->element.'dao'));
958 958
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
959 959
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
960 960
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/loan/class/loan.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -987,7 +987,7 @@
 block discarded – undo
987 987
 		$result .= $linkend;
988 988
 
989 989
 		global $action;
990
-		$hookmanager->initHooks(array($this->element . 'dao'));
990
+		$hookmanager->initHooks(array($this->element.'dao'));
991 991
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
992 992
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
993 993
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/compta/sociales/class/chargesociales.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -954,7 +954,7 @@
 block discarded – undo
954 954
 		}
955 955
 		$result .= $linkend;
956 956
 		global $action;
957
-		$hookmanager->initHooks(array($this->element . 'dao'));
957
+		$hookmanager->initHooks(array($this->element.'dao'));
958 958
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
959 959
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
960 960
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/ecm/class/ecmdirectory.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -987,7 +987,7 @@
 block discarded – undo
987 987
 		$result .= $linkend;
988 988
 
989 989
 		global $action;
990
-		$hookmanager->initHooks(array($this->element . 'dao'));
990
+		$hookmanager->initHooks(array($this->element.'dao'));
991 991
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
992 992
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
993 993
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/install/step2.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
 // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
39 39
 
40 40
 $err = error_reporting();
41
-error_reporting(0);      // Disable all errors
41
+error_reporting(0); // Disable all errors
42 42
 //error_reporting(E_ALL);
43
-@set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
43
+@set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
44 44
 error_reporting($err);
45 45
 
46 46
 $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
Please login to merge, or discard this patch.
htdocs/asset/note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
 	// Object card
93 93
 	// ------------------------------------------------------------
94
-	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
94
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
95 95
 
96 96
 	$morehtmlref = '<div class="refidno">';
97 97
 	$morehtmlref .= '</div>';
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 
107 107
 	$cssclass = "titlefield";
108
-	include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php';
108
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
109 109
 
110 110
 	print '</div>';
111 111
 
Please login to merge, or discard this patch.