Completed
Branch develop (1d589f)
by
unknown
21:18
created
htdocs/core/class/commonorder.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,13 +76,13 @@
 block discarded – undo
76 76
 	 * Boolean that indicates whether the product is available for sale '1' or not '0'
77 77
 	 * @var int
78 78
 	 */
79
-	public $product_tosell=0;
79
+	public $product_tosell = 0;
80 80
 
81 81
 	/**
82 82
 	 * Boolean that indicates whether the product is available for purchase '1' or not '0'
83 83
 	 * @var int
84 84
 	 */
85
-	public $product_tobuy=0;
85
+	public $product_tobuy = 0;
86 86
 
87 87
 	/**
88 88
 	 * Product description
Please login to merge, or discard this patch.
htdocs/accountancy/journal/bankjournal.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -314,7 +314,9 @@
 block discarded – undo
314 314
 			}
315 315
 			// Now loop on each link of record in bank (code similar to bankentries_list.php)
316 316
 			foreach ($links as $key => $val) {
317
-				if ($links[$key]['type'] == 'user' && !$is_sc) continue;
317
+				if ($links[$key]['type'] == 'user' && !$is_sc) {
318
+					continue;
319
+				}
318 320
 				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
319 321
 					// So we excluded 'company' and 'user' here. We want only payment lines
320 322
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
140 140
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
141 141
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
142
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity);
142
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = ".((int) $conf->entity);
143 143
 }
144 144
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
145 145
 $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal);
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
 			// Line into bank account
621 621
 			foreach ($tabbq[$key] as $k => $mt) {
622 622
 				if ($mt) {
623
-					$accountingaccount->fetch(null, $k, true);	// $k is accounting bank account. TODO We should use a cache here to avoid this fetch
623
+					$accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch
624 624
 					$account_label = $accountingaccount->label;
625 625
 
626 626
 					$reflabel = '';
@@ -736,43 +736,43 @@  discard block
 block discarded – undo
736 736
 						} elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
737 737
 							$bookkeeping->subledger_account = '';
738 738
 							$bookkeeping->subledger_label = '';
739
-							$accountingaccount->fetch(null, $k, true);	// TODO Use a cache
739
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
740 740
 							$bookkeeping->numero_compte = $k;
741 741
 							$bookkeeping->label_compte = $accountingaccount->label;
742 742
 						} elseif ($tabtype[$key] == 'payment_vat') {
743 743
 							$bookkeeping->subledger_account = '';
744 744
 							$bookkeeping->subledger_label = '';
745
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
745
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
746 746
 							$bookkeeping->numero_compte = $k;
747 747
 							$bookkeeping->label_compte = $accountingaccount->label;
748 748
 						} elseif ($tabtype[$key] == 'payment_donation') {
749 749
 							$bookkeeping->subledger_account = '';
750 750
 							$bookkeeping->subledger_label = '';
751
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
751
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
752 752
 							$bookkeeping->numero_compte = $k;
753 753
 							$bookkeeping->label_compte = $accountingaccount->label;
754 754
 						} elseif ($tabtype[$key] == 'member') {
755 755
 							$bookkeeping->subledger_account = '';
756 756
 							$bookkeeping->subledger_label = '';
757
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
757
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
758 758
 							$bookkeeping->numero_compte = $k;
759 759
 							$bookkeeping->label_compte = $accountingaccount->label;
760 760
 						} elseif ($tabtype[$key] == 'payment_loan') {
761 761
 							$bookkeeping->subledger_account = '';
762 762
 							$bookkeeping->subledger_label = '';
763
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
763
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
764 764
 							$bookkeeping->numero_compte = $k;
765 765
 							$bookkeeping->label_compte = $accountingaccount->label;
766 766
 						} elseif ($tabtype[$key] == 'payment_various') {
767 767
 							$bookkeeping->subledger_account = $k;
768 768
 							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
769
-							$accountingaccount->fetch(null, $tabpay[$key]["account_various"], true);	// TODO Use a cache
769
+							$accountingaccount->fetch(null, $tabpay[$key]["account_various"], true); // TODO Use a cache
770 770
 							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
771 771
 							$bookkeeping->label_compte = $accountingaccount->label;
772 772
 						} elseif ($tabtype[$key] == 'banktransfert') {
773 773
 							$bookkeeping->subledger_account = '';
774 774
 							$bookkeeping->subledger_label = '';
775
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
775
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
776 776
 							$bookkeeping->numero_compte = $k;
777 777
 							$bookkeeping->label_compte = $accountingaccount->label;
778 778
 						} else {
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 							}
804 804
 						} else {
805 805
 							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
806
-								require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
806
+								require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
807 807
 								$lettering_static = new Lettering($db);
808 808
 								$nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
809 809
 							}
@@ -1199,7 +1199,7 @@  discard block
 block discarded – undo
1199 1199
 
1200 1200
 				// Label operation
1201 1201
 				print '<td>';
1202
-				print $reflabel;	// This is already html escaped content
1202
+				print $reflabel; // This is already html escaped content
1203 1203
 				print "</td>";
1204 1204
 
1205 1205
 				print '<td class="center">'.$val["type_payment"]."</td>";
@@ -1292,7 +1292,7 @@  discard block
 block discarded – undo
1292 1292
 						}
1293 1293
 					}
1294 1294
 					print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
1295
-					print $accounttoshow;	// This is a HTML string
1295
+					print $accounttoshow; // This is a HTML string
1296 1296
 					print "</td>";
1297 1297
 
1298 1298
 					// Subledger account
@@ -1321,7 +1321,7 @@  discard block
 block discarded – undo
1321 1321
 						}
1322 1322
 					}
1323 1323
 					print '<td class="maxwidth300">';
1324
-					print $accounttoshowsubledger;	// This is a html string
1324
+					print $accounttoshowsubledger; // This is a html string
1325 1325
 					print "</td>";
1326 1326
 
1327 1327
 					print "<td>".$reflabel."</td>";
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/xinputfile.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
 		$maxfilesizearray = getMaxFileSizeArray();
114 114
 		$maxmin = $maxfilesizearray['maxmin'];
115 115
 		if ($maxmin > 0) {
116
-			$s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
116
+			$s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
117 117
 		}
118 118
 		$s .= '<input type="file" name="username" class="flat">';
119 119
 		return $s;
Please login to merge, or discard this patch.
htdocs/webhook/class/target.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 	/**
102 102
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
103 103
 	 */
