From 152cf51294705caacdc3d3f2621af4d3f4997772 Mon Sep 17 00:00:00 2001 From: Rolf Fluehmann Date: Tue, 7 Jun 2016 12:37:37 +0200 Subject: [PATCH] featured form-objects visible/unvisible --- SL/Controller/ClientConfig.pm | 1 + bin/mozilla/am.pl | 8 +++ templates/webpages/am/edit_accounts.html | 62 +++++++++++++--------- templates/webpages/client_config/form.html | 4 +- 4 files changed, 50 insertions(+), 25 deletions(-) diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm index 4ce4faa0a..c8afe1da0 100644 --- a/SL/Controller/ClientConfig.pm +++ b/SL/Controller/ClientConfig.pm @@ -30,6 +30,7 @@ sub action_edit { my ($self, %params) = @_; $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new'; + $::form->{feature_datev} = $self->defaults->feature_datev; $self->edit_form; } diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 62c645a6f..fbe5bb8d1 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -45,6 +45,7 @@ use SL::TODO; use SL::DB::Printer; use SL::DB::Tax; use SL::DB::Language; +use SL::DB::Default; use CGI; require "bin/mozilla/common.pl"; @@ -87,10 +88,17 @@ sub edit_account { my $form = $main::form; my %myconfig = %main::myconfig; + my $defaults = SL::DB::Default->get; $main::auth->assert('config'); $form->{title} = "Edit"; + $form->{feature_balance} = $defaults->feature_balance; + $form->{feature_datev} = $defaults->feature_datev; + $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung; + $form->{feature_eurechnung} = $defaults->feature_eurechnung; + $form->{feature_ustva} = $defaults->feature_ustva; + AM->get_account(\%myconfig, \%$form); foreach my $item (split(/:/, $form->{link})) { diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html index b89a9320d..b2ba877ad 100644 --- a/templates/webpages/am/edit_accounts.html +++ b/templates/webpages/am/edit_accounts.html @@ -217,7 +217,9 @@ $(function() { [% 'Taxkey' | $T8 %] [% 'valid from' | $T8 %] - [% 'pos_ustva' | $T8 %] + [% IF feature_ustva %] + [% 'pos_ustva' | $T8 %] + [% END %] [% 'delete' | $T8 %] ? [% FOREACH tk = ACCOUNT_TAXKEYS %] @@ -227,14 +229,18 @@ $(function() { - + [% IF feature_ustva %] + + [% END %] [% ELSE %] - + [% IF feature_ustva %] + + [% END %]   [% END %] @@ -247,27 +253,35 @@ $(function() {
[% 'Report and misc. Preferences' | $T8 %] - - - - - - - - - - - - - - - - - - + [% IF feature_erfolgsrechnung %] + + + + + [% END %] + [% IF feature_eurechnung %] + + + + + + + + + [% END %] + [% IF feature_balance %] + + + [% END %] + [% IF feature_datev %] + + + + + [% END %] diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html index 0f85512b3..56403108a 100644 --- a/templates/webpages/client_config/form.html +++ b/templates/webpages/client_config/form.html @@ -58,7 +58,9 @@ $(function() {
  • [% LxERP.t8('Ranges of numbers') %]
  • [% LxERP.t8('Default Accounts') %]
  • [% LxERP.t8('Posting Configuration') %]
  • -
  • [% LxERP.t8('DATEV check configuration') %]
  • + [% IF FORM.feature_datev %] +
  • [% LxERP.t8('DATEV check configuration') %]
  • + [% END %]
  • [% LxERP.t8('Orders / Delivery Orders deleteable') %]
  • [% LxERP.t8('Warehouse') %]
  • [% LxERP.t8('Features') %]
  • -- 2.20.1
    [% 'EUER' | $T8 %]
    [% 'Erfolgsrechnung' | $T8 %]
    [% 'BWA' | $T8 %]
    [% '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 %]
    [% 'Erfolgsrechnung' | $T8 %]
    [% 'EUER' | $T8 %]
    [% 'BWA' | $T8 %]
    [% '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 %]