X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fcommon%2Fshow_vc_details.html;h=cd9d4b3a4bf2fb36eeff8d3e0835636af7755c70;hb=08460123f185fc145d4d87ae150b6b5f051d119a;hp=e0555d33cd67848a6aad33c403b780547fcadb96;hpb=6061749dc0ece2873ef61a0c14af1b8a9e46034a;p=kivitendo-erp.git
diff --git a/templates/webpages/common/show_vc_details.html b/templates/webpages/common/show_vc_details.html
index e0555d33c..cd9d4b3a4 100644
--- a/templates/webpages/common/show_vc_details.html
+++ b/templates/webpages/common/show_vc_details.html
@@ -1,10 +1,18 @@
[%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE LxERP -%]
+
[% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"
[% BLOCK jump_block %]
[%- IF SHIPTO.size || CONTACTS.size %]
[% 'Jump to' | $T8 %] [% 'Billing Address' | $T8 %]
+ [%- FOREACH additional_billing_addresses = ADDITIONAL_BILLING_ADDRESSES %]
+ ,
+
+ [% 'Additional Billing Address' | $T8 %]
+ "[% HTML.escape(additional_billing_addresses.name) %]"
+
+ [%- END %]
[%- FOREACH shipto = SHIPTO %]
,
@@ -25,12 +33,7 @@
[%- END %]
[% END %]
-
-
- [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] "[% HTML.escape(name) %]"
-
-
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
[% 'Billing Address' | $T8 %]
@@ -70,6 +73,11 @@
[% HTML.escape(country) %] |
+
+ [% 'GLN' | $T8 %] |
+ [% HTML.escape(gln) %] |
+
+
[% 'Contact Person' | $T8 %] |
[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %] |
@@ -102,7 +110,7 @@
[% 'Discount' | $T8 %] |
- [% HTML.escape(discount) %]% |
+ [% HTML.escape(discount_as_percent) %]% |
[% IF is_customer %]
@@ -117,6 +125,11 @@
[% HTML.escape(payment_terms) %] |
+
+ [% 'Delivery Terms' | $T8 %] |
+ [% HTML.escape(delivery_terms) %] |
+
+
[% 'Tax Number' | $T8 %] |
[% HTML.escape(taxnumber) %] |
@@ -149,6 +162,15 @@
[% HTML.escape(bank) %] |
+
+ [% 'IBAN' | $T8 %] |
+ [% HTML.escape(iban) %] |
+
+
+
+ [% 'BIC' | $T8 %] |
+ [% HTML.escape(bic) %] |
+
[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %] |
[% HTML.escape(business) %] |
@@ -167,13 +189,79 @@
+ [% FOREACH row = ADDITIONAL_BILLING_ADDRESSES %]
+
+
+
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
+
+ [% 'Additional Billing Address' | $T8 %] "[% HTML.escape(row.name) %]"
+
+
+
+ [% 'Default Billing Address' | $T8 %] |
+ [% row.default_address ? LxERP.t8('yes') : LxERP.t8('no') %] |
+
+
+
+ [% 'Name' | $T8 %] |
+ [% HTML.escape(row.name) %] |
+
+
+
+ [% 'Department' | $T8 %] |
+ [% HTML.escape(row.department_1) %][% IF row.department_2 %][% IF row.department_1 %]; [% END %][% HTML.escape(row.department_2) %][% END %] |
+
+
+
+ [% 'Street' | $T8 %] |
+ [% HTML.escape(row.street) %] |
+
+
+
+ [% 'Zip, City' | $T8 %] |
+ [% HTML.escape(row.zipcode) %] [% HTML.escape(row.city) %] |
+
+
+
+ [% 'Country' | $T8 %] |
+ [% HTML.escape(row.country) %] |
+
+
+
+ [% 'GLN' | $T8 %] |
+ [% HTML.escape(row.gln) %] |
+
+
+
+ [% 'Contact' | $T8 %] |
+ [% HTML.escape(row.contact) %] |
+
+
+
+ [% 'Phone' | $T8 %] |
+ [% HTML.escape(row.phone) %] |
+
+
+
+ [% 'Fax' | $T8 %] |
+ [% HTML.escape(row.fax) %] |
+
+
+
+ [% 'E-mail' | $T8 %] |
+ [% HTML.escape(row.email) %] |
+
+
+
+ [% END %]
[% FOREACH row = SHIPTO %]
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
[% 'Shipping Address' | $T8 %] "[% HTML.escape(row.shiptoname) %]"
@@ -203,6 +291,11 @@
[% HTML.escape(row.shiptocountry) %] |
+
+ [% 'GLN' | $T8 %] |
+ [% HTML.escape(row.shiptogln) %] |
+
+
[% 'Contact Person' | $T8 %] |
[% HTML.escape(row.shiptocontact) %] |
@@ -239,7 +332,7 @@
- [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
+ [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
[% 'Contact Person' | $T8 %] "[% HTML.escape(row.cp_name) %]"