X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=e141696f80ab7f26c88f6da9572ef1b463436672;hb=718f7a1b58963922cb3a4512692e15e2b4267ee7;hp=ad6248f3d1d1b5fa19288beb1e48add95316915d;hpb=6af007aef5ff57abc085bf61c6b2d228baac7b25;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index ad6248f3d..e141696f8 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";
@@ -960,6 +962,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 +1037,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 +1420,7 @@ sub add_tax {
 
   my $parameters_ref = {
 #    ChartTypeIsAccount         => $ChartTypeIsAccount,
+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
   };
 
   # Ausgabe des Templates
@@ -1449,6 +1456,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 +1536,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!'));
 
@@ -1558,7 +1570,6 @@ sub add_price_factor {
 
   $form->{title}      = $locale->text('Add Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');
-  $::request->{layout}->focus('#description');
 
   $form->header();
   print $form->parse_html_template('am/edit_price_factor');
@@ -1577,7 +1588,6 @@ sub edit_price_factor {
 
   $form->{title}      = $locale->text('Edit Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');
-  $::request->{layout}->focus('#description');
 
   AM->get_price_factor(\%myconfig, $form);
 
@@ -1665,7 +1675,6 @@ sub add_warehouse {
 
   $form->{title}      = $locale->text('Add Warehouse');
   $form->{callback} ||= build_std_url('action=add_warehouse');
-  $::request->{layout}->focus('#description');
 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');
@@ -1688,7 +1697,6 @@ sub edit_warehouse {
 
   $form->{title}      = $locale->text('Edit Warehouse');
   $form->{callback} ||= build_std_url('action=list_warehouses');
-  $::request->{layout}->focus('#description');
 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');