Completed
Branch develop (3f25ff)
by
unknown
18:06
created
htdocs/core/class/commondocgenerator.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
151 151
 	public $result;
152 152
 
153 153
 	public $posxref;
154
-	public $posxpicture;	// For picture
155
-	public $posxdesc;		// For description
154
+	public $posxpicture; // For picture
155
+	public $posxdesc; // For description
156 156
 	public $posxqty;
157 157
 	public $posxpuht;
158 158
 	public $posxtva;
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 			'myuser_email'=>$user->email,
205 205
 			'myuser_logo'=>$logotouse,
206 206
 			'myuser_job'=>$user->job,
207
-			'myuser_web'=>'',	// url not exist in $user object
207
+			'myuser_web'=>'', // url not exist in $user object
208 208
 			'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
209 209
 			'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
210 210
 			'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 
521 521
 		if (get_class($object) == 'CommandeFournisseur') {
522 522
 			/* @var $object CommandeFournisseur*/
523
-			$object->date_validation =  $object->date_valid;
523
+			$object->date_validation = $object->date_valid;
524 524
 			$object->date_commande = $object->date;
525 525
 		}
526 526
 		$resarray = array(
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 			$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
607 607
 			$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
608 608
 			$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
609
-			$resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
609
+			$resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
610 610
 		}
611 611
 
612 612
 		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
 			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
630 630
 			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
631 631
 		} else { // empty replacement
632
-			$resarray[$array_key.'_project_ref'] ='';
632
+			$resarray[$array_key.'_project_ref'] = '';
633 633
 			$resarray[$array_key.'_project_title'] = '';
634 634
 			$resarray[$array_key.'_project_description'] = '';
635 635
 			$resarray[$array_key.'_project_date_start'] = '';
@@ -1461,7 +1461,7 @@  discard block
 block discarded – undo
1461 1461
 
1462 1462
 		if (!empty($fields)) {
1463 1463
 			// Sort extrafields by rank
1464
-			uasort($fields, function ($a, $b) {
1464
+			uasort($fields, function($a, $b) {
1465 1465
 				return  ($a->rank > $b->rank) ? 1 : -1;
1466 1466
 			});
1467 1467
 
Please login to merge, or discard this patch.
htdocs/core/modules/modPartnership.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		// 'user'             to add a tab in user view
212 212
 
213 213
 		// Dictionaries
214
-		$this->dictionaries=array(
214
+		$this->dictionaries = array(
215 215
 			'langs'=>'partnership',
216 216
 			// List of tables we want to see into dictonnary editor
217 217
 			'tabname'=>array("c_partnership_type"),
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
249 249
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
250 250
 		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
251 251
 
252
-		$arraydate=dol_getdate(dol_now());
253
-		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
252
+		$arraydate = dol_getdate(dol_now());
253
+		$datestart = dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
254 254
 
255 255
 		$this->cronjobs = array(
256
-			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
257
-			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
256
+			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'', 'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
257
+			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'', 'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
258 258
 		);
259 259
 
260 260
 		// Permissions provided by this module
Please login to merge, or discard this patch.