X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=d0415618717701f7910e3d82d7067b12620eeaa7;hb=3d99b4f59f7595e8f0faa0a729c70d333edfed04;hp=ec27fbbd487397f1335ed2f658440e46c8aaeb56;hpb=8651e0271eb23ad16c4b19bb785284e99d9aac08;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index ec27fbbd4..d04156187 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -34,11 +34,15 @@
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::Helper::Flash;
+use SL::Helper::UserPreferences;
use SL::User;
use SL::USTVA;
use SL::Iconv;
@@ -81,7 +85,6 @@ sub add_account {
$form->{callback} = "am.pl?action=list_account" unless $form->{callback};
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -109,7 +112,6 @@ sub edit_account {
}
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -225,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}) {
@@ -283,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}) {
@@ -372,6 +321,8 @@ sub account_header {
my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";
+ setup_am_edit_account_action_bar();
+
$form->header();
my $parameters_ref = {
@@ -393,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();
@@ -638,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));
@@ -708,14 +645,34 @@ 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();
+
$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}) };
+ $::request->{layout}->use_javascript("jquery.multiselect2side.js");
$form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login});
setup_am_config_action_bar();
-
$form->header();
$form->{full_signature} = $form->create_email_signature();
@@ -736,6 +693,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}
@@ -766,6 +728,8 @@ sub audit_control {
AM->closedto(\%::myconfig, $::form);
+ setup_am_audit_control_action_bar();
+
$::form->header;
print $::form->parse_html_template('am/audit_control');
@@ -794,6 +758,29 @@ sub doclose {
$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();
@@ -807,7 +794,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}));
- 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}));
@@ -817,11 +804,11 @@ sub edit_units {
$_->{"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++;
@@ -830,7 +817,9 @@ sub edit_units {
$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,
@@ -841,7 +830,7 @@ sub edit_units {
$main::lxdebug->leave_sub();
}
-sub add_unit {
+sub create_unit {
$main::lxdebug->enter_sub();
my $form = $main::form;
@@ -866,19 +855,19 @@ sub add_unit {
}
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}"});
- 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);
- $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();
}
@@ -896,9 +885,9 @@ sub set_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},
});
}
@@ -917,7 +906,7 @@ sub save_unit {
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 = ();
@@ -982,9 +971,9 @@ sub save_unit {
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();
}
@@ -997,6 +986,8 @@ sub show_history_search {
$main::auth->assert('config');
+ setup_am_show_history_search_action_bar();
+
$form->{title} = $locale->text("History Search");
$form->header();
@@ -1072,6 +1063,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();
@@ -1109,10 +1102,10 @@ sub add_tax {
$form->{expense} = 1;
$form->{costs} = 1;
+ setup_am_edit_tax_action_bar();
$form->header();
my $parameters_ref = {
-# ChartTypeIsAccount => $ChartTypeIsAccount,
LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
};
@@ -1146,6 +1139,7 @@ sub edit_tax {
$form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
+ setup_am_edit_tax_action_bar();
$form->header();
my $parameters_ref = {
@@ -1176,13 +1170,11 @@ sub list_tax {
$form->{title} = $locale->text('Tax-O-Matic');
+ setup_am_list_tax_action_bar();
$form->header();
- my $parameters_ref = {
- };
-
# 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();
}
@@ -1233,7 +1225,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();
}
@@ -1264,6 +1258,8 @@ sub add_warehouse {
$form->{title} = $locale->text('Add Warehouse');
$form->{callback} ||= build_std_url('action=add_warehouse');
+ setup_am_edit_warehouse_action_bar();
+
$form->header();
print $form->parse_html_template('am/edit_warehouse');
@@ -1286,12 +1282,28 @@ sub edit_warehouse {
$form->{title} = $locale->text('Edit Warehouse');
$form->{callback} ||= build_std_url('action=list_warehouses');
+ setup_am_edit_warehouse_action_bar(id => $::form->{id}, in_use => any { $_->{in_use} } @{ $::form->{BINS} });
+
$form->header();
print $form->parse_html_template('am/edit_warehouse');
$main::lxdebug->leave_sub();
}
+sub edit_bins {
+ $::auth->assert('config');
+
+ AM->get_warehouse(\%::myconfig, $::form);
+
+ $::form->{title} = $::locale->text('Edit Bins for Warehouse \'#1\'', $::form->{description});
+ $::form->{callback} ||= build_std_url('action=list_warehouses');
+
+ setup_am_edit_bins_action_bar(id => $::form->{id});
+
+ $::form->header;
+ print $::form->parse_html_template('am/edit_bins');
+}
+
sub list_warehouses {
$main::lxdebug->enter_sub();
@@ -1307,6 +1319,8 @@ sub list_warehouses {
$form->{title} = $locale->text('Warehouses');
$form->{url_base} = build_std_url('callback');
+ setup_am_list_warehouses_action_bar();
+
$form->header();
print $form->parse_html_template('am/list_warehouses');
@@ -1344,14 +1358,6 @@ sub delete_warehouse {
$main::auth->assert('config');
- if (!$form->{confirmed}) {
- $form->{title} = $locale->text('Confirmation');
-
- $form->header();
- print $form->parse_html_template('am/confirm_delete_warehouse');
- $::dispatcher->end_request;
- }
-
if (AM->delete_warehouse(\%myconfig, $form)) {
$form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
$form->redirect($locale->text('Warehouse deleted.'));
@@ -1394,3 +1400,224 @@ sub setup_am_config_action_bar {
);
}
}
+
+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?'),
+ ],
+ );
+ }
+}
+
+sub setup_am_list_tax_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add_tax',
+ ],
+ );
+ }
+}
+
+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?'),
+ ],
+ );
+ }
+}
+
+sub setup_am_add_unit_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "create_unit" } ],
+ accesskey => 'enter',
+ ],
+
+ 'separator',
+
+ link => [
+ t8('Back'),
+ link => 'am.pl?action=edit_units',
+ ],
+ );
+ }
+}
+
+sub setup_am_edit_units_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => "save_unit" } ],
+ accesskey => 'enter',
+ ],
+
+ 'separator',
+
+ link => [
+ t8('Add'),
+ link => 'am.pl?action=add_unit',
+ ],
+ );
+ }
+}
+
+sub setup_am_list_warehouses_action_bar {
+ my %params = @_;
+
+ 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',
+ ],
+ );
+ }
+}
+
+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',
+ ],
+ );
+ }
+}
+
+sub setup_am_edit_bins_action_bar {
+ my %params = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'save_bin' } ],
+ accesskey => 'enter',
+ ],
+
+ 'separator',
+
+ link => [
+ t8('Abort'),
+ link => 'am.pl?action=edit_warehouse&id=' . E($params{id}),
+ ],
+ );
+ }
+}
+
+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' ],
+ ],
+ );
+ }
+}