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-09 11:10:32 +02:00
parent 804badd561
commit 7fcbd0fe42
11 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/cashdesk/affIndex.php
View File

@ -36,9 +36,8 @@ if ( $_SESSION['uid'] <= 0 )
exit; exit;
} }
$langs->load("companies"); // Load translation files required by the page
$langs->load("compta"); $langs->loadLangs(array("companies","compta","cashdesk"));
$langs->load("cashdesk");
/* /*

4
htdocs/cashdesk/index.php
View File

@ -28,8 +28,8 @@
require_once '../main.inc.php'; require_once '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("cashdesk"); $langs->loadLangs(array("admin","cashdesk"));
// Test if user logged // Test if user logged
if ( $_SESSION['uid'] > 0 ) if ( $_SESSION['uid'] > 0 )

11
htdocs/cashdesk/index_verif.php
View File

@ -30,9 +30,8 @@ include '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php';
$langs->load("main"); // Load translation files required by the page
$langs->load("admin"); $langs->loadLangs(array("main","admin","cashdesk"));
$langs->load("cashdesk");
$username = GETPOST("txtUsername"); $username = GETPOST("txtUsername");
$password = GETPOST("pwdPassword"); $password = GETPOST("pwdPassword");
@ -119,7 +118,7 @@ if ( $retour >= 0 )
$_SESSION['firstname'] = $tab['firstname']; $_SESSION['firstname'] = $tab['firstname'];
$_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : ''); $_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : '');
$_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : ''); $_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
$_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : ''); $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
$_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : ''); $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
$_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : ''); $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
@ -135,8 +134,8 @@ if ( $retour >= 0 )
} }
else else
{ {
$langs->load("errors"); // Load translation files required by the page
$langs->load("other"); $langs->loadLangs(array("other","errors"));
$retour=$langs->trans("ErrorBadLoginPassword"); $retour=$langs->trans("ErrorBadLoginPassword");
header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid); header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
exit; exit;

6
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -26,10 +26,8 @@ if (empty($langs) || ! is_object($langs))
exit; exit;
} }
// Load translation files required by the page
$langs->load("main"); $langs->loadLangs(array("main","bills","cashdesk"));
$langs->load("bills");
$langs->load("cashdesk");
// Object $form must de defined // Object $form must de defined

5
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -28,9 +28,8 @@ if (empty($langs) || ! is_object($langs))
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$langs->load("main"); // Load translation files required by the page
$langs->load("bills"); $langs->loadLangs(array("main","bills","cashdesk"));
$langs->load("cashdesk");
?> ?>

5
htdocs/cashdesk/tpl/menu.tpl.php
View File

@ -63,9 +63,8 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)
$warehouseLink = $warehouse->getNomUrl(1); $warehouseLink = $warehouse->getNomUrl(1);
} }
// Load translation files required by the page
$langs->load("cashdesk"); $langs->loadLangs(array("main","cashdesk"));
$langs->load("main");
print "\n".'<!-- menu.tpl.php -->'."\n"; print "\n".'<!-- menu.tpl.php -->'."\n";
print '<div class="menu_bloc">'; print '<div class="menu_bloc">';

4
htdocs/cashdesk/tpl/ticket.tpl.php
View File

@ -27,8 +27,8 @@ if (empty($langs) || ! is_object($langs))
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$langs->load("main"); // Load translation files required by the page
$langs->load('cashdesk'); $langs->loadLangs(array("main","cashdesk"));
top_httphead('text/html'); top_httphead('text/html');

6
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -23,10 +23,8 @@ if (empty($langs) || ! is_object($langs))
exit; exit;
} }
// Load translation files required by the page
$langs->load("main"); $langs->loadLangs(array("main","bills","banks"));
$langs->load("bills");
$langs->load("banks");
// Object $form must de defined // Object $form must de defined

5
htdocs/cashdesk/tpl/validation2.tpl.php
View File

@ -24,9 +24,8 @@ if (empty($langs) || ! is_object($langs))
exit; exit;
} }
// Load translation files required by the page
$langs->load("main"); $langs->loadLangs(array("main","bills"));
$langs->load("bills");
?> ?>

5
htdocs/collab/index.php
View File

@ -28,9 +28,8 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin"); // Load translation files required by the page
$langs->load("other"); $langs->loadLangs(array("admin","other","website"));
$langs->load("website");
if (! $user->admin) accessforbidden(); if (! $user->admin) accessforbidden();

4
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -1003,8 +1003,8 @@ class FactureRec extends CommonInvoice
$error=0; $error=0;
$langs->load("bills"); // Load translation files required by the page
$langs->load('main'); $langs->loadLangs(array("main","bills"));
$nb_create=0; $nb_create=0;