From: G. Richardson Date: Thu, 15 Jan 2015 11:26:58 +0000 (+0100) Subject: Chartpicker auch für Steuerzonen und Buchungsgruppen X-Git-Tag: release-3.2.0beta~83 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=000588da;p=kivitendo-erp.git Chartpicker auch für Steuerzonen und Buchungsgruppen Hier wurde noch das entfernte init_accounts aus ClientConfig benutzt. --- diff --git a/SL/Controller/Buchungsgruppen.pm b/SL/Controller/Buchungsgruppen.pm index 0ad05c428..0de9d0c0f 100644 --- a/SL/Controller/Buchungsgruppen.pm +++ b/SL/Controller/Buchungsgruppen.pm @@ -8,7 +8,6 @@ use SL::DB::TaxZone; use SL::Helper::Flash; use SL::Locale::String; use SL::DB::TaxzoneChart; -use SL::Controller::ClientConfig; use SL::DB::Default; use Rose::Object::MakeMethods::Generic ( @@ -53,9 +52,7 @@ sub show_form { my ($self, %params) = @_; $self->render('buchungsgruppen/form', %params, - TAXZONES => SL::DB::Manager::TaxZone->get_all_sorted(), - ACCOUNTS => SL::Controller::ClientConfig->init_accounts(), - account_label => sub { "$_[0]{accno}--$_[0]{description}" }); + TAXZONES => SL::DB::Manager::TaxZone->get_all_sorted()); } sub action_edit { diff --git a/SL/Controller/Taxzones.pm b/SL/Controller/Taxzones.pm index 1e29e6022..6f5adf7f1 100644 --- a/SL/Controller/Taxzones.pm +++ b/SL/Controller/Taxzones.pm @@ -11,7 +11,6 @@ use SL::Helper::Flash; use SL::Locale::String; use SL::DB::Manager::Buchungsgruppe; use SL::DB::Manager::TaxzoneChart; -use SL::Controller::ClientConfig; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(config) ], @@ -47,9 +46,7 @@ sub show_form { my ($self, %params) = @_; $self->render('taxzones/form', %params, - BUCHUNGSGRUPPEN => SL::DB::Manager::Buchungsgruppe->get_all_sorted, - ACCOUNTS => SL::Controller::ClientConfig->init_accounts, - account_label => sub { "$_[0]{accno}--$_[0]{description}" }); + BUCHUNGSGRUPPEN => SL::DB::Manager::Buchungsgruppe->get_all_sorted); } sub action_edit { diff --git a/templates/webpages/buchungsgruppen/form.html b/templates/webpages/buchungsgruppen/form.html index 4141570f4..16912fd85 100644 --- a/templates/webpages/buchungsgruppen/form.html +++ b/templates/webpages/buchungsgruppen/form.html @@ -1,4 +1,5 @@ [%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%] +[% SET style="width: 400px" %]

[% HTML.escape(title) %]

@@ -13,9 +14,9 @@ [% 'Inventory Account' | $T8 %] [%- IF NOT SELF.config.id %] - [%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.defaults.inventory_accno_id) %] + [% L.chart_picker("config.inventory_accno_id", SELF.defaults.inventory_accno_id, choose=1, type='IC', style=style) %] [%- ELSIF SELF.config.id AND SELF.config.orphaned %] - [%- L.select_tag("config.inventory_accno_id", ACCOUNTS.ic, title_sub=\account_label, default=SELF.config.inventory_accno_id) %] + [% L.chart_picker("config.inventory_accno_id", SELF.config.inventory_accno_id, choose=1, type='IC', style=style) %] [%- ELSE %] [%- CHARTLIST.inventory_accno %] -- [%- CHARTLIST.inventory_accno_description %] [%- END %] @@ -24,9 +25,9 @@ [% 'Revenue' | $T8 %] [% HTML.escape(tz.description) %] [%- IF NOT SELF.config.id %] - [%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=SELF.defaults.income_accno_id) %] + [% L.chart_picker('income_accno_id_' _ tz.id, SELF.defaults.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %] [%- ELSIF SELF.config.id AND SELF.config.orphaned %] - [%- L.select_tag('income_accno_id_' _ tz.id, ACCOUNTS.ic_income, title_sub=\account_label, default=CHARTLIST.${tz.id}.income_accno_id) %] + [% L.chart_picker('income_accno_id_' _ tz.id, CHARTLIST.${tz.id}.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %] [%- ELSE %] [% CHARTLIST.${tz.id}.income_accno %] -- [% CHARTLIST.${tz.id}.income_accno_description %] [%- END %] @@ -34,9 +35,9 @@ [% 'Expense' | $T8 %] [% HTML.escape(tz.description) %] [%- IF NOT SELF.config.id %] - [%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=SELF.defaults.expense_accno_id) %] + [% L.chart_picker('expense_accno_id_' _ tz.id, SELF.defaults.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %] [%- ELSIF SELF.config.id AND SELF.config.orphaned %] - [%- L.select_tag('expense_accno_id_' _ tz.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=CHARTLIST.${tz.id}.expense_accno_id) %] + [% L.chart_picker('expense_accno_id_' _ tz.id, CHARTLIST.${tz.id}.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %] [%- ELSE %] [% CHARTLIST.${tz.id}.expense_accno %] -- [% CHARTLIST.${tz.id}.expense_accno_description %] [%- END %] diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html index 33cd1e61e..94688e2a4 100644 --- a/templates/webpages/login_screen/user_login.html +++ b/templates/webpages/login_screen/user_login.html @@ -29,7 +29,7 @@ - + @@ -70,3 +70,13 @@  |  [%- LxERP.t8('Documentation') %]

+ +[% IF FORM.client %] + +[% END %] diff --git a/templates/webpages/taxzones/form.html b/templates/webpages/taxzones/form.html index 9994057a8..bce8371f4 100644 --- a/templates/webpages/taxzones/form.html +++ b/templates/webpages/taxzones/form.html @@ -1,4 +1,5 @@ [%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]

[% HTML.escape(title) %]

+[% SET style="width: 400px" %] [%- L.hidden_tag("id", SELF.config.id) %] @@ -14,7 +15,7 @@ [%- IF SELF.config.id %] [%- ELSE %] - + [%- END %] @@ -22,7 +23,7 @@ [%- IF SELF.config.id %] [%- ELSE %] - + [%- END %] [%- END %]
[% 'Login Name' | $T8 %][% L.input_tag('{AUTH}login', '', id='auth_login', style=style, class='initial_focus') %][% L.input_tag('{AUTH}login', FORM.login, id='auth_login', style=style, class='initial_focus') %]
[% 'Password' | $T8 %]
[% CHARTLIST.${bg.id}.income_accno %] -- [% CHARTLIST.${bg.id}.income_accno_description %][%- L.select_tag('income_accno_id_' _ bg.id, ACCOUNTS.ic_income, title_sub=\account_label, default=SELF.defaults.income_accno_id) %][% L.chart_picker('income_accno_id_' _ bg.id, SELF.defaults.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %]
[% CHARTLIST.${bg.id}.expense_accno %] -- [% CHARTLIST.${bg.id}.expense_accno_description %][%- L.select_tag('expense_accno_id_' _ bg.id, ACCOUNTS.ic_expense, title_sub=\account_label, default=SELF.defaults.expense_accno_id) %][% L.chart_picker('expense_accno_id_' _ bg.id, SELF.defaults.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %]