Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / templates / webpages / is / form_footer.html

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 314e65a..3a86b2a 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -8,16 +8,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'
@@ -46,14 +46,18 @@
        <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">
@@ -79,12 +83,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 %]
@@ -163,7 +167,7 @@
   [% 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 %]">