Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp

[kivitendo-erp.git] / templates / webpages / customer_vendor / tabs / billing.html

diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index f666b5a..b7dfe9e 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -8,7 +8,7 @@
 
     <tr height="5"></tr>
 
-    [% IF ( conf_vertreter ) %]<!-- == $::lx_office_conf{features}->{vertreter}; -->
+    [% IF ( conf_vertreter ) %]
       <tr>
         <th align="right">
           [% IF SELF.is_vendor() %]
@@ -29,8 +29,7 @@
         </th>
 
         <td>
-          <!-- TODO: ALL_SALESMAN_CUSTOMERS -->
-          [% 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) %]
         </td>
       </tr>
 
@@ -86,10 +85,14 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.street', SELF.cv.street) %]
-        <a href="#" onclick="namespace('kivi.CustomerVendor').showMap('cv_');" title="[% 'Map' | $T8 %]">
-          <img src="image/map.png" alt="[% 'Map' | $T8 %]" />
-        </a>
+        [% L.input_tag('cv.street', SELF.cv.street, size = 35, maxlength = 75) %]
+        <span id="billing_map"></span>
+        <script type="text/javascript">
+          billingMapWidget = new kivi.CustomerVendor.MapWidget('cv_');
+          $(function() {
+            billingMapWidget.render($('#billing_map'));
+          });
+        </script>
       </td>
     </tr>
 
@@ -142,6 +145,22 @@
       </td>
     </tr>
 
+    <tr>
+      <th align="right">[% 'Cc E-mail' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag('cv.cc', SELF.cv.bcc, size = 45) %]
+      </td>
+    </tr>
+
+    <tr>
+      <th align="right">[% 'Bcc E-mail' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 45) %]
+      </td>
+    </tr>
+
     <tr>
       <th align="right" nowrap>
         [% IF homepage %]
@@ -294,14 +313,6 @@
         [% L.select_tag('cv.language_id', SELF.all_languages, default = SELF.cv.language_id, value_key = 'id', title_key = 'description', with_empty = 1) %]
       </td>
 
-
-      <th align="right">[% 'Bcc' | $T8 %]</th>
-
-      <td>
-        [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 40) %]
-      </td>
-
-
       [% IF ( SELF.is_customer() ) %]
         <th align="right">[% 'Preisklasse' | $T8 %]</th>
 
@@ -342,16 +353,16 @@
         <th align="right">[% 'Salesman' | $T8 %]</th>
 
         <td>
-          <!-- TODO: ALL_SALESMAN -->
-          [% 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) %]
         </td>
+      [%- END %]
 
-        <td>[% 'taxincluded checked' | $T8 %]</td>
+      <td>[% 'taxincluded checked' | $T8 %]</td>
+
+      <td>
+        [% 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) %]
+      </td>
 
-        <td>
-          [% 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) %]
-        </td>
-      [%- END %]
     </tr>
   </table>