Skip to content

I
intranet-invoices
Commit 1d698ba0 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Changes for invoicing article

parent c1d6d99a
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 121 deletions
tcl/intranet-invoices-procs.tcl
View file @ 1d698ba0
......@@ -513,12 +513,14 @@ ad_proc im_invoices_object_list_component { user_id invoice_id read write return
<tr>
<td align=left colspan=2>
<select name=action>
<option value='set_invoiced'>[lang::message::lookup "" intranet-invoices.Set_to_invoiced "Set to invoiced"]</option>
<option value='delete'>[_ intranet-core.Delete]</option>
<option value='add_project'>[_ intranet-invoices.Add_a_Project]</option>
<input type=submit value='[_ intranet-core.Apply]'>
<option value=\"set_invoiced\">[lang::message::lookup "" intranet-invoices.Set_to_invoiced "Set to invoiced"]</option>
<option value=\"delete\">[_ intranet-core.Delete]</option>
<option value=\"add_project\">[_ intranet-invoices.Add_a_Project]</option>
</select>
<input type=submit value=\"[_ intranet-core.Apply]\">
</td>
</tr>\n"
</tr>
"
}
append return_html "
</table>
......
www/view.adp
View file @ 1d698ba0
......@@ -15,28 +15,19 @@
<%= [im_invoices_object_list_component $user_id $invoice_id $read $write $return_url] %>
</td>
<td>&nbsp;&nbsp;</td>
<td valign="top">
@payment_list_html;noquote@
</td>
<td valign="top">@payment_list_html;noquote@</td>
</tr>
</table>
</td>
<if @surcharge_enabled_p@>
<td>
<td>
<table cellpadding=0 cellspacing=0>
<form action=invoice-discount-surcharge-action method=POST>
<%= [export_vars -form {{return_url $current_url} invoice_id}] %>
<tr class=rowtitle>
<td class=rowtitle align=center colspan=3>@submit_msg@</td>
</tr>
<!-- <tr class=rowtitle>
<td class=rowtitle align=center>&nbsp;</td>
<td class=rowtitle align=center>#intranet-invoices.Description#</td>
<td class=rowtitle align=center>%</td>
</tr>
-->
<tr>
<td><input type=checkbox name=line_check.1 @pm_fee_checked@></td>
<td><input type=textbox size=30 name=line_desc.1 value="@pm_fee_msg@"></td>
......@@ -79,16 +70,11 @@
<li>
<% set preview_vars [export_vars -url {invoice_id {render_template_id $invoice_template_id} return_url}] %>
<A HREF="/intranet-invoices/view?@preview_vars@">
<%= [lang::message::lookup "" intranet-invoices.Preview_using_template "Preview using template"] %>
</A>
<a HREF="/intranet-invoices/view?@preview_vars@"><%= [lang::message::lookup "" intranet-invoices.Preview_using_template "Preview using template"] %></a>
<if @pdf_enabled_p@>
<li>
<% set preview_vars [export_vars -url {invoice_id {render_template_id $invoice_template_id} return_url}] %>
<A HREF="/intranet-invoices/view?@preview_vars@&amp;pdf_p=1">
<%= [lang::message::lookup "" intranet-invoices.Preview_as_PDF "Preview as PDF"] %>
</A>
<a HREF="/intranet-invoices/view?@preview_vars@&amp;pdf_p=1"><%= [lang::message::lookup "" intranet-invoices.Preview_as_PDF "Preview as PDF"] %></a>
</li>
</if>
......@@ -96,16 +82,15 @@
<li>
<%
set level_of_details [parameter::get -package_id [apm_package_id_from_key intranet-invoices] -parameter LevelOfDetailsTimesheetHoursReport -default 4]
set ts_url [export_vars -base $timesheet_report_url {{level_of_detail $level_of_details} {invoice_id $invoice_id}}] %>
<A HREF="@ts_url;noquote@">
<%= [lang::message::lookup "" intranet-invoices.Show_Included_Timesheet_Hours "Show Included Timesheet Hours"] %>
</A>
set ts_url [export_vars -base $timesheet_report_url {{level_of_detail $level_of_details} {invoice_id $invoice_id}}]
%>
<a HREF="@ts_url;noquote@"><%= [lang::message::lookup "" intranet-invoices.Show_Included_Timesheet_Hours "Show Included Timesheet Hours"] %></a>
</li>
</if>
<if @show_promote_to_timesheet_invoice_p@>
<li>
<A HREF="<%= [export_vars -base "/intranet-timesheet2-invoices/invoices/promote-invoice-to-timesheet-invoice" {invoice_id return_url}] %>"><%= [lang::message::lookup "" intranet-invoices.Promote_Invoice_to_Timesheet_Invoice "Promote Invoice to Timesheet Invoice"] %></A>
<a HREF="<%= [export_vars -base "/intranet-timesheet2-invoices/invoices/promote-invoice-to-timesheet-invoice" {invoice_id return_url}] %>"><%= [lang::message::lookup "" intranet-invoices.Promote_Invoice_to_Timesheet_Invoice "Promote Invoice to Timesheet Invoice"] %></a>
</li>
</if>
......@@ -118,12 +103,14 @@
<% set target_cost_type_id [im_cost_type_invoice] %>
<% set gen_vars [export_vars -url {source_invoice_id target_cost_type_id return_url}] %>
<A HREF="/intranet-invoices/new-copy?@gen_vars@">@blurb@</A>
</li>
<li>
<% set blurb [lang::message::lookup $user_locale intranet-invoices.Generate_Delivery_Note_from_Quote "Generate Delivery Note from Quote"] %>
<% set source_invoice_id $invoice_id %>
<% set target_cost_type_id [im_cost_type_delivery_note] %>
<% set gen_vars [export_vars -url {source_invoice_id target_cost_type_id return_url}] %>
<A HREF="/intranet-invoices/new-copy?@gen_vars@">@blurb@</A>
</li>
</if>
<if @document_delnote_p@ eq "1">
......@@ -133,9 +120,9 @@
<% set target_cost_type_id [im_cost_type_invoice] %>
<% set gen_vars [export_vars -url {source_invoice_id target_cost_type_id return_url}] %>
<A HREF="/intranet-invoices/new-copy?@gen_vars@">@blurb@</A>
</li>
</if>
<if @document_po_p@ eq "1">
<li>
<% set blurb [lang::message::lookup $user_locale intranet-invoices.Generate_Provider_Bill_from_Purchase_Order "Generate Provider Bill from Purchase Order"] %>
......@@ -143,38 +130,34 @@
<% set target_cost_type_id [im_cost_type_bill] %>
<% set gen_vars [export_vars -url {source_invoice_id target_cost_type_id return_url}] %>
<A HREF="/intranet-invoices/new-copy?@gen_vars@">@blurb@</A>
</li>
</if>
<if @document_invoice_p@ eq "1">
<li>
<A HREF="/intranet-invoices/new-copy?target_cost_type_id=3700&amp;source_cost_type_id=3700&amp;source_invoice_id=<%=$invoice_id%>">
<%= [lang::message::lookup "" intranet-invoices.Duplicate_Invoice "Duplicate Invoice"] %>
</A>
<A HREF="/intranet-invoices/new-copy?target_cost_type_id=3700&amp;source_cost_type_id=3700&amp;source_invoice_id=<%=$invoice_id%>"><%= [lang::message::lookup "" intranet-invoices.Duplicate_Invoice "Duplicate Invoice"] %></a>
</li>
</if>
</if>
<if @write@>
<if "adp" eq @invoice_template_type@>
<if "adp" eq @invoice_template_type@>
<li>
<% set url [export_vars -base "/intranet-invoices/view" {invoice_id {render_template_id $invoice_template_id} {send_to_user_as "html"} return_url}] %>
<A HREF="@url@">
<%= [lang::message::lookup "" intranet-invoices.Send_document_as_HTML_attachment "Send this %cost_type% as HTML attachment"] %>
</A>
</if>
<if @pdf_enabled_p@>
<a HREF="@url@"><%= [lang::message::lookup "" intranet-invoices.Send_document_as_HTML_attachment "Send this %cost_type% as HTML attachment"] %></a>
</li>
</if>
<if @pdf_enabled_p@>
<li>
<% set url [export_vars -base "/intranet-invoices/view" {invoice_id {render_template_id $invoice_template_id} {send_to_user_as "pdf"} return_url}] %>
<A HREF="@url@">
<%= [lang::message::lookup "" intranet-invoices.Send_document_as_PDF_attachment "Send this %cost_type% as PDF attachment"] %>
</A>
</if>
<a HREF="@url@"><%= [lang::message::lookup "" intranet-invoices.Send_document_as_PDF_attachment "Send this %cost_type% as PDF attachment"] %></a>
</li>
</if>
</if>
</ul>
</td>
</tr>
</table>
......@@ -196,17 +179,17 @@
</td>
</tr>
<tr>
<td class=rowodd>#intranet-invoices.cost_type_nr#.:</td>
<td class=rowodd>#intranet-invoices.cost_type_nr#</td>
<td class=rowodd>@invoice_nr@</td>
</tr>
<tr>
<td class=roweven>#intranet-invoices.cost_type_date#:</td>
<td class=roweven>#intranet-invoices.cost_type_date#</td>
<td class=roweven>@invoice_date_pretty@</td>
</tr>
<if @cost_center_installed_p@ >
<if @show_cost_center_p@>
<tr>
<td class=roweven><%= [lang::message::lookup "" intranet-cost.Cost_Center "Cost Center"] %>:</td>
<td class=roweven><%= [lang::message::lookup "" intranet-cost.Cost_Center "Cost Center"] %></td>
<td class=roweven>@cost_center_name@</td>
</tr>
</if>
......@@ -242,17 +225,17 @@
</tr>
<tr>
<td class=roweven>#intranet-invoices.cost_type_status#:</td>
<td class=roweven>#intranet-invoices.cost_type_status#</td>
<td class=roweven>@cost_status@</td>
</tr>
<if @timesheet_invoice_p@>
<tr>
<td class=rowodd><%= [lang::message::lookup "" intranet-timesheet2-invoices.Invoicing_Period_Start "Invoice Period Start"] %>:</td>
<td class=rowodd><%= [lang::message::lookup "" intranet-timesheet2-invoices.Invoicing_Period_Start "Invoice Period Start"] %></td>
<td class=rowodd>@invoice_period_start_pretty@</td>
</tr>
<tr>
<td class=roweven><%= [lang::message::lookup "" intranet-timesheet2-invoices.Invoicing_Period_Start "Invoice Period End"] %>:</td>
<td class=roweven><%= [lang::message::lookup "" intranet-timesheet2-invoices.Invoicing_Period_Start "Invoice Period End"] %></td>
<td class=roweven>@invoice_period_end_pretty@</td>
</tr>
</if>
......
www/view.tcl
View file @ 1d698ba0
......@@ -1196,7 +1196,7 @@ append subtotal_item_html "
set payment_terms_html "
<tr>
<td valign=top class=rowplain>[lang::message::lookup $locale intranet-invoices.Payment_Terms]</td>
<td valign=top class=rowplain>[lang::message::lookup $locale intranet-invoices.Payment_Terms]:</td>
<td valign=top colspan=[expr {$colspan-1}] class=rowplain>
[lang::message::lookup $locale intranet-invoices.lt_This_invoice_is_past_]
</td>
......@@ -1205,7 +1205,7 @@ set payment_terms_html "
set payment_method_html "
<tr>
<td valign=top class=rowplain>[lang::message::lookup $locale intranet-invoices.Payment_Method_1]</td>
<td valign=top class=rowplain>[lang::message::lookup $locale intranet-invoices.Payment_Method_1]:</td>
<td valign=top colspan=[expr {$colspan-1}] class=rowplain> $invoice_payment_method_desc</td>
</tr>
"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment