X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdo%2Fform_header_master.html;h=44dd902cb46f7404b58166d78b205f22bf460a29;hb=229b26a09115ce8f99ca7fa5df59a6a9fc8b5ce9;hp=4829637d3f5024cbc0abc29d6eb45186379a2800;hpb=d707f7ac60b9dbe7da50d733db1e73eae84952f7;p=kivitendo-erp.git

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index 4829637d3..44dd902cb 100644
--- a/templates/webpages/do/form_header_master.html
+++ b/templates/webpages/do/form_header_master.html
@@ -16,7 +16,7 @@
         setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
         setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
 
-        [%- UNLESS closed %]
+        [%- UNLESS delivered %]
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
         [%- END %]
       }
@@ -42,7 +42,7 @@
  [%- SET the_oldvc = oldvendor %]
  [%- SET is_customer = '0' %]
  [%- END %]
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
@@ -60,6 +60,8 @@
   <input type="hidden" name="business" value="[% HTML.escape(business) %]">
   <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
   <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
   <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
   <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
   <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
@@ -87,6 +89,9 @@
   <input type="hidden" name="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
   <input type="hidden" name="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
   <input type="hidden" name="subject" value="[% HTML.escape(subject) %]">
+  <input type="hidden" name="taxincluded" value="[% HTML.escape(taxincluded) %]">
+  <input type="hidden" name="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
+  <input type="hidden" name="terms" value="[% HTML.escape(terms) %]">
   <input type="hidden" name="title" value="[% HTML.escape(title) %]">
   <input type="hidden" name="type" value="[% HTML.escape(type) %]">
   <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
@@ -101,7 +106,7 @@
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
         <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
         <td>
-         [%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
+         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
          [%- ELSE %]
          <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
@@ -111,14 +116,14 @@
          </select>
          <input type="hidden" name="select[% vc %]" value="1">
          [%- END %]
-         <input type="button" value="?" onclick="show_vc_details('[% vc %]')">
+         <input type="button" value="<translate>Details (one letter abbreviation)</translate>" onclick="show_vc_details('[% vc %]')">
         </td>
 
         [%- IF ALL_CONTACTS.size %]
         <tr>
          <th align="right"><translate>Contact Person</translate></th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
           [%- IF cp_id == row.cp_id %]
           [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
@@ -141,7 +146,7 @@
         <tr>
          <th align="right"><translate>Shipping Address</translate></th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
           [%- FOREACH row = ALL_SHIPTO %]
           [%- IF shipto_id == row.shipto_id %]
@@ -191,7 +196,7 @@
        <tr>
         <th align="right" nowrap><translate>Department</translate></th>
         <td colspan="3">
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="department" value="[% HTML.escape(department) %]">
          [%- FOREACH row = ALL_DEPARTMENTS %]
          [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
@@ -229,24 +234,36 @@
      <td align="right">
       <table>
 
-       [%- IF vc == 'customer' %]
        <tr>
         <td colspan="2" align="center">
-         <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
-         <label for="delivered"><translate>Delivered</translate></label>
+         [%- IF delivered %]
+          [%- IF is_customer %]
+          <translate>transferred out</translate>
+          [%- ELSE %]
+          <translate>transferred in</translate>
+          [%- END %]
+         [%- ELSE %]
+          [%- IF is_customer %]
+          <translate>not transferred out yet</translate>
+          [%- ELSE %]
+          <translate>not transferred in yet</translate>
+          [%- END %]
+         [%- END %]
+         ;
          [%- IF closed %]
-         <input type="hidden" name="delivered" value="1">
+          <translate>Closed</translate>
+         [%- ELSE %]
+          <translate>Open</translate>
          [%- END %]
         </td>
        </tr>
-       [%- ELSE %]
+
        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-       [%- END %]
 
        <tr>
         <th align="right"><translate>Employee</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
          [%- FOREACH row = ALL_EMPLOYEES %]
          [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -272,7 +289,7 @@
        <tr>
         <th align="right"><translate>Salesman</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
          [%- FOREACH row = ALL_SALESMEN %]
          [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -301,30 +318,23 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Order Number</translate>[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 
-       [%- UNLESS is_customer %]
-       <tr>
-        <th width="70%" align="right" nowrap><translate>Order Request Number</translate></th>
-        <td><input name="oreqnumber" size="11" value="[% HTML.escape(oreqnumber) %]"[% RO %]></td>
-       </tr>
-       [%- END %]
-
        <tr>
         <th align="right" nowrap><translate>Delivery Order Date</translate></th>
         <td nowrap>
          <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
                 onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
+         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
         </td>
        </tr>
 
        <tr>
         <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
          [%- FOREACH row = ALL_PROJECTS %]
          [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]