From: Rolf Fluehmann Date: Fri, 6 Jun 2014 13:52:56 +0000 (+0200) Subject: use-cases for CH-modus adjusted X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8f2af1b3b8bcd0c496bdd7e593f76cf05ba73637;p=kivitendo-erp.git use-cases for CH-modus adjusted --- diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm index ded1a33fb..a69779a60 100644 --- a/SL/Controller/ClientConfig.pm +++ b/SL/Controller/ClientConfig.pm @@ -16,6 +16,7 @@ use SL::Helper::Flash; use SL::Locale::String qw(t8); use SL::PriceSource::ALL; use SL::Template; +use SL::DBUtils; __PACKAGE__->run_before('check_auth'); @@ -28,6 +29,7 @@ sub action_edit { my ($self, %params) = @_; $::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new'; + $::form->{use_case} = scalar(grep(/^Switzerland/, (selectrow_query($::form, $::form->get_standard_dbh, 'SELECT coa FROM defaults'))[0])); $self->edit_form; } diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 5cde7aef8..e9c1abc96 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -215,29 +215,10 @@ sub account_header { my $select_eur = q|\n|; my %eur; - if(scalar(grep(/^Switzerland/, (selectrow_query($form, $form->get_standard_dbh, 'SELECT coa FROM defaults'))[0]))) { + if ($form->{use_case} = scalar(grep(/^Switzerland/, (selectrow_query($form, $form->get_standard_dbh, 'SELECT coa FROM defaults'))[0]))) { %eur = ( - 1 => "Umsatzerlöse", - 2 => "Spenden", - 3 => "Mitgliederbeiträge", - 4 => "Finanzerträge", - 5 => "Ertragsminderungen", - 6 => "Einkauf", - 7 => "Löhne und Gehälter", - 8 => "Sozialversicherungen", - 9 => "Mieten", - 10 => "Betriebsversicherungen", - 11 => "Material- und Warenverluste", - 12 => "Werbeaufwand", - 13 => "Werkzeuge, Unterhalt, Betriebsmaterial", - 14 => "Internet- und Serverhousingkosten", - 15 => "Arbeitsleistungen externer Firmen", - 16 => "Bürobedarf, Versandspesen, Telefon", - 17 => "Sonstige Aufwendungen", - 18 => "Abschreibungen", - 19 => "Finanzaufwand", - 20 => "Aufwandsminderungen", - 21 => "Betriebliche Steuern", + 1 => "Ertrag", + 6 => "Aufwand", ); } else { %eur = ( diff --git a/menus/erp_ch.ini b/menus/erp_ch.ini index 01a44645e..d4d43d887 100644 --- a/menus/erp_ch.ini +++ b/menus/erp_ch.ini @@ -284,13 +284,6 @@ ACCESS=general_ledger module=ap.pl action=add -[General Ledger--DATEV - Export Assistent] -ACCESS=datev_export -module=datev.pl -action=export - - - [General Ledger--Reports] module=menu.pl @@ -391,29 +384,6 @@ module=rp.pl action=report report=erfolgsrechnung -[Reports--Income Statement] -ACCESS=report -module=rp.pl -action=report -report=income_statement - -[Reports--BWA] -ACCESS=report -module=rp.pl -action=report -report=bwa - -[Reports--Balance Sheet] -ACCESS=report -module=rp.pl -action=report -report=balance_sheet - -[Reports--UStVa] -ACCESS=advance_turnover_tax_return -module=ustva.pl -action=report - [Reports--Projecttransactions] ACCESS=report module=rp.pl @@ -514,10 +484,6 @@ ACCESS=admin module=controller.pl action=ClientConfig/edit -[System--UStVa Einstellungen] -module=ustva.pl -action=config_step1 - [System--Edit Dunning] module=dn.pl action=edit_config diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html index 95cd8c09d..7555b8c3b 100644 --- a/templates/webpages/am/edit_accounts.html +++ b/templates/webpages/am/edit_accounts.html @@ -249,6 +249,7 @@ $(function() { [% 'EUER' | $T8 %] + [% IF use_case == 0 %] [% 'BWA' | $T8 %] @@ -262,6 +263,7 @@ $(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 %] diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html index 0f85512b3..1fda95df4 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 use_case == 0 %] +
  • [% LxERP.t8('DATEV check configuration') %]
  • + [% END %]
  • [% LxERP.t8('Orders / Delivery Orders deleteable') %]
  • [% LxERP.t8('Warehouse') %]
  • [% LxERP.t8('Features') %]