From cfcbc34972bfdc35e5e9208b6eceab5e1366bb21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Apr 2016 19:16:40 +0200
Subject: [PATCH] FIX Default vat is not set correctly when an error occured
and we use VAT identified by a code.
---
htdocs/core/class/html.form.class.php | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1e60fb11377..1dc472ee888 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4137,11 +4137,18 @@ class Form
$return='';
- // Define defaultnpr and defaultttx
+ // Define defaultnpr, defaultttx and defaultcode
$defaultnpr=($info_bits & 0x01);
$defaultnpr=(preg_match('/\*/',$selectedrate) ? 1 : $defaultnpr);
$defaulttx=str_replace('*','',$selectedrate);
-
+ $defaultcode='';
+ if (preg_match('/\s*\((.*)\)/', $defaulttx, $reg))
+ {
+ $defaultcode=$reg[1];
+ $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
+ }
+ //var_dump($defaulttx.'-'.$defaultnpr.'-'.$defaultcode);
+
// Check parameters
if (is_object($societe_vendeuse) && ! $societe_vendeuse->country_code)
{
@@ -4237,9 +4244,13 @@ class Form
$return.= $rate['nprtva'] ? '*': '';
if ($addcode && $rate['code']) $return.=' ('.$rate['code'].')';
$return.= '"';
- if ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+ if ($defaultcode)
{
- $return.= ' selected';
+ if ($defaultcode == $rate['code']) $return.= ' selected';
+ }
+ elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+ {
+ $return.= ' selected';
}
$return.= '>'.vatrate($rate['libtva']);
//$return.=($rate['code']?' '.$rate['code']:'');
--
GitLab