Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-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-invoices
Commits
4297f093
Commit
4297f093
authored
Oct 22, 2021
by
Project Open
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed portlet to work with financial documents related to more than one project
parent
4ca0ddf4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
dependency-tree.tcl
lib/dependency-tree.tcl
+4
-5
No files found.
lib/dependency-tree.tcl
View file @
4297f093
...
...
@@ -24,7 +24,7 @@ set invoice_base_url "/intranet-invoices/view"
# Main project
# -------------------------------------------------------------
set
main_project_id
[
db_list pids
"
set
main_project_id
s
[
db_list pids
"
select main_p.project_id
from acs_rels r,
im_projects p,
...
...
@@ -34,8 +34,7 @@ set main_project_id [db_list pids "
main_p.tree_sortkey = tree_root_key(p.tree_sortkey);
"
]
# ad_return_complaint 1 $main_project_id
lappend
main_project_ids 0
# -------------------------------------------------------------
# Get info about all financial documents of the project
...
...
@@ -56,7 +55,7 @@ set costs_sql "
im_costs c
LEFT OUTER JOIN im_invoices i ON (c.cost_id = i.invoice_id)
LEFT OUTER JOIN im_invoice_items ii ON (c.cost_id = ii.invoice_id)
where main_p.project_id
= :main_project_id
and
where main_p.project_id
in (
[
join
$main
_project_ids
","
]
)
and
p.tree_sortkey between main_p.tree_sortkey and tree_right(main_p.tree_sortkey) and
c.project_id = p.project_id and
c.cost_type_id not in (3714, 3718, 3720, 3722, 3726, 3736, 73102)
...
...
@@ -72,7 +71,7 @@ set costs_sql "
im_costs c
LEFT OUTER JOIN im_invoices i ON (c.cost_id = i.invoice_id)
LEFT OUTER JOIN im_invoice_items ii ON (c.cost_id = ii.invoice_id)
where main_p.project_id
= :main_project_id
and
where main_p.project_id
in (
[
join
$main
_project_ids
","
]
)
and
p.tree_sortkey between main_p.tree_sortkey and tree_right(main_p.tree_sortkey) and
r.object_id_one = p.project_id and
r.object_id_two = c.cost_id and
...
...
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