diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 3dd6d7b03a6..ecabc30b681 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3434,7 +3434,7 @@ abstract class CommonObject /** * Return if a country is inside the EEC (European Economic Community) - * @deprecated + * @deprecated Use function isInEEC function instead * * @return boolean true = country inside EEC, false = country outside EEC */ diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 4f1726a45c6..b44be44e222 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -573,7 +573,7 @@ function getFormeJuridiqueLabel($code) } /** - * Return if a country is inside the EEC (European Economic Community) + * Return if a country of an object is inside the EEC (European Economic Community) * TODO Add a field into country dictionary. * * @param Object $object Object diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 353b8ca0c47..8b9e205e4a7 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -74,8 +74,8 @@ Town=City Web=Web Poste= Position DefaultLang=Language by default -VATIsUsed=VAT is used -VATIsNotUsed=VAT is not used +VATIsUsed=Sale tax is used +VATIsNotUsed=Sale tax is not used CopyAddressFromSoc=Fill address with third party address ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects PaymentBankAccount=Payment bank account @@ -238,7 +238,7 @@ ProfId3TN=Prof Id 3 (Douane code) ProfId4TN=Prof Id 4 (BAN) ProfId5TN=- ProfId6TN=- -ProfId1US=Prof Id +ProfId1US=Prof Id (FEIN) ProfId2US=- ProfId3US=- ProfId4US=- @@ -254,8 +254,8 @@ ProfId1DZ=RC ProfId2DZ=Art. ProfId3DZ=NIF ProfId4DZ=NIS -VATIntra=VAT number -VATIntraShort=VAT number +VATIntra=Sales tax ID +VATIntraShort=Tax ID VATIntraSyntaxIsValid=Syntax is valid ProspectCustomer=Prospect / Customer Prospect=Prospect diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 0d8f256e15e..67abb030b09 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1222,7 +1222,7 @@ else print '