Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-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-invoices
Commits
60f86aa3
Commit
60f86aa3
authored
May 09, 2023
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After cosine fix with vat_type_enabled_p, also adding to "core" finance
parent
82ff01ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
new-copy.adp
www/new-copy.adp
+8
-1
new-copy.tcl
www/new-copy.tcl
+3
-0
No files found.
www/new-copy.adp
View file @
60f86aa3
...
...
@@ -285,7 +285,14 @@ window.addEventListener('load', function() {
<table border="0" cellspacing="1" cellpadding="0">
<tr>
<td>#intranet-invoices.VAT# </td>
<td><input type="text" name="vat" value='@vat@' size="4"> % </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"> %
</else>
</td>
</tr>
</table>
</td>
...
...
www/new-copy.tcl
View file @
60f86aa3
...
...
@@ -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
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?
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
]
...
...
@@ -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
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
...
...
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