Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2-invoices
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-timesheet2-invoices
Commits
2e2d00a0
Commit
2e2d00a0
authored
Sep 04, 2023
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosine #5667: Timesheet Prices now show project_name instead of project_nr
parent
64175c19
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
intranet-timesheet2-invoices-procs.tcl
tcl/intranet-timesheet2-invoices-procs.tcl
+2
-1
No files found.
tcl/intranet-timesheet2-invoices-procs.tcl
View file @
2e2d00a0
...
...
@@ -84,6 +84,7 @@ ad_proc im_timesheet_price_component { user_id company_id return_url} {
to_char(tp.valid_from, 'YYYY-MM-DD') as valid_from,
to_char(tp.valid_through, 'YYYY-MM-DD') as valid_through,
im_material_nr_from_id(tp.material_id) as material,
p.project_name,
p.project_nr
from
im_timesheet_prices tp
...
...
@@ -114,7 +115,7 @@ ad_proc im_timesheet_price_component { user_id company_id return_url} {
<td><a href='
$url
'>
$uom
</a></td>
<td>
$task
_type</td>
<td>
$material
</td>
<td>
$project
_n
r
</td>
<td>
$project
_n
ame
</td>
<td>
$valid
_from</td>
<td>
$valid
_through</td>
<td>
[
format
$price
_format
$price
]
$currency
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment