Completed
Branch develop (c23a95)
by
unknown
18:46
created
htdocs/core/boxes/box_contacts.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
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
102 102
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
103 103
 			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
104
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
104
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
105 105
 			}
106 106
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
107 107
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
Please login to merge, or discard this patch.
htdocs/multicurrency/class/multicurrency.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -644,7 +644,7 @@
 block discarded – undo
644 644
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
645 645
 
646 646
 		$urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key;
647
-		$urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
647
+		$urlendpoint .= '&source='.(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
648 648
 
649 649
 		dol_syslog("Call url endpoint ".$urlendpoint);
650 650
 
Please login to merge, or discard this patch.
htdocs/core/tpl/extrafields_list_print_fields.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
46 46
 				$title = dol_string_nohtmltag($valuetoshow);
47 47
 
48
-				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
48
+				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
49 49
 				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
50 50
 				print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
51 51
 				print '>';
Please login to merge, or discard this patch.
htdocs/expedition/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 }
77 77
 $result = restrictedArea($user, 'expedition', $object->id, '');
78 78
 
79
-$permissiontoadd = $user->rights->expedition->creer;	// Used by the include of actions_dellink.inc.php
79
+$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php
80 80
 
81 81
 
82 82
 /*
Please login to merge, or discard this patch.
htdocs/compta/sociales/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 }
79 79
 $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
80 80
 
81
-$permissiontoadd = $user->rights->tax->charges->creer;	// Used by the include of actions_dellink.inc.php
81
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
82 82
 
83 83
 
84 84
 /*
Please login to merge, or discard this patch.
htdocs/compta/deplacement/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 }
75 75
 $result = restrictedArea($user, 'deplacement', $id, '');
76 76
 
77
-$permissiontoadd = $user->rights->deplacement->creer;	// Used by the include of actions_dellink.inc.php
77
+$permissiontoadd = $user->rights->deplacement->creer; // Used by the include of actions_dellink.inc.php
78 78
 
79 79
 
80 80
 /*
Please login to merge, or discard this patch.
htdocs/compta/tva/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 }
80 80
 $result = restrictedArea($user, 'tax', '', 'tva', 'charges');
81 81
 
82
-$permissiontoadd = $user->rights->tax->charges->creer;	// Used by the include of actions_dellink.inc.php
82
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
83 83
 
84 84
 
85 85
 /*
Please login to merge, or discard this patch.
htdocs/compta/bank/various_payment/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 $upload_dir = $conf->bank->dir_output.'/'.dol_sanitizeFileName($object->id);
70 70
 $modulepart = 'banque';
71 71
 
72
-$permissiontoadd = $user->rights->banque->modifier;	// Used by the include of actions_dellink.inc.php
72
+$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php
73 73
 
74 74
 
75 75
 
Please login to merge, or discard this patch.
htdocs/compta/bank/account_statement_document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
 	$found = true;
121 121
 }
122 122
 
123
-$permissiontoadd = $user->rights->banque->modifier;	// Used by the include of actions_dellink.inc.php
123
+$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php
124 124
 
125 125
 
126 126
 /*
Please login to merge, or discard this patch.