From d3b32ce22f630bffe0bbbdd9b98c392ac577b622 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Nov 2014 19:49:42 +0100
Subject: [PATCH] Fixed: Bad function/picto for information messages (not a
 star)

---
 htdocs/admin/modules.php      | 2 +-
 htdocs/admin/perms.php        | 2 +-
 htdocs/admin/stock.php        | 5 +++++
 htdocs/core/lib/admin.lib.php | 2 +-
 htdocs/langs/en_US/admin.lang | 9 +++++----
 htdocs/user/perms.php         | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index fd3f74c06c2..9ce93a6bc26 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -534,7 +534,7 @@ dol_fiche_end();
 
 
 // Show warning about external users
-if ($mode != 'marketplace') print '<div class="info">'.showModulesExludedForExternal($modules).'</div><br>'."\n";
+if ($mode != 'marketplace') print info_admin(showModulesExludedForExternal($modules))."\n";
 
 
 llxFooter();
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 74a9b8c8434..907ed389b38 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -116,7 +116,7 @@ foreach ($modulesdir as $dir)
 $db->commit();
 
 // Show warning about external users
-print showModulesExludedForExternal($modules).'<br>'."\n";
+print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
 print "<br>\n";
 
 
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index d0582a91630..d9c5a3f616a 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -193,6 +193,11 @@ if (! empty($conf->expedition->enabled))
 	print "</form>\n</td>\n</tr>\n";
 }
 print '</table>';
+
+if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
+{
+	print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
+}
 print '<br>';
 
 // Title rule for stock increase
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 075baf41161..dd1615d7427 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1193,7 +1193,7 @@ function showModulesExludedForExternal($modules)
 			$text .= $langs->trans('Module'.$module->numero.'Name');
 		}
 	}
-	return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text;
+	return $text;
 }
 
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fec89ae5bcd..9a284748de1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -702,8 +702,8 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
 Permission1101=Read delivery orders
@@ -1416,8 +1416,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), check also setup of this module: Most point of sales modules are designed to create immediatly an invoice. If you need to have a stock decrease when registering a sell from your Point Of Sale whatever is the option set here, check your POS module is set up for that.
 ##### Menu #####
 MenuDeleted=Menu deleted
 TreeMenu=Tree menus
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index f9dbb54f8f4..b63b3e65ffc 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -276,7 +276,7 @@ print '</table><br>';
 
 if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'<br>';
 // Show warning about external users
-if (empty($user->societe_id)) print showModulesExludedForExternal($modules).'<br><br>'."\n";
+if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules)).'<br><br>'."\n";
 
 // For multicompany transversal mode
 // TODO Place a hook here