From ddbc0af54150d60dfc3a920be067156145bc6a1d Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Mon, 22 Jul 2013 18:23:30 +0200 Subject: [PATCH] =?utf8?q?Die=20Einstellung:=20""Steuer=20im=20Preis=20inb?= =?utf8?q?egriffen"=20vorw=C3=A4hlen"=20gefixt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fixt #2336 --- SL/Controller/CustomerVendor.pm | 5 +++++ templates/webpages/customer_vendor/tabs/billing.html | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm index 23c903687..b64c121af 100644 --- a/SL/Controller/CustomerVendor.pm +++ b/SL/Controller/CustomerVendor.pm @@ -577,6 +577,11 @@ sub _instantiate_args { } $self->{cv}->assign_attributes(%{$::form->{cv}}); + if ( $self->is_customer() && $::form->{cv}->{taxincluded_checked} eq '' ) { + $self->{cv}->taxincluded_checked(undef); + } + + foreach my $cvar (@{$self->{cv}->cvars_by_config()}) { my $value = $::form->{cv_cvars}->{$cvar->config->name}; diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html index ace2bd539..2e9ac4c1f 100644 --- a/templates/webpages/customer_vendor/tabs/billing.html +++ b/templates/webpages/customer_vendor/tabs/billing.html @@ -357,11 +357,13 @@ [%- END %] - [% 'taxincluded checked' | $T8 %] + [% IF ( SELF.is_customer() ) %] + [% 'taxincluded checked' | $T8 %] - - [% L.select_tag('cv.taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = SELF.cv.taxincluded_checked) %] - + + [% L.select_tag('cv.taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = SELF.cv.taxincluded_checked) %] + + [% END %] -- 2.20.1