Completed
Branch develop (88253b)
by
unknown
18:45
created
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 		));
156 156
 
157 157
 		// Retrieve all extrafields if not already not know (should not happen)
158
-		if (! is_object($extrafields)) {
158
+		if (!is_object($extrafields)) {
159 159
 			$extrafields = new ExtraFields($this->db);
160 160
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161
 		}
Please login to merge, or discard this patch.
htdocs/product/stats/facture_fournisseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@
 block discarded – undo
246 246
 						$supplierinvoicestatic->id = $objp->facid;
247 247
 						$supplierinvoicestatic->ref = $objp->ref;
248 248
 						$supplierinvoicestatic->ref_supplier = $objp->ref_supplier;
249
-						$supplierinvoicestatic->libelle = $objp->label;	// deprecated
249
+						$supplierinvoicestatic->libelle = $objp->label; // deprecated
250 250
 						$supplierinvoicestatic->label = $objp->label;
251 251
 						$supplierinvoicestatic->total_ht = $objp->total_ht;
252 252
 						$supplierinvoicestatic->total_ttc = $objp->total_ttc;
Please login to merge, or discard this patch.
doctemplates/websites/website_template-noimg/containers/manifest.json.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__);
3
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
2
+$websitekey = basename(__DIR__);
3
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded
4 4
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
5 5
 require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
6 6
 ob_start();
Please login to merge, or discard this patch.
htdocs/adherents/admin/member_emails.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -56,16 +56,16 @@
 block discarded – undo
56 56
 // Editing global variables not related to a specific theme
57 57
 $constantes = array(
58 58
 	'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
59
-	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member','label'=>''),
60
-	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member','label'=>''),
61
-	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member','label'=>''),
62
-	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member','label'=>''),
63
-	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member','label'=>''),
64
-	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member','label'=>''),
65
-	'ADHERENT_MAIL_FROM'							=>array('type'=>'string','label'=>''),
66
-	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string','label'=>''),
67
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string','label'=>''),
68
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'')
59
+	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member', 'label'=>''),
60
+	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member', 'label'=>''),
61
+	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member', 'label'=>''),
62
+	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
63
+	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
64
+	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member', 'label'=>''),
65
+	'ADHERENT_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
66
+	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
67
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string', 'label'=>''),
68
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'')
69 69
 );
70 70
 
71 71
 
Please login to merge, or discard this patch.
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
 
803 803
 			if (!empty($object->refuse_note)) {
804 804
 				$object->actionmsg .= '<br>';
805
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
805
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->refuse_note;
806 806
 			}
807 807
 
808 808
 			$object->sendtoid = 0;
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 
824 824
 			if (!empty($object->cancel_note)) {
825 825
 				$object->actionmsg .= '<br>';
826
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note;
826
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->cancel_note;
827 827
 			}
828 828
 
829 829
 			$object->sendtoid = 0;
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 
845 845
 			if (!empty($object->context['comments'])) {
846 846
 				$object->actionmsg .= '<br>';
847
-				$object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments'];
847
+				$object->actionmsg .= $langs->trans("Comment").': '.$object->context['comments'];
848 848
 			}
849 849
 
850 850
 			$object->sendtoid = 0;
@@ -1472,8 +1472,8 @@  discard block
 block discarded – undo
1472 1472
 		$actioncomm = new ActionComm($this->db);
1473 1473
 		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
1474 1474
 		$actioncomm->code        = 'AC_'.$action;
1475
-		$actioncomm->label       = $object->actionmsg2;		// Label of event
1476
-		$actioncomm->note_private = $object->actionmsg;		// Description
1475
+		$actioncomm->label       = $object->actionmsg2; // Label of event
1476
+		$actioncomm->note_private = $object->actionmsg; // Description
1477 1477
 		$actioncomm->fk_project  = $projectid;
1478 1478
 		$actioncomm->datep       = $now;
1479 1479
 		$actioncomm->datef       = $now;
Please login to merge, or discard this patch.
htdocs/core/lib/contract.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id;
101 101
 	$head[$h][1] = $langs->trans("Events");
102
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
102
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
103 103
 		$nbEvent = 0;
104 104
 		// Enable caching of thirdparty count actioncomm
105 105
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			} else {
120 120
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
121 121
 			}
122
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
122
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
123 123
 		}
124 124
 
125 125
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/lib/order.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
 	$head[$h][0] = DOL_URL_ROOT.'/commande/agenda.php?id='.$object->id;
133 133
 	$head[$h][1] = $langs->trans("Events");
134
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
134
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
135 135
 		$nbEvent = 0;
136 136
 		// Enable caching of thirdparty count actioncomm
137 137
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			} else {
152 152
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
153 153
 			}
154
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
154
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
155 155
 		}
156 156
 
157 157
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 		$maxfilesizearray = getMaxFileSizeArray();
163 163
 		$maxmin = $maxfilesizearray['maxmin'];
164 164
 		if ($maxmin > 0) {
165
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
165
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
166 166
 		}
167 167
 		$texte .= ' <input type="file" name="uploadfile">';
168 168
 		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
254 254
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
255 255
 
256
-				$newfiletmp = $objectref . '_' . $newfiletmp;
256
+				$newfiletmp = $objectref.'_'.$newfiletmp;
257 257
 
258 258
 				// Get extension (ods or odt)
259 259
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
 					if ($format == '1') {
263 263
 						$format = '%Y%m%d%H%M%S';
264 264
 					}
265
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
265
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
266 266
 				} else {
267
-					$filename = $newfiletmp . '.' . $newfileformat;
267
+					$filename = $newfiletmp.'.'.$newfileformat;
268 268
 				}
269
-				$file = $dir . '/' . $filename;
269
+				$file = $dir.'/'.$filename;
270 270
 				//print "newdir=".$dir;
271 271
 				//print "newfile=".$newfile;
272 272
 				//print "file=".$file;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 				dol_mkdir($conf->ticket->dir_temp);
276 276
 				if (!is_writable($conf->ticket->dir_temp)) {
277 277
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->ticket->dir_temp);
278
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
278
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
279 279
 					return -1;
280 280
 				}
281 281
 
Please login to merge, or discard this patch.
htdocs/core/modules/facture/modules_facture.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
121 121
 			$this->emetteur->name,
122 122
 			$this->emetteur->address,
123
-			$this->emetteur->zip . " " . $this->emetteur->town,
123
+			$this->emetteur->zip." ".$this->emetteur->town,
124 124
 			$this->emetteur->country_code
125 125
 		);
126 126
 		if (!$address->isValid()) {
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
176 176
 				$object->thirdparty->name,
177 177
 				$object->thirdparty->address,
178
-				$object->thirdparty->zip . " " . $object->thirdparty->town,
178
+				$object->thirdparty->zip." ".$object->thirdparty->town,
179 179
 				$object->thirdparty->country_code
180 180
 			);
181 181
 			if (!$address->isValid()) {
Please login to merge, or discard this patch.