X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fedit_accounts.html;h=76a08e46340305b8382d9486f512dd1a323d461f;hb=f46dfda018cac3aeaa549d678ad036d0cfff2e6d;hp=c55e08f1d57ab489ad37332df2fecbb5844037de;hpb=b1b4e6878345cc1a8b590dd7362e4a50048f2417;p=kivitendo-erp.git

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index c55e08f1d..76a08e463 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
+[%- USE L %]
 [% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
@@ -59,10 +60,27 @@ window.onload = function() {
 
         </label>
       </td>
-      <td><select name="charttype">[% select_charttype %]</select></td>
+      <td>
+[% IF AccountIsPosted %]
+        [% L.select_tag('dummy_charttype',
+                        all_charttypes,
+                        title_key => 'name',
+                        value_key => 'value',
+                        default => selected_charttype,
+                        disabled => '1') %]
+        [% L.hidden_tag('charttype', selected_charttype) %]
+[% ELSE %]
+        [% L.select_tag('charttype',
+                        all_charttypes,
+                        title_key => 'name',
+                        value_key => 'value',
+                        default => selected_charttype) %]
+[% END %]
+      </td>
     </tr>
   </table>
 </fieldset>
+
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Account Type' | $T8 %]</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
@@ -72,21 +90,32 @@ window.onload = function() {
 [% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
-    &nbsp;[% 'AR' | $T8 %]
-    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
-    &nbsp;[% 'AP' | $T8 %]
-    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
-    &nbsp;[% 'Inventory' | $T8 %]
+    [% 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 %]
+
+[% IF AccountIsPosted %]
+    [% IF AR %] [% L.hidden_tag('AR', 'AR') %] [% END %]
+    [% IF AP %] [% L.hidden_tag('AP', 'AP') %] [% END %]
+    [% IF IC %] [% L.hidden_tag('IC', 'IC') %] [% END %]
+[% END %]
+
 </fieldset>
 
 [% IF AccountIsPosted %]
-[%- SET DIS = ' disabled="disabled"' %]
+  [% IF AR_amount %] [% L.hidden_tag('AR_amount', 'AR_amount') %] [% END %]
+  [% IF AR_paid   %] [% L.hidden_tag('AR_paid',   'AR_paid')   %] [% END %]
+  [% IF AR_tax    %] [% L.hidden_tag('AR_tax',    'AR_tax')    %] [% END %]
+  [% IF AP_amount %] [% L.hidden_tag('AP_amount', 'AP_amount') %] [% END %]
+  [% IF AP_paid   %] [% L.hidden_tag('AP_paid',   'AP_paid')   %] [% END %]
+  [% IF AP_tax    %] [% L.hidden_tag('AP_tax',    'AP_tax')    %] [% END %]
+  [%- SET DIS = ' disabled="disabled"' %]
 [% END %]
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
-  <p style='font-weight:normal'>[% 'These will only be effective if the account is NOT a summary account AND there exists at least one taxkey. Setting the account as a summary account will erase these settings.' | $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 %]</p>
+  <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>
   <table width="100%">
     <tr>
       <th align="left">[% 'Receivables' | $T8 %]</th>
@@ -96,26 +125,46 @@ window.onload = function() {
     </tr>
     <tr>
       <td>
-        <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          [% HTML.escape(AR_amount)%][% DIS %]>&nbsp;
-        [% 'Revenue' | $T8 %] <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
-          [% HTML.escape(AR_paid) %][% DIS %]>&nbsp;
-        [% 'Receipt' | $T8 %] <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
-          [% HTML.escape(AR_tax) %][% DIS %]>&nbsp;
-        [% 'Tax' | $T8 %]
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_amount',
+          disabled => AccountIsPosted,
+          checked  => AR_amount) %]
+        &nbsp;[% 'Revenue' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_paid',
+          disabled => AccountIsPosted,
+          checked  => AR_paid) %]
+        &nbsp;[% 'Receipt' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => 'AR_tax',
+          disabled => AccountIsPosted,
+          checked  => AR_tax) %]
+        &nbsp;[% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown',
+          value => '',
+          disabled => AccountIsPosted) %]
+        &nbsp;[% 'do not include' | $T8 %]
       </td>
       <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
-          [% HTML.escape(AP_amount) %][% DIS %]>&nbsp;
-        [% 'Expense/Asset' | $T8 %] <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
-          [% HTML.escape(AP_paid) %][% DIS %]>&nbsp;
-        [% 'Payment' | $T8 %] <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
-            [% HTML.escape(AP_tax) %][% DIS %]>&nbsp;
-        [% 'Tax' | $T8 %]
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_amount',
+          disabled => AccountIsPosted,
+          checked  => AP_amount) %]
+        &nbsp;[% 'Expense/Asset' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_paid',
+          disabled => AccountIsPosted,
+          checked  => AP_paid) %]
+        &nbsp;[% 'Payment' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => 'AP_tax',
+          disabled => AccountIsPosted,
+          checked  => AP_tax) %]
+        &nbsp;[% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown',
+          value => '',
+          disabled => AccountIsPosted) %]
+        &nbsp;[% 'do not include' | $T8 %]
       </td>
       <td>
         <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
@@ -127,6 +176,7 @@ window.onload = function() {
         <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
           [% HTML.escape(IC_taxpart) %]>&nbsp;
         [% 'Tax' | $T8 %]
+        <br><br>
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
@@ -138,6 +188,7 @@ window.onload = function() {
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
           [% HTML.escape(IC_taxservice) %]>&nbsp;
         [% 'Tax' | $T8 %]
+        <br><br>
       </td>
     </tr>
   </table>
@@ -203,7 +254,7 @@ window.onload = function() {
         </tr -->
         <tr>
           <th align="left">[% 'Datevautomatik' | $T8 %]</th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
+          <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>
         <tr>
           <th align="left">[% 'Folgekonto' | $T8 %]</th>