Improve check VAT Number
This commit is contained in:
parent
40d94bb815
commit
66b7996c86
2 changed files with 13 additions and 4 deletions
|
|
@ -85,7 +85,7 @@ class Error_Message
|
|||
, 'MY_NAME' => _("Nom de la société")
|
||||
, 'MY_STREET' => _("Adresse de la société")
|
||||
, 'MY_CITY' => _("Ville")
|
||||
, 'MY_TVA' => _("Numéro de TVA")
|
||||
, 'MY_TVA' => _("Numéro de TVA, vide ou invalide, il doit commencer par les 2 lettres du code pays")
|
||||
, 'SIREN'=> 'SIREN'
|
||||
// , 'SIRET'=> 'SIRET'
|
||||
);
|
||||
|
|
@ -95,7 +95,7 @@ class Error_Message
|
|||
, 'postalzone' => _("Code postal")
|
||||
, 'city' => _("Ville")
|
||||
, 'country'=>_("Code pays")
|
||||
, 'customer_vat_id' => _("Numéro de TVA")
|
||||
, 'customer_vat_id' => _("Numéro de TVA, vide ou invalide, il doit commencer par les 2 lettres du code pays")
|
||||
, 'endpoint_id' => _('Identifiant PEPPOL') // here 9925:BE....
|
||||
|
||||
);
|
||||
|
|
|
|||
|
|
@ -137,6 +137,10 @@ class InvoiceUBL21 extends XMLInvoice {
|
|||
}
|
||||
|
||||
}
|
||||
if ( isset ($company['MY_TVA']) && preg_match('/([a-z][A-Z]){2}/',$company['MY_TVA']) == false )
|
||||
{
|
||||
$a_error[]="MY_TVA";
|
||||
}
|
||||
return $a_error;
|
||||
}
|
||||
/**
|
||||
|
|
@ -164,13 +168,18 @@ class InvoiceUBL21 extends XMLInvoice {
|
|||
list($scheme_id,$peppol)=explode(":", $this->data['customer'][$value]);
|
||||
if (preg_replace('/[0-9]/', '', $scheme_id) != "")
|
||||
{
|
||||
$a_error[]=ATTR_DEF_PEPPOLID;
|
||||
$a_error[]='endpoint_id';
|
||||
}elseif(\noalyss_trim($peppol) =="")
|
||||
{
|
||||
$a_error[]=ATTR_DEF_PEPPOLID;
|
||||
$a_error[]='endpoint_id';
|
||||
|
||||
}
|
||||
}
|
||||
if ( $this->data['customer']["customer_vat_id"] != "" && preg_match('/([a-z][A-Z]){2}/',$this->data['customer']["customer_vat_id"] ) == false)
|
||||
{
|
||||
$a_error[]='customer_vat_id';
|
||||
|
||||
}
|
||||
return $a_error;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue