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
0040abaf
Commit
0040abaf
authored
Sep 04, 2023
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosine #5667: Changed order and sort order
parent
2b15f1f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
intranet-timesheet2-invoices-procs.tcl
tcl/intranet-timesheet2-invoices-procs.tcl
+7
-6
No files found.
tcl/intranet-timesheet2-invoices-procs.tcl
View file @
0040abaf
...
...
@@ -65,10 +65,10 @@ ad_proc im_timesheet_price_component { user_id company_id return_url} {
<table border=0>
<tr><td colspan=
$colspan
class=rowtitle align=center>
[
_ intranet-timesheet2-invoices.Price_List
]
</td></tr>
<tr class=rowtitle>
<td class=rowtitle>
[
lang::message::lookup
""
intranet-timesheet2-invoices.Project
"Project"
]
</td>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.UoM
]
</td>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.Task_Type
]
</td>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.Material
]
</td>
<td class=rowtitle>
[
lang::message::lookup
""
intranet-timesheet2-invoices.Project
"Project"
]
</td>
<td class=rowtitle>
[
lang::message::lookup
""
intranet-timesheet2-invoices.From
"From"
]
</td>
<td class=rowtitle>
[
lang::message::lookup
""
intranet-timesheet2-invoices.Through
"Through"
]
</td>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.Rate
]
</td>
...
...
@@ -93,10 +93,11 @@ ad_proc im_timesheet_price_component { user_id company_id return_url} {
where
tp.company_id = :company_id
order by
tp.currency
,
p.project_name
,
tp.uom_id,
tp.task_type_id desc,
tp.material_id,
tp.
task_type_id desc
tp.
currency
"
set price_rows_html
""
...
...
@@ -112,13 +113,13 @@ ad_proc im_timesheet_price_component { user_id company_id return_url} {
append price_rows_html
"
<tr
$bgcolor
(
[
expr
{
$ctr
% 2
}]
) nobreak>
<td><a href='
$url
'>
$uom
</a></td>
<td>
$project
_name</td>
<td>
$uom
</td>
<td>
$task
_type</td>
<td>
$material
</td>
<td>
$project
_name</td>
<td>
$valid
_from</td>
<td>
$valid
_through</td>
<td>
[
format
$price
_format
$price
]
$currency
</td>
<td>
<a href='
$url
'>
[
format
$price
_format
$price
]
$currency
</a>
</td>
<td><input type=checkbox name=price_id.
$price
_id id=price_id.
$price
_id></td>
</tr>"
incr ctr
...
...
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