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
e0f4cdb0
Commit
e0f4cdb0
authored
Nov 01, 2013
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-- slightly better layout
-- fixed issue w/ customer_contact_id
parent
2af364f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
new-3.adp
www/invoices/new-3.adp
+5
-6
new-3.tcl
www/invoices/new-3.tcl
+5
-1
No files found.
www/invoices/new-3.adp
View file @
e0f4cdb0
...
...
@@ -14,7 +14,7 @@
@include_task_html;noquote@
<!-- Invoice Data and Receipient Tables -->
<table cellpadding=0 cellspacing=0 bordercolor=#6699CC border=0
width=100%
>
<table cellpadding=0 cellspacing=0 bordercolor=#6699CC border=0>
<tr valign=top>
<td>
...
...
@@ -79,8 +79,7 @@
</td>
<td></td>
<td align=right>
<td align=left>
<table border=0 cellspacing=2 cellpadding=0 >
<tr>
<td align=center valign=top class=rowtitle colspan=2>
...
...
@@ -117,9 +116,9 @@
</tr>
</table>
<br/><br/>
<!-- the list of tasks (invoicable items) -->
<div align=
righ
t>
<div align=
lef
t>
<table cellpadding=2 cellspacing=2 border=0>
<%= [im_timesheet_invoicing_project_hierarchy \
-select_project $select_project \
...
...
@@ -136,7 +135,7 @@
<!-- the list of task sums, distinguised by type and UOM -->
<table width=100%>
<tr>
<td align=
righ
t><table border=0 cellspacing=2 cellpadding=1>
<td align=
lef
t><table border=0 cellspacing=2 cellpadding=1>
@task_sum_html;noquote@
...
...
www/invoices/new-3.tcl
View file @
e0f4cdb0
...
...
@@ -144,6 +144,8 @@ set contact_ids [db_list contact_ids "
if
{[
llength
$contact
_ids
]
> 0
}
{
set company_contact_id
[
lindex
$contact
_ids 0
]
}
else
{
set company_contact_id
""
}
if
{
""
==
$company
_contact_id
}
{
set company_contact_id
$accounting
_contact_id
}
if
{
""
==
$company
_contact_id
}
{
set company_contact_id
$primary
_contact_id
}
...
...
@@ -245,7 +247,9 @@ append task_sum_html "
#
set
price_colspan 11
set
reference_price_html
"
<tr><td align=middle class=rowtitle colspan=
$price
_colspan>
[
_ intranet-timesheet2-invoices.Reference_Prices
]
</td></tr>
<tr>
<td align=middle class=rowtitle colspan=
$price
_colspan>
[
_ intranet-timesheet2-invoices.Reference_Prices
]
</td>
</tr>
<tr>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.Company
]
</td>
<td class=rowtitle>
[
_ intranet-timesheet2-invoices.UoM
]
</td>
...
...
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