diff --git a/ChangeLog b/ChangeLog index a55e95630d7c9355eed353b3ac31779d669c9c1f..64207534269f6aa394f992eed7c16cb2882f64fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -198,6 +198,11 @@ 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 +Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card +Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers +Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project +Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 305843f7188973f786924188a32e3cfb3afe3800..4a4e66e4ea5a0ec61f97aa3fe9131fe131f900d5 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -6,7 +6,7 @@ * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011 Remy Younes <ryounes@gmail.com> - * Copyright (C) 2012-2013 Marcos García <marcosgdf@gmail.com> + * Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr> * Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com> * @@ -1116,7 +1116,7 @@ if ($id) if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0; - $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&'; + $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'').'&id='.$id.'&'; // Active print '<td align="center" class="nowrap">'; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index d7b082fc65e103fc924df4f8520a48a96ec2caa4..9bf4fd9ea2e80dd20d4501837d8ce12dd019111c 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copytight (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copytight (C) 2012 Juanjo Menent <jmenent@2byte.es> + * 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 @@ -48,7 +49,7 @@ if ($action == 'add') $mesg=''; $dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int')); $label = GETPOST('label','alpha'); - $amount= GETPOST('amount','int'); + $amount= GETPOST('amount'); if (! $label) { diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index e0183094d231b06c8abdea330467009a887262ea..c92263d10529696d089b77d153d7c3bb179aedf9 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 @@ -98,8 +99,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'); @@ -157,8 +164,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'); @@ -200,12 +213,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); -} /* @@ -348,7 +355,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 @@ -416,10 +423,12 @@ else if ($id) print '</td></tr>'; // Type + $form->load_cache_types_fees(); + print '<tr><td>'; print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); print '</td><td>'; - print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); + print $form->editfieldval("Type",'type', $form->cache_types_fees[$object->type],$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); print '</td></tr>'; // Who @@ -440,7 +449,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 diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index e120ce24a40921c4583190da563099f6dc188b5e..d86061949dd37c0da71e5ea93872f38970796083 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -176,8 +176,6 @@ class Expedition extends CommonObject $now=dol_now(); - if (empty($this->model_pdf)) $this->model_pdf=$conf->global->EXPEDITION_ADDON_PDF; - require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; $error = 0; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 7dd671d109ff82218d47ba2535957ea571ed0ef7..5afbb78d241ea005909e2d0900a41e7ea4ddaa17 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -219,7 +219,6 @@ if (empty($reshook)) { $action='create'; } } - /* * Build a receiving receipt */ @@ -707,6 +706,14 @@ if ($action == 'create') print '<td colspan="3">'; print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">'; print "</td></tr>\n"; + + // Document model + print "<tr><td>".$langs->trans("Model")."</td>"; + print '<td colspan="3">'; + include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php'; + $liste = ModelePdfExpedition::liste_modeles($db); + print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF); + print "</td></tr>\n"; // Other attributes $parameters=array('colspan' => ' colspan="3"'); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 80a12964792b22185836bc415e7c255ccaf61bce..1c8f132cdbb12f5d70614a717d3bd25ba6a4f94d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -315,7 +315,14 @@ foreach ($listofreferent as $key => $value) } // Status - print '<td align="right">'.$element->getLibStatut(5).'</td>'; + print '<td align="right">'; + if ($element instanceof CommonInvoice) { + //This applies for Facture and FactureFournisseur + print $element->getLibStatut(5, $element->getSommePaiement()); + } else { + print $element->getLibStatut(5); + } + print '</td>'; print '</tr>';