X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fap%2Fform_footer.html;h=e66bb41ce21ea349e258c3c08f663a7591320c85;hb=a8151afb9e600b96569d0982465c5a2d3191e258;hp=8ac37eca60211c60603615fdb97f6282342d5b79;hpb=fc41222c61dbee590005f04c50e8603581462543;p=kivitendo-erp.git

diff --git a/templates/webpages/ap/form_footer.html b/templates/webpages/ap/form_footer.html
index 8ac37eca6..e66bb41ce 100644
--- a/templates/webpages/ap/form_footer.html
+++ b/templates/webpages/ap/form_footer.html
@@ -1,21 +1,16 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
-[%- USE LxERP %]
+[%- USE LxERP %][%- USE P -%]
 
 [%- IF (num_follow_ups && num_due) %]
-  <p>[% 'There are #1 unfinished follow-ups of which #2 are due.' | $T8(num_follow_ups, num_due) %]</p>
+  <p>[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due) %]</p>
 [%- END %]
 
 <input name=callback type=hidden value="[% callback | html %]">
 <input name=gldate type=hidden value="[% gldate | html %]">
-<input type=hidden name=draft_id value="[% draft_id %]">
-<input type=hidden name=draft_description value="[% draft_description | html %]">
-
-[%- IF ( !id && draft_id ) %]
-  [% L.checkbox_tag('remove_draft', checked=remove_draft, label=LxERP.t8('Remove draft when posting')) %]
-  <br>
-[%- END %]
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
 
 <br>
 
@@ -32,37 +27,34 @@
   [%- 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 %]">
   <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
 [%- ELSIF show_post_draft %]
     <input class=submit type=submit name=action value="[% 'Post' | $T8 %]">
-    <input type="submit" name="action" value="[% 'Save draft' | $T8 %]" class="submit">
+    [% L.button_tag('kivi.Draft.popup("ap", "invoice", "' _ draft_id _ '", "' _ draft_description _ '")', LxERP.t8('Drafts')) %]
 [%- END %]
 
 [%- IF id %]
-  <input type="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="[% 'history' | $T8 %]">
-  <input type="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+  <input type=button class=submit onclick="set_history_window([% id %], 'glid');" name="history" id="history" value="[% 'history' | $T8 %]">
+  [% IF INSTANCE_CONF.get_ap_show_mark_as_paid %]
+    [% L.submit_tag("action", 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 %]
 
+  [% L.button_tag("kivi.RecordTemplate.popup('ap_transaction')", LxERP.t8("Record templates")) %]
 </form>
 
 <script type="text/javascript">
-<!--
-function set_duedate() {
-   $.ajax({
-     url: 'is.pl?action=set_duedate',
-     data: {
-       invdate: $('#transdate').val(),
-       vendor_id: $('[name=vendor_id]').val(),
-     },
-     dataType: 'text',
-     success: function(data) {
-       $('#duedate').val(data);
-     }
+ <!--
+$(document).ready(function() {
+  [%- SET row=0 %]
+  [%- WHILE row < rowcount %]
+   [%- SET row=row + 1 %]
+   $('#AP_amount_chart_id_[% row %]').on('set_item:ChartPicker', function(e, item) {
+     kivi.GL.update_taxes(this);
    });
- }
-//-->
+  [%- END %]
+});
+-->
 </script>
-
-