lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-13 11:32:00 +01:00
parent 5c27ec5d25
commit ced386fdca
5 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commondocgenerator.class.php
View File

@ -585,7 +585,7 @@ abstract class CommonDocGenerator
$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true); $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
$line->fetch_optionals(); $line->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key=$array_key, $outputlangs); $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
// Load product data optional fields to the line -> enables to use "line_options_{extrafield}" // Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
if (isset($line->fk_product) && $line->fk_product > 0) if (isset($line->fk_product) && $line->fk_product > 0)

68
htdocs/product/stock/movement_card.php
View File

@ -52,23 +52,23 @@ $result=restrictedArea($user,'stock');
$id=GETPOST('id', 'int'); $id=GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
$msid=GETPOST('msid', 'int'); $msid=GETPOST('msid', 'int');
$product_id=GETPOST("product_id"); $product_id=GETPOST("product_id", 'int');
$action=GETPOST('action', 'aZ09'); $action=GETPOST('action', 'aZ09');
$cancel=GETPOST('cancel', 'alpha'); $cancel=GETPOST('cancel', 'alpha');
$contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'movementlist'; $contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'movementlist';
$idproduct = GETPOST('idproduct', 'int'); $idproduct = GETPOST('idproduct', 'int');
$year = GETPOST("year"); $year = GETPOST("year", 'int');
$month = GETPOST("month"); $month = GETPOST("month", 'int');
$search_ref = GETPOST('search_ref', 'alpha'); $search_ref = GETPOST('search_ref', 'alpha');
$search_movement = GETPOST("search_movement"); $search_movement = GETPOST("search_movement", 'alpha');
$search_product_ref = trim(GETPOST("search_product_ref")); $search_product_ref = trim(GETPOST("search_product_ref", 'alpha'));
$search_product = trim(GETPOST("search_product")); $search_product = trim(GETPOST("search_product", 'alpha'));
$search_warehouse = trim(GETPOST("search_warehouse")); $search_warehouse = trim(GETPOST("search_warehouse", 'alpha'));
$search_inventorycode = trim(GETPOST("search_inventorycode")); $search_inventorycode = trim(GETPOST("search_inventorycode", 'alpha'));
$search_user = trim(GETPOST("search_user")); $search_user = trim(GETPOST("search_user", 'alpha'));
$search_batch = trim(GETPOST("search_batch")); $search_batch = trim(GETPOST("search_batch", 'alpha'));
$search_qty = trim(GETPOST("search_qty")); $search_qty = trim(GETPOST("search_qty", 'alpha'));
$search_type_mouvement=GETPOST('search_type_mouvement','int'); $search_type_mouvement=GETPOST('search_type_mouvement','int');
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit; $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
@ -185,22 +185,22 @@ if ($action == "correct_stock")
if ($product->hasbatch()) if ($product->hasbatch())
{ {
$batch=GETPOST('batch_number'); $batch=GETPOST('batch_number', 'alpha');
//$eatby=GETPOST('eatby'); //$eatby=GETPOST('eatby');
//$sellby=GETPOST('sellby'); //$sellby=GETPOST('sellby');
$eatby=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear')); $eatby=dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
$sellby=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear')); $sellby=dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
$result=$product->correct_stock_batch( $result=$product->correct_stock_batch(
$user, $user,
$id, $id,
GETPOST("nbpiece", 'int'), GETPOST("nbpiece", 'int'),
GETPOST("mouvement"), GETPOST("mouvement", 'int'),
GETPOST("label", 'san_alpha'), GETPOST("label", 'san_alpha'),
GETPOST('unitprice'), GETPOST('unitprice', 'alpha'),
$eatby,$sellby,$batch, $eatby,$sellby,$batch,
GETPOST('inventorycode'), GETPOST('inventorycode', 'alpha'),
$origin_element, $origin_element,
$origin_id $origin_id
); // We do not change value of stock for a correction ); // We do not change value of stock for a correction
@ -211,10 +211,10 @@ if ($action == "correct_stock")
$user, $user,
$id, $id,
GETPOST("nbpiece", 'int'), GETPOST("nbpiece", 'int'),
GETPOST("mouvement"), GETPOST("mouvement", 'alpha'),
GETPOST("label",'san_alpha'), GETPOST("label",'san_alpha'),
GETPOST('unitprice'), GETPOST('unitprice', 'alpha'),
GETPOST('inventorycode'), GETPOST('inventorycode', 'alpha'),
$origin_element, $origin_element,
$origin_id $origin_id
); // We do not change value of stock for a correction ); // We do not change value of stock for a correction
@ -272,7 +272,7 @@ if ($action == "transfert_stock" && ! $cancel)
$product = new Product($db); $product = new Product($db);
$result=$product->fetch($product_id); $result=$product->fetch($product_id);
if ($product->hasbatch() && ! GETPOST("batch_number")) if ($product->hasbatch() && ! GETPOST("batch_number", 'alpha'))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
$error++; $error++;
@ -319,7 +319,7 @@ if ($action == "transfert_stock" && ! $cancel)
else else
{ {
$srcwarehouseid=$id; $srcwarehouseid=$id;
$batch=GETPOST('batch_number'); $batch=GETPOST('batch_number', 'alpha');
$eatby=$d_eatby; $eatby=$d_eatby;
$sellby=$d_sellby; $sellby=$d_sellby;
} }
@ -335,7 +335,7 @@ if ($action == "transfert_stock" && ! $cancel)
GETPOST("label", 'san_alpha'), GETPOST("label", 'san_alpha'),
$pricesrc, $pricesrc,
$eatby,$sellby,$batch, $eatby,$sellby,$batch,
GETPOST('inventorycode') GETPOST('inventorycode', 'alpha')
); );
// Add stock // Add stock
$result2=$product->correct_stock_batch( $result2=$product->correct_stock_batch(
@ -346,7 +346,7 @@ if ($action == "transfert_stock" && ! $cancel)
GETPOST("label", 'san_alpha'), GETPOST("label", 'san_alpha'),
$pricedest, $pricedest,
$eatby,$sellby,$batch, $eatby,$sellby,$batch,
GETPOST('inventorycode') GETPOST('inventorycode', 'alpha')
); );
} }
} }
@ -356,22 +356,22 @@ if ($action == "transfert_stock" && ! $cancel)
$result1=$product->correct_stock( $result1=$product->correct_stock(
$user, $user,
$id, $id,
GETPOST("nbpiece"), GETPOST("nbpiece", 'int'),
1, 1,
GETPOST("label"), GETPOST("label", 'alpha'),
$pricesrc, $pricesrc,
GETPOST('inventorycode') GETPOST('inventorycode', 'alpha')
); );
// Add stock // Add stock
$result2=$product->correct_stock( $result2=$product->correct_stock(
$user, $user,
GETPOST("id_entrepot_destination"), GETPOST("id_entrepot_destination"),
GETPOST("nbpiece"), GETPOST("nbpiece", 'int'),
0, 0,
GETPOST("label"), GETPOST("label", 'alpha'),
$pricedest, $pricedest,
GETPOST('inventorycode') GETPOST('inventorycode', 'alpha')
); );
} }
if (! $error && $result1 >= 0 && $result2 >= 0) if (! $error && $result1 >= 0 && $result2 >= 0)
@ -693,9 +693,9 @@ if ($resql)
} }
$param=''; $param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($id > 0) $param.='&id='.$id; if ($id > 0) $param.='&id='.urlencode($id);
if ($search_movement) $param.='&search_movement='.urlencode($search_movement); if ($search_movement) $param.='&search_movement='.urlencode($search_movement);
if ($search_inventorycode) $param.='&search_inventorycode='.urlencode($search_inventorycode); if ($search_inventorycode) $param.='&search_inventorycode='.urlencode($search_inventorycode);
if ($search_type_mouvement) $param.='&search_type_mouvement='.urlencode($search_type_mouvement); if ($search_type_mouvement) $param.='&search_type_mouvement='.urlencode($search_type_mouvement);
@ -706,7 +706,7 @@ if ($resql)
if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined
if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined
if ($search_user) $param.='&search_user='.urlencode($search_user); if ($search_user) $param.='&search_user='.urlencode($search_user);
if ($idproduct > 0) $param.='&idproduct='.$idproduct; if ($idproduct > 0) $param.='&idproduct='.urlencode($idproduct);
// Add $param from extra fields // Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

2
htdocs/projet/tasks/time.php
View File

@ -1045,7 +1045,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$contactsofproject=$projectstatic->getListContactId('internal'); $contactsofproject=$projectstatic->getListContactId('internal');
if (count($contactsofproject)>0) if (count($contactsofproject)>0)
{ {
if (in_array($user->id, $userid=$contactsofproject)) $userid = $user->id; if (in_array($user->id, $contactsofproject)) $userid = $user->id;
else $userid = $contactsofproject[0]; else $userid = $contactsofproject[0];
if ($projectstatic->public) $contactsofproject = array(); if ($projectstatic->public) $contactsofproject = array();
print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200'); print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');

2
htdocs/resource/class/html.formresource.class.php
View File

@ -85,7 +85,7 @@ class FormResource
$resourcestat = new Dolresource($this->db); $resourcestat = new Dolresource($this->db);
$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, $offset, $filter=''); $resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, $offset, $filter);
if ($outputmode != 2) if ($outputmode != 2)
{ {