Refactoring.

Angleichung der Templatenamen in OE an das allgemeine Namensschema.

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 32130b9feb7c2593829283047d6c658fbb6fe7e7..acfa4c2d7c1aabb951c0d4e8d21b9c00130e9032 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -471,7 +471,7 @@ sub form_header {
      is_pur_ord      => scalar ($form->{type} =~ /purchase_order$/),
   );
 
      is_pur_ord      => scalar ($form->{type} =~ /purchase_order$/),
   );
 

-  print $form->parse_html_template("oe/orders_header", { %TMPL_VAR });
+  print $form->parse_html_template("oe/form_header", { %TMPL_VAR });

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }


@@ -530,7 +530,7 @@ sub form_footer {
 
   $form->{oldinvtotal} = $form->{invtotal};
 
 
   $form->{oldinvtotal} = $form->{invtotal};
 

-  print $form->parse_html_template("oe/orders_footer", {
+  print $form->parse_html_template("oe/form_footer", {

      %TMPL_VAR,
      webdav          => $webdav,
      print_options   => print_options(inline => 1),
      %TMPL_VAR,
      webdav          => $webdav,
      print_options   => print_options(inline => 1),

diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html
new file mode 100644 (file)
index 0000000..9785de1
--- /dev/null
+++ b/templates/webpages/oe/form_footer_de.html
@@ -0,0 +1,161 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left">Bemerkungen</th>
+                <th align="left">interne Bemerkungen</th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
+                <td>[% intnotes %]</td>
+              </tr>
+              <tr>
+                <th align="right">Zahlungskonditionen</th>
+                <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
+                           label_key  = 'description',
+                           show_empty = 1 -%]
+                </td>
+            </tr>
+      [%- IF id && num_follow_ups %]
+      <tr>
+       <td colspan="2">[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 f&auml;llig ist/sind.', num_follow_ups, num_due_follow_ups) %]</td>
+      </tr>
+      [%- END %]
+      </table>
+          </td>
+[%- IF is_sales %]
+          <td>
+            <table>
+
+            <tr>
+              <th  align="left">Ertrag</th>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
+            </tr>
+            <tr>
+              <th  align="left">Ertrag prozentual</th>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
+            </tr>
+
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
+            </table>
+          </td>
+[%- END %]
+          <td align="right">
+[%- IF taxaccounts %]
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
+[%- END %]
+            <table>
+              [% subtotal %]
+              [% tax %]
+              <tr>
+                <th align="right">Summe</th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+
+[%- IF webdav %]
+  <tr>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+  <tr>
+   <td>
+    <table width="100%">
+     <tr>
+      <td align="left" width="30%"><b>Dateiname</b></td>
+      <td align="left" width="70%"><b>Webdavlink</b></td>
+     </tr>
+ [%- FOREACH file="WEBDAV" %]
+      <tr>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
+      </tr>
+ [%- END %]
+    </table>
+   </td>
+  </tr>
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+[%- END %]
+
+  <tr>
+    <td>
+      [% print_options %]
+    </td>
+  </tr>
+</table>
+
+[% label_edit %]<br>
+<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
+<input class="submit" type="submit" name="action" value="Lieferadresse">
+<input class="submit" type="submit" name="action" value="Drucken">
+<input class="submit" type="submit" name="action" value="eMail">
+<input class="submit" type="submit" name="action" value="Speichern">
+<input class="submit" type="submit" name="action" value="Speichern und schließen">
+
+[%- IF id %]
+  <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="Historie">
+
+  <br>[% label_workflow %]<br>
+  <input class="submit" type="submit" name="action" value="als neu speichern">
+  <input class="submit" type="submit" name="action" value="Löschen">
+
+  [%- IF is_sales_quo %]
+    <input class="submit" type="submit" name="action" value="Kundenauftrag">
+  [%- END %]
+
+  [%- IF is_req_quo %]
+    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
+  [%- END %]
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="Lieferschein">
+  [%- END %]
+
+  <input class="submit" type="submit" name="action" value="Rechnung">
+
+  <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
+  [%- IF is_sales_ord %]
+    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
+    <input class="submit" type="submit" name="action" value="Angebot">
+  [%- ELSE %]
+   [%- IF is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="Kundenauftrag">
+    <input class="submit" type="submit" name="action" value="Anfrage">
+   [%- ELSE %]
+    <input class="submit" type="submit" name="action" value="Auftrag">
+   [%- END %]
+  [%- END %]
+[%- END %]
+
+<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input type="hidden" name="callback" value="[% callback %]">
+
+</form>
+
+</body>
+</html>

diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
new file mode 100644 (file)
index 0000000..e866ff8
--- /dev/null
+++ b/templates/webpages/oe/form_footer_master.html
@@ -0,0 +1,161 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left"><translate>Notes</translate></th>
+                <th align="left"><translate>Internal Notes</translate></th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
+                <td>[% intnotes %]</td>
+              </tr>
+              <tr>
+                <th align="right"><translate>Payment Terms</translate></th>
+                <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
+                           label_key  = 'description',
+                           show_empty = 1 -%]
+                </td>
+            </tr>
+      [%- IF id && num_follow_ups %]
+      <tr>
+       <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
+      </tr>
+      [%- END %]
+      </table>
+          </td>
+[%- IF is_sales %]
+          <td>
+            <table>
+
+            <tr>
+              <th  align="left"><translate>Ertrag</translate></th>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
+            </tr>
+            <tr>
+              <th  align="left"><translate>Ertrag prozentual</translate></th>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
+            </tr>
+
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
+            </table>
+          </td>
+[%- END %]
+          <td align="right">
+[%- IF taxaccounts %]
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
+[%- END %]
+            <table>
+              [% subtotal %]
+              [% tax %]
+              <tr>
+                <th align="right"><translate>Total</translate></th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+
+[%- IF webdav %]
+  <tr>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+  <tr>
+   <td>
+    <table width="100%">
+     <tr>
+      <td align="left" width="30%"><b>Dateiname</b></td>
+      <td align="left" width="70%"><b>Webdavlink</b></td>
+     </tr>
+ [%- FOREACH file="WEBDAV" %]
+      <tr>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
+      </tr>
+ [%- END %]
+    </table>
+   </td>
+  </tr>
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+[%- END %]
+
+  <tr>
+    <td>
+      [% print_options %]
+    </td>
+  </tr>
+</table>
+
+[% label_edit %]<br>
+<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
+<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
+
+[%- IF id %]
+  <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
+  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
+
+  <br>[% label_workflow %]<br>
+  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+
+  [%- IF is_sales_quo %]
+    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
+  [%- END %]
+
+  [%- IF is_req_quo %]
+    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+  [%- END %]
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
+  [%- END %]
+
+  <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
+
+  <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
+  [%- IF is_sales_ord %]
+    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
+  [%- ELSE %]
+   [%- IF is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
+   [%- ELSE %]
+    <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
+   [%- END %]
+  [%- END %]
+[%- END %]
+
+<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input type="hidden" name="callback" value="[% callback %]">
+
+</form>
+
+</body>
+</html>

diff --git a/templates/webpages/oe/form_header_de.html b/templates/webpages/oe/form_header_de.html
new file mode 100644 (file)
index 0000000..209d4fa
--- /dev/null
+++ b/templates/webpages/oe/form_header_de.html
@@ -0,0 +1,259 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+<body onLoad="[% onload %]">
+
+  <form method="post" name="oe" action="[% script %]">
+
+    <script type="text/javascript" src="js/common.js"></script>
+    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+    <script type="text/javascript" src="js/vendor_selection.js"></script>
+    <script type="text/javascript" src="js/calculate_qty.js"></script>
+    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
+    <script type="text/javascript" src="js/follow_up.js"></script>
+
+[%- FOREACH row = HIDDENS %]
+   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
+[%- END %]
+
+    <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) %]">
+    <input type="hidden" name="follow_up_rowcount" value="1">
+
+    <div class="listtop">[% title %]</div>
+
+    <table width="100%">
+      <tr height="5"></tr>
+      <tr>
+        <td>
+          <table width="100%">
+            <tr valign="top">
+              <td width="50%">
+                <table width="100%">
+                  <tr>
+                    <th align="right">[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% 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) %]')">
+                    </td>
+                  </tr>
+[%- IF ALL_CONTACTS.size %]
+                  <tr>
+                    <th align="right">Ansprechpartner</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
+                           label_sub  = 'contact_labels',
+                           show_empty = 1 -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+                  <tr>
+                    <th align="right">Lieferadresse</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'shipto_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_SHIPTO,
+                           id_key     = 'shipto_id',
+                           label_sub  = 'shipto_labels',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <td align="right">Kreditlimit</td>
+                    <td>[% LxERP.format_amount(creditlimit, 0) %]; Rest <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
+                  </tr>
+[%- END %]
+[%- IF business %]
+                  <tr>
+                    <th align="right">[% business_label %]</th>
+                    <td>[% HTML.escape(business) %]; Rabatt [% LxERP.format_percent(tradediscount) %] %</td>
+                  </tr>
+[%- END %]
+[%- IF max_dunning_level %]
+                  <tr>
+                    <th align="right">höchste Mahnstufe:</th>
+                    <td>
+                      <b>[% HTML.escape(max_dunning_level) %]</b>;
+                      gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right">Steuersatz</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
+                           label_key  = 'description' -%]
+                    </td>
+                  </tr>
+[%- IF selectdepartment %]
+                  <tr>
+                    <th align="right" nowrap>Abteilung</th>
+                    <td colspan="3"><select name="department" style="width: 250px">[% selectdepartment %]</select>
+                    <input type="hidden" name="selectdepartment" value="[% HTML.escape(selectdepartment) %]">
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+[%- IF currencies %]
+                  <tr>
+                    <th align="right">Währung</th>
+                    <td>[% currencies %]</td>
+                  </tr>
+[%- END %]
+[%- IF show_exchangerate %]
+                  <tr>
+                    <th align="right">Wechselkurs</th>
+                    <td>
+                     [%- IF forex %]
+                      [% LxERP.format_amount(exchangerate, 0) %]
+                     [%- ELSE %]
+                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                     [%- END %]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_sales %]
+                  <tr>
+                    <th align="right">Motiv</th>
+                    <td style="font-weight:bold" colspan="3"><input name="motiv" size="35" value="[% HTML.escape(motiv) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right">Versandort</th>
+                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right">Transportmittel</th>
+                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right">Vorgangsbezeichnung</th>
+                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
+                  </tr>
+[%- IF show_delivery_customer %]
+                  <tr>
+                    <td colspan="4">
+                      <table>
+                        <tr>
+                          <td colspan="2">
+                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Endkunde wählen:</button>
+                        </td>
+                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
+                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Händler wählen</button>
+                          </td>
+                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
+                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+[%- END %]
+                </table>
+              </td>
+              <td align="right">
+                <table>
+              [% openclosed %]
+                  <tr>
+                    <th align="right">Bearbeiter</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    </td>
+                  </tr>
+[%- IF is_sales and ALL_SALESMEN.size %]
+                  <tr>
+                    <th align="right">Verkäufer/in</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'salesman_id',
+                           default    = salesman_id ? salesman_id : employee_id,
+                           DATA       = ALL_SALESMEN,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>Auftragsnummer</th>
+                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
+                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
+                  </tr>
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
+                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_order %]
+                      Auftragsdatum
+                     [%- ELSE %]
+                      Angebotsdatum
+                     [%- END %]
+                    </th>
+                    [% button1 %]
+                  </tr>
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_sales_quo %]
+                      gültig bis
+                     [%- ELSE %]
+                      Lieferdatum
+                     [%- END %]
+                    </th>
+                    [% button2 %]
+                  </tr>
+                  <tr>
+                    <th width="70%" align="right" nowrap>Projektnummer</th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'globalproject_id',
+                           DATA       = ALL_PROJECTS,
+                           id_key     = 'id',
+                           label_key  = 'projectnumber',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      [% jsscript %]

diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
new file mode 100644 (file)
index 0000000..f5df7d6
--- /dev/null
+++ b/templates/webpages/oe/form_header_master.html
@@ -0,0 +1,259 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+<body onLoad="[% onload %]">
+
+  <form method="post" name="oe" action="[% script %]">
+
+    <script type="text/javascript" src="js/common.js"></script>
+    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+    <script type="text/javascript" src="js/vendor_selection.js"></script>
+    <script type="text/javascript" src="js/calculate_qty.js"></script>
+    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
+    <script type="text/javascript" src="js/follow_up.js"></script>
+
+[%- FOREACH row = HIDDENS %]
+   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
+[%- END %]
+
+    <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) %]">
+    <input type="hidden" name="follow_up_rowcount" value="1">
+
+    <div class="listtop">[% title %]</div>
+
+    <table width="100%">
+      <tr height="5"></tr>
+      <tr>
+        <td>
+          <table width="100%">
+            <tr valign="top">
+              <td width="50%">
+                <table width="100%">
+                  <tr>
+                    <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) %]')">
+                    </td>
+                  </tr>
+[%- IF ALL_CONTACTS.size %]
+                  <tr>
+                    <th align="right"><translate>Contact Person</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
+                           label_sub  = 'contact_labels',
+                           show_empty = 1 -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF ALL_SHIPTO.size %]
+                  <tr>
+                    <th align="right"><translate>Shipping Address</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'shipto_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_SHIPTO,
+                           id_key     = 'shipto_id',
+                           label_sub  = 'shipto_labels',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <td align="right"><translate>Credit Limit</translate></td>
+                    <td>[% LxERP.format_amount(creditlimit, 0) %]; <translate>Remaining</translate> <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
+                  </tr>
+[%- END %]
+[%- IF business %]
+                  <tr>
+                    <th align="right">[% business_label %]</th>
+                    <td>[% HTML.escape(business) %]; <translate>Trade Discount</translate> [% LxERP.format_percent(tradediscount) %] %</td>
+                  </tr>
+[%- END %]
+[%- IF max_dunning_level %]
+                  <tr>
+                    <th align="right"><translate>Max. Dunning Level</translate>:</th>
+                    <td>
+                      <b>[% HTML.escape(max_dunning_level) %]</b>;
+                      <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
+                    </td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right"><translate>Steuersatz</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
+                           label_key  = 'description' -%]
+                    </td>
+                  </tr>
+[%- IF selectdepartment %]
+                  <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>
+                  </tr>
+[%- END %]
+                  <tr>
+[%- IF currencies %]
+                  <tr>
+                    <th align="right"><translate>Currency</translate></th>
+                    <td>[% currencies %]</td>
+                  </tr>
+[%- END %]
+[%- IF show_exchangerate %]
+                  <tr>
+                    <th align="right"><translate>Exchangerate</translate></th>
+                    <td>
+                     [%- IF forex %]
+                      [% LxERP.format_amount(exchangerate, 0) %]
+                     [%- 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>
+                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right"><translate>Ship via</translate></th>
+                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
+                  </tr>
+                  <tr>
+                    <th align="right"><translate>Transaction description</translate></th>
+                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
+                  </tr>
+[%- IF show_delivery_customer %]
+                  <tr>
+                    <td colspan="4">
+                      <table>
+                        <tr>
+                          <td colspan="2">
+                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')"><translate>Choose Customer</translate></button>
+                        </td>
+                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
+                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')"><translate>Choose Vendor</translate></button>
+                          </td>
+                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
+                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+[%- END %]
+                </table>
+              </td>
+              <td align="right">
+                <table>
+              [% openclosed %]
+                  <tr>
+                    <th align="right"><translate>Employee</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    </td>
+                  </tr>
+[%- IF is_sales and ALL_SALESMEN.size %]
+                  <tr>
+                    <th align="right"><translate>Salesman</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'salesman_id',
+                           default    = salesman_id ? salesman_id : employee_id,
+                           DATA       = ALL_SALESMEN,
+                           id_key     = 'id',
+                           label_sub  = 'sales_employee_labels' -%]
+                    </td>
+                  </tr>
+[%- END %]
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
+                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
+                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
+                  </tr>
+[%- IF is_order %]
+                  <tr>
+                    <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
+                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
+                  </tr>
+[%- END %]
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_order %]
+                      <translate>Order Date</translate>
+                     [%- ELSE %]
+                      <translate>Quotation Date</translate>
+                     [%- END %]
+                    </th>
+                    [% button1 %]
+                  </tr>
+                  <tr>
+                    <th align="right" nowrap>
+                     [%- IF is_sales_quo %]
+                      <translate>Valid until</translate>
+                     [%- ELSE %]
+                      <translate>Required by</translate>
+                     [%- END %]
+                    </th>
+                    [% button2 %]
+                  </tr>
+                  <tr>
+                    <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
+                    <td>
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'globalproject_id',
+                           DATA       = ALL_PROJECTS,
+                           id_key     = 'id',
+                           label_key  = 'projectnumber',
+                           show_empty = 1,
+                           onChange   = "document.getElementById('update_button').click();" -%]
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      [% jsscript %]

