X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcustomer_vendor%2Ftabs%2Fbilling.html;h=82ff5f2b4c58de2b8803083c40ed4084fdd1167a;hb=464f44accd46ed0b2e1f7e2459f53337a6720a7f;hp=d9e1e390a3969b0e495bc1bfa9d7746629f23c39;hpb=4ec4e9044c7d901afbc81210850229b2386432a1;p=kivitendo-erp.git

diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index d9e1e390a..82ff5f2b4 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE JavaScript -%]
 
 <div id="billing">
   <table width="100%">
@@ -76,8 +77,8 @@
       <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.department_1', SELF.cv.department_1, size = 16, maxlength = 75) %]
-        [% L.input_tag('cv.department_2', SELF.cv.department_2, size = 16, maxlength = 75) %]
+        [% L.input_tag('cv.department_1', SELF.cv.department_1, size = 16) %]
+        [% L.input_tag('cv.department_2', SELF.cv.department_2, size = 16) %]
       </td>
     </tr>
 
@@ -85,10 +86,10 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.street', SELF.cv.street, size = 35, maxlength = 75) %]
+        [% L.input_tag('cv.street', SELF.cv.street, size = 35) %]
         <span id="billing_map"></span>
         <script type="text/javascript">
-          billingMapWidget = new kivi.CustomerVendor.MapWidget('cv_');
+          billingMapWidget = new kivi.CustomerVendor.MapWidget('cv_', '[% JavaScript.escape(SELF.home_address_for_google_maps) %]');
           $(function() {
             billingMapWidget.render($('#billing_map'));
           });
@@ -100,8 +101,8 @@
       <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.zipcode', SELF.cv.zipcode, size = 5 maxlength = 10) %]
-        [% L.input_tag('cv.city', SELF.cv.city, size = 30 maxlength = 75) %]
+        [% L.input_tag('cv.zipcode', SELF.cv.zipcode, size = 5) %]
+        [% L.input_tag('cv.city', SELF.cv.city, size = 30) %]
       </td>
     </tr>
 
@@ -109,7 +110,7 @@
       <th align="right" nowrap>[% 'Country' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.country', SELF.cv.country, size = 30 maxlength = 75) %]
+        [% L.input_tag('cv.country', SELF.cv.country, size = 30) %]
       </td>
     </tr>
 
@@ -117,7 +118,7 @@
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.contact', SELF.cv.contact, size = 28 maxlength = 75) %]
+        [% L.input_tag('cv.contact', SELF.cv.contact, size = 28) %]
       </td>
     </tr>
 
@@ -133,7 +134,7 @@
       <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.fax', SELF.cv.fax, size = 30 maxlength = 30) %]
+        [% L.input_tag('cv.fax', SELF.cv.fax, size = 30) %]
       </td>
     </tr>
 
@@ -213,7 +214,7 @@
       <th align="right">[% 'Discount' | $T8 %]</th>
 
       <td>
-        [% 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) %]%
       </td>
     </tr>
 
@@ -229,7 +230,7 @@
       <th align="right">[% 'sales tax identification number' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.ustid', SELF.cv.ustid, maxlength = 14 size = 20 ) %]
+        [% L.input_tag('cv.ustid', SELF.cv.ustid, size = 20 ) %]
       </td>
 
 
@@ -246,50 +247,15 @@
       [%- END %]
     </tr>
 
+  [% IF ( SELF.all_currencies.size ) %]
     <tr>
-      <th align="right">[% 'Account Number' | $T8 %]</th>
-
-      <td>
-        [% L.input_tag('cv.account_number', SELF.cv.account_number, size = 10, maxlength = 100) %]
-      </td>
-
-
-      <th align="right">[% 'Bank Code Number' | $T8 %]</th>
-
-      <td>
-        [% L.input_tag('cv.bank_code', SELF.cv.bank_code, size = 10, maxlength = 100) %]
-      </td>
-
-
-      <th align="right">[% 'Bank' | $T8 %]</th>
-
-      <td>
-        [% L.input_tag('cv.bank', SELF.cv.bank, size = 20) %]
-      </td>
-    </tr>
-
-    <tr>
-      <th align="right">[% 'IBAN' | $T8 %]</th>
-
-      <td>
-        [% L.input_tag('cv.iban', SELF.cv.iban, size = 10, maxlength = 100) %]
-      </td>
-
-
-      <th align="right">[% 'BIC' | $T8 %]</th>
-      <td>
-        [% L.input_tag('cv.bic', SELF.cv.bic, size = 10, maxlength = 100) %]
-      </td>
-
-
-      [% IF ( SELF.all_currencies.size ) %]
         <th align="right">[% 'Currency' | $T8 %]</th>
 
         <td>
           [% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id) %]
         </td>
-      [% END %]
     </tr>
+  [% END %]
 
     <tr>
       [% IF ( !INSTANCE_CONF.get_vertreter ) %]
@@ -313,13 +279,12 @@
         [% L.select_tag('cv.language_id', SELF.all_languages, default = SELF.cv.language_id, value_key = 'id', title_key = 'description', with_empty = 1) %]
       </td>
 
-      [% IF ( SELF.is_customer() ) %]
-        <th align="right">[% 'Preisklasse' | $T8 %]</th>
+      <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+
+      <td>
+        [% 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) %]
+      </td>
 
-        <td>
-          [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]
-        </td>
-      [% END  %]
     </tr>
 
     <tr>
@@ -328,7 +293,7 @@
       </td>
 
       <td>
-        [% L.checkbox_tag('cv.obsolete', checked = SELF.cv.obsolete) %]
+        [% L.checkbox_tag('cv.obsolete', checked = SELF.cv.obsolete, for_submit=1) %]
       </td>
 
 
@@ -337,8 +302,17 @@
       </td>
 
       <td>
-        [% 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) %]
       </td>
+
+      [% IF ( SELF.is_customer() ) %]
+        <th align="right">[% 'Preisklasse' | $T8 %]</th>
+
+        <td>
+          [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]
+        </td>
+      [% END  %]
+
     </tr>
 
     <tr>
@@ -366,6 +340,13 @@
       [% END %]
 
     </tr>
+
+    [% IF ( SELF.is_customer() ) %]
+     <tr>
+      <th align="right">[%- LxERP.t8("Hourly rate") %]</th>
+      <td>[% L.input_tag("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %]</td>
+     </tr>
+    [% END %]
   </table>
 
   <table>