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

Fix trans

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-01 19:06:16 +02:00
parent 414da83456
commit 0dce34f527
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/langs/en_US/salaries.lang
View File

@ -17,8 +17,8 @@ TJM=Average daily rate
CurrentSalary=Current salary CurrentSalary=Current salary
THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
TJMDescription=This value is currently for information only and is not used for any calculation TJMDescription=This value is currently for information only and is not used for any calculation
LastSalaries=Latest %s salary payments LastSalaries=Latest %s salaries
AllSalaries=All salary payments AllSalaries=All salaries
SalariesStatistics=Salary statistics SalariesStatistics=Salary statistics
SalariesAndPayments=Salaries and payments SalariesAndPayments=Salaries and payments
ConfirmDeleteSalaryPayment=Do you want to delete this payment of salary ? ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?

3
htdocs/salaries/class/salary.class.php
View File

@ -502,6 +502,9 @@ class Salary extends CommonObject
if ($this->datesp && $this->dateep) { if ($this->datesp && $this->dateep) {
$label .= '<br><b>'.$langs->trans('Period').':</b> '.dol_print_date($this->datesp, 'day').' - '.dol_print_date($this->dateep, 'day'); $label .= '<br><b>'.$langs->trans('Period').':</b> '.dol_print_date($this->datesp, 'day').' - '.dol_print_date($this->dateep, 'day');
} }
if (isset($this->amount)) {
$label .= '<br><b>'.$langs->trans('Amount').':</b> '.price($this->amount);
}
$url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id; $url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;

29
htdocs/user/bank.php
View File

@ -366,12 +366,12 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
$payment_salary = new PaymentSalary($db); $payment_salary = new PaymentSalary($db);
$salary = new Salary($db); $salary = new Salary($db);
$sql = "SELECT s.rowid as sid, s.ref as sref, s.label, s.datesp, s.dateep, s.paye, SUM(ps.amount) as alreadypaid"; $sql = "SELECT s.rowid as sid, s.ref as sref, s.label, s.datesp, s.dateep, s.paye, s.amount, SUM(ps.amount) as alreadypaid";
$sql .= " FROM ".MAIN_DB_PREFIX."salary as s"; $sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as ps ON (s.rowid = ps.fk_salary)"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as ps ON (s.rowid = ps.fk_salary)";
$sql .= " WHERE s.fk_user = ".$object->id; $sql .= " WHERE s.fk_user = ".$object->id;
$sql .= " AND s.entity IN (".getEntity('salary').")"; $sql .= " AND s.entity IN (".getEntity('salary').")";
$sql .= " GROUP BY s.rowid, s.ref, s.label, s.datesp, s.dateep, s.paye"; $sql .= " GROUP BY s.rowid, s.ref, s.label, s.datesp, s.dateep, s.paye, s.amount";
$sql .= " ORDER BY s.dateep DESC"; $sql .= " ORDER BY s.dateep DESC";
$resql = $db->query($sql); $resql = $db->query($sql);
@ -381,7 +381,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>'; print '<td colspan="5"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
print '</tr></table></td>'; print '</tr></table></td>';
print '</tr>'; print '</tr>';
@ -389,16 +389,17 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
while ($i < $num && $i < $MAXLIST) { while ($i < $num && $i < $MAXLIST) {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$payment_salary->id = $objp->rowid;
$payment_salary->ref = $objp->ref;
$payment_salary->datep = $db->jdate($objp->datep);
$salary->id = $objp->sid; $salary->id = $objp->sid;
$salary->ref = $objp->sref ? $objp->sref : $objp->sid; $salary->ref = $objp->sref ? $objp->sref : $objp->sid;
$salary->label = $objp->label; $salary->label = $objp->label;
$salary->datesp = $db->jdate($objp->datesp); $salary->datesp = $db->jdate($objp->datesp);
$salary->dateep = $db->jdate($objp->dateep); $salary->dateep = $db->jdate($objp->dateep);
$salary->paye = $objp->paye; $salary->paye = $objp->paye;
$salary->amount = $objp->amount;
$payment_salary->id = $objp->rowid;
$payment_salary->ref = $objp->ref;
$payment_salary->datep = $db->jdate($objp->datep);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td class="nowraponall">'; print '<td class="nowraponall">';
@ -407,7 +408,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n"; print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n"; print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
//print '<td class="right" class="nowraponall"><span class="ampount">'.price($objp->amount).'</span></td>'; print '<td class="right" class="nowraponall"><span class="amount">'.price($objp->amount).'</span></td>';
print '<td class="right" class="nowraponall">'.$salary->getLibStatut(5, $objp->alreadypaid).'</td>'; print '<td class="right" class="nowraponall">'.$salary->getLibStatut(5, $objp->alreadypaid).'</td>';
print '</tr>'; print '</tr>';
@ -416,7 +417,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
$db->free($resql); $db->free($resql);
if ($num <= 0) { if ($num <= 0) {
print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>'; print '<td colspan="5" class="opacitymedium">'.$langs->trans("None").'</a>';
} }
print "</table>"; print "</table>";
} else { } else {
@ -424,9 +425,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
} }
} }
/* // Latest leave requests
* Last holidays
*/
if (!empty($conf->holiday->enabled) && if (!empty($conf->holiday->enabled) &&
($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id)) ($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))
) { ) {
@ -478,9 +477,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
} }
} }
/* // Latest expense report
* Last expense report
*/
if (!empty($conf->expensereport->enabled) && if (!empty($conf->expensereport->enabled) &&
($user->rights->expensereport->readall || ($user->rights->expensereport->lire && $object->id == $user->id)) ($user->rights->expensereport->readall || ($user->rights->expensereport->lire && $object->id == $user->id))
) { ) {
@ -516,7 +513,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print '<td class="nowrap">'; print '<td class="nowrap">';
print $exp->getNomUrl(1); print $exp->getNomUrl(1);
print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n"; print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
print '<td class="right" style="min-width: 60px">'.price($objp->total_ttc).'</td>'; print '<td class="right" style="min-width: 60px"><span class="amount">'.price($objp->total_ttc).'</span></td>';
print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>'; print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>';
$i++; $i++;
} }