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
b8fb0f80
Commit
b8fb0f80
authored
Mar 08, 2018
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Added project_wbs
parent
363a637d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
new-3.tcl
www/invoices/new-3.tcl
+3
-3
No files found.
www/invoices/new-3.tcl
View file @
b8fb0f80
...
...
@@ -325,7 +325,7 @@ if {$aggregate_tasks_p} {
coalesce(t.material_id, :default_material_id) as task_material_id,
coalesce(t.uom_id, :default_uom_id) as uom_id,
p.project_type_id as task_type_id,
p.project_nr
as outline_nr,
coalesce(p.project_wbs, p.project_nr)
as outline_nr,
p.company_id
from
im_projects parent,
...
...
@@ -358,7 +358,7 @@ if {$aggregate_tasks_p} {
t.planned_units as planned_sum,
t.billable_units as billable_sum,
t.task_id,
p.project_nr
as outline_nr,
coalesce(p.project_wbs, p.project_nr)
as outline_nr,
CASE WHEN t.uom_id = 321 THEN
(select sum(h.days) from im_hours h where h.project_id = p.project_id)
ELSE
...
...
@@ -483,7 +483,7 @@ order by
(
$task
_sum_inner_sql) s
LEFT JOIN im_projects p ON (s.project_id = p.project_id)
order by
p.project_id
s.outline_nr
"
set ctr 1
...
...
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