Mit Bankimport abgeglichen Dialog-Buchungen schreibschützen

[mfinanz.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index bcb39d258f066a65813f4ca81a272541914ae4be..0b29a83a9ece6575a9054eb2bd4e6a9ee3e07987 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # administration
 #======================================================================
 #
 # administration


@@ -33,16 +34,25 @@
 
 use utf8;
 
 
 use utf8;
 

+use List::MoreUtils qw(any);
+

 use SL::Auth;
 use SL::Auth::PasswordPolicy;
 use SL::AM;
 use SL::CA;
 use SL::Form;
 use SL::Auth;
 use SL::Auth::PasswordPolicy;
 use SL::AM;
 use SL::CA;
 use SL::Form;

+use SL::Helper::Flash;
+use SL::Helper::UserPreferences;

 use SL::User;
 use SL::USTVA;
 use SL::Iconv;
 use SL::User;
 use SL::USTVA;
 use SL::Iconv;

+use SL::Locale::String qw(t8);

 use SL::TODO;
 use SL::TODO;

-use SL::Printer;
+use SL::DB::Printer;
+use SL::DB::Tax;
+use SL::DB::Language;
+use SL::DB::Default;
+use SL::DBUtils qw(selectall_array_query conv_dateq);

 use CGI;
 
 require "bin/mozilla/common.pl";
 use CGI;
 
 require "bin/mozilla/common.pl";


@@ -75,7 +85,6 @@ sub add_account {
   $form->{callback} = "am.pl?action=list_account" unless $form->{callback};
 
   &account_header;
   $form->{callback} = "am.pl?action=list_account" unless $form->{callback};
 
   &account_header;

-  &form_footer;

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -85,10 +94,17 @@ sub edit_account {
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;

+  my $defaults = SL::DB::Default->get;

 
   $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
   $main::auth->assert('config');
 
   $form->{title} = "Edit";

+  $form->{feature_balance} = $defaults->feature_balance;
+  $form->{feature_datev} = $defaults->feature_datev;
+  $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung;
+  $form->{feature_eurechnung} = $defaults->feature_eurechnung;
+  $form->{feature_ustva} = $defaults->feature_ustva;
+

   AM->get_account(\%myconfig, \%$form);
 
   foreach my $item (split(/:/, $form->{link})) {
   AM->get_account(\%myconfig, \%$form);
 
   foreach my $item (split(/:/, $form->{link})) {


@@ -96,7 +112,6 @@ sub edit_account {
   }
 
   &account_header;
   }
 
   &account_header;

-  &form_footer;

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -212,38 +227,7 @@ sub account_header {
   }
 
   my $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
   }
 
   my $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;

-  my %eur = (
-          1  => "Umsatzerlöse",
-          2  => "sonstige Erlöse",
-          3  => "Privatanteile",
-          4  => "Zinserträge",
-          5  => "Ausserordentliche Erträge",
-          6  => "Vereinnahmte Umsatzst.",
-          7  => "Umsatzsteuererstattungen",
-          8  => "Wareneingänge",
-          9  => "Löhne und Gehälter",
-          10 => "Gesetzl. sozialer Aufw.",
-          11 => "Mieten",
-          12 => "Gas, Strom, Wasser",
-          13 => "Instandhaltung",
-          14 => "Steuern, Versich., Beiträge",
-          15 => "Kfz-Steuern",
-          16 => "Kfz-Versicherungen",
-          17 => "Sonst. Fahrzeugkosten",
-          18 => "Werbe- und Reisekosten",
-          19 => "Instandhaltung u. Werkzeuge",
-          20 => "Fachzeitschriften, Bücher",
-          21 => "Miete für Einrichtungen",
-          22 => "Rechts- und Beratungskosten",
-          23 => "Bürobedarf, Porto, Telefon",
-          24 => "Sonstige Aufwendungen",
-          25 => "Abschreibungen auf Anlagever.",
-          26 => "Abschreibungen auf GWG",
-          27 => "Vorsteuer",
-          28 => "Umsatzsteuerzahlungen",
-          29 => "Zinsaufwand",
-          30 => "Ausserordentlicher Aufwand",
-          31 => "Betriebliche Steuern");
+  my %eur = %{ AM->get_eur_categories(\%myconfig, $form) };

   foreach my $item (sort({ $a <=> $b } keys(%eur))) {
     my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
     if ($item == $form->{pos_eur}) {
   foreach my $item (sort({ $a <=> $b } keys(%eur))) {
     my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
     if ($item == $form->{pos_eur}) {


@@ -254,31 +238,23 @@ sub account_header {
 
   }
 
 
   }
 

+  my $select_er = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+  my %er = (
+       1  => "Ertrag",
+       6  => "Aufwand");
+  foreach my $item (sort({ $a <=> $b } keys(%er))) {
+    my $text = H($::locale->{iconv_utf8}->convert($er{$item}));
+    if ($item == $form->{pos_er}) {
+      $select_er .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
+    } else {
+      $select_er .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
+    }
+
+  }
+

   my $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
 
   my $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
 

-  my %bwapos = (
-             1  => 'Umsatzerlöse',
-             2  => 'Best.Verdg.FE/UE',
-             3  => 'Aktiv.Eigenleistung',
-             4  => 'Mat./Wareneinkauf',
-             5  => 'So.betr.Erlöse',
-             10 => 'Personalkosten',
-             11 => 'Raumkosten',
-             12 => 'Betriebl.Steuern',
-             13 => 'Vers./Beiträge',
-             14 => 'Kfz.Kosten o.St.',
-             15 => 'Werbe-Reisek.',
-             16 => 'Kosten Warenabgabe',
-             17 => 'Abschreibungen',
-             18 => 'Rep./instandhlt.',
-             19 => 'Übrige Steuern',
-             20 => 'Sonst.Kosten',
-             30 => 'Zinsauwand',
-             31 => 'Sonst.neutr.Aufw.',
-             32 => 'Zinserträge',
-             33 => 'Sonst.neutr.Ertrag',
-             34 => 'Verr.kalk.Kosten',
-             35 => 'Steuern Eink.u.Ertr.');
+  my %bwapos = %{ AM->get_bwa_categories(\%myconfig, $form) };

   foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
     my $text = H($::locale->{iconv_utf8}->convert($bwapos{$item}));
     if ($item == $form->{pos_bwa}) {
   foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
     my $text = H($::locale->{iconv_utf8}->convert($bwapos{$item}));
     if ($item == $form->{pos_bwa}) {


@@ -345,6 +321,8 @@ sub account_header {
   my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
   my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";
 
   my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
   my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";
 

+  setup_am_edit_account_action_bar();
+

   $form->header();
 
   my $parameters_ref = {
   $form->header();
 
   my $parameters_ref = {


@@ -356,6 +334,7 @@ sub account_header {
     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,
     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,

+    select_er                  => $select_er,

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -365,21 +344,6 @@ sub account_header {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub form_footer {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  print $::form->parse_html_template('am/form_footer', {
-    show_save        => !$::form->{id}
-                     || ($::form->{id} && $::form->{orphaned})
-                     || ($::form->{type} eq "account" && !$::form->{new_chart_valid}),
-    show_delete      => $::form->{id} && $::form->{orphaned},
-    show_save_as_new => $::form->{id} && $::form->{type} eq "account",
-  });
-
-  $::lxdebug->leave_sub;
-}
-

 sub save_account {
   $main::lxdebug->enter_sub();
 
 sub save_account {
   $main::lxdebug->enter_sub();
 


@@ -573,7 +537,7 @@ sub delete_account {
   $form->{title} = $locale->text('Delete Account');
 
   foreach my $id (
   $form->{title} = $locale->text('Delete Account');
 
   foreach my $id (

-    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
+    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id rndgain_accno_id rndloss_accno_id)

     ) {
     if ($form->{id} == $form->{$id}) {
       $form->error($locale->text('Cannot delete default account!'));
     ) {
     if ($form->{id} == $form->{$id}) {
       $form->error($locale->text('Cannot delete default account!'));


@@ -587,408 +551,6 @@ sub delete_account {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub add_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_lead" unless $form->{callback};
-
-  &lead_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_lead(\%myconfig, \%$form);
-
-  &lead_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_lead {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  AM->lead(\%::myconfig, $::form);
-
-  $::form->{callback} = "am.pl?action=list_lead";
-  $::form->{title}    = $::locale->text('Lead');
-
-  $::form->header;
-  print $::form->parse_html_template('am/lead_list');
-
-  $::lxdebug->leave_sub;
-}
-
-sub lead_header {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  # $locale->text('Add Lead')
-  # $locale->text('Edit Lead')
-  $::form->{title} = $::locale->text("$::form->{title} Lead");
-
-  $::form->header;
-  print $::form->parse_html_template('am/lead_header');
-
-  $::lxdebug->leave_sub;
-}
-
-sub save_lead {
-  $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_lead(\%myconfig, \%$form);
-  $form->redirect($locale->text('lead saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_lead(\%myconfig, \%$form);
-  $form->redirect($locale->text('lead deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_language" unless $form->{callback};
-
-  &language_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_language(\%myconfig, \%$form);
-
-  &language_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_language {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  AM->language(\%::myconfig, $::form);
-
-  $::form->{callback} = "am.pl?action=list_language";
-  $::form->{title}   = $::locale->text('Languages');
-
-  $::form->header;
-
-  print $::form->parse_html_template('am/language_list');
-
-  $::lxdebug->leave_sub;
-}
-
-sub language_header {
-  $::lxdebug->enter_sub;
-  $::auth->assert('config');
-
-  # $locale->text('Add Language')
-  # $locale->text('Edit Language')
-  $::form->{title} = $::locale->text("$::form->{title} Language");
-
-  $::form->header;
-
-  print $::form->parse_html_template('am/language_header', {
-    numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
-    dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
-  });
-
-  $::lxdebug->leave_sub;
-}
-
-sub save_language {
-  $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('Language missing!'));
-  $form->isblank("template_code", $locale->text('Template Code missing!'));
-  $form->isblank("article_code", $locale->text('Article Code missing!'));
-  AM->save_language(\%myconfig, \%$form);
-  $form->redirect($locale->text('Language saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_language(\%myconfig, \%$form);
-  $form->redirect($locale->text('Language deleted!'));
-
-  $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 edit_defaults {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  # get defaults for account numbers and last numbers
-  AM->defaultaccounts(\%myconfig, \%$form);
-  $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');
-
-  map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
-
-  # default language
-  my $all_languages = SL::DB::Manager::Language->get_all;
-
-# cash = IST-Versteuerung, accrual = SOLL-Versteuerung
-
-  foreach my $key (keys %{ $form->{IC} }) {
-    foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
-      my $array = "ACCNOS_" . uc($key);
-      $form->{$array} ||= [];
-
-      my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description};
-      push @{ $form->{$array} }, {
-        'name'     => $value,
-        'value'    => $value,
-        'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key},
-      };
-    }
-  }
-
-  $form->{title} = $locale->text('Ranges of numbers and default accounts');
-
-  $form->header();
-  print $form->parse_html_template('am/edit_defaults',
-                                   { ALL_LANGUAGES => $all_languages, });
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_defaults {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  AM->save_defaults();
-
-  $form->redirect($locale->text('Defaults saved.'));
-
-  $main::lxdebug->leave_sub();
-}
-

 sub _build_cfg_options {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 sub _build_cfg_options {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;


@@ -1012,9 +574,11 @@ sub config {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;

+  my $defaults = SL::DB::Default->get;

 
   _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
 
   _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));

-  _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
+  _build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
+  _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00"));

 
   my @formats = ();
   if ($::lx_office_conf{print_templates}->{opendocument}
 
   my @formats = ();
   if ($::lx_office_conf{print_templates}->{opendocument}


@@ -1059,7 +623,7 @@ sub config {
     { 'name' => $locale->text('Queue'),   'value' => 'queue',   'selected' => $selected{queue}, },
     ];
 
     { 'name' => $locale->text('Queue'),   'value' => 'queue',   'selected' => $selected{queue}, },
     ];
 

-  $form->{PRINTERS} = [ SL::Printer->all_printers(%::myconfig) ];
+  $form->{PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;

 
   my %countrycodes = User->country_codes;
 
 
   my %countrycodes = User->country_codes;
 


@@ -1073,7 +637,7 @@ sub config {
   }
 
   $form->{STYLESHEETS} = [];
   }
 
   $form->{STYLESHEETS} = [];

-  foreach my $item (qw(lx-office-erp.css Mobile.css kivitendo.css)) {
+  foreach my $item (qw(lx-office-erp.css kivitendo.css)) {

     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,
     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,


@@ -1081,13 +645,39 @@ sub config {
     };
   }
 
     };
   }
 

+  my $user_prefs = SL::Helper::UserPreferences->new(
+    namespace         => 'TopQuickSearch',
+  );
+  my $prefs_val;
+  my @quick_search_modules;
+  if ($user_prefs) {
+    $prefs_val            = $user_prefs->get('quick_search_modules');
+    @quick_search_modules = split ',', $prefs_val;
+  }
+
+  my $enabled_quick_search = [ SL::Controller::TopQuickSearch->new->available_modules ];
+  $form->{enabled_quick_searchmodules} = \@{$enabled_quick_search};
+  $form->{default_quick_searchmodules} = \@quick_search_modules;
+
+  $form->{displayable_name_specs_by_module} = AM->displayable_name_specs_by_module();
+  $form->{positions_scrollbar_height}       = AM->positions_scrollbar_height();
+  $form->{purchase_search_makemodel}        = AM->purchase_search_makemodel();
+  $form->{sales_search_customer_partnumber} = AM->sales_search_customer_partnumber();
+  $form->{positions_show_update_button}     = AM->positions_show_update_button();
+  $form->{time_recording_use_duration}      = AM->time_recording_use_duration();
+

   $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
   $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
   $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
   $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();

-  $form->{todo_cfg}            = { TODO->get_user_config('login' => $form->{login}) };
+  $form->{todo_cfg}            = { TODO->get_user_config('login' => $::myconfig{login}) };
+  $form->{title}               = $locale->text('Edit Preferences for #1', $::myconfig{login});

 
 

-  $form->{title}               = $locale->text('Edit Preferences for #1', $form->{login});
+  $::request->{layout}->use_javascript("${_}.js") for qw(jquery.multiselect2side ckeditor/ckeditor ckeditor/adapters/jquery);

 
 

+  setup_am_config_action_bar();

   $form->header();
   $form->header();

+
+  $form->{company_signature} = SL::DB::Default->get->signature;
+

   print $form->parse_html_template('am/config');
 
   $main::lxdebug->leave_sub();
   print $form->parse_html_template('am/config');
 
   $main::lxdebug->leave_sub();


@@ -1102,9 +692,14 @@ sub save_preferences {
 
   $form->{stylesheet} = $form->{usestylesheet};
 
 
   $form->{stylesheet} = $form->{usestylesheet};
 

-  TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+  TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });

 
 

-  if (AM->save_preferences(\%myconfig, $form)) {
+  if ($form->{quick_search_modules}) {
+    my $user_prefs = SL::Helper::UserPreferences->new( namespace => 'TopQuickSearch',);
+    my $quick_search_modules = join ',', @{$form->{quick_search_modules}};
+    $user_prefs->store('quick_search_modules', $quick_search_modules);
+  }
+  if (AM->save_preferences($form)) {

     if ($::auth->can_change_password()
         && defined $form->{new_password}
         && ($form->{new_password} ne '********')) {
     if ($::auth->can_change_password()
         && defined $form->{new_password}
         && ($form->{new_password} ne '********')) {


@@ -1115,11 +710,7 @@ sub save_preferences {
         $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
       }
 
         $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
       }
 

-      $::auth->change_password($form->{login}, $form->{new_password});
-
-      $form->{password} = $form->{new_password};
-      $::auth->set_session_value('password', $form->{password});
-      $::auth->create_or_refresh_session();
+      $::auth->change_password($::myconfig{login}, $form->{new_password});

     }
 
     $form->redirect($locale->text('Preferences saved!'));
     }
 
     $form->redirect($locale->text('Preferences saved!'));


@@ -1138,6 +729,8 @@ sub audit_control {
 
   AM->closedto(\%::myconfig, $::form);
 
 
   AM->closedto(\%::myconfig, $::form);
 

+  setup_am_audit_control_action_bar();
+

   $::form->header;
   print $::form->parse_html_template('am/audit_control');
 
   $::form->header;
   print $::form->parse_html_template('am/audit_control');
 


@@ -1166,6 +759,29 @@ sub doclose {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub add_unit {
+  $::auth->assert('config');
+
+  # my $units = AM->retrieve_units(\%::myconfig, $::form, "resolved_");
+  # # AM->units_in_use(\%::myconfig, $::form, $units);
+
+  # $units->{$_}->{BASE_UNIT_DDBOX} = AM->unit_select_data($units, $units->{$_}->{base_unit}, 1) for keys %{$units};
+
+  my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
+
+  my $units = AM->retrieve_units(\%::myconfig, $::form);
+  my $ddbox = AM->unit_select_data($units, undef, 1);
+
+  setup_am_add_unit_action_bar();
+
+  $::form->{title} = $::locale->text("Add unit");
+  $::form->header();
+  print($::form->parse_html_template("am/add_unit", {
+    NEW_BASE_UNIT_DDBOX => $ddbox,
+    LANGUAGES           => \@languages,
+  }));
+}
+

 sub edit_units {
   $main::lxdebug->enter_sub();
 
 sub edit_units {
   $main::lxdebug->enter_sub();
 


@@ -1179,7 +795,7 @@ sub edit_units {
   AM->units_in_use(\%myconfig, $form, $units);
   map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
 
   AM->units_in_use(\%myconfig, $form, $units);
   map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
 

-  my @languages = AM->language(\%myconfig, $form, 1);
+  my @languages = @{ SL::DB::Manager::Language->get_all_sorted };

 
   my @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
 
 
   my @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
 


@@ -1189,11 +805,11 @@ sub edit_units {
     $_->{"UNITLANGUAGES"} = [];
     foreach my $lang (@languages) {
       push(@{ $_->{"UNITLANGUAGES"} },
     $_->{"UNITLANGUAGES"} = [];
     foreach my $lang (@languages) {
       push(@{ $_->{"UNITLANGUAGES"} },

-           { "idx" => $i,
-             "unit" => $_->{"name"},
-             "language_id" => $lang->{"id"},
-             "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
-             "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
+           { "idx"              => $i,
+             "unit"             => $_->{"name"},
+             "language_id"      => $lang->id,
+             "localized"        => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized"},
+             "localized_plural" => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized_plural"},

            });
     }
     $i++;
            });
     }
     $i++;


@@ -1202,7 +818,9 @@ sub edit_units {
   $units = AM->retrieve_units(\%myconfig, $form);
   my $ddbox = AM->unit_select_data($units, undef, 1);
 
   $units = AM->retrieve_units(\%myconfig, $form);
   my $ddbox = AM->unit_select_data($units, undef, 1);
 

-  $form->{"title"} = $locale->text("Add and edit units");
+  setup_am_edit_units_action_bar();
+
+  $form->{"title"} = $locale->text("Edit units");

   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS"               => \@unit_list,
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS"               => \@unit_list,


@@ -1213,7 +831,7 @@ sub edit_units {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub add_unit {
+sub create_unit {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1238,19 +856,19 @@ sub add_unit {
   }
 
   my @languages;
   }
 
   my @languages;

-  foreach my $lang (AM->language(\%myconfig, $form, 1)) {
+  foreach my $lang (@{ SL::DB::Manager::Language->get_all_sorted }) {

     next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
     next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});

-    push(@languages, { "id" => $lang->{"id"},
-                       "localized" => $form->{"new_localized_$lang->{id}"},
-                       "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
+    push(@languages, { "id"               => $lang->id,
+                       "localized"        => $form->{"new_localized_" . $lang->id},
+                       "localized_plural" => $form->{"new_localized_plural_" . $lang->id},

          });
   }
 
   AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, \@languages);
 
          });
   }
 
   AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, \@languages);
 

-  $form->{"saved_message"} = $locale->text("The unit has been saved.");
+  flash_later('info', $locale->text("The unit has been added."));

 
 

-  edit_units();
+  print $form->redirect_header('am.pl?action=edit_units');

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1268,9 +886,9 @@ sub set_unit_languages {
 
   foreach my $lang (@{$languages}) {
     push(@{ $unit->{"LANGUAGES"} },
 
   foreach my $lang (@{$languages}) {
     push(@{ $unit->{"LANGUAGES"} },

-         { "id" => $lang->{"id"},
-           "localized" => $form->{"localized_${idx}_$lang->{id}"},
-           "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
+         { "id"               => $lang->id,
+           "localized"        => $form->{"localized_${idx}_" . $lang->id},
+           "localized_plural" => $form->{"localized_plural_${idx}_" . $lang->id},

          });
   }
 
          });
   }
 


@@ -1289,7 +907,7 @@ sub save_unit {
   my $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
   AM->units_in_use(\%myconfig, $form, $old_units);
 
   my $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
   AM->units_in_use(\%myconfig, $form, $old_units);
 

-  my @languages = AM->language(\%myconfig, $form, 1);
+  my @languages = @{ SL::DB::Manager::Language->get_all_sorted };

 
   my $new_units = {};
   my @delete_units = ();
 
   my $new_units = {};
   my @delete_units = ();


@@ -1354,9 +972,9 @@ sub save_unit {
 
   AM->save_units(\%myconfig, $form, $new_units, \@delete_units);
 
 
   AM->save_units(\%myconfig, $form, $new_units, \@delete_units);
 

-  $form->{"saved_message"} = $locale->text("The units have been saved.");
+  flash_later('info', $locale->text("The units have been saved."));

 
 

-  edit_units();
+  print $form->redirect_header('am.pl?action=edit_units');

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1369,6 +987,8 @@ sub show_history_search {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

+  setup_am_show_history_search_action_bar();
+

   $form->{title} = $locale->text("History Search");
   $form->header();
 
   $form->{title} = $locale->text("History Search");
   $form->header();
 


@@ -1389,23 +1009,28 @@ sub show_am_history {
   my $callback     = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
   $form->{order} ||= 'h.itime--1';
 
   my $callback     = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
   $form->{order} ||= 'h.itime--1';
 

-  my %search = ( "Artikelnummer"          => "parts",
-                 "Kundennummer"           => "customer",
-                 "Lieferantennummer"      => "vendor",
-                 "Projektnummer"          => "project",
-                 "Buchungsnummer"         => "oe",
-                 "Eingangsrechnungnummer" => "ap",
-                 "Ausgangsrechnungnummer" => "ar",
-                 "Mahnungsnummer"         => "dunning"
-    );
+  # my %search = ( "Artikelnummer"          => "parts",
+  #                "Kundennummer"           => "customer",
+  #                "Lieferantennummer"      => "vendor",
+  #                "Projektnummer"          => "project",
+  #                "Auftragsnummer"         => "oe",
+  #                "Angebotsnummer"         => "oe",
+  #                "Eingangsrechnungnummer" => "ap",
+  #                "Ausgangsrechnungnummer" => "ar",
+  #                "Mahnungsnummer"         => "dunning",
+  #                "Buchungsnummer"         => "gl",
+  # );
+

   my %searchNo = ( "Artikelnummer"          => "partnumber",
                    "Kundennummer"           => "customernumber",
                    "Lieferantennummer"      => "vendornumber",
                    "Projektnummer"          => "projectnumber",
   my %searchNo = ( "Artikelnummer"          => "partnumber",
                    "Kundennummer"           => "customernumber",
                    "Lieferantennummer"      => "vendornumber",
                    "Projektnummer"          => "projectnumber",

-                   "Buchungsnummer"         => "ordnumber",
+                   "Auftragsnummer"         => "ordnumber",
+                   "Angebotsnummer"         => "quonumber",

                    "Eingangsrechnungnummer" => "invnumber",
                    "Ausgangsrechnungnummer" => "invnumber",
                    "Eingangsrechnungnummer" => "invnumber",
                    "Ausgangsrechnungnummer" => "invnumber",

-                   "Mahnungsnummer"         => "dunning_id"
+                   "Mahnungsnummer"         => "dunning_id",
+                   "Buchungsnummer"         => "gltransaction"

     );
 
   my $dbh = $form->dbconnect(\%myconfig);
     );
 
   my $dbh = $form->dbconnect(\%myconfig);


@@ -1420,17 +1045,27 @@ sub show_am_history {
     $restriction  .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
   }
 
     $restriction  .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
   }
 

-  my $query = qq|SELECT trans_id AS id FROM history_erp | .
-    (  $form->{'searchid'} ? qq| WHERE snumbers = '|  . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
-     :                       qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
+  my $snumbers_where = '';
+  my $snumbers_value;
+  if ($form->{'searchid'}) {
+    $snumbers_where = ' WHERE snumbers = ?';
+    $snumbers_value = $searchNo{$form->{'what2search'}} . '_' . $form->{'searchid'};
+  } else {
+    $snumbers_where = ' WHERE snumbers ~ ?';
+    $snumbers_value = '^' . $searchNo{$form->{'what2search'}};
+  }
+  my $query = qq|SELECT trans_id AS id FROM history_erp $snumbers_where|;

 
 

-  my @ids    = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
+  my @ids    = grep { $_ * 1 } selectall_array_query($form, $dbh, $query, $snumbers_value);

   my $daten .= shift @ids;
   my $daten .= shift @ids;

-  $daten    .= join '', map { " OR trans_id = $_" } @ids;
-
+  if (scalar(@ids) > 0 ) {
+    $daten  .= ' OR trans_id IN (' . join(',', @ids) . ')';
+  }

   my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)$/$1/;
 
   my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)$/$1/;
 

+  setup_am_show_am_history_action_bar();
+

   $form->{title} = $locale->text("History Search");
   $form->header();
 
   $form->{title} = $locale->text("History Search");
   $form->header();
 


@@ -1461,10 +1096,18 @@ sub add_tax {
 
   _get_taxaccount_selection();
 
 
   _get_taxaccount_selection();
 

+  $form->{asset}      = 1;
+  $form->{liability}  = 1;
+  $form->{equity}     = 1;
+  $form->{revenue}    = 1;
+  $form->{expense}    = 1;
+  $form->{costs}      = 1;
+
+  setup_am_edit_tax_action_bar();

   $form->header();
 
   my $parameters_ref = {
   $form->header();
 
   my $parameters_ref = {

-#    ChartTypeIsAccount         => $ChartTypeIsAccount,
+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -1485,17 +1128,24 @@ sub edit_tax {
   $form->{title} =  $locale->text('Edit');
 
   AM->get_tax(\%myconfig, \%$form);
   $form->{title} =  $locale->text('Edit');
 
   AM->get_tax(\%myconfig, \%$form);

+

   _get_taxaccount_selection();
 
   _get_taxaccount_selection();
 

+  $form->{asset}      = $form->{chart_categories} =~ 'A' ? 1 : 0;
+  $form->{liability}  = $form->{chart_categories} =~ 'L' ? 1 : 0;
+  $form->{equity}     = $form->{chart_categories} =~ 'Q' ? 1 : 0;
+  $form->{revenue}    = $form->{chart_categories} =~ 'I' ? 1 : 0;
+  $form->{expense}    = $form->{chart_categories} =~ 'E' ? 1 : 0;
+  $form->{costs}      = $form->{chart_categories} =~ 'C' ? 1 : 0;
+

   $form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
 
   $form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
 

+  setup_am_edit_tax_action_bar();

   $form->header();
 
   $form->header();
 

-  #set readonly if the there are entries in acc_trans with the tax
-  my $readonly = $form->{tax_already_used} ? 'readonly' : '';
-

   my $parameters_ref = {
   my $parameters_ref = {

-    readonly => $readonly, 
+    LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
+    TAX       => SL::DB::Manager::Tax->find_by(id => $form->{id}),

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -1521,13 +1171,11 @@ sub list_tax {
 
   $form->{title} = $locale->text('Tax-O-Matic');
 
 
   $form->{title} = $locale->text('Tax-O-Matic');
 

+  setup_am_list_tax_action_bar();

   $form->header();
 
   $form->header();
 

-  my $parameters_ref = {
-  };
-

   # Ausgabe des Templates
   # Ausgabe des Templates

-  print($form->parse_html_template('am/list_tax', $parameters_ref));
+  print($form->parse_html_template('am/list_tax'));

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1574,8 +1222,13 @@ sub save_tax {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }
 
     $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);
   AM->save_tax(\%myconfig, \%$form);

-  $form->redirect($locale->text('Tax saved!'));
+  flash_later('info', $locale->text("Tax saved!"));
+
+  print $form->redirect_header('am.pl?action=list_tax');

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1595,7 +1248,7 @@ sub delete_tax {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub add_price_factor {
+sub add_warehouse {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1603,17 +1256,18 @@ sub add_price_factor {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title}      = $locale->text('Add Price Factor');
-  $form->{callback} ||= build_std_url('action=add_price_factor');
-  $::request->{layout}->focus('#description');
+  $form->{title}      = $locale->text('Add Warehouse');
+  $form->{callback} ||= build_std_url('action=add_warehouse');
+
+  setup_am_edit_warehouse_action_bar();

 
   $form->header();
 
   $form->header();

-  print $form->parse_html_template('am/edit_price_factor');
+  print $form->parse_html_template('am/edit_warehouse');

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub edit_price_factor {
+sub edit_warehouse {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1622,46 +1276,36 @@ sub edit_price_factor {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title}      = $locale->text('Edit Price Factor');
-  $form->{callback} ||= build_std_url('action=add_price_factor');
-  $::request->{layout}->focus('#description');
+  AM->get_warehouse(\%myconfig, $form);
+
+  $form->get_lists('employees' => 'EMPLOYEES');

 
 

-  AM->get_price_factor(\%myconfig, $form);
+  $form->{title}      = $locale->text('Edit Warehouse');
+  $form->{callback} ||= build_std_url('action=list_warehouses');

 
 

-  $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1);
+  setup_am_edit_warehouse_action_bar(id => $::form->{id}, in_use => any { $_->{in_use} } @{ $::form->{BINS} });

 
   $form->header();
 
   $form->header();

-  print $form->parse_html_template('am/edit_price_factor');
+  print $form->parse_html_template('am/edit_warehouse');

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub list_price_factors {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
+sub edit_bins {
+  $::auth->assert('config');

 
 

-  AM->get_all_price_factors(\%myconfig, \%$form);
+  AM->get_warehouse(\%::myconfig, $::form);

 
 

-  foreach my $current (@{ $form->{PRICE_FACTORS} }) {
-    $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
-  }
+  $::form->{title}      = $::locale->text('Edit Bins for Warehouse \'#1\'', $::form->{description});
+  $::form->{callback} ||= build_std_url('action=list_warehouses');

 
 

-  $form->{callback} = build_std_url('action=list_price_factors');
-  $form->{title}    = $locale->text('Price Factors');
-  $form->{url_base} = build_std_url('callback');
+  setup_am_edit_bins_action_bar(id => $::form->{id});

 
 

-  $form->header();
-  print $form->parse_html_template('am/list_price_factors');
-
-  $main::lxdebug->leave_sub();
+  $::form->header;
+  print $::form->parse_html_template('am/edit_bins');

 }
 
 }
 

-sub save_price_factor {
+sub list_warehouses {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1670,21 +1314,21 @@ sub save_price_factor {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->isblank("description", $locale->text('Description missing!'));
-  $form->isblank("factor", $locale->text('Factor missing!'));
-
-  $form->{factor} = $form->parse_amount(\%myconfig, $form->{factor});
+  AM->get_all_warehouses(\%myconfig, $form);

 
 

-  AM->save_price_factor(\%myconfig, $form);
+  $form->{callback} = build_std_url('action=list_warehouses');
+  $form->{title}    = $locale->text('Warehouses');
+  $form->{url_base} = build_std_url('callback');

 
 

-  $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor saved!')) if ($form->{callback});
+  setup_am_list_warehouses_action_bar();

 
 

-  $form->redirect($locale->text('Price factor saved!'));
+  $form->header();
+  print $form->parse_html_template('am/list_warehouses');

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub delete_price_factor {
+sub save_warehouse {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1693,34 +1337,41 @@ sub delete_price_factor {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->delete_price_factor(\%myconfig, \%$form);
+  $form->isblank("description", $locale->text('Description missing!'));
+  $form->isblank("number_of_new_bins", $locale->text('Number')  . $locale->text(' missing!'));

 
 

-  $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor deleted!')) if ($form->{callback});
+  $form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});

 
 

-  $form->redirect($locale->text('Price factor deleted!'));
+  AM->save_warehouse(\%myconfig, $form);
+
+  $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse saved.')) if ($form->{callback});
+
+  $form->redirect($locale->text('Warehouse saved.'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub add_warehouse {
+sub delete_warehouse {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;

+  my %myconfig = %main::myconfig;

   my $locale   = $main::locale;
 
   $main::auth->assert('config');
 
   my $locale   = $main::locale;
 
   $main::auth->assert('config');
 

-  $form->{title}      = $locale->text('Add Warehouse');
-  $form->{callback} ||= build_std_url('action=add_warehouse');
-  $::request->{layout}->focus('#description');
+  if (AM->delete_warehouse(\%myconfig, $form)) {
+    $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
+    $form->redirect($locale->text('Warehouse deleted.'));

 
 

-  $form->header();
-  print $form->parse_html_template('am/edit_warehouse');
+  } else {
+    $form->error($locale->text('The warehouse could not be deleted because it has already been used.'));
+  }

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub edit_warehouse {
+sub save_bin {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1729,105 +1380,246 @@ sub edit_warehouse {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->get_warehouse(\%myconfig, $form);
-
-  $form->get_lists('employees' => 'EMPLOYEES');
+  AM->save_bins(\%myconfig, $form);

 
 

-  $form->{title}      = $locale->text('Edit Warehouse');
-  $form->{callback} ||= build_std_url('action=list_warehouses');
-  $::request->{layout}->focus('#description');
+  $form->{callback} .= '&saved_message=' . E($locale->text('Bins saved.')) if ($form->{callback});

 
 

-  $form->header();
-  print $form->parse_html_template('am/edit_warehouse');
+  $form->redirect($locale->text('Bins saved.'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub list_warehouses {
-  $main::lxdebug->enter_sub();
+sub setup_am_config_action_bar {
+  my %params = @_;

 
 

-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->get_all_warehouses(\%myconfig, $form);
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => "save_preferences" } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}

 
 

-  $form->{callback} = build_std_url('action=list_warehouses');
-  $form->{title}    = $locale->text('Warehouses');
-  $form->{url_base} = build_std_url('callback');
+sub setup_am_edit_account_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      combobox => [
+        action => [
+          t8('Save'),
+          submit    => [ '#form', { action => "save_account" } ],
+          accesskey => 'enter',
+        ],
+
+        action => [
+          t8('Save as new'),
+          submit   => [ '#form', { action => "save_as_new_account" } ],
+          disabled => !$::form->{id} ? t8('The object has not been saved yet.') : undef,
+        ],
+      ],
+
+      action => [
+        t8('Delete'),
+        submit   => [ '#form', { action => "delete_account" } ],
+        disabled => !$::form->{id}                         ? t8('The object has not been saved yet.')
+                  :  $::form->{id} && !$::form->{orphaned} ? t8('The object is in use and cannot be deleted.')
+                  :                                          undef,
+        confirm  => t8('Do you really want to delete this object?'),
+      ],
+    );
+  }
+}

 
 

-  $form->header();
-  print $form->parse_html_template('am/list_warehouses');
+sub setup_am_list_tax_action_bar {
+  my %params = @_;

 
 

-  $main::lxdebug->leave_sub();
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Add'),
+        link => 'am.pl?action=add_tax',
+      ],
+    );
+  }

 }
 
 }
 

-sub save_warehouse {
-  $main::lxdebug->enter_sub();
+sub setup_am_edit_tax_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => "save_tax" } ],
+        accesskey => 'enter',
+      ],
+
+      action => [
+        t8('Delete'),
+        submit   => [ '#form', { action => "delete_tax" } ],
+        disabled => !$::form->{id}                                      ? t8('The object has not been saved yet.')
+                  : !$::form->{orphaned} || $::form->{tax_already_used} ? t8('The object is in use and cannot be deleted.')
+                  :                                                       undef,
+        confirm  => t8('Do you really want to delete this object?'),
+      ],
+    );
+  }
+}

 
 

-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
+sub setup_am_add_unit_action_bar {
+  my %params = @_;

 
 

-  $main::auth->assert('config');
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => "create_unit" } ],
+        accesskey => 'enter',
+      ],

 
 

-  $form->isblank("description", $locale->text('Description missing!'));
+      'separator',

 
 

-  $form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});
+      link => [
+        t8('Back'),
+        link => 'am.pl?action=edit_units',
+      ],
+    );
+  }
+}

 
 

-  AM->save_warehouse(\%myconfig, $form);
+sub setup_am_edit_units_action_bar {
+  my %params = @_;

 
 

-  $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse saved.')) if ($form->{callback});
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => "save_unit" } ],
+        accesskey => 'enter',
+      ],

 
 

-  $form->redirect($locale->text('Warehouse saved.'));
+      'separator',

 
 

-  $main::lxdebug->leave_sub();
+      link => [
+        t8('Add'),
+        link => 'am.pl?action=add_unit',
+      ],
+    );
+  }

 }
 
 }
 

-sub delete_warehouse {
-  $main::lxdebug->enter_sub();
+sub setup_am_list_warehouses_action_bar {
+  my %params = @_;

 
 

-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Add'),
+        link      => 'am.pl?action=add&type=warehouse&callback=' . E($::form->{callback}),
+        accesskey => 'enter',
+      ],
+    );
+  }
+}

 
 

-  $main::auth->assert('config');
+sub setup_am_edit_warehouse_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => 'save_warehouse' } ],
+        accesskey => 'enter',
+      ],
+
+      action => [
+        t8('Delete'),
+        submit   => [ '#form', { action => 'delete_warehouse' } ],
+        disabled => !$params{id}    ? t8('The object has not been saved yet.')
+                  : $params{in_use} ? t8('The object is in use and cannot be deleted.')
+                  :                   undef,
+        confirm  => t8('Do you really want to delete this object?'),
+      ],
+
+      'separator',
+
+      link => [
+        t8('Bins'),
+        link    => 'am.pl?action=edit_bins&id=' . E($params{id}),
+        only_if => $params{id},
+      ],
+
+      link => [
+        t8('Abort'),
+        link => $::form->{callback} || 'am.pl?action=list_warehouses',
+      ],
+    );
+  }
+}

 
 

-  if (!$form->{confirmed}) {
-    $form->{title} = $locale->text('Confirmation');
+sub setup_am_edit_bins_action_bar {
+  my %params = @_;

 
 

-    $form->header();
-    print $form->parse_html_template('am/confirm_delete_warehouse');
-    ::end_of_request();
-  }
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => 'save_bin' } ],
+        accesskey => 'enter',
+      ],

 
 

-  if (AM->delete_warehouse(\%myconfig, $form)) {
-    $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
-    $form->redirect($locale->text('Warehouse deleted.'));
+      'separator',

 
 

-  } else {
-    $form->error($locale->text('The warehouse could not be deleted because it has already been used.'));
+      link => [
+        t8('Abort'),
+        link => 'am.pl?action=edit_warehouse&id=' . E($params{id}),
+      ],
+    );

   }
   }

-
-  $main::lxdebug->leave_sub();

 }
 
 }
 

-sub save_bin {
-  $main::lxdebug->enter_sub();
+sub setup_am_audit_control_action_bar {
+  my %params = @_;

 
 

-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Save'),
+        submit    => [ '#form', { action => 'doclose' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}

 
 

-  AM->save_bins(\%myconfig, $form);
+sub setup_am_show_history_search_action_bar {
+  my %params = @_;

 
 

-  $form->{callback} .= '&saved_message=' . E($locale->text('Bins saved.')) if ($form->{callback});
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Show'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}

 
 

-  $form->redirect($locale->text('Bins saved.'));
+sub setup_am_show_am_history_action_bar {
+  my %params = @_;

 
 

-  $main::lxdebug->leave_sub();
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Back'),
+        call => [ 'kivi.history_back' ],
+      ],
+    );
+  }

 }
 }