projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CsvImport Aufträge: Variable besser benannt und Kommentar berichtigt.
[kivitendo-erp.git]
/
templates
/
webpages
/
common
/
show_vc_details.html
diff --git
a/templates/webpages/common/show_vc_details.html
b/templates/webpages/common/show_vc_details.html
index
be6406b
..
f374980
100644
(file)
--- a/
templates/webpages/common/show_vc_details.html
+++ b/
templates/webpages/common/show_vc_details.html
@@
-1,5
+1,6
@@
[%- USE T8 %]
[% USE HTML %]
[%- USE T8 %]
[% USE HTML %]
+<h1>[% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"</h1>
[% BLOCK jump_block %]
[%- IF SHIPTO.size || CONTACTS.size %]
[% BLOCK jump_block %]
[%- IF SHIPTO.size || CONTACTS.size %]
@@
-25,11
+26,6
@@
[%- END %]
[% END %]
[%- END %]
[% END %]
-
- <div width="100%" class="listtop">
- [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"
- </div>
-
[%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
<a name="billing"><h1>[% 'Billing Address' | $T8 %]</h1></a>
[%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
<a name="billing"><h1>[% 'Billing Address' | $T8 %]</h1></a>
@@
-70,6
+66,11
@@
<td>[% HTML.escape(country) %]</td>
</tr>
<td>[% HTML.escape(country) %]</td>
</tr>
+ <tr>
+ <td align="right">[% 'GLN' | $T8 %]</td>
+ <td>[% HTML.escape(gln) %]</td>
+ </tr>
+
<tr>
<td align="right">[% 'Contact Person' | $T8 %]</td>
<td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
<tr>
<td align="right">[% 'Contact Person' | $T8 %]</td>
<td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
@@
-102,14
+103,26
@@
<tr>
<td align="right">[% 'Discount' | $T8 %]</td>
<tr>
<td align="right">[% 'Discount' | $T8 %]</td>
- <td>[% HTML.escape(discount) %]%</td>
+ <td>[% HTML.escape(discount
_as_percent
) %]%</td>
</tr>
</tr>
+ [% IF is_customer %]
+ <tr>
+ <td align="right">[% 'Pricegroup' | $T8 %]</td>
+ <td>[% HTML.escape(pricegroup) %]</td>
+ </tr>
+ [% END %]
+
<tr>
<td align="right">[% 'Payment Terms' | $T8 %]</td>
<td>[% HTML.escape(payment_terms) %]</td>
</tr>
<tr>
<td align="right">[% 'Payment Terms' | $T8 %]</td>
<td>[% HTML.escape(payment_terms) %]</td>
</tr>
+ <tr>
+ <td align="right">[% 'Delivery Terms' | $T8 %]</td>
+ <td>[% HTML.escape(delivery_terms) %]</td>
+ </tr>
+
<tr>
<td align="right">[% 'Tax Number' | $T8 %]</td>
<td>[% HTML.escape(taxnumber) %]</td>
<tr>
<td align="right">[% 'Tax Number' | $T8 %]</td>
<td>[% HTML.escape(taxnumber) %]</td>
@@
-142,6
+155,15
@@
<td>[% HTML.escape(bank) %]</td>
</tr>
<td>[% HTML.escape(bank) %]</td>
</tr>
+ <tr>
+ <td align="right">[% 'IBAN' | $T8 %]</td>
+ <td>[% HTML.escape(iban) %]</td>
+ </tr>
+
+ <tr>
+ <td align="right">[% 'BIC' | $T8 %]</td>
+ <td>[% HTML.escape(bic) %]</td>
+ </tr>
<tr>
<td align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</td>
<td>[% HTML.escape(business) %]</td>
<tr>
<td align="right">[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</td>
<td>[% HTML.escape(business) %]</td>
@@
-196,6
+218,11
@@
<td>[% HTML.escape(row.shiptocountry) %]</td>
</tr>
<td>[% HTML.escape(row.shiptocountry) %]</td>
</tr>
+ <tr>
+ <td align="right">[% 'GLN' | $T8 %]</td>
+ <td>[% HTML.escape(row.shiptogln) %]</td>
+ </tr>
+
<tr>
<td align="right">[% 'Contact Person' | $T8 %]</td>
<td>[% HTML.escape(row.shiptocontact) %]</td>
<tr>
<td align="right">[% 'Contact Person' | $T8 %]</td>
<td>[% HTML.escape(row.shiptocontact) %]</td>