Merge pull request #2451 from Dolibarr/revert-2318-3.5-accountingmask

Revert "FIXED Allowed 0 to be used as an account mask"
Dolibarr · Mar 14, 2015 · da72cf3 · da72cf3
2 parents da042c1 + 4a9a3ab
commit da72cf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -44,8 +44,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	function __construct()
 	{
 	    global $conf;
-		if (is_null($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-		if (is_null($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+        if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}

diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
@@ -114,11 +114,7 @@
     	{
     		$param=GETPOST("param".$i,'alpha');
     		$value=GETPOST("value".$i,'alpha');
-			// Use the default values if the field is not set
-			if ($param == '') {
-				$param = null;
-			}
-			$res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
 	    	if (! $res > 0) $error++;
     	}
     }