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

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-11 17:30:43 +02:00
parent b4cbb0561d
commit 05772f5327
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/product.lib.php
View File

@ -190,8 +190,9 @@ function product_prepare_head($object)
function productlot_prepare_head($object)
{
global $db, $langs, $conf, $user;
$langs->load("products");
$langs->load("productbatch");
// Load translation files required by the page
$langs->loadLangs(array("products","productbatch"));
$h = 0;
$head = array();
@ -200,7 +201,7 @@ function productlot_prepare_head($object)
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'card';
$h++;
// Attachments
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

8
htdocs/core/lib/sendings.lib.php
View File

@ -36,8 +36,8 @@ function shipping_prepare_head($object)
{
global $db, $langs, $conf, $user;
$langs->load("sendings");
$langs->load("deliveries");
// Load translation files required by the page
$langs->loadLangs(array("sendings","deliveries"));
$h = 0;
$head = array();
@ -121,8 +121,8 @@ function delivery_prepare_head($object)
{
global $langs, $conf, $user;
$langs->load("sendings");
$langs->load("deliveries");
// Load translation files required by the page
$langs->loadLangs(array("sendings","deliveries"));
$h = 0;
$head = array();

5
htdocs/core/lib/signature.lib.php
View File

@ -28,8 +28,9 @@ function showOnlineSignatureUrl($type,$ref)
{
global $conf, $langs;
$langs->load("payment");
$langs->load("paybox");
// Load translation files required by the page
$langs->loadLangs(array("payment","paybox"));
$servicename='Online';
$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature",$servicename).'<br>';

5
htdocs/core/lib/supplier_proposal.lib.php
View File

@ -32,8 +32,9 @@
function supplier_proposal_prepare_head($object)
{
global $db, $langs, $conf, $user;
$langs->load("supplier_proposal");
$langs->load("compta");
// Load translation files required by the page
$langs->loadLangs(array("supplier_proposal","compta"));
$h = 0;
$head = array();

26
htdocs/core/menus/standard/eldy.lib.php
View File

@ -80,8 +80,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
$showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
if ($showmode)
{
$langs->load("companies");
$langs->load("suppliers");
// Load translation files required by the page
$langs->loadLangs(array("companies","suppliers"));
$classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
@ -174,8 +174,8 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
$showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
if ($showmode)
{
$langs->load("compta");
$langs->load("banks");
// Load translation files required by the page
$langs->loadLangs(array("compta","banks"));
$classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
@ -528,8 +528,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if ($usemenuhider || empty($leftmenu) || $leftmenu=="setup")
{
$langs->load("admin");
$langs->load("help");
// Load translation files required by the page
$langs->loadLangs(array("admin","help"));
$warnpicto='';
if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
@ -1176,10 +1176,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
*/
if ($mainmenu == 'bank')
{
$langs->load("withdrawals");
$langs->load("banks");
$langs->load("bills");
$langs->load('categories');
// Load translation files required by the page
$langs->loadLangs(array("withdrawals","banks","bills","categories"));
// Bank-Caisse
if (! empty($conf->banque->enabled))
@ -1402,8 +1400,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Leave/Holiday/Vacation module
if (! empty($conf->holiday->enabled))
{
$langs->load("holiday");
$langs->load("trips");
// Load translation files required by the page
$langs->loadLangs(array("holiday","trips"));
$newmenu->add("/holiday/list.php?leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');
$newmenu->add("/holiday/card.php?action=request", $langs->trans("New"), 1,$user->rights->holiday->write);
@ -1499,8 +1497,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
if (! empty($conf->adherent->enabled))
{
$langs->load("members");
$langs->load("compta");
// Load translation files required by the page
$langs->loadLangs(array("members","compta"));
$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire, '', $mainmenu, 'members');
$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer);