@@ -179,9 +179,9 @@ |
||
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 |
@@ -280,7 +280,7 @@ |
||
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">'; |
@@ -216,7 +216,7 @@ |
||
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 | } |
@@ -137,7 +137,7 @@ discard block |
||
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 |
||
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 |
||
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) { |
@@ -72,5 +72,5 @@ |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | if (empty($downloadMode)) { |
75 | - header('Content-Disposition: attachment;filename=' . $completefilename); |
|
75 | + header('Content-Disposition: attachment;filename='.$completefilename); |
|
76 | 76 | } |
@@ -76,9 +76,9 @@ discard block |
||
76 | 76 | setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors'); |
77 | 77 | $action = 'create'; |
78 | 78 | } else { |
79 | - $sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS')); |
|
79 | + $sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS')); |
|
80 | 80 | |
81 | - dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); |
|
81 | + dol_syslog('accountancy/admin/card.php:: $sql='.$sql); |
|
82 | 82 | $result = $db->query($sql); |
83 | 83 | $obj = $db->fetch_object($result); |
84 | 84 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | if (!$error) { |
124 | 124 | setEventMessages("RecordCreatedSuccessfully", null, 'mesgs'); |
125 | 125 | $urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php'; |
126 | - header("Location: " . $urltogo); |
|
126 | + header("Location: ".$urltogo); |
|
127 | 127 | exit; |
128 | 128 | } |
129 | 129 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | $sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) getDolGlobalInt('CHARTOFACCOUNTS')); |
143 | 143 | |
144 | - dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); |
|
144 | + dol_syslog('accountancy/admin/card.php:: $sql='.$sql); |
|
145 | 145 | $result2 = $db->query($sql); |
146 | 146 | $obj = $db->fetch_object($result2); |
147 | 147 | |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | $result = $object->update($user); |
172 | 172 | |
173 | 173 | if ($result > 0) { |
174 | - $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id); |
|
175 | - header("Location: " . $urltogo); |
|
174 | + $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id); |
|
175 | + header("Location: ".$urltogo); |
|
176 | 176 | exit(); |
177 | 177 | } elseif ($result == -2) { |
178 | 178 | setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors'); |
@@ -264,14 +264,14 @@ discard block |
||
264 | 264 | print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">'; |
265 | 265 | // autosuggest from existing account types if found |
266 | 266 | print '<datalist id="pcg_type_datalist">'; |
267 | - $sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account"; |
|
268 | - $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
|
269 | - $sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy. |
|
267 | + $sql = "SELECT DISTINCT pcg_type FROM ".MAIN_DB_PREFIX."accounting_account"; |
|
268 | + $sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'"; |
|
269 | + $sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy. |
|
270 | 270 | $sql .= ' LIMIT 50000'; // just as a sanity check |
271 | 271 | $resql = $db->query($sql); |
272 | 272 | if ($resql) { |
273 | 273 | while ($obj = $db->fetch_object($resql)) { |
274 | - print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">'; |
|
274 | + print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">'; |
|
275 | 275 | } |
276 | 276 | } |
277 | 277 | print '</datalist>'; |
@@ -341,14 +341,14 @@ discard block |
||
341 | 341 | print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">'; |
342 | 342 | // autosuggest from existing account types if found |
343 | 343 | print '<datalist id="pcg_type_datalist">'; |
344 | - $sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account'; |
|
345 | - $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
|
346 | - $sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy. |
|
344 | + $sql = 'SELECT DISTINCT pcg_type FROM '.MAIN_DB_PREFIX.'accounting_account'; |
|
345 | + $sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'"; |
|
346 | + $sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy. |
|
347 | 347 | $sql .= ' LIMIT 50000'; // just as a sanity check |
348 | 348 | $resql = $db->query($sql); |
349 | 349 | if ($resql) { |
350 | 350 | while ($obj = $db->fetch_object($resql)) { |
351 | - print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">'; |
|
351 | + print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">'; |
|
352 | 352 | } |
353 | 353 | } |
354 | 354 | print '</datalist>'; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } |
253 | 253 | } |
254 | 254 | if (empty($error)) { |
255 | - header("Location: card.php?id=" . $object->id); |
|
255 | + header("Location: card.php?id=".$object->id); |
|
256 | 256 | exit; |
257 | 257 | } |
258 | 258 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | } else { |
308 | 308 | $result = $object->fetch($id); |
309 | 309 | |
310 | - $object->amount = $amount; |
|
310 | + $object->amount = $amount; |
|
311 | 311 | |
312 | 312 | $result = $object->update($user); |
313 | 313 | if ($result <= 0) { |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | |
470 | 470 | // Auto create payment |
471 | 471 | print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>'; |
472 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n"; |
|
472 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; |
|
473 | 473 | |
474 | 474 | print '<tr class="hide_if_no_auto_create_payment">'; |
475 | 475 | print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>'; |
@@ -609,9 +609,9 @@ discard block |
||
609 | 609 | print '</td></tr>'; |
610 | 610 | |
611 | 611 | if ($action == 'edit') { |
612 | - print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>'; |
|
612 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>'; |
|
613 | 613 | } else { |
614 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>'; |
|
614 | + print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>'; |
|
615 | 615 | } |
616 | 616 | |
617 | 617 | // Mode of payment |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | $month_current = dol_print_date(dol_now(), "%m"); |
53 | 53 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
54 | 54 | } |
55 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
56 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
55 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
56 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
57 | 57 | |
58 | 58 | // We define date_start and date_end |
59 | 59 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
256 | 256 | $sql .= " AND aa.entity = ".$conf->entity; |
257 | 257 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
258 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
258 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
259 | 259 | } |
260 | 260 | $sql .= " GROUP BY dm"; |
261 | 261 | $sql .= " ORDER BY dm"; |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | $month_current = dol_print_date(dol_now(), "%m"); |
49 | 49 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
50 | 50 | } |
51 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
52 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
51 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
52 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
53 | 53 | |
54 | 54 | // We define date_start and date_end |
55 | 55 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $sql .= " AND b.numero_compte = aa.account_number"; |
241 | 241 | $sql .= " AND aa.entity = ".$conf->entity; |
242 | 242 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
243 | - $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
243 | + $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
244 | 244 | } |
245 | 245 | //print $sql; |
246 | 246 |