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
8aaf58d1
Commit
8aaf58d1
authored
Mar 20, 2021
by
Project Open
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed "Aggregate per material and task type" function.
It seems this was messed up when introducing outline numbers
parent
8dc2dee6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
new-3.tcl
www/invoices/new-3.tcl
+1
-4
No files found.
www/invoices/new-3.tcl
View file @
8aaf58d1
...
...
@@ -278,12 +278,11 @@ if {$aggregate_tasks_p} {
sum(t.units_in_interval) as interval_sum,
sum(t.unbilled_units) as unbilled_sum,
parent.project_id as project_id,
-- t.task_id
,
'' as outline_nr
,
parent.project_id as task_id,
im_material_name_from_id(t.task_material_id) || ' - ' || im_category_from_id(t.task_type_id) as task_name,
t.task_type_id,
t.uom_id,
t.outline_nr,
t.company_id,
t.task_material_id as material_id
from
...
...
@@ -325,7 +324,6 @@ 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,
coalesce(p.project_wbs, p.project_nr) as outline_nr,
p.company_id
from
im_projects parent,
...
...
@@ -344,7 +342,6 @@ if {$aggregate_tasks_p} {
t.task_material_id,
t.task_type_id,
t.uom_id,
t.outline_nr,
t.company_id,
parent.project_id
"
...
...
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