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
f5087a74
Commit
f5087a74
authored
Jul 11, 2017
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed issue reported by AECres about outline_nr
parent
edf759bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
new-3.tcl
www/invoices/new-3.tcl
+3
-0
No files found.
www/invoices/new-3.tcl
View file @
f5087a74
...
@@ -283,6 +283,7 @@ if {$aggregate_tasks_p} {
...
@@ -283,6 +283,7 @@ if {$aggregate_tasks_p} {
im_material_name_from_id(t.task_material_id) || ' - ' || im_category_from_id(t.task_type_id) as task_name,
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.task_type_id,
t.uom_id,
t.uom_id,
t.outline_nr,
t.company_id,
t.company_id,
t.task_material_id as material_id
t.task_material_id as material_id
from
from
...
@@ -324,6 +325,7 @@ if {$aggregate_tasks_p} {
...
@@ -324,6 +325,7 @@ if {$aggregate_tasks_p} {
coalesce(t.material_id, :default_material_id) as task_material_id,
coalesce(t.material_id, :default_material_id) as task_material_id,
coalesce(t.uom_id, :default_uom_id) as uom_id,
coalesce(t.uom_id, :default_uom_id) as uom_id,
p.project_type_id as task_type_id,
p.project_type_id as task_type_id,
p.project_nr as outline_nr,
p.company_id
p.company_id
from
from
im_projects parent,
im_projects parent,
...
@@ -342,6 +344,7 @@ if {$aggregate_tasks_p} {
...
@@ -342,6 +344,7 @@ if {$aggregate_tasks_p} {
t.task_material_id,
t.task_material_id,
t.task_type_id,
t.task_type_id,
t.uom_id,
t.uom_id,
t.outline_nr,
t.company_id,
t.company_id,
parent.project_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