X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fis%2Fform_footer.html;h=28fafaa09d1ef1049759b4a67f81d5412ce69924;hb=e112111e80aafcd8f3c86b4ba2a5c5fe3db4b5c2;hp=314e65af9767db3250c2b37f2714db1b104b5945;hpb=b61f5c3df68e3a3b4fb6a8a287172b0989215748;p=kivitendo-erp.git

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 314e65af9..28fafaa09 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
+[%- USE L %][%- USE P -%]
   <tr>
    <td>
     <table width="100%">
@@ -8,16 +9,16 @@
       <td>
        <table>
         <tr>
-         <th align="left">[% 'Notes' | $T8 %]</th>
+         <th align="left">[% 'Notes (will appear on hard copy)' | $T8 %]</th>
          <th align="left">[% 'Internal Notes' | $T8 %]</th>
          <th align="right">[% 'Payment Terms' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+          <textarea name="notes" rows="[% rows %]" cols="26">[% notes %]</textarea>
          </td>
          <td>
-          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+          <textarea name="intnotes" rows="[% rows %]" cols="35">[% intnotes %]</textarea>
          </td>
          <td>
             [%- INCLUDE 'generic/multibox.html'
@@ -28,9 +29,9 @@
                  label_key     = 'description',
                  show_empty    = 1
                  allow_textbox = 0 -%]
-          <script type='text/javascript'>$('#payment_id').change(function(){
-            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
-          </script>
+          <script type='text/javascript'>$('#payment_id').change(function(){ if (this.value) set_duedate()})</script>
+          <br>
+          [%- L.checkbox_tag('direct_debit', 'checked', direct_debit, 'label', LxERP.t8('direct debit')) %]
          </td>
         </tr>
 [%- IF id && follow_ups.size %]
@@ -42,23 +43,40 @@
 [%- 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>
        <table>
         <tr>
          <th  align=left>[% 'Ertrag' | $T8 %]</th>
-         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
+         <td>
+          [% LxERP.format_amount(marge_total, 2, 0) %]
+          <input type=hidden name="marge_total" value="[% marge_total %]">
+         </td>
         </tr>
         <tr>
          <th  align=left>[% 'Ertrag prozentual' | $T8 %]</th>
-         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
+         <td>
+          [% LxERP.format_amount(marge_percent, 2, 0) %] %
+          <input type=hidden name="marge_percent" value="[% marge_percent %]">
+         </td>
         </tr>
-        <input type=hidden name="marge_total" value="[% marge_total %]">
-        <input type=hidden name="marge_percent" value="[% marge_percent %]">
        </table>
       </td>
       <td align="right">
   [%- IF taxaccounts %]
-       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+       <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
+       <input name="taxincluded" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
        <b>[% 'Tax Included' | $T8 %]</b>
        <br>
        <br>
@@ -79,12 +97,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 %]
@@ -101,21 +119,18 @@
    </td>
   </tr>
 
-[% PROCESS 'webdav/_list.html' %]
-
 [% PROCESS 'is/_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>
 
+<p>[% print_options %]</p>
 
   [% IF id %]
 
@@ -127,7 +142,7 @@
     <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 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Use As New' | $T8 %]">
 
 [% IF id && !is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
@@ -136,11 +151,7 @@
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
     <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
-
-  [%- UNLESS locked %]
-       <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
-  [%- END %]
-
+    <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
     <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
@@ -158,18 +169,15 @@
   [% 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 %]">
+      [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]
+          <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+      [% END %]
   [% END %]
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
-<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="callback" value="[% callback | html %]">
 <input type="hidden" name="draft_id" value="[% draft_id %]">
 <input type="hidden" name="draft_description" value="[% draft_description %]">
 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
 <input type="hidden" name="gldate" value="[% gldate %]">
 </form>
-
-</body>
-
-</html>