浏览代码

Fix custom code should not appears on services

Laurent Destailleur 9 年之前
父节点
当前提交
3611161b67
共有 3 个文件被更改,包括 5 次插入2 次删除
  1. 2 1
      dev/translation/sanity_check_en_langfiles.php
  2. 2 0
      htdocs/langs/en_US/products.lang
  3. 1 1
      htdocs/product/card.php

+ 2 - 1
dev/translation/sanity_check_en_langfiles.php

@@ -324,7 +324,8 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
 	    if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0;
-
+	    if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0;
+	    
 	    if (preg_match('/sms/i', $value)) $qualifiedforclean=0;
 	    if (preg_match('/TF_/i', $value)) $qualifiedforclean=0;
 	    if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0;

+ 2 - 0
htdocs/langs/en_US/products.lang

@@ -32,6 +32,8 @@ ServicesOnSellAndOnBuy=Services for sale and for purchase
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
+CardProduct0=Product card
+CardProduct1=Service card
 Stock=Stock
 Stocks=Stocks
 Movements=Movements

+ 1 - 1
htdocs/product/card.php

@@ -1314,7 +1314,7 @@ else
 	        }
 
 	        // Custom code
-    	    if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+    	    if (! $object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
         	{
 	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.$object->customcode.'"></td>';
 	            // Origin country