X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=c23e9d2416404c6774401affa319a06cd1aa65a0;hb=fec48603264c8adad06fbc212358633778322b56;hp=c776ef60a20e7fb0f4def3c542c751c5943581a6;hpb=5efcb49405b1caa362cd214b52c9314b66d569da;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c776ef60a..c23e9d241 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -84,7 +84,6 @@ sub add_account {
$form->{callback} = "am.pl?action=list_account" unless $form->{callback};
&account_header;
- &form_footer;
$main::lxdebug->leave_sub();
}
@@ -227,38 +226,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 +253,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 +343,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();
@@ -770,6 +701,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 +959,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 +1036,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();
@@ -1444,8 +1381,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 +1551,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' ],
+ ],
+ );
+ }
+}