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

New: Add option MAIN_DISABLEVATCHECK to disable link to VAT check

Browse Source
This commit is contained in:
Regis Houssin 2011-01-31 10:32:51 +00:00
parent b8cf54e676
commit aa4b3f0701
5 changed files with 118 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/societe/canvas/default/actions_card_default.class.php
View File

@ -106,6 +106,17 @@ class ActionsCardDefault extends ActionsCardCommon
$this->tpl['profid3'] = $this->object->ape; $this->tpl['profid3'] = $this->object->ape;
$this->tpl['profid4'] = $this->object->idprof4; $this->tpl['profid4'] = $this->object->idprof4;
if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) {
$js = "\n";
$js.= '<script language="JavaScript" type="text/javascript">';
$js.= "function CheckVAT(a) {\n";
$js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
$js.= "}\n";
$js.= '</script>';
$js.= "\n";
$this->tpl['js_checkVatPopup'] = $js;
}
if ($action == 'create' || $action == 'edit') if ($action == 'create' || $action == 'edit')
{ {
for ($i=1; $i<=4; $i++) for ($i=1; $i<=4; $i++)
@ -124,18 +135,25 @@ class ActionsCardDefault extends ActionsCardCommon
$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id); $this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
// VAT intra // VAT intra
$s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">'; $s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
$s.=' '; if (empty($conf->global->MAIN_DISABLEVATCHECK))
if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.=' ';
$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
if ($conf->use_javascript_ajax)
{
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
}
else
{
$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
}
} }
else else
{ {
$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>'; $this->tpl['tva_intra'] = $s;
} }
} }
if ($action == 'view') if ($action == 'view')
@ -154,21 +172,29 @@ class ActionsCardDefault extends ActionsCardCommon
} }
// TVA intra // TVA intra
if ($this->tva_intra) if ($this->object->tva_intra)
{ {
$s=''; $s=$this->object->tva_intra;
$s.=$this->object->tva_intra;
$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">'; $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
$s.=' &nbsp; '; if (empty($conf->global->MAIN_DISABLEVATCHECK))
if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.=' &nbsp; ';
$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
if ($conf->use_javascript_ajax)
{
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
}
else
{
$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
}
} }
else else
{ {
$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>'; $this->tpl['tva_intra'] = $s;
} }
} }
else else
{ {

12
htdocs/societe/canvas/default/tpl/card_create.tpl.php
View File

@ -33,6 +33,8 @@
<?php echo $this->control->tpl['ajax_selectcountry']; ?> <?php echo $this->control->tpl['ajax_selectcountry']; ?>
<?php } ?> <?php } ?>
<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc"> <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
<input type="hidden" name="canvas" value="<?php echo $canvas ?>"> <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@ -161,7 +163,7 @@ for ($i=1; $i<=4; $i++) {
</tr> </tr>
<tr> <tr>
<td><?php echo $langs->trans("Type"); ?></td> <td><?php echo $langs->trans("ThirdPartyType"); ?></td>
<td><?php echo $this->control->tpl['select_companytype']; echo $this->control->tpl['info_admin']; ?></td> <td><?php echo $this->control->tpl['select_companytype']; echo $this->control->tpl['info_admin']; ?></td>
<td><?php echo $langs->trans("Staff"); ?></td> <td><?php echo $langs->trans("Staff"); ?></td>
<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td> <td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
@ -174,14 +176,6 @@ for ($i=1; $i<=4; $i++) {
</tr> </tr>
<?php } ?> <?php } ?>
<?php if ($conf->use_javascript_ajax) { ?>
<script language="JavaScript" type="text/javascript">
function CheckVAT(a) {
newpopup('<?php echo DOL_URL_ROOT; ?>/societe/checkvat/checkVatPopup.php?vatNumber='+a,'<?php echo dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")); ?>',500,260);
}
</script>
<?php } ?>
<tr> <tr>
<td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $langs->trans('VATIsUsed'); ?></td>
<td><?php echo $this->control->tpl['yn_assujtva']; ?></td> <td><?php echo $this->control->tpl['yn_assujtva']; ?></td>

11
htdocs/societe/canvas/default/tpl/card_edit.tpl.php
View File

@ -22,6 +22,7 @@
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php echo $this->control->tpl['ajax_selectcountry']; ?> <?php echo $this->control->tpl['ajax_selectcountry']; ?>
<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
<form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc"> <form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
<input type="hidden" name="canvas" value="<?php echo $canvas ?>"> <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@ -174,7 +175,7 @@ for ($i=1; $i<=4; $i++) {
</tr> </tr>
<tr> <tr>
<td><?php echo $langs->trans("Type"); ?></td> <td><?php echo $langs->trans("ThirdPartyType"); ?></td>
<td><?php echo $this->control->tpl['select_companytype']; echo $this->control->tpl['info_admin']; ?></td> <td><?php echo $this->control->tpl['select_companytype']; echo $this->control->tpl['info_admin']; ?></td>
<td><?php echo $langs->trans("Staff"); ?></td> <td><?php echo $langs->trans("Staff"); ?></td>
<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td> <td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
@ -187,14 +188,6 @@ for ($i=1; $i<=4; $i++) {
</tr> </tr>
<?php } ?> <?php } ?>
<?php if ($conf->use_javascript_ajax) { ?>
<script language="JavaScript" type="text/javascript">
function CheckVAT(a) {
newpopup('<?php echo DOL_URL_ROOT; ?>/societe/checkvat/checkVatPopup.php?vatNumber='+a,'<?php echo dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")); ?>',500,260);
}
</script>
<?php } ?>
<tr> <tr>
<td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $langs->trans('VATIsUsed'); ?></td>
<td><?php echo $this->control->tpl['yn_assujtva']; ?></td> <td><?php echo $this->control->tpl['yn_assujtva']; ?></td>

