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

Work on invoicing time spent

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-15 21:01:01 +01:00
parent 734d022305
commit d6b0f852c5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.form.class.php
View File

@ -6754,8 +6754,11 @@ class Form
// Special case for project/task page // Special case for project/task page
if ($paramid == 'project_ref') if ($paramid == 'project_ref')
{ {
$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/','/tasks.php',$navurl); if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl)) // TODO Remove this when nav with project_ref on task pages are ok
$paramid='ref'; {
$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
$paramid='ref';
}
} }
// accesskey is for Windows or Linux: ALT + key for chrome, ALT + SHIFT + KEY for firefox // accesskey is for Windows or Linux: ALT + key for chrome, ALT + SHIFT + KEY for firefox

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

@ -235,3 +235,4 @@ RecordsClosed=%s project(s) closed
SendProjectRef=Information project %s SendProjectRef=Information project %s
ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
NewTaskRefSuggested=Task ref already used, a new task ref is required NewTaskRefSuggested=Task ref already used, a new task ref is required
TimeSpentInvoiced=Time spent billed