X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/734f5baa9d1bbdba84a1914299e4e0d94e42984a..0b34e29fb04ad9ac9912f67b767f9f401700ca97:/templates/webpages/am/edit_accounts.html diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html index 09c98b3a5..7b000d674 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 %]
+ +
@@ -43,7 +40,7 @@ window.onload = function() { - + @@ -51,7 +48,7 @@ window.onload = function() { [% 'Description' | $T8 %] - + @@ -60,10 +57,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 %] [% 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_amount', 'AR_tax') %] [% 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_amount', 'AP_tax') %] [% 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 %]
[% '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 to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $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 %] + [% '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 %]

@@ -103,26 +138,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 %] +

@@ -157,39 +214,40 @@ window.onload = function() {

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

-[% IF account_exists %] - + [% IF country_mode != 'CH' %] + + [% END %] [% FOREACH tk = ACCOUNT_TAXKEYS %] + [% IF tk.id %] - + [% IF country_mode != 'CH' %] + + [% END %] [% ELSE %] - + [% IF country_mode != 'CH' %] + + [% END %] [% END %] + [% END %] -[% ELSE %] - - - -[% END %] -
[% 'Taxkey' | $T8 %] [% 'valid from' | $T8 %][% 'pos_ustva' | $T8 %][% 'pos_ustva' | $T8 %][% 'delete' | $T8 %] ?
 

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

-
+
@@ -199,6 +257,7 @@ window.onload = function() { [% 'EUER' | $T8 %] + [% IF country_mode != 'CH' %] [% 'BWA' | $T8 %] @@ -210,8 +269,9 @@ 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 %] + [% END %] [% 'Folgekonto' | $T8 %] @@ -222,3 +282,19 @@ window.onload = function() { [% END %]
+ +[% IF ( id ) %] + +[% END %]