Entwürfe: beim Buchen dazugehörigen Entwurf löschen

[mfinanz.git] / templates / webpages / is / form_footer.html

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 7f1bb622aa79aa37ba4c3e4bb93a9923eb39ed16..1cb4a1836c0b9c4c3beddfd245530b16549263fd 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -24,15 +24,7 @@
            <table>
              <tr>
                <th align="right">[% 'Payment Terms' | $T8 %]</th>
            <table>
              <tr>
                <th align="right">[% 'Payment Terms' | $T8 %]</th>

-               <td>
-                 [%- INCLUDE 'generic/multibox.html'
-                   name          = 'payment_id',
-                   style         = 'width: 250px',
-                   DATA          = payment_terms,
-                   id_key        = 'id',
-                   label_key     = 'description',
-                   show_empty    = 1
-                   allow_textbox = 0 -%]
+               <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>
                  <script type='text/javascript'>$('#payment_id').change(function(){ kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"); })</script>
                </td>
              </tr>


@@ -107,13 +99,6 @@
        </tr>
 [%- END %]
 
        </tr>
 [%- END %]
 

-[%- IF rounding %]
-        <tr>
-          <th align='right'>[% 'Rounding' | $T8 %]</th>
-          <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>
-        </tr>
-[%- END %]
-

 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
 [% SET description_ref = item _ '_description' %]
 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
 [% SET description_ref = item _ '_description' %]


@@ -131,6 +116,14 @@
        </tr>
   [%- END %]
 [%- END %]
        </tr>
   [%- END %]
 [%- END %]

+
+[%- 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>
         <tr>
          <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>


@@ -197,7 +190,7 @@
       [%#- button for saving history %]
       <input type="button" class="submit" onclick="set_history_window([% id | html %], 'glid');" name="history" id="history" value="[% 'history' | $T8 %]">
       [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]
       [%#- button for saving history %]
       <input type="button" class="submit" onclick="set_history_window([% id | html %], 'glid');" name="history" id="history" value="[% 'history' | $T8 %]">
       [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]

-          <input type="submit" class="submit" name="action_mark_as_paid" value="[% 'mark as paid' | $T8 %]">
+        [% L.submit_tag("action_mark_as_paid", LxERP.t8('mark as paid'), confirm=LxERP.t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?')) %]

       [% END %]
   [% END %]
 
       [% END %]
   [% END %]
 


@@ -208,8 +201,8 @@
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
 <input type="hidden" name="callback" value="[% callback | html %]">
 
 <input type="hidden" name="rowcount" value="[% rowcount %]">
 <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 %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]

 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
 <input type="hidden" name="gldate" value="[% gldate %]">
 </form>
 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
 <input type="hidden" name="gldate" value="[% gldate %]">
 </form>