X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcustomer_vendor%2Ftabs%2Fbilling.html;h=d67740a9f02c052f2a0bfef5d5311d3129585a27;hb=578b62c5b00b467f43c528ad2f7e0880bf08c18d;hp=d2b4225735966038d8cee9022af60aabe2cc2d35;hpb=3bb283ad739b95704f8df9a55c1ed0b86f617f23;p=kivitendo-erp.git
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index d2b422573..d67740a9f 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -8,7 +8,7 @@
- [% IF ( conf_vertreter ) %]
+ [% IF ( INSTANCE_CONF.get_vertreter ) %]
[% IF SELF.is_vendor() %]
@@ -29,8 +29,7 @@
|
-
- [% L.select_tag('cv.salesman_id', SELF.all_employees, value_key = 'id', title_key = 'safe_name', with_empty = 1) %]
+ [% L.select_tag('cv.salesman_id', SELF.all_salesman_customers, default = SELF.cv.salesman_id, value_key = 'id', title_key = 'name', with_empty = 1) %]
|
@@ -86,10 +85,13 @@
[% 'Street' | $T8 %] |
- [% L.input_tag('cv.street', SELF.cv.street) %]
+ [% L.input_tag('cv.street', SELF.cv.street, size = 35, maxlength = 75) %]
|
@@ -143,6 +145,22 @@
+
+ [% 'Cc E-mail' | $T8 %] |
+
+
+ [% L.input_tag('cv.cc', SELF.cv.cc, size = 45) %]
+ |
+
+
+
+ [% 'Bcc E-mail' | $T8 %] |
+
+
+ [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 45) %]
+ |
+
+
[% IF homepage %]
@@ -195,7 +213,7 @@
| [% 'Discount' | $T8 %] |
- [% L.input_tag('cv.discount_as_percent', SELF.cv.discount_as_percent, size = 4) %]
+ [% L.input_tag('cv.discount_as_percent', SELF.cv.discount_as_percent, size = 4) %]%
|
@@ -228,53 +246,18 @@
[%- END %]
+ [% IF ( SELF.all_currencies.size ) %]
- [% 'Account Number' | $T8 %] |
-
-
- [% L.input_tag('cv.account_number', SELF.cv.account_number, size = 10, maxlength = 100) %]
- |
-
-
- [% 'Bank Code Number' | $T8 %] |
-
-
- [% L.input_tag('cv.bank_code', SELF.cv.bank_code, size = 10, maxlength = 100) %]
- |
-
-
- [% 'Bank' | $T8 %] |
-
-
- [% L.input_tag('cv.bank', SELF.cv.bank, size = 20) %]
- |
-
-
-
- [% 'IBAN' | $T8 %] |
-
-
- [% L.input_tag('cv.iban', SELF.cv.iban, size = 10, maxlength = 100) %]
- |
-
-
- [% 'BIC' | $T8 %] |
-
- [% L.input_tag('cv.bic', SELF.cv.bic, size = 10, maxlength = 100) %]
- |
-
-
- [% IF ( SELF.all_currencies.size ) %]
[% 'Currency' | $T8 %] |
- [% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id, with_empty = 1) %]
+ [% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id) %]
|
- [% END %]
+ [% END %]
- [% IF ( !conf_vertreter ) %]
+ [% IF ( !INSTANCE_CONF.get_vertreter ) %]
[% IF ( SELF.is_vendor() ) %]
[% 'Type of Vendor' | $T8 %]
@@ -295,21 +278,12 @@
[% L.select_tag('cv.language_id', SELF.all_languages, default = SELF.cv.language_id, value_key = 'id', title_key = 'description', with_empty = 1) %]
-
- | [% 'Bcc' | $T8 %] |
+ [% 'Delivery Terms' | $T8 %] |
- [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 40) %]
+ [% L.select_tag('cv.delivery_term_id', SELF.all_delivery_terms, default = SELF.cv.delivery_term_id, value_key = 'id', title_key = 'description', with_empty = 1) %]
|
-
- [% IF ( SELF.is_customer() ) %]
- [% 'Preisklasse' | $T8 %] |
-
-
- [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]
- |
- [% END %]
@@ -318,7 +292,7 @@
- [% L.checkbox_tag('cv.obsolete', checked = SELF.cv.obsolete) %]
+ [% L.checkbox_tag('cv.obsolete', checked = SELF.cv.obsolete, for_submit=1) %]
|
@@ -327,8 +301,17 @@
- [% L.checkbox_tag('cv.direct_debit', checked = SELF.cv.direct_debit) %]
+ [% L.checkbox_tag('cv.direct_debit', checked = SELF.cv.direct_debit, for_submit=1) %]
|
+
+ [% IF ( SELF.is_customer() ) %]
+ [% 'Preisklasse' | $T8 %] |
+
+
+ [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]
+ |
+ [% END %]
+
@@ -339,21 +322,30 @@
- [% IF ( SELF.is_customer() && !conf_vertreter ) %]
+ [% IF ( SELF.is_customer() && !INSTANCE_CONF.get_vertreter ) %]
[% 'Salesman' | $T8 %] |
-
- [% L.select_tag('cv.salesman_id', SELF.all_employees, default = salesman_id, value_key = 'id', title_key = 'safe_name', with_empty = 1) %]
+ [% L.select_tag('cv.salesman_id', SELF.all_salesmen, default = SELF.cv.salesman_id, value_key = 'id', title_key = 'safe_name', with_empty = 1) %]
|
+ [%- END %]
+ [% IF ( SELF.is_customer() ) %]
[% 'taxincluded checked' | $T8 %] |
[% L.select_tag('cv.taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = SELF.cv.taxincluded_checked) %]
|
- [%- END %]
+ [% END %]
+
+
+ [% IF ( SELF.is_customer() ) %]
+
+ [%- LxERP.t8("Hourly rate") %] |
+ [% L.input_tag("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %] |
+
+ [% END %]