Completed
Branch develop (16edaf)
by
unknown
16:33
created
htdocs/core/class/notify.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -615,7 +615,7 @@
 block discarded – undo
615 615
 
616 616
 						$ref = dol_sanitizeFileName($newref);
617 617
 						$pdf_path = $dir_output."/".$ref.".pdf";
618
-						if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {
618
+						if (!dol_is_file($pdf_path) || (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {
619 619
 							// We can't add PDF as it is not generated yet.
620 620
 							$filepdf = '';
621 621
 						} else {
Please login to merge, or discard this patch.
htdocs/compta/bank/annuel.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
 // Total debit-credit
215 215
 print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
216 216
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
217
-	print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
218
-	print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
217
+	print '<td class="right nowraponall"><b>'.(isset($totsorties[$annee]) ? price($totsorties[$annee]) : '').'</b></td>';
218
+	print '<td class="right nowraponall"><b>'.(isset($totentrees[$annee]) ? price($totentrees[$annee]) : '').'</b></td>';
219 219
 }
220 220
 print "</tr>\n";
221 221
 
Please login to merge, or discard this patch.
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/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/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/modulebuilder/template/class/myobject.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 	/**
154 154
 	 * @var int Thirdparty ID
155 155
 	 */
156
-	public $socid;		// both socid and fk_soc are used
157
-	public $fk_soc;		// both socid and fk_soc are used
156
+	public $socid; // both socid and fk_soc are used
157
+	public $fk_soc; // both socid and fk_soc are used
158 158
 
159 159
 	/**
160 160
 	 * @var int Status
@@ -936,7 +936,7 @@  discard block
 block discarded – undo
936 936
 				$this->date_creation     = $this->db->jdate($obj->datec);
937 937
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
938 938
 				if (!empty($obj->datev)) {
939
-					$this->date_validation   = empty($obj->datev) ? '' : $this->db->jdate($obj->datev);
939
+					$this->date_validation = empty($obj->datev) ? '' : $this->db->jdate($obj->datev);
940 940
 				}
941 941
 			}
942 942
 
Please login to merge, or discard this patch.
htdocs/projet/tasks/note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,9 +115,9 @@
 block discarded – undo
115 115
 
116 116
 $now = dol_now();
117 117
 
118
-$title = $object->ref . ' - ' . $langs->trans("Notes");
118
+$title = $object->ref.' - '.$langs->trans("Notes");
119 119
 if (!empty($withproject)) {
120
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
120
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
121 121
 }
122 122
 $help_url = '';
123 123
 
Please login to merge, or discard this patch.
htdocs/projet/tasks/document.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,9 +121,9 @@
 block discarded – undo
121 121
  */
122 122
 $form = new Form($db);
123 123
 
124
-$title = $object->ref . ' - ' . $langs->trans("Documents");
124
+$title = $object->ref.' - '.$langs->trans("Documents");
125 125
 if (!empty($withproject)) {
126
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
126
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
127 127
 }
128 128
 $help_url = '';
129 129
 
Please login to merge, or discard this patch.
htdocs/projet/tasks/contact.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,9 +146,9 @@
 block discarded – undo
146 146
 $userstatic = new User($db);
147 147
 $result = $projectstatic->fetch($object->fk_project);
148 148
 
149
-$title = $object->ref . ' - ' . $langs->trans("Contacts");
149
+$title = $object->ref.' - '.$langs->trans("Contacts");
150 150
 if (!empty($withproject)) {
151
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
151
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
152 152
 }
153 153
 $help_url = '';
154 154
 
Please login to merge, or discard this patch.