X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=e18246bc5d83cc88e5649973d156e4a1be4bc2e1;hb=1f9b0c55e2288183a36b9026f1758a3921967811;hp=c918770b0c79ab5402b15e71f4007e8c7b13ab3a;hpb=891f62176912eb5c1e8864a1140635e4ad533d08;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c918770b0..e18246bc5 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -43,6 +43,8 @@ use SL::USTVA;
 use SL::Iconv;
 use SL::TODO;
 use SL::DB::Printer;
+use SL::DB::Tax;
+use SL::DB::Language;
 use CGI;
 
 require "bin/mozilla/common.pl";
@@ -788,153 +790,6 @@ sub delete_language {
   $main::lxdebug->leave_sub();
 }
 
-
-sub add_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  # $locale->text("Add Buchungsgruppe")
-  # $locale->text("Edit Buchungsgruppe")
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};
-
-  AM->get_buchungsgruppe(\%myconfig, \%$form);
-  $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
-  for (my $i = 0; 4 > $i; $i++) {
-    map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
-        qw(income expense));
-  }
-
-  &buchungsgruppe_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_buchungsgruppe(\%myconfig, \%$form);
-
-  &buchungsgruppe_header;
-
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_buchungsgruppe {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  AM->buchungsgruppe(\%::myconfig, $::form);
-
-  $::form->{callback} = "am.pl?action=list_buchungsgruppe";
-  $::form->{title}    = $::locale->text('Buchungsgruppen');
-  $::form->header;
-
-  print $::form->parse_html_template('am/buchungsgruppe_list', {
-    swap_link => qq|am.pl?action=swap_buchungsgruppen&|,
-  });
-
-  $::lxdebug->leave_sub;
-}
-
-sub buchungsgruppe_header {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  # $locale->text('Add Accounting Group')
-  # $locale->text('Edit Accounting Group')
-  $::form->{title}    = $::locale->text("$::form->{title} Buchungsgruppe");
-
-  my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
-  my %acc_type_map = (
-    IC         => $acc_inventory,
-    IC_income  => $acc_income,
-    IC_sale    => $acc_income,
-    IC_expense => $acc_expense,
-    IC_cogs    => $acc_expense,
-  );
-
-  for my $key (keys %acc_type_map) {
-    for my $ref (@{ $::form->{IC_links}{$key} }) {
-      $acc_type_map{$key}{$ref->{id}} = $ref;
-    }
-  }
-
-  my %sorted_accounts = map {
-    $_ => [ sort { $a->{accno} cmp $b->{accno} } values %{ $acc_type_map{$_} } ],
-  } keys %acc_type_map;
-
-  $::form->header;
-  print $::form->parse_html_template('am/buchungsgruppe_header', {
-    accounts      => \%sorted_accounts,
-    account_label => sub { "$_[0]{accno}--$_[0]{description}" },
-  });
-
-  $::lxdebug->leave_sub;
-}
-
-sub save_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Description missing!'));
-
-  AM->save_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Accounting Group saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Accounting Group deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub swap_buchungsgruppen {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
-  list_buchungsgruppe();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub _build_cfg_options {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
@@ -960,6 +815,7 @@ sub config {
   my $locale   = $main::locale;
 
   _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
+  _build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
   _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
 
   my @formats = ();
@@ -1034,6 +890,9 @@ sub config {
   $form->{title}               = $locale->text('Edit Preferences for #1', $form->{login});
 
   $form->header();
+
+  $form->{full_signature} = $form->create_email_signature();
+
   print $form->parse_html_template('am/config');
 
   $main::lxdebug->leave_sub();
@@ -1414,6 +1273,7 @@ sub add_tax {
 
   my $parameters_ref = {
 #    ChartTypeIsAccount         => $ChartTypeIsAccount,
+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
   };
 
   # Ausgabe des Templates
@@ -1449,6 +1309,8 @@ sub edit_tax {
   $form->header();
 
   my $parameters_ref = {
+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
+    TAX       => SL::DB::Manager::Tax->find_by(id => $form->{id}),
   };
 
   # Ausgabe des Templates
@@ -1527,6 +1389,9 @@ sub save_tax {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }
 
+  my @translation_keys  =  grep { $_ =~ '^translation_\d+' } keys %$form;
+  $form->{translations} = { map { $_ =~ '^translation_(\d+)'; $1 => $form->{$_} } @translation_keys };
+
   AM->save_tax(\%myconfig, \%$form);
   $form->redirect($locale->text('Tax saved!'));