@@ -96,7 +96,7 @@ |
||
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
99 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
99 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
100 | 100 | |
101 | 101 | |
102 | 102 | /* |
@@ -141,7 +141,7 @@ |
||
141 | 141 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
142 | 142 | |
143 | 143 | // Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
144 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
144 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
145 | 145 | $i = 0; |
146 | 146 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
147 | 147 | foreach ($dataseries as $key => $val) { |
@@ -59,7 +59,7 @@ |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | $usestripeterminals = getDolGlobalString('STRIPE_LOCATION'); |
62 | -if (! $usestripeterminals) { |
|
62 | +if (!$usestripeterminals) { |
|
63 | 63 | accessforbidden('Feature to use Stripe terminals not enabled'); |
64 | 64 | } |
65 | 65 |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | '', |
91 | 91 | array( |
92 | 92 | 'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'), |
93 | - 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | - 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
93 | + 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | + 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
95 | 95 | 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
96 | 96 | 'entity' => array('name' => 'entity', 'type' => 'xsd:string') |
97 | 97 | ) |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | 'amount' => array('name' => 'amount', 'type' => 'xsd:double'), |
121 | 121 | 'num_payment' => array('name' => 'num_payment', 'type' => 'xsd:string'), |
122 | 122 | 'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'), |
123 | - 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | - 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | - 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | - 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | - 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | - 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
123 | + 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | + 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | + 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | + 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | + 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | + 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
129 | 129 | ) |
130 | 130 | ); |
131 | 131 | |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $now = dol_now(); |
166 | 166 | |
167 | 167 | dol_syslog("Function: createPayment login=" . $authentication['login'] . " id=" . $payment->id . |
168 | - ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
168 | + ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
169 | 169 | |
170 | 170 | if ($authentication['entity']) { |
171 | 171 | $conf->entity = $authentication['entity']; |
@@ -64,8 +64,7 @@ |
||
64 | 64 | $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php |
65 | 65 | |
66 | 66 | $tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? |
67 | - (empty($dolibarr_main_cookie_cryptkey) ? '' : |
|
68 | - $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
67 | + (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
69 | 68 | // Unique id of instance |
70 | 69 | |
71 | 70 | // The recommended value (may be not defined for old versions) |
@@ -113,7 +113,7 @@ |
||
113 | 113 | 'maxTopMenu' => & $maxTopMenu |
114 | 114 | ); |
115 | 115 | |
116 | -$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
116 | +$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
117 | 117 | if ($reshook < 0) { |
118 | 118 | $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
119 | 119 | } |
@@ -49,7 +49,9 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | // Not sure this is required |
52 | -if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
52 | +if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) { |
|
53 | + unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
54 | +} |
|
53 | 55 | |
54 | 56 | if (GETPOST('noredirect')) { |
55 | 57 | return; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | //permissions |
86 | 86 | |
87 | -$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
87 | +$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
88 | 88 | |
89 | 89 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
90 | 90 | $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); |
@@ -218,19 +218,19 @@ discard block |
||
218 | 218 | |
219 | 219 | $societe->client = GETPOSTINT('client') ? GETPOSTINT('client') : $societe->client; |
220 | 220 | |
221 | - $societe->address = GETPOST('address', 'alphanohtml'); |
|
221 | + $societe->address = GETPOST('address', 'alphanohtml'); |
|
222 | 222 | |
223 | - $societe->country_id = GETPOSTINT('country_id'); |
|
223 | + $societe->country_id = GETPOSTINT('country_id'); |
|
224 | 224 | |
225 | - $societe->phone = GETPOST('phone', 'alpha'); |
|
225 | + $societe->phone = GETPOST('phone', 'alpha'); |
|
226 | 226 | |
227 | - $societe->fax = GETPOST('fax', 'alpha'); |
|
227 | + $societe->fax = GETPOST('fax', 'alpha'); |
|
228 | 228 | |
229 | - $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
229 | + $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
230 | 230 | |
231 | - $societe->client = 2 ; // our client is a prospect |
|
231 | + $societe->client = 2; // our client is a prospect |
|
232 | 232 | |
233 | - $societe->code_client = '-1'; |
|
233 | + $societe->code_client = '-1'; |
|
234 | 234 | |
235 | 235 | $societe->name_alias = GETPOST('name_alias', 'alphanohtml'); |
236 | 236 |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | } |
708 | 708 | |
709 | 709 | // Other attributes |
710 | - $parameters['tpl_context'] = 'public'; // define template context to public |
|
710 | + $parameters['tpl_context'] = 'public'; // define template context to public |
|
711 | 711 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
712 | 712 | |
713 | 713 | // Comments |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | |
770 | 770 | // Set amount for the subscription: |
771 | 771 | // - First check the amount of the member type. |
772 | - $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
772 | + $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
773 | 773 | $amount = empty($amountbytype[$typeid]) ? (isset($amount) ? $amount : 0) : $amountbytype[$typeid]; |
774 | 774 | // - If not found, take the default amount only of the user is authorized to edit it |
775 | 775 | if ($caneditamount && empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) { |