Completed
Branch develop (05527d)
by
unknown
15:23
created
htdocs/ecm/index_medias.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 $websitekey = '';
102 102
 
103
-$permissiontoadd = $permissiontouploadfile;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
103
+$permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
104 104
 
105 105
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
106 106
 $hookmanager->initHooks(array('ecmmediascard', 'globalcard'));
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 if ($sortorder) {
118 118
 	$backtopage .= '&sortorder='.urlencode($sortorder);
119 119
 }
120
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
120
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
121 121
 
122 122
 $backtopage = $savbacktopage;
123 123
 
Please login to merge, or discard this patch.
htdocs/ecm/class/ecmfiles.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -161,16 +161,16 @@  discard block
 block discarded – undo
161 161
 		'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"contains hash of file content"),
162 162
 		'share' => array('type'=>'varchar(128)', 'label'=>'Share', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "contains hash for file sharing"),
163 163
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
164
-		'filepath' => array('type'=>'varchar(255)', 'label'=>'FilePath', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "relative to dolibarr document dir. Example module/def"),
165
-		'filename' => array('type'=>'varchar(255)', 'label'=>'FileName', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"file name only without any directory"),
166
-		'src_object_type' => array('type'=>'varchar(64)', 'label'=>'SourceType', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>0, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "Source object type ('proposal', 'invoice', ...)"),
164
+		'filepath' => array('type'=>'varchar(255)', 'label'=>'FilePath', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=> "relative to dolibarr document dir. Example module/def"),
165
+		'filename' => array('type'=>'varchar(255)', 'label'=>'FileName', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"file name only without any directory"),
166
+		'src_object_type' => array('type'=>'varchar(64)', 'label'=>'SourceType', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>0, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=> "Source object type ('proposal', 'invoice', ...)"),
167 167
 		'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
168
-		'fullpath_orig' => array('type'=>'varchar(750)', 'label'=>'FullPathOrig', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"full path of original filename, when file is uploaded from a local computer"),
168
+		'fullpath_orig' => array('type'=>'varchar(750)', 'label'=>'FullPathOrig', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"full path of original filename, when file is uploaded from a local computer"),
169 169
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110),
170
-		'keywords' => array('type'=>'varchar(750)', 'label'=>'Keywords', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"list of keywords, separated with comma. Must be limited to most important keywords."),
170
+		'keywords' => array('type'=>'varchar(750)', 'label'=>'Keywords', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"list of keywords, separated with comma. Must be limited to most important keywords."),
171 171
 		'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment'=>"is this file a file to use for a cover"),
