X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fir%2Fform_footer.html;h=30f77c5960697c43603212fcde715a5cd6802186;hb=c39e831b3bceef01a851a0825ce6b19d1ddc3eda;hp=9e751783bae1db901ad5fe8b5a56b25a5259a75f;hpb=b61f5c3df68e3a3b4fb6a8a287172b0989215748;p=kivitendo-erp.git

diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 9e751783b..30f77c596 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
+[%- USE L %][%- USE P -%]
   <tr>
    <td>
     <table width="100%">
@@ -10,13 +11,36 @@
         <tr>
          <th align="left">[% 'Notes' | $T8 %]</th>
          <th align="left">[% 'Internal Notes' | $T8 %]</th>
+         <th align="right">[% 'Payment / Delivery Options' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+          [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
          </td>
          <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+          [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %]
+         </td>
+         <td>
+           <table>
+             <tr>
+               <th align="right">[% 'Payment Terms' | $T8 %]</th>
+               <td>[% L.select_tag('payment_id', payment_terms, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %]
+                 <script type='text/javascript'>$('#payment_id').change(function(){ kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"); })</script>
+               </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>
+             <tr>
+               <th align="right">[% 'direct debit' | $T8 %]</th>
+               <td>
+                 [%- L.checkbox_tag('direct_debit', 'checked', direct_debit) %]
+               </td>
+             </tr>
+           </table>
          </td>
         </tr>
 [%- IF id && follow_ups.size %]
@@ -28,6 +52,18 @@
 [%- END %]
        </table>
       </td>
+[%- IF show_weight %]
+      <td>
+       <table>
+        <tr>
+         <th  align=left>[% 'Total weight' | $T8 %]</th>
+         <td>
+          [% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]
+         </td>
+        </tr>
+       </table>
+      </td>
+[%- END %]
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
@@ -51,12 +87,12 @@
 [% SET total_ref       = item _ '_total' %]
 [% SET netto_ref       = item _ '_netto' %]
        <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <th align="right">[% 'Including' | $T8 %] [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
         <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
        </tr>
   [%- IF taxincluded %]
        <tr>
-        <th align="right">Nettobetrag</th>
+        <th align="right">[% 'Net amount' | $T8 %]</th>
         <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
   [%- END %]
@@ -73,60 +109,24 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list.thml' %]
-
 [% PROCESS 'ir/_payments.html' %]
 
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-[% print_options %]
-    </td>
-  </tr>
  </table>
+</div>
+[% PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+ [%- LxERP.t8("Loading...") %]
+</div>
+</div>
 
+<hr size="3" noshade>
 
-
-  [% IF id %]
-
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
-[% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
-[% END %]
-    <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
-    <input class="submit" type="submit" name="action" value="[% 'Use As Template' | $T8 %]">
-
-[% IF show_delete %]
-    <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
-[% END %]
-
-    <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
-
- [% ELSE # no id %]
-   [% UNLESS locked %]
-      <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
-      <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
-      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
-   [%- END %]
- [% END # id %]
-
-  [% IF id %]
-      [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
-
-      <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
-  [% END %]
+<p>[% print_options %]</p>
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
 <input type="hidden" name="callback" value="[% callback %]">
-<input type="hidden" name="draft_id" value="[% draft_id %]">
-<input type="hidden" name="draft_description" value="[% draft_description %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
 <input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
 
 </form>
-
-</body>
-
-</html>