From: Thomas Heck <theck@linet-services.de>
Date: Thu, 17 Oct 2013 09:21:27 +0000 (+0200)
Subject: Confirm bei geänderter/m Kontonummer/-namen
X-Git-Tag: release-3.1.0beta1~31^2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d366e4291fa63d64a74c8c80be4aa2dac4c1223f;p=kivitendo-erp.git

Confirm bei geänderter/m Kontonummer/-namen

fixt #2319
---

diff --git a/js/locale/de.js b/js/locale/de.js
index c5a0d26be..969a16240 100644
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -2,6 +2,7 @@ namespace("kivi").setupLocale({
 "Add linked record":"Verknüpften Beleg hinzufügen",
 "Are you sure?":"Sind Sie sicher?",
 "Database Connection Test":"Test der Datenbankverbindung",
+"Do you want to set the account number \"#1\" to \"#2\" and the name \"#3\" to \"#4\"?":"Soll die Kontonummer \"#1\" zu \"#2\" und den Name \"#3\" zu \"#4\" geändert werden?",
 "Map":"Karte",
 "Part picker":"Artikelauswahl",
 "The description is missing.":"Die Beschreibung fehlt.",
diff --git a/locale/de/all b/locale/de/all
index 73db8ac2c..ea2c59635 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -716,6 +716,7 @@ $self->{texts} = {
   'Do you really want to delete this warehouse?' => 'Wollen Sie dieses Lager wirklich l&ouml;schen?',
   'Do you want to <b>limit</b> your search?' => 'Wollen Sie Ihre Suche <b>spezialisieren</b>?',
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Wollen Sie diese Lieferadresse in den neuen Lieferantenauftrag &uuml;bernehmen, damit der H&auml;ndler die Waren direkt an Ihren Kunden liefern kann?',
+  'Do you want to set the account number "#1" to "#2" and the name "#3" to "#4"?' => 'Soll die Kontonummer "#1" zu "#2" und den Name "#3" zu "#4" geändert werden?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'M&ouml;chten Sie die vorhandenen Mengendaten in ein Lager &uuml;bertragen?',
   'Document'                    => 'Dokument',
   'Document Project Number'     => 'Projektnummer des Belegs',
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index d3e4fe7eb..297b2b8a4 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -41,7 +41,7 @@ $(function() {
         <label>
           [% 'Account Number' | $T8 %]
         </label></td>
-        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
+        <td><input id="accno" name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
       <td>
@@ -49,7 +49,7 @@ $(function() {
           [% 'Description' | $T8 %]
         </label>
       </td>
-      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
+      <td><input id="description" name="description" size="40" value="[% HTML.escape(description) %]"></td>
     </tr>
     <tr>
       <td>
@@ -275,3 +275,17 @@ $(function() {
 [% END %]
 </fieldset>
 <hr size="3" noshade>
+
+<script type="text/javascript">
+function callback_save() {
+  var prev_desc = "[% description | html %]";
+  var prev_accno = "[% accno | html %]";
+  var cur_desc = $("#description").val();
+  var cur_accno = $("#accno").val();
+
+  if ( prev_desc != cur_desc || prev_accno != cur_accno )
+    return confirm(kivi.t8("Do you want to set the account number \"#1\" to \"#2\" and the name \"#3\" to \"#4\"?", [prev_accno, cur_accno, prev_desc, cur_desc]));
+  else
+    return true;
+}
+</script>
diff --git a/templates/webpages/am/form_footer.html b/templates/webpages/am/form_footer.html
index c5c9e34bb..18a561f02 100644
--- a/templates/webpages/am/form_footer.html
+++ b/templates/webpages/am/form_footer.html
@@ -5,7 +5,7 @@
 [% L.hidden_tag('callback', callback) %]
 
 <br>
-[%- IF show_save %][% L.submit_tag('action', LxERP.t8('Save')) %][% END %]
+[%- IF show_save %][% L.submit_tag('action', LxERP.t8('Save'), onclick = 'if ( typeof(callback_save) === "function" ) return callback_save(); ') %][% END %]
 [%- IF show_delete %][% L.submit_tag('action', LxERP.t8('Delete')) %][% END %]
 [%- IF show_save_as_new %][% L.submit_tag('action', LxERP.t8('Save as new')) %][% END %]