lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: VAT number is saved in one field only. This is more "international".

Browse Source
This commit is contained in:
Laurent Destailleur 2009-12-09 13:17:16 +00:00
parent 526fef3a4f
commit ffaa8dc08f
7 changed files with 48 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ For users:
customer. customer.
- New: Can use {tttt} in numbering mask setup. It will be replaced - New: Can use {tttt} in numbering mask setup. It will be replaced
with third party type. with third party type.
- New: VAT number is stored in one field. This is more "international".
- Fix: bug #28055 : Unable to modify the date of a cloned command - Fix: bug #28055 : Unable to modify the date of a cloned command
- Fix: bug #27891 - Fix: bug #27891

11
htdocs/admin/company.php
View File

@ -664,8 +664,8 @@ else
{ {
print "\n"; print "\n";
print '<script language="JavaScript" type="text/javascript">'; print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a,b) {\n"; print "function CheckVAT(a) {\n";
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n"; print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
print "}\n"; print "}\n";
print '</script>'; print '</script>';
print "\n"; print "\n";
@ -676,15 +676,12 @@ else
if ($conf->global->MAIN_INFO_TVAINTRA) if ($conf->global->MAIN_INFO_TVAINTRA)
{ {
$s=''; $s='';
$code=substr($conf->global->MAIN_INFO_TVAINTRA,0,2);
$num=substr($conf->global->MAIN_INFO_TVAINTRA,2);
$s.=$conf->global->MAIN_INFO_TVAINTRA; $s.=$conf->global->MAIN_INFO_TVAINTRA;
$s.='<input type="hidden" name="tva_intra_code" size="1" maxlength="2" value="'.$code.'">'; $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$conf->global->MAIN_INFO_TVAINTRA.'">';
$s.='<input type="hidden" name="tva_intra_num" size="12" maxlength="18" value="'.$num.'">';
$s.=' &nbsp; '; $s.=' &nbsp; ';
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else

8
htdocs/lib/lib_head.js
View File

@ -1,12 +1,14 @@
// Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> // Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
// Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> // Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
// //
// Script javascript added in header of pages (in HEAD section) // Script javascript added in header of pages (in HEAD section)
//
// //
// \file htdocs/lib/lib_head.js // \file htdocs/lib/lib_head.js
// \brief File that include javascript functions (included if option use_javascript activated) // \brief File that include javascript functions (included if option use_javascript activated)
// \version $Revision$ // \version $Id$
//
function dolibarr_type_reload(param) function dolibarr_type_reload(param)
{ {

2
htdocs/master.inc.php
View File

@ -374,7 +374,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
$mysoc->profid2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET; $mysoc->profid2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
$mysoc->profid3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE; $mysoc->profid3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
$mysoc->profid4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS; $mysoc->profid4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
$mysoc->tva_intra=$conf->global->MAIN_INFO_TVAINTRA; $mysoc->tva_intra=$conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
$mysoc->capital=$conf->global->MAIN_INFO_CAPITAL; $mysoc->capital=$conf->global->MAIN_INFO_CAPITAL;
$mysoc->forme_juridique_code=$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE; $mysoc->forme_juridique_code=$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
$mysoc->email=$conf->global->MAIN_INFO_SOCIETE_MAIL; $mysoc->email=$conf->global->MAIN_INFO_SOCIETE_MAIL;

39
htdocs/soc.php
View File

@ -104,9 +104,7 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
$soc->gencod = $_POST["gencod"]; $soc->gencod = $_POST["gencod"];
$soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_assuj = $_POST["assujtva_value"];
$soc->tva_intra_code = $_POST["tva_intra_code"]; $soc->tva_intra = $_POST["tva_intra"];
$soc->tva_intra_num = $_POST["tva_intra_num"];
$soc->tva_intra = $_POST["tva_intra_code"] . $_POST["tva_intra_num"];
$soc->forme_juridique_code = $_POST["forme_juridique_code"]; $soc->forme_juridique_code = $_POST["forme_juridique_code"];
$soc->effectif_id = $_POST["effectif_id"]; $soc->effectif_id = $_POST["effectif_id"];
@ -341,8 +339,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
$soc->effectif_id=($_POST["effectif_id"]&&!$_POST["cleartype"])?$_POST["effectif_id_id"]:($_REQUEST["private"]?'EF1-5':''); $soc->effectif_id=($_POST["effectif_id"]&&!$_POST["cleartype"])?$_POST["effectif_id_id"]:($_REQUEST["private"]?'EF1-5':'');
$soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_assuj = $_POST["assujtva_value"];
$soc->tva_intra_code=$_POST["tva_intra_code"]; $soc->tva_intra=$_POST["tva_intra"];
$soc->tva_intra_num=$_POST["tva_intra_num"];
$soc->commercial_id=$_POST["commercial_id"]; $soc->commercial_id=$_POST["commercial_id"];
@ -577,20 +574,19 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
{ {
print "\n"; print "\n";
print '<script language="JavaScript" type="text/javascript">'; print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a,b) {\n"; print "function CheckVAT(a) {\n";
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n"; print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
print "}\n"; print "}\n";
print '</script>'; print '</script>';
print "\n"; print "\n";
} }
print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>'; print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
$s ='<input type="text" class="flat" name="tva_intra_code" size="1" maxlength="2" value="'.$soc->tva_intra_code.'">'; $s.='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.='<input type="text" class="flat" name="tva_intra_num" size="12" maxlength="18" value="'.$soc->tva_intra_num.'">';
$s.=' '; $s.=' ';
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else
@ -693,8 +689,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
$soc->forme_juridique_code=$_POST["forme_juridique_code"]; $soc->forme_juridique_code=$_POST["forme_juridique_code"];
$soc->tva_assuj = $_POST["assujtva_value"]; $soc->tva_assuj = $_POST["assujtva_value"];
$soc->tva_intra_code=$_POST["tva_intra_code"]; $soc->tva_intra=$_POST["tva_intra"];
$soc->tva_intra_num=$_POST["tva_intra_num"];
// On positionne pays_id, pays_code et libelle du pays choisi // On positionne pays_id, pays_code et libelle du pays choisi
if ($soc->pays_id) if ($soc->pays_id)
@ -897,20 +892,19 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
{ {
print "\n"; print "\n";
print '<script language="JavaScript" type="text/javascript">'; print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a,b) {\n"; print "function CheckVAT(a) {\n";
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n"; print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
print "}\n"; print "}\n";
print '</script>'; print '</script>';
print "\n"; print "\n";
} }
print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>'; print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
$s ='<input type="text" class="flat" name="tva_intra_code" size="1" maxlength="2" value="'.$soc->tva_intra_code.'">'; $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.='<input type="text" class="flat" name="tva_intra_num" size="12" maxlength="18" value="'.$soc->tva_intra_num.'">';
$s.=' '; $s.=' ';
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else
@ -1110,8 +1104,8 @@ else
{ {
print "\n"; print "\n";
print '<script language="JavaScript" type="text/javascript">'; print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a,b) {\n"; print "function CheckVAT(a) {\n";
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n"; print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
print "}\n"; print "}\n";
print '</script>'; print '</script>';
print "\n"; print "\n";
@ -1120,15 +1114,12 @@ else
if ($soc->tva_intra) if ($soc->tva_intra)
{ {
$s=''; $s='';
$code=substr($soc->tva_intra,0,2);
$num=substr($soc->tva_intra,2);
$s.=$soc->tva_intra; $s.=$soc->tva_intra;
$s.='<input type="hidden" name="tva_intra_code" size="1" maxlength="2" value="'.$code.'">'; $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.='<input type="hidden" name="tva_intra_num" size="12" maxlength="18" value="'.$num.'">';
$s.=' &nbsp; '; $s.=' &nbsp; ';
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else

2
htdocs/societe.class.php
View File

@ -601,8 +601,6 @@ class Societe extends CommonObject
$this->tva_assuj = $obj->tva_assuj; $this->tva_assuj = $obj->tva_assuj;
$this->tva_intra = $obj->tva_intra; $this->tva_intra = $obj->tva_intra;
$this->tva_intra_code = substr($obj->tva_intra,0,2);
$this->tva_intra_num = substr($obj->tva_intra,2);
$this->typent_id = $obj->typent_id; $this->typent_id = $obj->typent_id;
$this->typent_code = $obj->typent_code; $this->typent_code = $obj->typent_code;

43
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,11 +17,11 @@
*/ */
/** /**
* \file htdocs/societe/checkvat/checkVatPopup.php * \file htdocs/societe/checkvat/checkVatPopup.php
* \ingroup societe * \ingroup societe
* \brief Popup screen to validate VAT * \brief Popup screen to validate VAT
* \version $Id$ * \version $Id$
*/ */
require ("../../main.inc.php"); require ("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/nusoap/lib/nusoap.php");
$langs->load("companies"); $langs->load("companies");
$WS_DOL_URL='http://ec.europa.eu/taxation_customs/vies/api/checkVatPort'; $WS_DOL_URL='http://ec.europa.eu/taxation_customs/vies/api/checkVatPort';
$WS_METHOD = 'checkVat'; $WS_METHOD ='checkVat';
top_htmlhead("", $langs->trans("VATIntraCheckableOnEUSite")); top_htmlhead("", $langs->trans("VATIntraCheckableOnEUSite"));
@ -41,25 +41,22 @@ print '<div>';
print_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','setup'); print_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','setup');
if (! $_REQUEST["countryCode"]) if (! $_REQUEST["vatNumber"])
{
print '<br>';
print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("Country")).'</font><br>';
}
elseif (! $_REQUEST["vatNumber"])
{ {
print '<br>'; print '<br>';
print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("VATIntraShort")).'</font><br>'; print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("VATIntraShort")).'</font><br>';
} }
else else
{ {
print '<b>'.$langs->trans("Country").'</b>: '.$_REQUEST["countryCode"].'<br>'; $countryCode=substr($_REQUEST["vatNumber"],0,2);
print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$_REQUEST["vatNumber"].'<br>'; $vatNumber=substr($_REQUEST["vatNumber"],2);
print '<b>'.$langs->trans("Country").'</b>: '.$countryCode.'<br>';
print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$vatNumber.'<br>';
print '<br>'; print '<br>';
// Set the parameters to send to the WebService // Set the parameters to send to the WebService
$parameters = array("countryCode" => $_REQUEST["countryCode"], $parameters = array("countryCode" => $countryCode,
"vatNumber" => $_REQUEST["vatNumber"]); "vatNumber" => $vatNumber);
// Set the WebService URL // Set the WebService URL
dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL); dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL);
@ -69,10 +66,10 @@ else
dol_syslog("Call method ".$WS_METHOD); dol_syslog("Call method ".$WS_METHOD);
$result = $soapclient->call($WS_METHOD,$parameters); $result = $soapclient->call($WS_METHOD,$parameters);
// print "x".is_array($result)."i"; // print "x".is_array($result)."i";
// print_r($result); // print_r($result);
// print $soapclient->request.'<br>'; // print $soapclient->request.'<br>';
// print $soapclient->response.'<br>'; // print $soapclient->response.'<br>';
$messagetoshow=''; $messagetoshow='';
print '<b>'.$langs->trans("Response").'</b>:<br>'; print '<b>'.$langs->trans("Response").'</b>:<br>';
@ -95,7 +92,7 @@ else
} }
// Syntaxe ko // Syntaxe ko
elseif (preg_match('/INVALID_INPUT/i',$result['faultstring']) elseif (preg_match('/INVALID_INPUT/i',$result['faultstring'])
|| ($result['requestDate'] && ! $result['valid'])) || ($result['requestDate'] && ! $result['valid']))
{ {
if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>'; if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>'; print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
@ -110,7 +107,7 @@ else
print $langs->trans("VATIntraValueIsValid").': '; print $langs->trans("VATIntraValueIsValid").': ';
if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring'])) if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring']))
{ {
print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$_REQUEST["countryCode"]).'</font><br>'; print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$countryCode).'</font><br>';
} }
else else
{ {