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

Merge pull request #8822 from aspangaro/8.0-b27

Browse Source 
Salaries : Move to LoadLangs
This commit is contained in:
Laurent Destailleur 2018-05-25 10:34:36 +02:00 committed by GitHub
commit 205732e240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/salaries/card.php
View File

@ -30,13 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
$langs->loadLangs(array("compta","banks","bills","users","salaries","hrm"));
$langs->load("compta");
$langs->load("banks");
$langs->load("bills");
$langs->load("users");
$langs->load("salaries");
$langs->load('hrm');
$id=GETPOST("id",'int'); $id=GETPOST("id",'int');
$action=GETPOST('action','aZ09'); $action=GETPOST('action','aZ09');

6
htdocs/compta/salaries/document.php
View File

@ -35,11 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
$langs->load("other"); $langs->loadLangs(array("compta","bills","users","salaries","hrm"));
$langs->load("users");
$langs->load("salaries");
$langs->load('hrm');
$langs->load("companies");
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');

6
htdocs/compta/salaries/info.php
View File

@ -28,11 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$langs->load("compta"); $langs->loadLangs(array("compta","bills","users","salaries","hrm"));
$langs->load("bills");
$langs->load("users");
$langs->load("salaries");
$langs->load('hrm');
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$action=GETPOST('action','aZ09'); $action=GETPOST('action','aZ09');

3
htdocs/compta/salaries/stats/index.php
View File

@ -26,8 +26,7 @@ require '../../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/salariesstats.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/salariesstats.class.php';
$langs->load("salaries"); $langs->loadLangs(array("salaries","companies"));
$langs->load("companies");
$WIDTH=DolGraph::getDefaultGraphSizeForStats('width'); $WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height'); $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');