diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 68be93f7ed1..e5f84bbec77 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -62,10 +62,12 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes') //if ($user->rights->facture->creer) $amount_ttc_1 = GETPOST('amount_ttc_1'); + $amount_ttc_1 = price2num($amount_ttc_1); $amount_ttc_2 = GETPOST('amount_ttc_2'); + $amount_ttc_2 = price2num($amount_ttc_2); $error = 0; - $remid = GETPOST("remid") ?GETPOST("remid") : 0; + $remid = (GETPOST("remid", 'int') ? GETPOST("remid", 'int') : 0); $discount = new DiscountAbsolute($db); $res = $discount->fetch($remid); if (!$res > 0) diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php index cfa45cb6a4b..ea446799b79 100644 --- a/htdocs/core/modules/modStripe.class.php +++ b/htdocs/core/modules/modStripe.class.php @@ -150,6 +150,8 @@ class modStripe extends DolibarrModules 'target' => '', 'user' => 0 ); + + $r++; $this->menu[$r] = array( 'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe', 'type' => 'left', diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index b44c9b0e9d6..b15631a8f86 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2148,12 +2148,15 @@ else if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) { print ''; + // Num print ''; print $numline; print ''; + // Date print ''.dol_print_date($db->jdate($line->date), 'day').''; + // Project if (!empty($conf->projet->enabled)) { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index d3a647adfcf..335881f7993 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -152,8 +152,15 @@ if ($action == 'order' && isset($_POST['valid'])) { $productsupplier->getMultiLangs(); } - $line->desc = $productsupplier->description; - if (!empty($conf->global->MAIN_MULTILANGS)) + + // if we use supplier description of the products + if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) { + $desc = $productsupplier->desc_supplier; + } else { + $desc = $productsupplier->description; + } + $line->desc = $desc; + if (! empty($conf->global->MAIN_MULTILANGS)) { // TODO Get desc in language of thirdparty } diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php index 2815b1ac5a9..3d643fef35d 100644 --- a/htdocs/stripe/payout.php +++ b/htdocs/stripe/payout.php @@ -106,7 +106,6 @@ if (!$rowid) { print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center '); print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left '); print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); - print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right '); print "\n"; @@ -203,8 +202,7 @@ if (!$rowid) { // Type print ''.$payout->description.''; // Amount - print ''.price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)).""; - print ''.price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)).""; + print ''.price(($payout->amount) / 100, 0, '', 1, -1, -1, strtoupper($payout->currency)).""; // Status print ""; if ($payout->status == 'paid') { diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 6a0067bf220..624bdb89bcf 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -105,7 +105,7 @@ if (!$rowid) { print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left '); print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right_'); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right '); print "\n"; print "\n"; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index e72c2833933..609aa11abb9 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -235,8 +235,11 @@ if (empty($reshook)) { $object->employee = GETPOST('employee', 'alphanohtml'); $object->thm = GETPOST("thm", 'alphanohtml') != '' ? GETPOST("thm", 'alphanohtml') : ''; + $object->thm = price2num($object->thm); $object->tjm = GETPOST("tjm", 'alphanohtml') != '' ? GETPOST("tjm", 'alphanohtml') : ''; + $object->tjm = price2num($object->tjm); $object->salary = GETPOST("salary", 'alphanohtml') != '' ? GETPOST("salary", 'alphanohtml') : ''; + $object->salary = price2num($object->salary); $object->salaryextra = GETPOST("salaryextra", 'alphanohtml') != '' ? GETPOST("salaryextra", 'alphanohtml') : ''; $object->weeklyhours = GETPOST("weeklyhours", 'alphanohtml') != '' ? GETPOST("weeklyhours", 'alphanohtml') : ''; @@ -394,10 +397,15 @@ if (empty($reshook)) { $object->employee = GETPOST('employee', 'int'); $object->thm = GETPOST("thm", 'alphanohtml') != '' ? GETPOST("thm", 'alphanohtml') : ''; + $object->thm = price2num($object->thm); $object->tjm = GETPOST("tjm", 'alphanohtml') != '' ? GETPOST("tjm", 'alphanohtml') : ''; + $object->thm = price2num($object->thm); $object->salary = GETPOST("salary", 'alphanohtml') != '' ? GETPOST("salary", 'alphanohtml') : ''; + $object->salary = price2num($object->salary); $object->salaryextra = GETPOST("salaryextra", 'alphanohtml') != '' ? GETPOST("salaryextra", 'alphanohtml') : ''; + $object->salaryextra = price2num($object->salaryextra); $object->weeklyhours = GETPOST("weeklyhours", 'alphanohtml') != '' ? GETPOST("weeklyhours", 'alphanohtml') : ''; + $object->weeklyhours = price2num($object->weeklyhours); $object->color = GETPOST("color", 'alphanohtml') != '' ? GETPOST("color", 'alphanohtml') : ''; $dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));