172 172
 		'position' => array('type' => 'integer', 'label' => 'Position', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
173
-		'gen_or_uploaded' => array('type'=>'varchar(12)', 'label'=>'GenOrUpload', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"'generated' or 'uploaded'"),
173
+		'gen_or_uploaded' => array('type'=>'varchar(12)', 'label'=>'GenOrUpload', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"'generated' or 'uploaded'"),
174 174
 		'extraparams' => array('type'=>'varchar(255)', 'label'=>'ExtraParams', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "for stocking other parameters with json format"),
175 175
 		'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
176 176
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 		$result .= $linkstart.$this->ref.$linkend;
907 907
 
908 908
 		global $action;
909
-		$hookmanager->initHooks(array($this->element . 'dao'));
909
+		$hookmanager->initHooks(array($this->element.'dao'));
910 910
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
911 911
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
912 912
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/categories/viewcat.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 				print '<table class="noborder centpercent">';
680 680
 				print '<tr class="liste_titre"><td>';
681 681
 				print $langs->trans("AddSupplierIntoCategory").' &nbsp;';
682
-				$filter ='(s.fournisseur:=:1)';
682
+				$filter = '(s.fournisseur:=:1)';
683 683
 				print $form->select_company('', 'elemid', $filter);
684 684
 				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
685 685
 				print '</tr>';
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
 				print '<input type="hidden" name="action" value="addintocategory">';
1115 1115
 				print '<table class="noborder centpercent">';
1116 1116
 				print '<tr class="liste_titre"><td>';
1117
-				$force_entity = getEntity($object->element);	// So we will get same filter than the getObjectsInCateg()
1117
+				$force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg()
1118 1118
 				print img_picto('', $type, 'class="pictofixedwidth"');
1119 1119
 				print $form->select_dolusers('', 'elemid', 1, null, 0, '', '', $force_entity);
1120 1120
 				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
Please login to merge, or discard this patch.
htdocs/societe/class/companypaymentmode.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -179,9 +179,9 @@
 block discarded – undo
179 179
 	public $max_total_amount_of_all_payments;
180 180
 	public $preapproval_key;
181 181
 	public $total_amount_of_all_payments;
182
-	public $stripe_card_ref;	// External system payment mode ID
183
-	public $stripe_account;		// External system customer ID
184
-	public $ext_payment_site;	// External system 'StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ...
182
+	public $stripe_card_ref; // External system payment mode ID
183
+	public $stripe_account; // External system customer ID
184
+	public $ext_payment_site; // External system 'StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ...
185 185
 
186 186
 	/**
187 187
 	 * @var int Status
Please login to merge, or discard this patch.
htdocs/societe/societecontact.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -280,7 +280,7 @@
 block discarded – undo
280 280
 
281 281
 						// Type
282 282
 						$membertypestatic->id = $objp->type_id;
283
-						$membertypestatic->libelle = $objp->type_label;	// deprecated
283
+						$membertypestatic->libelle = $objp->type_label; // deprecated
284 284
 						$membertypestatic->label = $objp->type_label;
285 285
 
286 286
 						print '<td class="nowrap">';
Please login to merge, or discard this patch.
htdocs/societe/ajax/ajaxcompanies.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
 }
83 83
 
84 84
 // Generate list of companies
85
-if (! $socid) {
85
+if (!$socid) {
86 86
 	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
87 87
 	exit;
88 88
 }
Please login to merge, or discard this patch.
htdocs/societe/admin/societe.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 
36 36
 $action = GETPOST('action', 'aZ09');
37 37
 $value = GETPOST('value', 'alpha');
38
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
38
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
39 39
 
40 40
 if (!$user->admin) {
41 41
 	accessforbidden();
Please login to merge, or discard this patch.
htdocs/don/payment/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@
 block discarded – undo
216 216
 		if (!$disable_delete) {
217 217
 			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1);
218 218
 		} else {
219
-			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, [ 'attr' => ['classOverride' => 'butActionRefused']]);
219
+			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, ['attr' => ['classOverride' => 'butActionRefused']]);
220 220
 		}
221 221
 	}
222 222
 }
Please login to merge, or discard this patch.
htdocs/accountancy/class/api_accountancy.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		// set filter for each period available
138 138
 		$filter = array();
139 139
 		$doc_date_start = null;
140
-		$doc_date_end= null;
140
+		$doc_date_end = null;
141 141
 		$now = dol_now();
142 142
 		$now_arr = dol_getdate($now);
143 143
 		$now_month = $now_arr['mon'];
@@ -173,9 +173,9 @@  discard block
 block discarded – undo
173 173
 			$prev_month_date_list = array();
174 174
 			$prev_month_date_list[] = dol_get_prev_month($now_month, $now_year); // get previous month for index = 0
175 175
 			for ($i = 1; $i < $nb_prev_month; $i++) {
176
-				$prev_month_date_list[] = dol_get_prev_month($prev_month_date_list[$i-1]['month'], $prev_month_date_list[$i-1]['year']); // get i+1 previous month for index=i
176
+				$prev_month_date_list[] = dol_get_prev_month($prev_month_date_list[$i - 1]['month'], $prev_month_date_list[$i - 1]['year']); // get i+1 previous month for index=i
177 177
 			}
178
-			$doc_date_start = dol_mktime(0, 0, 0, $prev_month_date_list[$nb_prev_month-1]['month'], 1, $prev_month_date_list[$nb_prev_month-1]['year']); // first day of n previous month for index=n-1
178
+			$doc_date_start = dol_mktime(0, 0, 0, $prev_month_date_list[$nb_prev_month - 1]['month'], 1, $prev_month_date_list[$nb_prev_month - 1]['year']); // first day of n previous month for index=n-1
179 179
 			$doc_date_end = dol_get_last_day($prev_month_date_list[0]['year'], $prev_month_date_list[0]['month']); // last day of previous month for index = 0
180 180
 		} elseif ($period == 'currentyear' || $period == 'lastyear') {
181 181
 			$period_year = $now_year;
@@ -242,9 +242,9 @@  discard block
 block discarded – undo
242 242
 					foreach ($bookkeeping->lines as $movement) {
243 243
 						$now = dol_now();
244 244
 
245
-						$sql = " UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping";
246
-						$sql .= " SET date_export = '" . $this->db->idate($now) . "'";
247
-						$sql .= " WHERE rowid = " . ((int) $movement->id);
245
+						$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
246
+						$sql .= " SET date_export = '".$this->db->idate($now)."'";
247
+						$sql .= " WHERE rowid = ".((int) $movement->id);
248 248
 
249 249
 						$result = $this->db->query($sql);
250 250
 						if (!$result) {
Please login to merge, or discard this patch.