@@ -201,7 +201,7 @@ |
||
201 | 201 | $tmplotstatic->eatby = $objp->eatby; |
202 | 202 | |
203 | 203 | print '<tr class="oddeven">'; |
204 | - print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement', 'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>'; |
|
204 | + print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement', 'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>'; |
|
205 | 205 | print '<td class="tdoverflowmax150">'; |
206 | 206 | print $producttmp->getNomUrl(1); |
207 | 207 | print "</td>\n"; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $fk_entrepot = GETPOST('fk_entrepot', 'int'); |
69 | 69 | |
70 | 70 | // List all visible warehouses |
71 | -$resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize(getEntity('stock')) .")"); |
|
71 | +$resWar = $db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (".$db->sanitize(getEntity('stock')).")"); |
|
72 | 72 | $listofqualifiedwarehousesid = ""; |
73 | 73 | $count = 0; |
74 | 74 | while ($tmpobj = $db->fetch_object($resWar)) { |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p'; |
362 | 362 | $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product'; |
363 | 363 | $list_warehouse = (empty($listofqualifiedwarehousesid) ? '0' : $listofqualifiedwarehousesid); |
364 | -$sql .= ' AND s.fk_entrepot IN ('.$db->sanitize($list_warehouse) .')'; |
|
364 | +$sql .= ' AND s.fk_entrepot IN ('.$db->sanitize($list_warehouse).')'; |
|
365 | 365 | |
366 | 366 | //$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')'; |
367 | 367 | if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) { |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | exit; |
801 | 801 | } |
802 | 802 | |
803 | - $prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock?', novirtual':''), $draftchecked); |
|
803 | + $prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock ? ', novirtual' : ''), $draftchecked); |
|
804 | 804 | |
805 | 805 | // Multilangs |
806 | 806 | if (getDolGlobalInt('MAIN_MULTILANGS')) { |
@@ -672,8 +672,12 @@ discard block |
||
672 | 672 | if ($limit > 0 && $limit != $conf->liste_limit) { |
673 | 673 | $filters .= '&limit='.((int) $limit); |
674 | 674 | } |
675 | -if (!empty($includeproductswithoutdesiredqty)) $filters .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty); |
|
676 | -if (!empty($salert)) $filters .= '&salert='.urlencode($salert); |
|
675 | +if (!empty($includeproductswithoutdesiredqty)) { |
|
676 | + $filters .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty); |
|
677 | +} |
|
678 | +if (!empty($salert)) { |
|
679 | + $filters .= '&salert='.urlencode($salert); |
|
680 | +} |
|
677 | 681 | |
678 | 682 | $param = (isset($type) ? '&type='.urlencode($type) : ''); |
679 | 683 | $param .= '&fourn_id='.urlencode($fourn_id).'&search_label='.urlencode($search_label).'&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty).'&salert='.urlencode($salert).'&draftorder='.urlencode($draftorder); |
@@ -681,8 +685,12 @@ discard block |
||
681 | 685 | $param .= '&mode='.urlencode($mode); |
682 | 686 | $param .= '&fk_supplier='.urlencode($fk_supplier); |
683 | 687 | $param .= '&fk_entrepot='.urlencode($fk_entrepot); |
684 | -if (!empty($includeproductswithoutdesiredqty)) $param .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty); |
|
685 | -if (!empty($salert)) $param .= '&salert='.urlencode($salert); |
|
688 | +if (!empty($includeproductswithoutdesiredqty)) { |
|
689 | + $param .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty); |
|
690 | +} |
|
691 | +if (!empty($salert)) { |
|
692 | + $param .= '&salert='.urlencode($salert); |
|
693 | +} |
|
686 | 694 | |
687 | 695 | $stocklabel = $langs->trans('Stock'); |
688 | 696 | $stocklabelbis = $langs->trans('Stock'); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | |
34 | 34 | // Get parameters |
35 | 35 | $id = GETPOST('id', 'int'); |
36 | -$ref = GETPOST('ref', 'alpha'); |
|
36 | +$ref = GETPOST('ref', 'alpha'); |
|
37 | 37 | $action = GETPOST('action', 'aZ09'); |
38 | 38 | |
39 | 39 | // Initialize technical objects |
@@ -341,9 +341,9 @@ |
||
341 | 341 | $product_static->status_buy = $objp->tobuy; |
342 | 342 | $product_static->status_batch = $objp->tobatch; |
343 | 343 | |
344 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read'); |
|
344 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read'); |
|
345 | 345 | if ($product_static->isService()) { |
346 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read'); |
|
346 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read'); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | // Multilangs |
@@ -288,7 +288,7 @@ |
||
288 | 288 | print '<tr class="oddeven" height="24">'; |
289 | 289 | print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>'; |
290 | 290 | print '<td class="right">'.$val['nb'].'</td>'; |
291 | - print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>'; |
|
291 | + print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>'; |
|
292 | 292 | print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>'; |
293 | 293 | print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>'; |
294 | 294 | print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>'; |
@@ -357,7 +357,7 @@ |
||
357 | 357 | if (isModEnabled('contrat')) { |
358 | 358 | $formcontract = new FormContract($db); |
359 | 359 | print "<tr><td>".$langs->trans("Contract")."</td><td>"; |
360 | - $contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contract) ? $object->fk_contract : 0) ; |
|
360 | + $contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contract) ? $object->fk_contract : 0); |
|
361 | 361 | $numcontract = $formcontract->select_contract($object->thirdparty->id, $contractid, 'contracttid'); |
362 | 362 | print "</td></tr>"; |
363 | 363 | } |
@@ -126,7 +126,7 @@ |
||
126 | 126 | $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); |
127 | 127 | |
128 | 128 | // Amount |
129 | - $morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency); |
|
129 | + $morehtmlref .= '<br>'.$langs->trans('Amount').' : '.price($object->amount, '', $langs, 0, 0, -1, $conf->currency); |
|
130 | 130 | |
131 | 131 | $allow_delete = 1; |
132 | 132 | // Bank account |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $search_date_endday = GETPOST('search_date_endday', 'int'); |
75 | 75 | $search_date_endmonth = GETPOST('search_date_endmonth', 'int'); |
76 | 76 | $search_date_endyear = GETPOST('search_date_endyear', 'int'); |
77 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
77 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
78 | 78 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
79 | 79 | $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int'); |
80 | 80 | $search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int'); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int'); |
83 | 83 | $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int'); |
84 | 84 | $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int'); |
85 | -$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
85 | +$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
86 | 86 | $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear); |
87 | 87 | $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int'); |
88 | 88 | $search_montant_ht = GETPOST('search_montant_ht', 'alpha'); |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | if ($searchCategoryProductOperator == 0) { |
443 | 443 | $searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")"; |
444 | 444 | } else { |
445 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct); |
|
445 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct); |
|
446 | 446 | } |
447 | 447 | } |
448 | 448 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * \brief Main page for ECM section area |
24 | 24 | */ |
25 | 25 | |
26 | -if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1); |
|
26 | +if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1); |
|
27 | 27 | |
28 | 28 | // Load Dolibarr environment |
29 | 29 | require '../main.inc.php'; |
@@ -23,7 +23,9 @@ |
||
23 | 23 | * \brief Main page for ECM section area |
24 | 24 | */ |
25 | 25 | |
26 | -if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1); |
|
26 | +if (! defined('DISABLE_JS_GRAHP')) { |
|
27 | + define('DISABLE_JS_GRAPH', 1); |
|
28 | +} |
|
27 | 29 | |
28 | 30 | // Load Dolibarr environment |
29 | 31 | require '../main.inc.php'; |