From 6173706531ac4a19e0c5b66d3f066e6b98cc2c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sun, 12 Apr 2015 21:55:20 +0200
Subject: [PATCH] Fix: [ bug #1906 ] Deplacement does not allow translated
decimal format
---
ChangeLog | 1 +
htdocs/compta/deplacement/fiche.php | 27 +++++++++++++++++----------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 31e0bad5a16..89e358f1fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics
Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
Fix: [ bug #1846 ] Browser IE11 not detected
+Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 808d9163222..65328ff6bfb 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -123,8 +124,14 @@ else if ($action == 'add' && $user->rights->deplacement->creer)
{
$error=0;
+ $km = GETPOST('km');
+
+ if ($km) {
+ $km = price2num($km);
+ }
+
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
- $object->km = GETPOST('km','int');
+ $object->km = $km;
$object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int');
@@ -182,8 +189,14 @@ else if ($action == 'update' && $user->rights->deplacement->creer)
{
$result = $object->fetch($id);
+ $km = GETPOST('km');
+
+ if ($km) {
+ $km = price2num($km);
+ }
+
$object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
- $object->km = GETPOST('km','int');
+ $object->km = $km;
$object->type = GETPOST('type','alpha');
$object->socid = GETPOST('socid','int');
$object->fk_user = GETPOST('fk_user','int');
@@ -225,12 +238,6 @@ else if ($action == 'setdated' && $user->rights->deplacement->creer)
$result=$object->setValueFrom('dated',$dated,'','','date');
if ($result < 0) dol_print_error($db, $object->error);
}
-else if ($action == 'setkm' && $user->rights->deplacement->creer)
-{
- $object->fetch($id);
- $result=$object->setValueFrom('km',GETPOST('km','int'));
- if ($result < 0) dol_print_error($db, $object->error);
-}
else if ($action == 'setnote_public' && $user->rights->deplacement->creer)
{
$object->fetch($id);
@@ -385,7 +392,7 @@ else if ($id)
// Km
print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
- print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+ print '<input name="km" class="flat" size="10" value="'.price($object->km).'">';
print '</td></tr>';
// Where
@@ -477,7 +484,7 @@ else if ($id)
print '<tr><td valign="top">';
print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
print '</td><td>';
- print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+ print $form->editfieldval("FeesKilometersOrAmout",'km',price($object->km),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
print "</td></tr>";
// Where
--
GitLab