Completed
Branch develop (266b7a)
by
unknown
15:37
created
htdocs/core/class/html.formldap.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@
 block discarded – undo
124 124
 			$htmlname = 'activesynchro';
125 125
 		}
126 126
 
127
-		$dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP") . (($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : "");
128
-		$ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr") . (($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : "");
127
+		$dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP").(($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : "");
128
+		$ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr").(($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : "");
129 129
 
130 130
 		$arraylist = array(
131 131
 			Ldap::SYNCHRO_NONE				=> $langs->trans("No"),
Please login to merge, or discard this patch.
htdocs/emailcollector/lib/emailcollector.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,10 +175,10 @@
 block discarded – undo
175 175
 	}
176 176
 
177 177
 	$i = 1;
178
-	$filepath = $path . $filename . '.' . $ext;
178
+	$filepath = $path.$filename.'.'.$ext;
179 179
 
180 180
 	while (file_exists($filepath)) {
181
-		$filepath = $path . $filename . '(' . $i . ').' . $ext;
181
+		$filepath = $path.$filename.'('.$i.').'.$ext;
182 182
 		$i++;
183 183
 	}
184 184
 	file_put_contents($filepath, $data);
Please login to merge, or discard this patch.
htdocs/hrm/class/skilldet.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 	/**
103 103
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
104 104
 	 */
105
-	public $fields=array(
105
+	public $fields = array(
106 106
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
107 107
 		'fk_skill' => array('type'=>'integer:Skill:/hrm/class/skill.class.php', 'label'=>'fk_skill', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>0,),
108 108
 		'rankorder' => array('type'=>'integer', 'label'=>'rank', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>2,),
Please login to merge, or discard this patch.
htdocs/product/inventory/ajax/searchfrombarcode.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	$result = $db->query($sql);
79 79
 	if ($result) {
80 80
 		$nbline = $db->num_rows($result);
81
-		for ($i=0; $i < $nbline; $i++) {
81
+		for ($i = 0; $i < $nbline; $i++) {
82 82
 			$object = $db->fetch_object($result);
83 83
 			if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) {
84 84
 				$warehouse->fetch(0, $product["Warehouse"]);
@@ -88,22 +88,22 @@  discard block
 block discarded – undo
88 88
 					$fk_product = $object->fk_product;
89 89
 					$reelqty = $object->reel;
90 90
 
91
-					$objectreturn = array('fk_warehouse'=>$warehouseid,'fk_product'=>$fk_product,'reelqty'=>$reelqty);
91
+					$objectreturn = array('fk_warehouse'=>$warehouseid, 'fk_product'=>$fk_product, 'reelqty'=>$reelqty);
92 92
 				}
93 93
 			}
94 94
 		}
95 95
 		if ($warehousefound < 1) {
96
-			$response = array('status'=>'error','errorcode'=>'NotFound','message'=>'No warehouse found for barcode'.$barcode);
96
+			$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>'No warehouse found for barcode'.$barcode);
97 97
 		} elseif ($warehousefound > 1) {
98
-			$response = array('status'=>'error','errorcode'=>'TooManyWarehouse','message'=>'Too many warehouse found');
98
+			$response = array('status'=>'error', 'errorcode'=>'TooManyWarehouse', 'message'=>'Too many warehouse found');
99 99
 		} else {
100
-			$response = array('status'=>'success','message'=>'Warehouse found','object'=>$objectreturn);
100
+			$response = array('status'=>'success', 'message'=>'Warehouse found', 'object'=>$objectreturn);
101 101
 		}
102 102
 	} else {
103
-		$response = array('status'=>'error','errorcode'=>'NotFound','message'=>"No results found for barcode");
103
+		$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>"No results found for barcode");
104 104
 	}
105 105
 } else {
106
-	$response = array('status'=>'error','errorcode'=>'ActionError','message'=>"Error on action");
106
+	$response = array('status'=>'error', 'errorcode'=>'ActionError', 'message'=>"Error on action");
107 107
 }
108 108
 
109 109
 if ($action == "addnewlineproduct") {
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
 
123 123
 		$result = $inventoryline->create($user);
124 124
 		if ($result > 0) {
125
-			$response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result);
125
+			$response = array('status'=>'success', 'message'=>'Success on creating line', 'id_line'=>$result);
126 126
 		} else {
127
-			$response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation");
127
+			$response = array('status'=>'error', 'errorcode'=>'ErrorCreation', 'message'=>"Error on line creation");
128 128
 		}
129 129
 	} else {
130
-		$response = array('status'=>'error','errorcode'=>'NoIdForInventory','message'=>"No id for inventory");
130
+		$response = array('status'=>'error', 'errorcode'=>'NoIdForInventory', 'message'=>"No id for inventory");
131 131
 	}
132 132
 }
133 133
 
Please login to merge, or discard this patch.
htdocs/core/multicompany_page.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 $title = $langs->trans("Multicompanies");
82 82
 
83 83
 // URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
84
-$head = '<!-- Multicompany selection -->'."\n";	// This is used by DoliDroid to know page is a multicompany selection page
84
+$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page
85 85
 $arrayofjs = array();
86 86
 $arrayofcss = array();
87 87
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
Please login to merge, or discard this patch.
htdocs/core/bookmarks_page.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 $title = $langs->trans("Bookmarks");
59 59
 
60 60
 // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests
61
-$head = '<!-- Bookmarks -->'."\n";	// This is used by DoliDroid to know page is a bookmark selection page
61
+$head = '<!-- Bookmarks -->'."\n"; // This is used by DoliDroid to know page is a bookmark selection page
62 62
 $arrayofjs = array();
63 63
 $arrayofcss = array();
64 64
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
Please login to merge, or discard this patch.
htdocs/core/get_menudiv.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 $title = $langs->trans("Menu");
85 85
 
86 86
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
87
-$head = '<!-- Menu -->'."\n";	// This is used by DoliDroid to know page is a menu page
87
+$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page
88 88
 $arrayofjs = array();
89 89
 $arrayofcss = array();
90 90
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
Please login to merge, or discard this patch.
htdocs/accountancy/closure/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
 	// Specify as export : update field date_validated on selected month/year
88 88
 	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
89 89
 	$sql .= " SET date_validated = '".$db->idate($now)."'";
90
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
91
-	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
92
-	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
90
+	$sql .= " WHERE entity = ".((int) $conf->entity);
91
+	$sql .= " AND doc_date >= '".$db->idate($date_start)."'";
92
+	$sql .= " AND doc_date <= '".$db->idate($date_end)."'";
93 93
 	$sql .= " AND date_validated IS NULL";
94 94
 
95 95
 	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 $title = $langs->trans('Closure');
124 124
 
125
-$help_url ='EN:Module_Double_Entry_Accounting';
125
+$help_url = 'EN:Module_Double_Entry_Accounting';
126 126
 
127 127
 llxHeader('', $title, $help_url);
128 128
 
Please login to merge, or discard this patch.
htdocs/holiday/month_report.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
150 150
 $sql .= " AND (";
151 151
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
152
-$sql .= " OR";	// For leave over several months
152
+$sql .= " OR"; // For leave over several months
153 153
 $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') ";
154 154
 $sql .= " )";
155 155
 if (!empty($search_ref)) {
Please login to merge, or discard this patch.