104
-	public $fields=array(
104
+	public $fields = array(
105 105
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
106 106
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
107 107
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',),
Please login to merge, or discard this patch.
htdocs/compta/sociales/list.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
 $search_date_endday = GETPOST('search_date_endday', 'int');
59 59
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
60 60
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
61
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
61
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
62 62
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
63 63
 $search_date_limit_startday = GETPOST('search_date_limit_startday', 'int');
64 64
 $search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int');
Please login to merge, or discard this patch.
htdocs/fichinter/index.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
 	$vals = array();
97 97
 	$bool = false;
98 98
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
99
-	if ($num>0) {
99
+	if ($num > 0) {
100 100
 		while ($row = $db->fetch_row($resql)) {
101 101
 			if (!isset($vals[$row[1]])) {
102 102
 				$vals[$row[1]] = 0;
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,9 @@
 block discarded – undo
115 115
 	print '<table class="noborder nohover centpercent">';
116 116
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
117 117
 	$listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
118
-	if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) $listofstatus[] = Fichinter::STATUS_BILLED;
118
+	if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
119
+		$listofstatus[] = Fichinter::STATUS_BILLED;
120
+	}
119 121
 
120 122
 	foreach ($listofstatus as $status) {
121 123
 		$dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
Please login to merge, or discard this patch.
htdocs/comm/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -552,9 +552,9 @@
 block discarded – undo
552 552
 			while ($i < $nbofloop) {
553 553
 				$obj = $db->fetch_object($resql);
554 554
 
555
-				$fichinterstatic->id=$obj->rowid;
556
-				$fichinterstatic->ref=$obj->ref;
557
-				$fichinterstatic->statut=$obj->fk_statut;
555
+				$fichinterstatic->id = $obj->rowid;
556
+				$fichinterstatic->ref = $obj->ref;
557
+				$fichinterstatic->statut = $obj->fk_statut;
558 558
 
559 559
 				$companystatic->id = $obj->socid;
560 560
 				$companystatic->name = $obj->name;
Please login to merge, or discard this patch.
htdocs/admin/accountant.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -46,26 +46,26 @@
 block discarded – undo
46 46
  */
47 47
 
48 48
 $parameters = array();
49
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); 	// Note that $action and $object may have been modified by some hooks
49
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
50 50
 if ($reshook < 0) {
51 51
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
52 52
 }
53 53
 
54 54
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
55 55
 || ($action == 'updateedit')) {
56
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME",    GETPOST("nom", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
57
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
58
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN",    GETPOST("town", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
59
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP",     GETPOST("zipcode", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
60
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE",   GETPOST("state_id", 'int'),            'chaine', 0, '', $conf->entity);
61
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION",  GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
62
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'),          'chaine', 0, '', $conf->entity);
63
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE",   GETPOST("tel", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
64
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX",     GETPOST("fax", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
65
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL",    GETPOST("mail", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
66
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB",     GETPOST("web", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
67
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE",    GETPOST("code", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
68
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE",    GETPOST("note", 'restricthtml'),       'chaine', 0, '', $conf->entity);
56
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
57
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
58
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
59
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
60
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
61
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
62
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
63
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
64
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
65
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
66
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
67
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
68
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
69 69
 
70 70
 	if ($action != 'updateedit' && !$error) {
71 71
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
Please login to merge, or discard this patch.
htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -208,12 +208,12 @@
 block discarded – undo
208 208
 
209 209
 		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
210 210
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
211
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
211
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
212 212
 			$literaltype = '';
213
-			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
213
+			$literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type
214 214
 			switch ($literaltype) {
215 215
 				case 'EAN13': //EAN13 rowid = 2
216
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
216
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
217 217
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
218 218
 							$eansum = barcode_gen_ean_sum($ean);
219 219
 							$ean .= $eansum; //substitute the las character by the key
Please login to merge, or discard this patch.