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
ecf94ac4
Commit
ecf94ac4
authored
Nov 06, 2023
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Cancellation Invoice
parent
0cda2c45
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
intranet-timesheet2-invoices-procs.tcl
tcl/intranet-timesheet2-invoices-procs.tcl
+8
-0
new-2.tcl
www/invoices/new-2.tcl
+3
-0
new-3.tcl
www/invoices/new-3.tcl
+1
-0
No files found.
tcl/intranet-timesheet2-invoices-procs.tcl
View file @
ecf94ac4
...
@@ -165,6 +165,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
...
@@ -165,6 +165,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
-select_project:required
-select_project:required
-start_date:required
-start_date:required
-end_date:required
-end_date:required
{
-filter_status_id
""
}
-invoice_hour_type:required
-invoice_hour_type:required
}
{
}
{
Returns a formatted HTML table representing the list of subprojects
Returns a formatted HTML table representing the list of subprojects
...
@@ -226,6 +227,12 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
...
@@ -226,6 +227,12 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
# Show a line with with the selected invoicing type
# Show a line with with the selected invoicing type
set select_row_colspan 3
set select_row_colspan 3
if
{
$show
_project_nr_p
}
{
incr select_row_colspan
}
if
{
$show
_project_nr_p
}
{
incr select_row_colspan
}
set extra_where
""
if
{
""
ne
$filter
_status_id
}
{
set extra_where
"and children.project_status_id in (
[
join
[
im_sub_categories
$filter
_status_id
]
","
]
)"
}
append task_table_rows
"
append task_table_rows
"
<tr>
<tr>
...
@@ -287,6 +294,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
...
@@ -287,6 +294,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
where
where
children.tree_sortkey between parent.tree_sortkey and tree_right(parent.tree_sortkey)
children.tree_sortkey between parent.tree_sortkey and tree_right(parent.tree_sortkey)
and parent.project_id in (
[
join
$select
_project
","
]
)
and parent.project_id in (
[
join
$select
_project
","
]
)
$extra
_where
order by
order by
parent.project_name,
parent.project_name,
children.tree_sortkey
children.tree_sortkey
...
...
www/invoices/new-2.tcl
View file @
ecf94ac4
...
@@ -22,6 +22,7 @@ ad_page_contract {
...
@@ -22,6 +22,7 @@ ad_page_contract {
{
cost_center_id:integer 0
}
{
cost_center_id:integer 0
}
{
start_date
""
}
{
start_date
""
}
{
end_date
""
}
{
end_date
""
}
{
filter_status_id
""
}
{
return_url
""
}
{
return_url
""
}
}
}
...
@@ -196,6 +197,7 @@ ad_form \
...
@@ -196,6 +197,7 @@ ad_form \
-form
{
-form
{
{
start_date:text
(
text
)
,optional
{
label
$start
_date_l10n
}}
{
start_date:text
(
text
)
,optional
{
label
$start
_date_l10n
}}
{
end_date:text
(
text
)
,optional
{
label
$end
_date_l10n
}}
{
end_date:text
(
text
)
,optional
{
label
$end
_date_l10n
}}
{
filter_status_id:text
(
im_category_tree
)
,optional
{
label
"
[
_ intranet-timesheet2-tasks.Status
]
"
}
{
custom
{
category_type
"Intranet Project Status"
translate_p 1
}}}
}
}
template::element::set_value
$form
_id start_date
$start
_date
template::element::set_value
$form
_id start_date
$start
_date
...
@@ -210,6 +212,7 @@ set task_table_rows [im_timesheet_invoicing_project_hierarchy \
...
@@ -210,6 +212,7 @@ set task_table_rows [im_timesheet_invoicing_project_hierarchy \
-select_project
$select
_project
\
-select_project
$select
_project
\
-start_date
$start
_date
\
-start_date
$start
_date
\
-end_date
$end
_date
\
-end_date
$end
_date
\
-filter_status_id
$filter
_status_id
\
-invoice_hour_type
""
\
-invoice_hour_type
""
\
]
]
www/invoices/new-3.tcl
View file @
ecf94ac4
...
@@ -222,6 +222,7 @@ switch $target_cost_type_id {
...
@@ -222,6 +222,7 @@ switch $target_cost_type_id {
3704
{
set default_template_id
$default
_bill_template_id
}
3704
{
set default_template_id
$default
_bill_template_id
}
3706
{
set default_template_id
$default
_po_template_id
}
3706
{
set default_template_id
$default
_po_template_id
}
3724
{
set default_template_id
$default
_delnote_template_id
}
3724
{
set default_template_id
$default
_delnote_template_id
}
3752
{
set default_template_id
$default
_invoice_template_id
}
}
}
set
due_date
[
db_string get_due_date
"select to_date(to_char(sysdate,'YYYY-MM-DD'),'YYYY-MM-DD') +
$default
_payment_days from dual"
]
set
due_date
[
db_string get_due_date
"select to_date(to_char(sysdate,'YYYY-MM-DD'),'YYYY-MM-DD') +
$default
_payment_days from dual"
]
...
...
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