@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | // Security check |
54 | 54 | if ($user->socid) $socid = $user->socid; |
55 | 55 | |
56 | -$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | -$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | -$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | -$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
56 | +$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | +$search_date_startday = GETPOST('search_date_startday', 'int'); |
|
58 | +$search_date_startmonth = GETPOST('search_date_startmonth', 'int'); |
|
59 | +$search_date_startyear = GETPOST('search_date_startyear', 'int'); |
|
60 | 60 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
61 | -$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
61 | +$search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
|
62 | 62 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
63 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | -$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
|
65 | -$search_user = GETPOST('search_user', 'alpha'); |
|
63 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
64 | +$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
|
65 | +$search_user = GETPOST('search_user', 'alpha'); |
|
66 | 66 | $search_payment_type = GETPOST('search_payment_type'); |
67 | -$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
67 | +$search_cheque_num = GETPOST('search_cheque_num', 'alpha'); |
|
68 | 68 | $search_bank_account = GETPOST('search_bank_account', 'int'); |
69 | -$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
69 | +$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x' |
|
70 | 70 | |
71 | 71 | $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; |
72 | 72 | $sortfield = GETPOST('sortfield', 'aZ09comma'); |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | $sql .= natural_search('pndf.rowid', $search_ref); |
199 | 199 | } |
200 | 200 | if ($search_date_start) { |
201 | - $sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'"; |
|
201 | + $sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'"; |
|
202 | 202 | } |
203 | 203 | if ($search_date_end) { |
204 | - $sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'"; |
|
204 | + $sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'"; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | if ($search_user) { |
@@ -49,7 +49,9 @@ |
||
49 | 49 | $socid = GETPOST('socid', 'int'); |
50 | 50 | |
51 | 51 | // Security check |
52 | -if ($user->socid) $socid = $user->socid; |
|
52 | +if ($user->socid) { |
|
53 | + $socid = $user->socid; |
|
54 | +} |
|
53 | 55 | |
54 | 56 | $search_ref = GETPOST('search_ref', 'alpha'); |
55 | 57 | $search_date_startday = GETPOST('search_date_startday', 'int'); |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | print '<tr class="oddeven"><td>'; |
260 | 260 | print $langs->trans("NumberOfTerminals"); |
261 | 261 | print '<td colspan="2">'; |
262 | -print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS) . '">'; |
|
262 | +print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="'.(empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS).'">'; |
|
263 | 263 | print "</td></tr>\n"; |
264 | 264 | |
265 | 265 | // Services |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | print '<tr class="oddeven"><td>'; |
393 | 393 | print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc")); |
394 | 394 | print '<td colspan="2">'; |
395 | - print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')) . '">'; |
|
395 | + print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="'.(getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')).'">'; |
|
396 | 396 | print "</td></tr>\n"; |
397 | 397 | } |
398 | 398 |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | $pdf->SetFont('', 'B', $default_font_size - 3); |
686 | 686 | |
687 | 687 | // Output Rect |
688 | - $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter |
|
688 | + $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter |
|
689 | 689 | |
690 | 690 | $pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200))); |
691 | 691 | $pdf->SetDrawColor(200, 200, 200); |
@@ -696,24 +696,24 @@ discard block |
||
696 | 696 | |
697 | 697 | |
698 | 698 | if (empty($hidetop)) { |
699 | - $pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11); // line takes a position y in 2nd parameter and 4th parameter |
|
699 | + $pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11); // line takes a position y in 2nd parameter and 4th parameter |
|
700 | 700 | $pdf->SetXY($this->posxdesc - 1, $tab_top + 1); |
701 | 701 | $pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L'); |
702 | 702 | } |
703 | 703 | |
704 | - $pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height); |
|
704 | + $pdf->line($this->posxlabel - 1, $tab_top, $this->posxlabel - 1, $tab_top + $tab_height); |
|
705 | 705 | if (empty($hidetop)) { |
706 | 706 | $pdf->SetXY($this->posxlabel - 1, $tab_top + 1); |
707 | 707 | $pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'C'); |
708 | 708 | } |
709 | 709 | |
710 | - $pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height); |
|
710 | + $pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height); |
|
711 | 711 | if (empty($hidetop)) { |
712 | 712 | $pdf->SetXY($this->posxqty - 1, $tab_top + 1); |
713 | 713 | $pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'C'); |
714 | 714 | } |
715 | 715 | |
716 | - $pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height); |
|
716 | + $pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height); |
|
717 | 717 | if (empty($hidetop)) { |
718 | 718 | $pdf->SetXY($this->posxup - 1, $tab_top + 1); |
719 | 719 | $pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'C'); |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'C'); |
726 | 726 | } |
727 | 727 | |
728 | - $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); |
|
728 | + $pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height); |
|
729 | 729 | if (empty($hidetop)) { |
730 | 730 | $pdf->SetXY($this->posxdiscount - 1, $tab_top + 1); |
731 | 731 | $pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'C'); |
@@ -303,7 +303,7 @@ |
||
303 | 303 | $sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'"; |
304 | 304 | } |
305 | 305 | if (preg_match('/_dtend$/', $key)) { |
306 | - $sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'"; |
|
306 | + $sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'"; |
|
307 | 307 | } |
308 | 308 | } |
309 | 309 | } |
@@ -201,7 +201,7 @@ |
||
201 | 201 | } |
202 | 202 | |
203 | 203 | div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown { |
204 | - line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46' ); ?>px; |
|
204 | + line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46'); ?>px; |
|
205 | 205 | } |
206 | 206 | a.top-menu-dropdown-link { |
207 | 207 | padding: 8px; |
@@ -73,7 +73,7 @@ |
||
73 | 73 | { |
74 | 74 | global $conf; |
75 | 75 | |
76 | - $uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE'); |
|
76 | + $uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE'); |
|
77 | 77 | |
78 | 78 | if ($uselogfile) { |
79 | 79 | $this->getStorageLogs($this->path); |
@@ -507,7 +507,7 @@ |
||
507 | 507 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
508 | 508 | $cssforfield .= ($cssforfield ? ' ' : '').'right'; |
509 | 509 | } |
510 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
510 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
511 | 511 | if (!empty($arrayfields['t.'.$key]['checked'])) { |
512 | 512 | print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n"; |
513 | 513 | $totalarray['nbfield']++; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0)) { |
32 | 32 | if (($id > 0 && is_numeric($id)) || !empty($ref)) { // To discard case when id is list of ids like '1,2,3...' |
33 | - $ret = $object->fetch($id, (empty($ref)? '' : $ref)); |
|
33 | + $ret = $object->fetch($id, (empty($ref) ? '' : $ref)); |
|
34 | 34 | if ($ret > 0) { |
35 | 35 | $object->fetch_thirdparty(); |
36 | 36 | $id = $object->id; |
@@ -235,7 +235,7 @@ |
||
235 | 235 | if (!function_exists('simplexml_load_string')) { |
236 | 236 | throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.'); |
237 | 237 | } |
238 | - $xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
238 | + $xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
239 | 239 | if (libxml_get_errors()) { |
240 | 240 | $msg = var_export(libxml_get_errors(), true); |
241 | 241 | libxml_clear_errors(); |