X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fam%2Fedit_accounts.html;h=95cd8c09d53db5d27a558dd8b0f85877d421dada;hb=3aa5cee2f12c1dff757539b60196bf5e1be0a5d6;hp=098ab67076b58b49219d2568231fb391c6748eb2;hpb=dab2f724f162a7183d5782d79fde672f4f443a6d;p=kivitendo-erp.git diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html index 098ab6707..95cd8c09d 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 %] -
- - - - - -
[% title %]
-
[% 'Main Preferences' | $T8 %] @@ -43,7 +38,7 @@ window.onload = function() { - + @@ -51,7 +46,7 @@ window.onload = function() { [% 'Description' | $T8 %] - + @@ -60,10 +55,27 @@ window.onload = function() { - + +[% 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 %] +
+
[% 'Account Type' | $T8 %] -  [% 'AR' | $T8 %] - -  [% 'AP' | $T8 %] - -  [% 'Inventory' | $T8 %] + [% L.radio_button_tag('summary_account', + value => 'AR', + disabled => AccountIsPosted, + checked => AR) %] +  [% 'AR' | $T8 %] + [% L.radio_button_tag('summary_account', + value => 'AP', + disabled => AccountIsPosted, + checked => AP) %] +  [% 'AP' | $T8 %] + [% L.radio_button_tag('summary_account', + value => 'IC', + disabled => AccountIsPosted, + checked => IC) %] +  [% 'Inventory' | $T8 %] + [% L.radio_button_tag('summary_account', + value => '', + disabled => AccountIsPosted) %] +  [% 'No summary account' | $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 %] +
[% IF AccountIsPosted %] @@ -92,9 +124,9 @@ window.onload = function() { [% END %]
[% 'Include in drop-down menus' | $T8 %] -

[% '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 %]

+

[% '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 %]

[% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %] - [% 'And if the account does not act as tax-o-matic account.' | $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 %]

@@ -104,26 +136,46 @@ window.onload = function() {
[% 'Receivables' | $T8 %]
-   - [% 'Revenue' | $T8 %]
-   - [% 'Receipt' | $T8 %]
-   - [% 'Tax' | $T8 %] + [% L.radio_button_tag('AR_include_in_dropdown', + value => 'AR_amount', + disabled => AccountIsPosted, + checked => AR_amount) %] +  [% 'Revenue' | $T8 %]
+ [% L.radio_button_tag('AR_include_in_dropdown', + value => 'AR_paid', + disabled => AccountIsPosted, + checked => AR_paid) %] +  [% 'Receipt' | $T8 %]
+ [% L.radio_button_tag('AR_include_in_dropdown', + value => 'AR_tax', + disabled => AccountIsPosted, + checked => AR_tax) %] +  [% 'Tax' | $T8 %]
+ [% L.radio_button_tag('AR_include_in_dropdown', + value => '', + disabled => AccountIsPosted) %] +  [% 'do not include' | $T8 %] 		-   - [% 'Expense/Asset' | $T8 %]
-   - [% 'Payment' | $T8 %]
-   - [% 'Tax' | $T8 %] + [% L.radio_button_tag('AP_include_in_dropdown', + value => 'AP_amount', + disabled => AccountIsPosted, + checked => AP_amount) %] +  [% 'Expense/Asset' | $T8 %]
+ [% L.radio_button_tag('AP_include_in_dropdown', + value => 'AP_paid', + disabled => AccountIsPosted, + checked => AP_paid) %] +  [% 'Payment' | $T8 %]
+ [% L.radio_button_tag('AP_include_in_dropdown', + value => 'AP_tax', + disabled => AccountIsPosted, + checked => AP_tax) %] +  [% 'Tax' | $T8 %]
+ [% L.radio_button_tag('AP_include_in_dropdown', + value => '', + disabled => AccountIsPosted) %] +  [% 'do not include' | $T8 %] 		  [% 'Tax' | $T8 %] +

  [% 'Tax' | $T8 %] +

@@ -158,7 +212,6 @@ window.onload = function() {

[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]

-[% IF account_exists %] @@ -166,6 +219,7 @@ window.onload = function() { [% FOREACH tk = ACCOUNT_TAXKEYS %] + [% IF tk.id %] @@ -183,14 +237,9 @@ window.onload = function() { [% END %] + [% END %] -[% ELSE %] - - - -[% END %] -
[% 'Taxkey' | $T8 %] [% 'valid from' | $T8 %][% 'delete' | $T8 %] ?

[% 'Save account first to insert taxkeys' | $T8 %]

-
+
@@ -211,7 +260,7 @@ window.onload = function() { [% 'Datevautomatik' | $T8 %] - + [% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] [% 'Folgekonto' | $T8 %] @@ -223,3 +272,19 @@ window.onload = function() { [% END %]
+ +[% IF ( id ) %] + +[% END %]