diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index fce09733349..a4c27855a30 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -30,8 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php' require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -if (!empty($conf->projet->enabled)) -{ +if (!empty($conf->projet->enabled)) { include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } @@ -124,8 +123,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') { $object->fetch($id); $result = $object->delete($user); - if ($result > 0) - { + if ($result > 0) { header("Location: list.php"); exit; } else { @@ -137,7 +135,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // Add social contribution if ($action == 'add' && $user->rights->tax->charges->creer) { - $amount = price2num(GETPOST('amount')); + $amount = price2num(GETPOST('amount'), 'MT'); if (!$dateech) { @@ -155,23 +153,21 @@ if ($action == 'add' && $user->rights->tax->charges->creer) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors'); $action = 'create'; - } elseif (!is_numeric($amount)) - { + } elseif (!is_numeric($amount)) { setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors'); $action = 'create'; } else { $object->type = $actioncode; $object->label = GETPOST('label', 'alpha'); $object->date_ech = $dateech; - $object->periode = $dateperiod; - $object->amount = $amount; - $object->mode_reglement_id = GETPOST('mode_reglement_id'); - $object->fk_account = GETPOST('fk_account', 'int'); - $object->fk_project = GETPOST('fk_project'); + $object->periode = $dateperiod; + $object->amount = $amount; + $object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int'); + $object->fk_account = (int) GETPOST('fk_account', 'int'); + $object->fk_project = (int) GETPOST('fk_project', 'int'); $id = $object->create($user); - if ($id <= 0) - { + if ($id <= 0) { setEventMessages($object->error, $object->errors, 'errors'); $action = 'create'; } @@ -181,7 +177,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer) if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer) { - $amount = price2num(GETPOST('amount')); + $amount = price2num(GETPOST('amount'), 'MT'); if (!$dateech) { @@ -203,12 +199,11 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre $result = $object->fetch($id); $object->date_ech = $dateech; - $object->periode = $dateperiod; - $object->amount = price2num($amount); + $object->periode = $dateperiod; + $object->amount = $amount; $result = $object->update($user); - if ($result <= 0) - { + if ($result <= 0) { setEventMessages($object->error, $object->errors, 'errors'); } } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 830d391ad9c..e62e2399901 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -93,7 +93,6 @@ $search_btn = GETPOST('button_search', 'alpha'); $search_remove_btn = GETPOST('button_removefilter', 'alpha'); $status = GETPOST('statut', 'alpha'); -$search_status = GETPOST('search_status'); // Security check $orderid = GETPOST('orderid', 'int');