Auftragsmaske: JavaScript-Checks für Speichern aktiver per. Rechnungen nach kivi...

diff --git a/js/edit_periodic_invoices_config.js b/js/edit_periodic_invoices_config.js
index 44ebd1916c1f8d9d85b25b3c7b33a9181eede924..b969e1dde59ae0f23d20fbf614703b615fd72a79 100644 (file)
--- a/js/edit_periodic_invoices_config.js
+++ b/js/edit_periodic_invoices_config.js
@@ -14,7 +14,3 @@ function edit_periodic_invoices_config() {
   // alert(url);
   window.open(url, "_new_generic", parm);
 }
   // alert(url);
   window.open(url, "_new_generic", parm);
 }

-
-function warn_save_active_periodic_invoice() {
-  return confirm(kivi.t8('This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?'));
-}

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index dfd2a6abb0a2c1def610f6ad37e16b1fc610b86b..bcae1145a59536a783a9f63ed899d568304e8e28 100644 (file)
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -49,11 +49,18 @@ namespace('kivi.SalesPurchase', function(ns) {
     return confirm(kivi.t8('There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?'));
   };
 
     return confirm(kivi.t8('There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?'));
   };
 

+  this.oe_warn_save_active_periodic_invoice = function() {
+    return confirm(kivi.t8('This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?'));
+  };
+

   this.on_submit_checks = function() {
     var $button = $(this);
     if (($button.data('check-transfer-qty') == 1) && !kivi.SalesPurchase.delivery_order_check_transfer_qty())
       return false;
 
   this.on_submit_checks = function() {
     var $button = $(this);
     if (($button.data('check-transfer-qty') == 1) && !kivi.SalesPurchase.delivery_order_check_transfer_qty())
       return false;
 

+    if (($button.data('warn-save-active-periodic-invoice') == 1) && !kivi.SalesPurchase.oe_warn_save_active_periodic_invoice())
+      return false;
+

     return true;
   };
 
     return true;
   };
 

diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index 1896f7609e288bd7f8ff2ef04e5e70d0e4fcf688..aa52392b6314c85fe89cb3988b08fc95af68db7f 100644 (file)
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -131,8 +131,8 @@
 <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
 <input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
 <input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">
 <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
 <input class="submit" type="submit" name="action_print" value="[% 'Print' | $T8 %]">
 <input class="submit" type="submit" name="action_e_mail" value="[% 'E-mail' | $T8 %]">

-<input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]"[% IF warn_save_active_periodic_invoice %] onclick="return warn_save_active_periodic_invoice();"[% END %]>
-<input class="submit" type="submit" name="action_save_and_close" value="[% 'Save and Close' | $T8 %]"[% IF warn_save_active_periodic_invoice %] onclick="return warn_save_active_periodic_invoice();"[% END %]>
+<input class="submit" type="submit" name="action_save" value="[% 'Save' | $T8 %]"[% IF warn_save_active_periodic_invoice %] data-warn-save-active-periodic-invoice="1"[% END %]>
+<input class="submit" type="submit" name="action_save_and_close" value="[% 'Save and Close' | $T8 %]"[% IF warn_save_active_periodic_invoice %] data-warn-save-active-periodic-invoice="1"[% END %]>

 
 [%- IF id %]
   <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
 [%- IF id %]
   <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">


@@ -183,3 +183,6 @@
 [% END %]
 
 </form>
 [% END %]
 
 </form>

+<script type='text/javascript'>
+ $(kivi.SalesPurchase.init_on_submit_checks);
+</script>