Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2
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
Dominique Lenoir
intranet-timesheet2
Commits
9d9cd716
Commit
9d9cd716
authored
Jan 16, 2020
by
cosine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Now using default hourly_rate instead of 0.0 for logging hours
parent
bc44aabb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
intranet-timesheet2-procs.tcl
tcl/intranet-timesheet2-procs.tcl
+2
-1
No files found.
tcl/intranet-timesheet2-procs.tcl
View file @
9d9cd716
...
...
@@ -130,6 +130,7 @@ ad_proc -public im_timesheet2_sync_timesheet_costs {
if
{
!$sync_timesheet_costs
}
{
return
}
set default_currency
[
im_parameter -package_id
[
im_package_cost_id
]
"DefaultCurrency"
""
"EUR"
]
set default_hourly_cost
[
parameter::get_from_package_key -package_key intranet-cost -parameter DefaultTimesheetHourlyCost -default 100
]
set user_sql
""
set project_sql
""
...
...
@@ -154,7 +155,7 @@ ad_proc -public im_timesheet2_sync_timesheet_costs {
h.*,
h.day::date as hour_date,
h.user_id as hour_user_id,
coalesce(e.hourly_cost,
0
) as billing_rate,
coalesce(e.hourly_cost,
:default_hourly_cost
) as billing_rate,
coalesce(e.currency, :default_currency) as billing_currency,
p.company_id as customer_id,
p.project_nr,
...
...
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