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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-03 21:40:23 +01:00
parent 695a681c14
commit 5a6e46a9c3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/projects.lang
View File

@ -241,4 +241,5 @@ TimeSpentForInvoice=Time spent
GenerateInvoice=Generate invoice GenerateInvoice=Generate invoice
OneLinePerUser=One line per user OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
ProjectBillTimeDescription=Check if you enter timesheet on project and plan to generate invoice from the timesheet to invoice the customer of project.

15
htdocs/projet/card.php
View File

@ -622,7 +622,10 @@ if ($action == 'create' && $user->rights->projet->creer)
// Bill time // Bill time
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT)) if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{ {
print '<tr><td>'.$langs->trans("BillTime").'</td>'; print '<tr><td>';
$htmltext = $langs->trans("ProjectBillTimeDescription");
print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
print '</td>';
print '<td><input type="checkbox" name="bill_time"'.(GETPOST('bill_time', 'alpha')!=''?' checked="checked"':'').'"></td>'; print '<td><input type="checkbox" name="bill_time"'.(GETPOST('bill_time', 'alpha')!=''?' checked="checked"':'').'"></td>';
print '</tr>'; print '</tr>';
} }
@ -857,7 +860,10 @@ elseif ($object->id > 0)
// Bill time // Bill time
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT)) if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{ {
print '<tr><td>'.$langs->trans("BillTime").'</td>'; print '<tr><td>';
$htmltext = $langs->trans("ProjectBillTimeDescription");
print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
print '</td>';
print '<td><input type="checkbox" name="bill_time"'.((GETPOSTISSET('bill_time')?GETPOST('bill_time', 'alpha'):$object->bill_time) ? ' checked="checked"' : '').'"></td>'; print '<td><input type="checkbox" name="bill_time"'.((GETPOSTISSET('bill_time')?GETPOST('bill_time', 'alpha'):$object->bill_time) ? ' checked="checked"' : '').'"></td>';
print '</tr>'; print '</tr>';
} }
@ -987,7 +993,10 @@ elseif ($object->id > 0)
// Bill time // Bill time
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT)) if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{ {
print '<tr><td>'.$langs->trans("BillTime").'</td>'; print '<tr><td>';
$htmltext = $langs->trans("ProjectBillTimeDescription");
print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
print '</td>';
print '<td>'.yn($object->bill_time).'</td>'; print '<td>'.yn($object->bill_time).'</td>';
print '</tr>'; print '</tr>';
} }