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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-23 15:34:24 +01:00
commit b42193b9ea
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/expensereport/card.php
View File

@ -1978,7 +1978,8 @@ else
$i = 0;$total = 0;
print '<tr class="liste_titre">';
print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
print '<td style="text-align:center;">'.$langs->trans('LineNb').'</td>';
//print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
if (! empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
@ -2001,15 +2002,21 @@ else
foreach ($object->lines as &$line)
{
$piece_comptable = $i + 1;
$numline = $i + 1;
if ($action != 'editline' || $line->rowid != GETPOST('rowid'))
{
print '<tr class="oddeven">';
print '<td style="text-align:center;">';
print $numline;
print '</td>';
/*print '<td style="text-align:center;">';
print img_picto($langs->trans("Document"), "object_generic");
print ' <span>'.$piece_comptable.'</span></td>';
print ' <span>'.$piece_comptable.'</span>';
print '</td>';*/
print '<td style="text-align:center;">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
if (! empty($conf->projet->enabled))
{

1
htdocs/langs/en_US/main.lang
View File

@ -854,6 +854,7 @@ FileNotShared=File not shared to exernal public
Project=Project
Projects=Projects
Rights=Permissions
LineNb=Line nb
# Week day
Monday=Monday
Tuesday=Tuesday