Commit 60f86aa3 authored by Frank Bergmann's avatar Frank Bergmann

After cosine fix with vat_type_enabled_p, also adding to "core" finance

parent 82ff01ac
...@@ -285,7 +285,14 @@ window.addEventListener('load', function() { ...@@ -285,7 +285,14 @@ window.addEventListener('load', function() {
<table border="0" cellspacing="1" cellpadding="0"> <table border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<td>#intranet-invoices.VAT#&nbsp;</td> <td>#intranet-invoices.VAT#&nbsp;</td>
<td><input type="text" name="vat" value='@vat@' size="4"> % &nbsp;</td> <td>
<if @vat_type_id_enabled_p@ gt 0>
@vat_type_select;noquote@
</if>
<else>
<input type="text" name="vat" value="@vat@" size="4"> % &nbsp;
</else>
</td>
</tr> </tr>
</table> </table>
</td> </td>
......
...@@ -82,6 +82,8 @@ set discount_enabled_p [im_parameter -package_id [im_package_invoices_id] "Enabl ...@@ -82,6 +82,8 @@ set discount_enabled_p [im_parameter -package_id [im_package_invoices_id] "Enabl
set surcharge_enabled_p [im_parameter -package_id [im_package_invoices_id] "EnabledInvoiceSurchargeFieldP" "" 0] set surcharge_enabled_p [im_parameter -package_id [im_package_invoices_id] "EnabledInvoiceSurchargeFieldP" "" 0]
set outline_number_enabled_p [im_column_exists im_invoice_items item_outline_number] set outline_number_enabled_p [im_column_exists im_invoice_items item_outline_number]
set vat_type_id_enabled_p [im_parameter -package_id [im_package_invoices_id] "EnabledInvoiceVatTypeIdP" "" 0]
# Should we show a "Material" field for invoice lines? # Should we show a "Material" field for invoice lines?
set material_enabled_p [im_parameter -package_id [im_package_invoices_id] "ShowInvoiceItemMaterialFieldP" "" 0] set material_enabled_p [im_parameter -package_id [im_package_invoices_id] "ShowInvoiceItemMaterialFieldP" "" 0]
set project_type_enabled_p [im_parameter -package_id [im_package_invoices_id] "ShowInvoiceItemProjectTypeFieldP" "" 1] set project_type_enabled_p [im_parameter -package_id [im_package_invoices_id] "ShowInvoiceItemProjectTypeFieldP" "" 1]
...@@ -134,6 +136,7 @@ if { "" == $project_id || ![info exists project_id] } { ...@@ -134,6 +136,7 @@ if { "" == $project_id || ![info exists project_id] } {
# --------------------------------------------------------------- # ---------------------------------------------------------------
set customer_select [im_company_select -tag_attributes {id "customer_id"} customer_id $customer_id "" "CustOrIntl"] set customer_select [im_company_select -tag_attributes {id "customer_id"} customer_id $customer_id "" "CustOrIntl"]
set provider_select [im_company_select -tag_attributes {id "provider_id"} provider_id $provider_id "" "Provider"] set provider_select [im_company_select -tag_attributes {id "provider_id"} provider_id $provider_id "" "Provider"]
set vat_type_select [im_category_select "Intranet VAT Type" vat_type_id $vat_type_id]
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Determine whether it's an Invoice or a Bill # Determine whether it's an Invoice or a Bill
......
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