diff --git a/templates/webpages/oe/orders_footer_de.html b/templates/webpages/oe/orders_footer_de.html
deleted file mode 100644 (file)
index 9785de1..0000000
--- a/templates/webpages/oe/orders_footer_de.html
+++ /dev/null
@@ -1,161 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left">Bemerkungen</th>
-                <th align="left">interne Bemerkungen</th>
-              </tr>
-              <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
-              </tr>
-              <tr>
-                <th align="right">Zahlungskonditionen</th>
-                <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                </td>
-            </tr>
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 f&auml;llig ist/sind.', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left">Ertrag</th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
-            </tr>
-            <tr>
-              <th  align="left">Ertrag prozentual</th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
-              <td>%</td>
-            </tr>
-
-            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-[%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
-[%- END %]
-            <table>
-              [% subtotal %]
-              [% tax %]
-              <tr>
-                <th align="right">Summe</th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <table width="100%">
-     <tr>
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-     </tr>
- [%- FOREACH file="WEBDAV" %]
-      <tr>
-        <td align="left">[% HTML.escape(file.name) %]</td>
-        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
-      </tr>
- [%- END %]
-    </table>
-   </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-[%- END %]
-
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
-
-[% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-<input class="submit" type="submit" name="action" value="Lieferadresse">
-<input class="submit" type="submit" name="action" value="Drucken">
-<input class="submit" type="submit" name="action" value="eMail">
-<input class="submit" type="submit" name="action" value="Speichern">
-<input class="submit" type="submit" name="action" value="Speichern und schließen">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="Historie">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="als neu speichern">
-  <input class="submit" type="submit" name="action" value="Löschen">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="Kundenauftrag">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="Lieferschein">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action" value="Rechnung">
-
-  <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-  [%- IF is_sales_ord %]
-    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
-    <input class="submit" type="submit" name="action" value="Angebot">
-  [%- ELSE %]
-   [%- IF is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="Kundenauftrag">
-    <input class="submit" type="submit" name="action" value="Anfrage">
-   [%- ELSE %]
-    <input class="submit" type="submit" name="action" value="Auftrag">
-   [%- END %]
-  [%- END %]
-[%- END %]
-
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
-
-</form>
-
-</body>
-</html>

diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
deleted file mode 100644 (file)
index e866ff8..0000000
--- a/templates/webpages/oe/orders_footer_master.html
+++ /dev/null
@@ -1,161 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left"><translate>Notes</translate></th>
-                <th align="left"><translate>Internal Notes</translate></th>
-              </tr>
-              <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
-              </tr>
-              <tr>
-                <th align="right"><translate>Payment Terms</translate></th>
-                <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'payment_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_PAYMENTS,
-                           id_key     = 'id',
-                           label_key  = 'description',
-                           show_empty = 1 -%]
-                </td>
-            </tr>
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left"><translate>Ertrag</translate></th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
-            </tr>
-            <tr>
-              <th  align="left"><translate>Ertrag prozentual</translate></th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
-              <td>%</td>
-            </tr>
-
-            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-[%- IF taxaccounts %]
-            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
-[%- END %]
-            <table>
-              [% subtotal %]
-              [% tax %]
-              <tr>
-                <th align="right"><translate>Total</translate></th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <table width="100%">
-     <tr>
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-     </tr>
- [%- FOREACH file="WEBDAV" %]
-      <tr>
-        <td align="left">[% HTML.escape(file.name) %]</td>
-        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
-      </tr>
- [%- END %]
-    </table>
-   </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-[%- END %]
-
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
-
-[% label_edit %]<br>
-<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
-<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-  [%- END %]
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
-
-  <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-  [%- IF is_sales_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
-  [%- ELSE %]
-   [%- IF is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
-   [%- ELSE %]
-    <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
-   [%- END %]
-  [%- END %]
-[%- END %]
-
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
-
-</form>
-
-</body>
-</html>

diff --git a/templates/webpages/oe/orders_header_de.html b/templates/webpages/oe/orders_header_de.html
deleted file mode 100644 (file)
index 209d4fa..0000000
--- a/templates/webpages/oe/orders_header_de.html
+++ /dev/null
@@ -1,259 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="[% onload %]">
-
-  <form method="post" name="oe" action="[% script %]">
-
-    <script type="text/javascript" src="js/common.js"></script>
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/vendor_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <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) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-
-    <div class="listtop">[% title %]</div>
-
-    <table width="100%">
-      <tr height="5"></tr>
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <th align="right">[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% 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) %]')">
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right">Ansprechpartner</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  <tr>
-                    <th align="right">Lieferadresse</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'shipto_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_SHIPTO,
-                           id_key     = 'shipto_id',
-                           label_sub  = 'shipto_labels',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <td align="right">Kreditlimit</td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; Rest <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; Rabatt [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right">höchste Mahnstufe:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      gemahnter Betrag: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Steuersatz</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    </td>
-                  </tr>
-[%- IF selectdepartment %]
-                  <tr>
-                    <th align="right" nowrap>Abteilung</th>
-                    <td colspan="3"><select name="department" style="width: 250px">[% selectdepartment %]</select>
-                    <input type="hidden" name="selectdepartment" value="[% HTML.escape(selectdepartment) %]">
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-[%- IF currencies %]
-                  <tr>
-                    <th align="right">Währung</th>
-                    <td>[% currencies %]</td>
-                  </tr>
-[%- END %]
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right">Wechselkurs</th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 0) %]
-                     [%- ELSE %]
-                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_sales %]
-                  <tr>
-                    <th align="right">Motiv</th>
-                    <td style="font-weight:bold" colspan="3"><input name="motiv" size="35" value="[% HTML.escape(motiv) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">Versandort</th>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Transportmittel</th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">Vorgangsbezeichnung</th>
-                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Endkunde wählen:</button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Händler wählen</button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right">Bearbeiter</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right">Verkäufer/in</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'salesman_id',
-                           default    = salesman_id ? salesman_id : employee_id,
-                           DATA       = ALL_SALESMEN,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Auftragsnummer</th>
-                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
-                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
-                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      Auftragsdatum
-                     [%- ELSE %]
-                      Angebotsdatum
-                     [%- END %]
-                    </th>
-                    [% button1 %]
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      gültig bis
-                     [%- ELSE %]
-                      Lieferdatum
-                     [%- END %]
-                    </th>
-                    [% button2 %]
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap>Projektnummer</th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'globalproject_id',
-                           DATA       = ALL_PROJECTS,
-                           id_key     = 'id',
-                           label_key  = 'projectnumber',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      [% jsscript %]

diff --git a/templates/webpages/oe/orders_header_master.html b/templates/webpages/oe/orders_header_master.html
deleted file mode 100644 (file)
index f5df7d6..0000000
--- a/templates/webpages/oe/orders_header_master.html
+++ /dev/null
@@ -1,259 +0,0 @@
-[%- USE HTML %]
-[%- USE LxERP %]
-<body onLoad="[% onload %]">
-
-  <form method="post" name="oe" action="[% script %]">
-
-    <script type="text/javascript" src="js/common.js"></script>
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/vendor_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <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) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-
-    <div class="listtop">[% title %]</div>
-
-    <table width="100%">
-      <tr height="5"></tr>
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <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) %]')">
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right"><translate>Contact Person</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_SHIPTO.size %]
-                  <tr>
-                    <th align="right"><translate>Shipping Address</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'shipto_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_SHIPTO,
-                           id_key     = 'shipto_id',
-                           label_sub  = 'shipto_labels',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <td align="right"><translate>Credit Limit</translate></td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; <translate>Remaining</translate> <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; <translate>Trade Discount</translate> [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right"><translate>Max. Dunning Level</translate>:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      <translate>Dunning Amount</translate>: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right"><translate>Steuersatz</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
-                    </td>
-                  </tr>
-[%- IF selectdepartment %]
-                  <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>
-                  </tr>
-[%- END %]
-                  <tr>
-[%- IF currencies %]
-                  <tr>
-                    <th align="right"><translate>Currency</translate></th>
-                    <td>[% currencies %]</td>
-                  </tr>
-[%- END %]
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right"><translate>Exchangerate</translate></th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 0) %]
-                     [%- 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>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right"><translate>Ship via</translate></th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right"><translate>Transaction description</translate></th>
-                    <td colspan="3"><input name="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"></td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')"><translate>Choose Customer</translate></button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')"><translate>Choose Vendor</translate></button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right"><translate>Employee</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right"><translate>Salesman</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'salesman_id',
-                           default    = salesman_id ? salesman_id : employee_id,
-                           DATA       = ALL_SALESMEN,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
-                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
-                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
-                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      <translate>Order Date</translate>
-                     [%- ELSE %]
-                      <translate>Quotation Date</translate>
-                     [%- END %]
-                    </th>
-                    [% button1 %]
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      <translate>Valid until</translate>
-                     [%- ELSE %]
-                      <translate>Required by</translate>
-                     [%- END %]
-                    </th>
-                    [% button2 %]
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
-                    <td>
-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'globalproject_id',
-                           DATA       = ALL_PROJECTS,
-                           id_key     = 'id',
-                           label_key  = 'projectnumber',
-                           show_empty = 1,
-                           onChange   = "document.getElementById('update_button').click();" -%]
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      [% jsscript %]