diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 7a8b03cde4e..ad8530fd17f 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -61,8 +61,10 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
//if ($user->rights->societe->creer)
//if ($user->rights->facture->creer)
- $amount_ttc_1=GETPOST('amount_ttc_1');
- $amount_ttc_2=GETPOST('amount_ttc_2');
+ $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;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 07318bc0571..b95dad0f200 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2146,12 +2146,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 113b5b1c879..770904fb4a0 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -150,7 +150,13 @@ if ($action == 'order' && isset($_POST['valid']))
{
$productsupplier->getMultiLangs();
}
- $line->desc = $productsupplier->description;
+
+ // 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/user/card.php b/htdocs/user/card.php
index 34802a57a5d..31b2cc78011 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -226,8 +226,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') : '';
@@ -379,10 +382,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'));