X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fform_footer.html;h=14f29547b2b2aee2d340a336e3f6f2e84e99da9a;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=b0ba7fe67f3b9da809fee8729edd52646fcc240e;hpb=6b935d522a38e1a20802c25ed51a15e0cd292c1d;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index b0ba7fe67..14f29547b 100644
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -2,6 +2,15 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- IF is_req_quo || is_pur_ord %]
+  [%- SET allow_invoice=1 %]
+[%- ELSIF is_sales_quo && INSTANCE_CONF.get_allow_sales_invoice_from_sales_quotation %]
+  [%- SET allow_invoice=1 %]
+[%- ELSIF is_sales_ord && INSTANCE_CONF.get_allow_sales_invoice_from_sales_order %]
+  [%- SET allow_invoice=1 %]
+[%- ELSE %]
+  [%- SET allow_invoice=0 %]
+[%- END %]
   <tr>
     <td>
       <table width="100%">
@@ -13,21 +22,17 @@
                 <th align="left">[% 'Internal Notes' | $T8 %]</th>
               </tr>
               <tr valign="top">
-                <td>[% notes %]</td>
-                <td>[% intnotes %]</td>
+                <td>[% L.textarea_tag('notes',    notes,    style="width: 350px; height: 150px", class="texteditor") %]</td>
+                <td>[% L.textarea_tag('intnotes', intnotes, style="width: 350px; height: 150px") %]</td>
               </tr>
               <tr>
                 <th align="right">[% 'Payment Terms' | $T8 %]</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>
+                <td>[% L.select_tag('payment_id', ALL_PAYMENTS, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %]</td>
+              </tr>
+              <tr>
+                <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+                <td>[% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', style = 'width: 250px') %]</td>
+              </tr>
 
 [%- IF is_sales_ord %]
             <tr>
@@ -36,6 +41,7 @@
               [% L.button_tag("edit_periodic_invoices_config(); return false;", LxERP.t8('Configure')) %]
               ([% HTML.escape(periodic_invoices_status) %])
               [% L.hidden_tag("periodic_invoices_config", periodic_invoices_config) %]
+              <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank">?</a>
              </td>
             </tr>
 [%- END %]
@@ -47,28 +53,45 @@
       [%- END %]
       </table>
           </td>
+      [%- IF show_weight %]
+          <td>
+            <table>
+            <tr>
+              <th  align="left">[% 'Total weight' | $T8 %]</th>
+              <td align="right">
+                [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
+              </td>
+            </tr>
+            </table>
+          </td>
+      [%- END %]
 [%- IF is_sales %]
           <td>
             <table>
 
             <tr>
               <th  align="left">[% 'Ertrag' | $T8 %]</th>
-              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
+              <td align="right">
+                [% LxERP.format_amount(marge_total, 2) %]
+                <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+              </td>
             </tr>
             <tr>
               <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
-              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td align="right">
+                [% LxERP.format_amount(marge_percent, 2) %]
+                <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
+              </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>[% 'Tax Included' | $T8 %]</b><br><br>
+            <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
+            <input name="taxincluded" class="checkbox" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
 [%- END %]
             <table>
 [%- IF NOT taxincluded %]
@@ -78,9 +101,18 @@
               </tr>
 [%- END %]
               [% tax %]
+[%- IF rounding %]
+              <tr>
+                <th align='right'>[% 'Rounding' | $T8 %]</th>
+                <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>
+              </tr>
+[%- END %]
               <tr>
                 <th align="right">[% 'Total' | $T8 %]</th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]
+                  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+                  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
+                </td>
               </tr>
             </table>
           </td>
@@ -88,98 +120,36 @@
       </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_update" id="update_button" value="[% 'Update' | $T8 %]">
-<input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
-<input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
-<input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">
-<input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]">
-<input class="submit" type="submit" name="action_save_and_close" value="[% 'Save and Close' | $T8 %]">
-
-[%- IF id %]
-  <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
-  <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="[% 'history' | $T8 %]">
-
-  <br>[% label_workflow %]<br>
-  <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
-  <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
-
-  [%- IF is_sales_quo %]
-    <input class="submit" type="submit" name="action_sales_order" value="[% 'Sales Order' | $T8 %]">
-  [%- END %]
-
-  [%- IF is_req_quo %]
-    <input class="submit" type="submit" name="action_purchase_order" value="[% 'Purchase Order' | $T8 %]">
-  [%- END %]
+</div>
+[%- PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+ [%- LxERP.t8("Loading...") %]
+</div>
+</div>
 
-  [%- IF is_sales_ord || is_pur_ord  && !delivered%]
-    <input class="submit" type="submit" name="action_delivery_order" value="[% 'Delivery Order' | $T8 %]">
-  [%- END %]
-
-  <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
-
-  [%- IF is_sales_ord || is_pur_ord %]
-    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-    [%- IF is_sales_ord %]
-      <input class="submit" type="submit" name="action_purchase_order" value="[% 'Purchase Order' | $T8 %]">
-     <input class="submit" type="submit" name="action_quotation" value="[% 'Quotation' | $T8 %]">
-    [%- ELSE %]
-    [%- IF is_pur_ord %]
-      <input class="submit" type="submit" name="action_sales_order" value="[% 'Sales Order' | $T8 %]">
-     <input class="submit" type="submit" name="action_request_for_quotation" value="[% 'Request for Quotation' | $T8 %]">
-    [%- END %]
-    [%- END %]
-  [%- END %]
-[%- END %]
-<input type="hidden" name="action" value="dispatcher">
 <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 %]">
+[% L.hidden_tag("rowcount", rowcount) %]
+<input type="hidden" name="callback" value="[% callback | html %]">
 [% IF vc == 'customer' %]
   <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
 [% ELSE %]
   <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
 [% END %]
 
+<div id="shipto_inputs" class="hidden">
+ [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]
+</div>
+
+<div id="email_inputs" class="hidden"></div>
+
+<div id="print_options" class="hidden">
+ [% print_options %]
+</div>
 </form>
 
-</body>
-</html>
+<div id="shipto_dialog" class="hidden"></div>
+<div id="print_dialog" class="hidden">
+ [%- PROCESS 'common/_print_dialog.html' %]
+</div>