X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=541ababeacac436a2172671c0a774c272562df1b;hb=94f5cb152afa9210162295b6727801c296af0631;hp=c776ef60a20e7fb0f4def3c542c751c5943581a6;hpb=5efcb49405b1caa362cd214b52c9314b66d569da;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c776ef60a..541ababea 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -42,6 +42,7 @@ 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;
@@ -84,7 +85,6 @@ sub add_account {
$form->{callback} = "am.pl?action=list_account" unless $form->{callback};
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -227,38 +227,7 @@ sub account_header {
}
my $select_eur = q|\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}) {
@@ -285,29 +254,7 @@ sub account_header {
my $select_bwa = q|\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}) {
@@ -397,21 +344,6 @@ sub account_header {
$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();
@@ -642,6 +574,7 @@ sub config {
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('timeformat', qw(hh:mm hh:mm:ss));
@@ -712,17 +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();
+ $form->{longdescription_dialog_size_percentage} = AM->longdescription_dialog_size_percentage();
+
$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' => $::myconfig{login}) };
-
$form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login});
- setup_am_config_action_bar();
+ $::request->{layout}->use_javascript("${_}.js") for qw(jquery.multiselect2side ckeditor/ckeditor ckeditor/adapters/jquery);
+ setup_am_config_action_bar();
$form->header();
- $form->{full_signature} = $form->create_email_signature();
+ $form->{company_signature} = SL::DB::Default->get->signature;
print $form->parse_html_template('am/config');
@@ -740,6 +695,11 @@ sub save_preferences {
TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });
+ 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}
@@ -770,6 +730,8 @@ sub audit_control {
AM->closedto(\%::myconfig, $::form);
+ setup_am_audit_control_action_bar();
+
$::form->header;
print $::form->parse_html_template('am/audit_control');
@@ -1026,6 +988,8 @@ sub show_history_search {
$main::auth->assert('config');
+ setup_am_show_history_search_action_bar();
+
$form->{title} = $locale->text("History Search");
$form->header();
@@ -1101,6 +1065,8 @@ sub show_am_history {
my ($sort, $sortby) = split(/\-\-/, $form->{order});
$sort =~ s/.*\.(.*)$/$1/;
+ setup_am_show_am_history_action_bar();
+
$form->{title} = $locale->text("History Search");
$form->header();
@@ -1261,7 +1227,9 @@ sub save_tax {
$form->{translations} = { map { $_ =~ '^translation_(\d+)'; $1 => $form->{$_} } @translation_keys };
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();
}
@@ -1371,6 +1339,7 @@ sub save_warehouse {
$main::auth->assert('config');
$form->isblank("description", $locale->text('Description missing!'));
+ $form->isblank("number_of_new_bins", $locale->text('Number') . $locale->text(' missing!'));
$form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});
@@ -1444,8 +1413,6 @@ sub setup_am_edit_account_action_bar {
action => [
t8('Save'),
submit => [ '#form', { action => "save_account" } ],
- disabled => $::form->{id} && !$::form->{orphaned} ? t8('The object is in use and cannot be changed.')
- : undef,
accesskey => 'enter',
],
@@ -1616,3 +1583,44 @@ sub setup_am_edit_bins_action_bar {
);
}
}
+
+sub setup_am_audit_control_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'doclose' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_am_show_history_search_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Show'),
+ submit => [ '#form' ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_am_show_am_history_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Back'),
+ call => [ 'kivi.history_back' ],
+ ],
+ );
+ }
+}