lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Bad function/picto for information messages (not a star)

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-28 19:49:42 +01:00
parent df9a6dae6c
commit d3b32ce22f
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/modules.php
View File

@ -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();

2
htdocs/admin/perms.php
View File

@ -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";

5
htdocs/admin/stock.php
View File

@ -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

2
htdocs/core/lib/admin.lib.php
View File

@ -1193,7 +1193,7 @@ function showModulesExludedForExternal($modules)
$text .= $langs->trans('Module'.$module->numero.'Name');
}
}
return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text;
return $text;
}

9
htdocs/langs/en_US/admin.lang
View File

@ -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

2
htdocs/user/perms.php
View File

@ -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