Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Dolibarr · Feb 12, 2018 · 36ac380 · 36ac380
2 parents fda5822 + 00a8be2
commit 36ac380
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -3496,7 +3496,7 @@ function setIncoterms($id_incoterm, $location)
 
 	/**
 	 *  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
@@ -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/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
@@ -80,7 +80,7 @@ function __construct($db)
 
         // New pages on tabs
         // -----------------
-       	//$this->tabs[] = array('data'=>'thirdparty:+website:WebSites:website:($conf->societe->enabled && $user->rights->societe->lire):/societe/website.php?mainmenu=home&id=__ID__');  					// To add a new tab identified by code tabname1
+       	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
         // Boxes
         //------

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
@@ -75,8 +75,8 @@ Town=City
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
+VATIsUsed=Sales tax is used
+VATIsNotUsed=Sales 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
@@ -239,7 +239,7 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id
+ProfId1US=Prof Id (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -255,8 +255,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/product/list.php b/htdocs/product/list.php
@@ -716,15 +716,15 @@
 				// Ref
 				if (! empty($arrayfields['p.ref']['checked']))
 				{
-					print '<td class="tdoverflowmax150">';
+					print '<td class="tdoverflowmax200">';
 					print $product_static->getNomUrl(1);
 					print "</td>\n";
 					if (! $i) $totalarray['nbfield']++;
 				}
 	   			// Ref supplier
 				if (! empty($arrayfields['pfp.ref_fourn']['checked']))
 				{
-					print '<td class="tdoverflowmax150">';
+					print '<td class="tdoverflowmax200">';
 					print $product_static->getNomUrl(1);
 					print "</td>\n";
 					if (! $i) $totalarray['nbfield']++;

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
@@ -1230,7 +1230,7 @@
         print '<td class="nowrap">';
         $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-        if (empty($conf->global->MAIN_DISABLEVATCHECK))
+        if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
         {
             $s.=' ';
 
@@ -1849,7 +1849,7 @@
             print '<td colspan="3">';
             $s ='<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-            if (empty($conf->global->MAIN_DISABLEVATCHECK))
+            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
             {
                 $s.=' &nbsp; ';