X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fedit_accounts.html;h=12a284c25d6f88ecf9d7762a088a04bd23c931b2;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=dcf0be088524ca2e90fe1776bc1d3dd333b594a7;hpb=171a38d37e97d7c21f6e78fdc344fc1bd12b9ab6;p=kivitendo-erp.git

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index dcf0be088..12a284c25 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -1,6 +1,9 @@
 [%- USE T8 %]
 [%- USE L %]
-[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
 * Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
@@ -19,18 +22,13 @@ $(function() {
 <input type="hidden" name="type"               value="account">
 <input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
 <input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
-<input type="hidden" name="original_accno"    value="[% HTML.escape(accno) %]">
 <input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
 <input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
 <input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
 <input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
 <input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
-
-<table border="0" width="100%">
-  <tr>
-    <th class="listtop">[% title %]</th>
-  </tr>
-</table>
+<input type="hidden" name="rndgain_accno_id"   value="[% HTML.escape(rndgain_accno_id) %]">
+<input type="hidden" name="rndloss_accno_id"   value="[% HTML.escape(rndloss_accno_id) %]">
 
 <fieldset>
   <legend>
@@ -42,7 +40,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>
@@ -50,7 +48,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>
@@ -89,9 +87,25 @@ $(function() {
 [% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
-    [% L.checkbox_tag('AR', value => 'AR', checked => AR, class => 'checkbox', disabled => AccountIsPosted) %] &nbsp;[% 'AR' | $T8 %]
-    [% L.checkbox_tag('AP', value => 'AP', checked => AP, class => 'checkbox', disabled => AccountIsPosted) %] &nbsp;[% 'AP' | $T8 %]
-    [% L.checkbox_tag('IC', value => 'IC', checked => IC, class => 'checkbox', disabled => AccountIsPosted) %] &nbsp;[% 'Inventory' | $T8 %]
+        [% L.radio_button_tag('summary_account',
+          value => 'AR',
+          disabled => AccountIsPosted,
+          checked  => AR) %]
+        &nbsp;[% 'AR' | $T8 %]
+        [% L.radio_button_tag('summary_account',
+          value => 'AP',
+          disabled => AccountIsPosted,
+          checked  => AP) %]
+        &nbsp;[% 'AP' | $T8 %]
+        [% L.radio_button_tag('summary_account',
+          value => 'IC',
+          disabled => AccountIsPosted,
+          checked  => IC) %]
+        &nbsp;[% 'Inventory' | $T8 %]
+        [% L.radio_button_tag('summary_account',
+          value => '',
+          disabled => AccountIsPosted) %]
+        &nbsp;[% 'No summary account' | $T8 %]
 
 [% IF AccountIsPosted %]
     [% IF AR %] [% L.hidden_tag('AR', 'AR') %] [% END %]
@@ -200,7 +214,6 @@ $(function() {
   <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]</p>
 
             <table>
-[% IF account_exists %]
               <tr>
                 <th align="left">[% 'Taxkey' | $T8 %]</th>
                 <th align="left">[% 'valid from' | $T8 %]</th>
@@ -208,6 +221,7 @@ $(function() {
                 <th align="left">[% 'delete' | $T8 %] ? </th>
               </tr>
 [% FOREACH tk = ACCOUNT_TAXKEYS %]
+
               <tr>
     [% IF tk.id %]
                 <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
@@ -225,14 +239,9 @@ $(function() {
     [% END %]
               </tr>
 
+
 [% END %]
-[% ELSE %]
-<tr>
-  <td align="center" colspan="4"><p>[% 'Save account first to insert taxkeys' | $T8 %]</p>
-  </td>
-</tr>
-[% END %]
-            </table>
+    </table>
 </fieldset>
 
 <fieldset class="DEPENDS ON charttype BEING A">
@@ -242,6 +251,10 @@ $(function() {
           <th align="left">[% 'EUER' | $T8 %]</th>
           <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
         </tr>
+        <tr>
+          <th align="left">[% 'Erfolgsrechnung' | $T8 %]</th>
+          <td colspan="3"><select name="pos_er">[% select_er %]</select></td>
+        </tr>
         <tr>
           <th align="left">[% 'BWA' | $T8 %]</th>
           <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
@@ -265,3 +278,19 @@ $(function() {
 [% END %]
 </fieldset>
 <hr size="3" noshade>
+
+[% IF ( id ) %]
+  <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>
+[% END %]