X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/0483b692e6e694c43854cc168db4039e5235a6a9..HEAD:/templates/webpages/am/edit_accounts.html

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 7b000d674..e07484b63 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -12,11 +12,11 @@
 
 <script type="text/javascript">
 $(function() {
-    setupDependencies('EditAccount'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
+    setupDependencies('EditAccount'); //name of form(s). Separate each with a comma (ie: 'weboptions', 'myotherform' )
 });
 </script>
 
-<form method="post" name="EditAccount" action="am.pl">
+<form method="post" name="EditAccount" action="am.pl" id="form">
 
 <input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
 <input type="hidden" name="type"               value="account">
@@ -128,7 +128,7 @@ $(function() {
   <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
   <p style='font-weight:normal'>[% 'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' | $T8 %]</p>
   <p style='font-weight:normal'>[% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]
-  [% 'The changing of tax-o-matic account is NOT recommended, but if you do so please also (re)configure buchungsgruppen and reconfigure ALL charts which point to this tax-o-matic account. ' | $T8 %]</p>
+  [% 'The changing of tax-o-matic account is NOT recommended, but if you do so please also (re)configure booking groups and reconfigure ALL charts which point to this tax-o-matic account. ' | $T8 %]</p>
   <table width="100%">
     <tr>
       <th align="left">[% 'Receivables' | $T8 %]</th>
@@ -217,7 +217,7 @@ $(function() {
               <tr>
                 <th align="left">[% 'Taxkey' | $T8 %]</th>
                 <th align="left">[% 'valid from' | $T8 %]</th>
-                [% IF country_mode != 'CH' %]
+                [% IF feature_ustva %]
                   <th align="left">[% 'pos_ustva' | $T8 %]</th>
                 [% END %]
                 <th align="left">[% 'delete' | $T8 %] ? </th>
@@ -229,7 +229,7 @@ $(function() {
                 <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
                 <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
                 <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                [% IF country_mode != 'CH' %]
+                [% IF feature_ustva %]
                   <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
                 [% END %]
                 <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
@@ -238,7 +238,7 @@ $(function() {
                 <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
                 <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
                 <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                [% IF country_mode != 'CH' %]
+                [% IF feature_ustva %]
                   <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
                 [% END %]
                 <td>&nbsp;</td>
@@ -253,25 +253,35 @@ $(function() {
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Report and misc. Preferences' | $T8 %]</legend>
   <table>
-        <tr>
-          <th align="left">[% 'EUER' | $T8 %]</th>
-          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
-        </tr>
-     [% IF country_mode != 'CH' %]
-        <tr>
-          <th align="left">[% 'BWA' | $T8 %]</th>
-          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
-        </tr>
-        <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
-        <!-- tr>
-          <th align="left">[% 'Bilanz' | $T8 %]</th>
-          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
-        </tr -->
-        <tr>
-          <th align="left">[% 'Datevautomatik' | $T8 %]</th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td>
-        </tr>
-     [% END %]
+        [% IF feature_erfolgsrechnung %]
+          <tr>
+            <th align="left">[% 'Erfolgsrechnung' | $T8 %]</th>
+            <td colspan="3"><select name="pos_er">[% select_er %]</select></td>
+          </tr>
+        [% END %]
+        [% IF feature_eurechnung %]
+          <tr>
+            <th align="left">[% 'EUER' | $T8 %]</th>
+            <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
+          </tr>
+          <tr>
+            <th align="left">[% 'BWA' | $T8 %]</th>
+            <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
+          </tr>
+        [% END %]
+        [% IF feature_balance %]
+          <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
+          <!-- tr>
+            <th align="left">[% 'Bilanz' | $T8 %]</th>
+            <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
+          </tr -->
+        [% END %]
+        [% IF feature_datev %]
+          <tr>
+            <th align="left">[% 'Datevautomatik' | $T8 %]</th>
+            <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td>
+          </tr>
+        [% END %]
         <tr>
           <th align="left">[% 'Folgekonto' | $T8 %]</th>
           <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
@@ -298,3 +308,5 @@ $(function() {
   }
   </script>
 [% END %]
+[% L.hidden_tag('callback', callback) %]
+</form>