X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fform_header_master.html;h=27ae25031b6fe1f5e1249e1aaa0bfe799b5597a7;hb=b65cc47a206d0b5df78123d9b36c1867928bf684;hp=f5df7d6488d1e496dcf38c2a6d8cafe1ff01861c;hpb=2a5030b2dcfe53c431a7498b7bae56939020643b;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
index f5df7d648..27ae25031 100644
--- a/templates/webpages/oe/form_header_master.html
+++ b/templates/webpages/oe/form_header_master.html
@@ -15,6 +15,8 @@
    <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 
+    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+
     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
     <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
@@ -34,15 +36,16 @@
                     <th align="right">[% IF vc == 'customer' %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
                     <td>
                       [%- INCLUDE 'generic/multibox.html'
-                           name       = vc,
-                           style      = 'width: 250px',
-                           DATA       = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
-                           id_sub     = 'vc_keys',
-                           label_key  = 'name',
-                           select     = vc_select,
-                           limit      = vclimit,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                      <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
+                           name          = vc,
+                           style         = 'width: 250px',
+                           DATA          = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
+                           id_sub        = 'vc_keys',
+                           label_key     = 'name',
+                           select        = vc_select,
+                           limit         = vclimit,
+                           allow_textbox = 1,
+                           onChange      = "document.getElementById('update_button').click();" -%]
+                      <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
                   </tr>
 [%- IF ALL_CONTACTS.size %]
@@ -106,11 +109,17 @@
                            label_key  = 'description' -%]
                     </td>
                   </tr>
-[%- IF selectdepartment %]
+[%- IF ALL_DEPARTMENTS %]
                   <tr>
                     <th align="right" nowrap><translate>Department</translate></th>
-                    <td colspan="3"><select name="department" style="width: 250px">[% selectdepartment %]</select>
-                    <input type="hidden" name="selectdepartment" value="[% HTML.escape(selectdepartment) %]">
+                    <td colspan="3">
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'department_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_DEPARTMENTS,
+                           id_key     = 'id',
+                           label_sub  = 'department_labels',
+                           show_empty = 1 -%]
                     </td>
                   </tr>
 [%- END %]
@@ -126,18 +135,12 @@
                     <th align="right"><translate>Exchangerate</translate></th>
                     <td>
                      [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 0) %]
+                      [% LxERP.format_amount(exchangerate, 2) %]
                      [%- ELSE %]
                       <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
                      [%- END %]
                     </td>
                   </tr>
-[%- END %]
-[%- IF is_sales %]
-                  <tr>
-                    <th align="right"><translate>Motiv</translate></th>
-                    <td style="font-weight:bold" colspan="3"><input name="motiv" size="35" value="[% HTML.escape(motiv) %]"></td>
-                  </tr>
 [%- END %]
                   <tr>
                     <th align="right"><translate>Shipping Point</translate></th>
@@ -225,7 +228,10 @@
                       <translate>Quotation Date</translate>
                      [%- END %]
                     </th>
-                    [% button1 %]
+                    <td nowrap>
+                      <input name=transdate id=transdate size=11 title="[% HTML.escape(dateformat) %]" value="[% transdate %]" onBlur="check_right_date_format(this)">
+                      <input type=button name=transdate id="trigger1" value="<translate>button</translate>">
+                    </td>
                   </tr>
                   <tr>
                     <th align="right" nowrap>
@@ -235,7 +241,10 @@
                       <translate>Required by</translate>
                      [%- END %]
                     </th>
-                    [% button2 %]
+                    <td nowrap>
+                      <input name=reqdate id=reqdate size=11 title="[% HTML.escape(dateformat) %]" value="[% reqdate %]" onBlur="check_right_date_format(this)">
+                      <input type=button name=reqdate id="trigger2" value="<translate>button</translate>">
+                    </td>
                   </tr>
                   <tr>
                     <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
@@ -256,4 +265,9 @@
         </td>
       </tr>
 
-      [% jsscript %]
+    <script type="text/javascript">
+     <!--
+       Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+       Calendar.setup({ inputField : "reqdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+     //-->
+    </script>