Skip to content
Snippets Groups Projects
Commit a462cd23 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into 3.8

parents 9e2a0562 4a88c9ea
Branches
No related tags found
No related merge requests found
Showing
with 2 additions and 2 deletions
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -115,7 +115,7 @@ else if ($action == 'add' && $user->rights->deplacement->creer) ...@@ -115,7 +115,7 @@ else if ($action == 'add' && $user->rights->deplacement->creer)
$error=0; $error=0;
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); $object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
$object->km = GETPOST('km','int'); $object->km = price2num(GETPOST('km','alpha'), 'MU'); // Not 'int', it may be a formated amount
$object->type = GETPOST('type','alpha'); $object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int'); $object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int'); $object->fk_user = GETPOST('fk_user','int');
...@@ -174,7 +174,7 @@ else if ($action == 'update' && $user->rights->deplacement->creer) ...@@ -174,7 +174,7 @@ else if ($action == 'update' && $user->rights->deplacement->creer)
$result = $object->fetch($id); $result = $object->fetch($id);
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); $object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
$object->km = GETPOST('km','int'); $object->km = price2num(GETPOST('km','alpha'), 'MU'); // Not 'int', it may be a formated amount
$object->type = GETPOST('type','alpha'); $object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int'); $object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int'); $object->fk_user = GETPOST('fk_user','int');
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment