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

Merge pull request #2691 from aspangaro/develop-devcamp

Browse Source 
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
This commit is contained in:
Juanjo Menent 2015-04-22 09:20:31 +02:00
commit 45c585ac64
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/account.php
View File

@ -46,6 +46,7 @@ $langs->load("banks");
$langs->load("categories"); $langs->load("categories");
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
$langs->load("salaries");
$langs->load("loan"); $langs->load("loan");
$langs->load("donations"); $langs->load("donations");

1
htdocs/compta/bank/ligne.php
View File

@ -37,6 +37,7 @@ $langs->load("bills");
if (! empty($conf->adherent->enabled)) $langs->load("members"); if (! empty($conf->adherent->enabled)) $langs->load("members");
if (! empty($conf->don->enabled)) $langs->load("donations"); if (! empty($conf->don->enabled)) $langs->load("donations");
if (! empty($conf->loan->enabled)) $langs->load("loan"); if (! empty($conf->loan->enabled)) $langs->load("loan");
if (! empty($conf->salaries->enabled)) $langs->load("salaries");
$id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));

3
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -424,7 +424,8 @@ class PaymentSalary extends CommonObject
$bank_line_id, $bank_line_id,
$this->fk_user, $this->fk_user,
DOL_URL_ROOT.'/user/card.php?id=', DOL_URL_ROOT.'/user/card.php?id=',
$langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), $fuser->getFullName($langs),
// $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
'user' 'user'
); );