Completed
Branch develop (8ce07d)
by
unknown
18:07
created
htdocs/hrm/establishment/card.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
 			$object->town = GETPOST('town', 'alpha');
85 85
 			$object->country_id = GETPOST("country_id", 'int');
86 86
 			$object->status = GETPOST('status', 'int');
87
-			$object->fk_user_author	= $user->id;
87
+			$object->fk_user_author = $user->id;
88 88
 			$object->datec = dol_now();
89 89
 			$object->entity = GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity;
90 90
 
Please login to merge, or discard this patch.
htdocs/product/class/productfournisseurprice.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 	/**
93 93
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
94 94
 	 */
95
-	public $fields=array(
95
+	public $fields = array(
96 96
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
97 97
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
98 98
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>-1,),
Please login to merge, or discard this patch.
htdocs/cron/info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
  * View
44 44
  */
45 45
 
46
-$form = new Form($db);	// $form is required as global value into dol_banner_tab
46
+$form = new Form($db); // $form is required as global value into dol_banner_tab
47 47
 
48 48
 llxHeader('', $langs->trans("CronInfo"));
49 49
 
Please login to merge, or discard this patch.
htdocs/compta/stats/supplier_turnover_by_prodserv.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,8 +97,8 @@
 block discarded – undo
97 97
 	$month_current = dol_print_date(dol_now(), '%m');
98 98
 	$year_start = $year;
99 99
 }
100
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
101
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
100
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
101
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
102 102
 // Quarter
103 103
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
104 104
 	$q = GETPOST("q", "int");
Please login to merge, or discard this patch.
htdocs/salaries/payment_salary/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	$result = $object->fetch($id);
48 48
 	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
49 49
 }
50
-restrictedArea($user, 'salaries', $object->fk_salary, 'salary', '');	// $object is payment of salary
50
+restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary
51 51
 
52 52
 
53 53
 /*
Please login to merge, or discard this patch.
htdocs/admin/system/modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -286,19 +286,19 @@
 block discarded – undo
286 286
 
287 287
 // sort list
288 288
 if ($sortfield == "name" && $sortorder == "asc") {
289
-	usort($moduleList, function (stdClass $a, stdClass $b) {
289
+	usort($moduleList, function(stdClass $a, stdClass $b) {
290 290
 		return strcasecmp($a->name, $b->name);
291 291
 	});
292 292
 } elseif ($sortfield == "name" && $sortorder == "desc") {
293
-	usort($moduleList, function (stdClass $a, stdClass $b) {
293
+	usort($moduleList, function(stdClass $a, stdClass $b) {
294 294
 		return strcasecmp($b->name, $a->name);
295 295
 	});
296 296
 } elseif ($sortfield == "version" && $sortorder == "asc") {
297
-	usort($moduleList, function (stdClass $a, stdClass $b) {
297
+	usort($moduleList, function(stdClass $a, stdClass $b) {
298 298
 		return strcasecmp($a->version, $b->version);
299 299
 	});
300 300
 } elseif ($sortfield == "version" && $sortorder == "desc") {
301
-	usort($moduleList, function (stdClass $a, stdClass $b) {
301
+	usort($moduleList, function(stdClass $a, stdClass $b) {
302 302
 		return strcasecmp($b->version, $a->version);
303 303
 	});
304 304
 } elseif ($sortfield == "id" && $sortorder == "asc") {
Please login to merge, or discard this patch.
htdocs/societe/checkvat/checkVatPopup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
  *		\brief      Popup screen to validate VAT
22 22
  */
23 23
 
24
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
24
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
25 25
 
26 26
 require "../../main.inc.php";
27 27
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
Please login to merge, or discard this patch.
htdocs/expedition/shipment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 	$socid = $user->socid;
80 80
 }
81 81
 
82
-$result = restrictedArea($user, 'expedition', 0, '');	// We use 0 for id, because there is no particular shipment on this tab, only id of order is known
82
+$result = restrictedArea($user, 'expedition', 0, ''); // We use 0 for id, because there is no particular shipment on this tab, only id of order is known
83 83
 
84 84
 
85 85
 
Please login to merge, or discard this patch.
htdocs/compta/journal/sellsjournal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
122 122
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
123 123
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
124
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
124
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
125 125
 }
126 126
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
127 127
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
Please login to merge, or discard this patch.