X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=56c48f3a9fc117baf61804b65bffe3d063943030;hb=a3053fa7958da91dd3ba509bae4bfd13726ca3f2;hp=e18246bc5d83cc88e5649973d156e4a1be4bc2e1;hpb=f5c454e3855012bdb1928f3e4c4964403d4d8163;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index e18246bc5..56c48f3a9 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -875,7 +875,7 @@ sub config { } $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, @@ -885,9 +885,9 @@ sub config { $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', $form->{login}); + $form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login}); $form->header(); @@ -907,7 +907,7 @@ sub save_preferences { $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($form)) { if ($::auth->can_change_password() @@ -920,7 +920,7 @@ sub save_preferences { $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}); + $::auth->change_password($::myconfig{login}, $form->{new_password}); } $form->redirect($locale->text('Preferences saved!')); @@ -1190,23 +1190,28 @@ sub show_am_history { 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", - "Buchungsnummer" => "ordnumber", + "Auftragsnummer" => "ordnumber", + "Angebotsnummer" => "quonumber", "Eingangsrechnungnummer" => "invnumber", "Ausgangsrechnungnummer" => "invnumber", - "Mahnungsnummer" => "dunning_id" + "Mahnungsnummer" => "dunning_id", + "Buchungsnummer" => "gltransaction" ); my $dbh = $form->dbconnect(\%myconfig);