@@ -160,7 +160,7 @@ |
||
160 | 160 | $sql .= " AND cp.statut = " . Holiday::STATUS_APPROVED; |
161 | 161 | $sql .= " AND ("; |
162 | 162 | $sql .= " (date_format(cp.date_debut, '%Y-%m') = '" . $db->escape($year_month) . "' OR date_format(cp.date_fin, '%Y-%m') = '" . $db->escape($year_month) . "')"; |
163 | -$sql .= " OR"; // For leave over several months |
|
163 | +$sql .= " OR"; // For leave over several months |
|
164 | 164 | $sql .= " (date_format(cp.date_debut, '%Y-%m') < '" . $db->escape($year_month) . "' AND date_format(cp.date_fin, '%Y-%m') > '" . $db->escape($year_month) . "') "; |
165 | 165 | $sql .= " )"; |
166 | 166 | if (!empty($search_ref)) { |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... |
44 | 44 | $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) |
45 | -$mode = GETPOST('mode', 'alpha'); |
|
45 | +$mode = GETPOST('mode', 'alpha'); |
|
46 | 46 | $show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ? |
47 | 47 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
48 | 48 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | $include = ''; |
316 | 316 | |
317 | 317 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
318 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
318 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
319 | 319 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
320 | 320 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
321 | 321 |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | print '<datalist id="pcg_type_datalist">'; |
257 | 257 | $sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account"; |
258 | 258 | $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
259 | - $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
259 | + $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
260 | 260 | $sql .= ' LIMIT 50000'; // just as a sanity check |
261 | 261 | $resql = $db->query($sql); |
262 | 262 | if ($resql) { |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | print '<datalist id="pcg_type_datalist">'; |
334 | 334 | $sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account'; |
335 | 335 | $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'"; |
336 | - $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
336 | + $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy. |
|
337 | 337 | $sql .= ' LIMIT 50000'; // just as a sanity check |
338 | 338 | $resql = $db->query($sql); |
339 | 339 | if ($resql) { |
@@ -461,7 +461,7 @@ |
||
461 | 461 | print '<br>'; |
462 | 462 | |
463 | 463 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
464 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
464 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
465 | 465 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
466 | 466 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
467 | 467 |
@@ -335,7 +335,7 @@ |
||
335 | 335 | print '<div class="info">' . $langs->trans("WarningCreateSubAccounts") . '</div>'; |
336 | 336 | |
337 | 337 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
338 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
338 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
339 | 339 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
340 | 340 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
341 | 341 |
@@ -188,7 +188,7 @@ |
||
188 | 188 | |
189 | 189 | // Si verif ok et action add, on ajoute la ligne |
190 | 190 | if ($ok && GETPOST('actionadd', 'alpha')) { |
191 | - $newid = 0; // Initialise before if for static analysis |
|
191 | + $newid = 0; // Initialise before if for static analysis |
|
192 | 192 | if ($tabrowid[$id]) { |
193 | 193 | // Get free id for insert |
194 | 194 | $sql = "SELECT MAX(" . $db->sanitize($tabrowid[$id]) . ") newid FROM " . $db->sanitize($tabname[$id]); |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $confirm = GETPOST('confirm', 'alpha'); |
41 | 41 | $cancel = GETPOST('cancel', 'aZ09'); |
42 | 42 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
43 | -$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
43 | +$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
44 | 44 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used |
45 | 45 | $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha'); |
46 | 46 | $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $search_date_endday = GETPOSTINT('search_date_endday'); |
62 | 62 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
63 | 63 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
64 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
65 | 65 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
66 | 66 | $search_country = GETPOST('search_country', 'aZ09'); |
67 | 67 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | // Search Getpost |
60 | 60 | $search_societe = GETPOST('search_societe', 'alpha'); |
61 | -$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
61 | +$search_lineid = GETPOST('search_lineid', 'alpha'); // Can be '> 100' |
|
62 | 62 | $search_ref = GETPOST('search_ref', 'alpha'); |
63 | 63 | $search_invoice = GETPOST('search_invoice', 'alpha'); |
64 | 64 | $search_label = GETPOST('search_label', 'alpha'); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $search_date_endday = GETPOSTINT('search_date_endday'); |
73 | 73 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
74 | 74 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
75 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
75 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
76 | 76 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
77 | 77 | $search_country = GETPOST('search_country', 'aZ09'); |
78 | 78 | $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); |
@@ -568,14 +568,14 @@ discard block |
||
568 | 568 | $thirdpartystatic->client = $objp->client; |
569 | 569 | $thirdpartystatic->fournisseur = $objp->fournisseur; |
570 | 570 | $thirdpartystatic->code_client = $objp->code_client; |
571 | - $thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility |
|
571 | + $thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility |
|
572 | 572 | $thirdpartystatic->code_compta_client = $objp->code_compta_client; |
573 | 573 | $thirdpartystatic->code_fournisseur = $objp->code_fournisseur; |
574 | 574 | $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur; |
575 | 575 | $thirdpartystatic->email = $objp->email; |
576 | 576 | $thirdpartystatic->country_code = $objp->country_code; |
577 | 577 | $thirdpartystatic->tva_intra = $objp->tva_intra; |
578 | - $thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
578 | + $thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion) |
|
579 | 579 | |
580 | 580 | $product_static->ref = $objp->product_ref; |
581 | 581 | $product_static->id = $objp->product_id; |