12
htdocs/societe/canvas/default/tpl/card_view.tpl.php
View File

@ -22,6 +22,7 @@
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?> <?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
<form name="formsoc" method="POST"> <form name="formsoc" method="POST">
<input type="hidden" name="canvas" value="<?php echo $canvas ?>"> <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@ -129,15 +130,6 @@ for ($i=1; $i<=4; $i++) {
<tr> <tr>
<td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $langs->trans('VATIsUsed'); ?></td>
<td><?php echo $this->control->tpl['tva_assuj']; ?></td> <td><?php echo $this->control->tpl['tva_assuj']; ?></td>
<?php if ($conf->use_javascript_ajax) { ?>
<script language="JavaScript" type="text/javascript">
function CheckVAT(a) {
newpopup('<?php echo DOL_URL_ROOT; ?>/societe/checkvat/checkVatPopup.php?vatNumber='+a,'<?php echo dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")); ?>',500,260);
}
</script>
<?php } ?>
<td nowrap="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> <td nowrap="nowrap"><?php echo $langs->trans('VATIntra'); ?></td>
<td><?php echo $this->control->tpl['tva_intra']; ?></td> <td><?php echo $this->control->tpl['tva_intra']; ?></td>
</tr> </tr>
@ -160,7 +152,7 @@ function CheckVAT(a) {
</tr> </tr>
<tr> <tr>
<td><?php echo $langs->trans("Type"); ?></td> <td><?php echo $langs->trans("ThirdPartyType"); ?></td>
<td><?php echo $this->control->tpl['typent']; ?></td> <td><?php echo $this->control->tpl['typent']; ?></td>
<td><?php echo $langs->trans("Staff"); ?></td> <td><?php echo $langs->trans("Staff"); ?></td>
<td><?php echo $this->control->tpl['effectif']; ?></td> <td><?php echo $this->control->tpl['effectif']; ?></td>

131
htdocs/societe/soc.php
View File

@ -1,9 +1,9 @@
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Brian Fraval <brian@fraval.org> * Copyright (C) 2003 Brian Fraval <brian@fraval.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net> * Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* *
@ -877,33 +877,36 @@ else
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" size="12" maxlength="20" value="'.$soc->tva_intra.'">'; $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.=' ';
if ($conf->use_javascript_ajax) if (empty($conf->global->MAIN_DISABLEVATCHECK))
{ {
print "\n"; $s.=' ';
print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a) {\n"; if ($conf->use_javascript_ajax)
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 language="JavaScript" type="text/javascript">';
print "\n"; print "function CheckVAT(a) {\n";
if (empty($conf->global->MAIN_DISABLEVATCHECK)) print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
{ print "}\n";
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; print '</script>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print "\n";
} $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
else print $s; print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else
{ {
if (empty($conf->global->MAIN_DISABLEVATCHECK)) $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>'; $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
print $s; }
} }
print $s;
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
// TODO add specific function by country
if($mysoc->pays_code=='ES') if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
@ -1256,32 +1259,36 @@ else
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" size="12" maxlength="20" value="'.$soc->tva_intra.'">'; $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.=' &nbsp; ';
if ($conf->use_javascript_ajax) if (empty($conf->global->MAIN_DISABLEVATCHECK))
{ {
print "\n"; $s.=' &nbsp; ';
print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a) {\n"; if ($conf->use_javascript_ajax)
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n"; {
print "}\n"; print "\n";
print '</script>'; print '<script language="JavaScript" type="text/javascript">';
print "\n"; print "function CheckVAT(a) {\n";
if (empty($conf->global->MAIN_DISABLEVATCHECK)) print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
{ print "}\n";
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; print '</script>';
print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); print "\n";
} $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
else print $s; print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else
{ {
if (empty($conf->global->MAIN_DISABLEVATCHECK)) $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>'; $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
print $s; }
} }
print $s;
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
// TODO add specific function by country
if($mysoc->pays_code=='ES') if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
@ -1519,28 +1526,29 @@ else
$s=''; $s='';
$s.=$soc->tva_intra; $s.=$soc->tva_intra;
$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">'; $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$soc->tva_intra.'">';
$s.=' &nbsp; ';
if ($conf->use_javascript_ajax) if (empty($conf->global->MAIN_DISABLEVATCHECK))
{ {
print "\n"; $s.=' &nbsp; ';
print '<script language="JavaScript" type="text/javascript">';
print "function CheckVAT(a) {\n"; if ($conf->use_javascript_ajax)
print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n"; {
print "}\n"; print "\n";
print '</script>'; print '<script language="JavaScript" type="text/javascript">';
print "\n"; print "function CheckVAT(a) {\n";
if (empty($conf->global->MAIN_DISABLEVATCHECK)) print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,285);\n";
{ print "}\n";
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; print '</script>';
print "\n";
$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 print $s; else
} {
else $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
{ }
if (empty($conf->global->MAIN_DISABLEVATCHECK)) $s.='<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
print $s;
} }
print $s;
} }
else else
{ {
@ -1551,6 +1559,7 @@ else
print '</tr>'; print '</tr>';
// Local Taxes // Local Taxes
// TODO add specific function by country
if($mysoc->pays_code=='ES') if($mysoc->pays_code=='ES')
{ {
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")