X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=d9d484269d0e26c55810f58f36cf99e8eb39c74c;hb=a3f90d6fa23d0a8d026682511e7624bd847d532f;hp=537151561c6081f7ed509043428678ce2fd097c2;hpb=9e06d0e40cb328336d6e7604ec06387a0e3b1ea7;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 537151561..d9d484269 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -44,22 +44,28 @@ use CGI;
use Data::Dumper;
-1;
-
require "bin/mozilla/common.pl";
+use strict;
+
+1;
+
# end of main
-sub add { call_sub("add_$form->{type}"); }
-sub delete { call_sub("delete_$form->{type}"); }
-sub save { call_sub("save_$form->{type}"); }
-sub edit { call_sub("edit_$form->{type}"); }
-sub continue { call_sub($form->{"nextsub"}); }
+sub add { call_sub("add_$main::form->{type}"); }
+sub delete { call_sub("delete_$main::form->{type}"); }
+sub save { call_sub("save_$main::form->{type}"); }
+sub edit { call_sub("edit_$main::form->{type}"); }
+sub continue { call_sub($main::form->{"nextsub"}); }
+sub save_as_new { call_sub("save_as_new_$main::form->{type}"); }
sub add_account {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $auth->assert('config');
+ $main::auth->assert('config');
$form->{title} = "Add";
$form->{charttype} = "A";
@@ -70,13 +76,16 @@ sub add_account {
&account_header;
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit_account {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('config');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('config');
$form->{title} = "Edit";
AM->get_account(\%myconfig, \%$form);
@@ -88,18 +97,22 @@ sub edit_account {
&account_header;
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub account_header {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- $auth->assert('config');
+ $main::auth->assert('config');
if ( $form->{action} eq 'edit_account') {
$form->{account_exists} = '1';
- }
-
+ }
+
$form->{title} = $locale->text("$form->{title} Account");
$form->{"$form->{charttype}_checked"} = "checked";
@@ -108,9 +121,9 @@ sub account_header {
$form->{select_tax} = "";
my @tax_report_pos = USTVA->report_variables({
- myconfig => \%myconfig,
- form => $form,
- type => '',
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
attribute => 'position',
calc => '',
});
@@ -121,7 +134,7 @@ sub account_header {
}
# Fill in empty row for new Taxkey
- $newtaxkey_ref = {
+ my $newtaxkey_ref = {
id => '',
chart_id => '',
accno => '',
@@ -146,27 +159,27 @@ sub account_header {
if ($item->{id} == $taxkey_used->{tax_id}) {
$form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
qq||;
}
- foreach $item (@{ $form->{NEWACCOUNT} }) {
+ foreach my $item (@{ $form->{NEWACCOUNT} }) {
if ($item->{id} == $form->{new_chart_id}) {
$form->{selectnewaccount} .=
qq||;
@@ -197,8 +210,9 @@ sub account_header {
}
}
- $select_eur = q|\n|;
- %eur = (1 => "Umsatzerlöse",
+ my $select_eur = q|\n|;
+ my %eur = (
+ 1 => "Umsatzerlöse",
2 => "sonstige Erlöse",
3 => "Privatanteile",
4 => "Zinserträge",
@@ -214,7 +228,7 @@ sub account_header {
14 => "Steuern, Versich., Beiträge",
15 => "Kfz-Steuern",
16 => "Kfz-Versicherungen",
- 17 => "Sonst. Fahrtkosten",
+ 17 => "Sonst. Fahrzeugkosten",
18 => "Werbe- und Reisekosten",
19 => "Instandhaltung u. Werkzeuge",
20 => "Fachzeitschriften, Bücher",
@@ -229,8 +243,8 @@ sub account_header {
29 => "Zinsaufwand",
30 => "Ausserordentlicher Aufwand",
31 => "Betriebliche Steuern");
- foreach $item (sort({ $a <=> $b } keys(%eur))) {
- my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $eur{$item}));
+ foreach my $item (sort({ $a <=> $b } keys(%eur))) {
+ my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $eur{$item}));
if ($item == $form->{pos_eur}) {
$select_eur .= qq|\n|;
} else {
@@ -239,9 +253,10 @@ sub account_header {
}
- $select_bwa = q|\n|;
+ my $select_bwa = q|\n|;
- %bwapos = (1 => 'Umsatzerlöse',
+ my %bwapos = (
+ 1 => 'Umsatzerlöse',
2 => 'Best.Verdg.FE/UE',
3 => 'Aktiv.Eigenleistung',
4 => 'Mat./Wareneinkauf',
@@ -263,8 +278,8 @@ sub account_header {
33 => 'Sonst.neutr.Ertrag',
34 => 'Verr.kalk.Kosten',
35 => 'Steuern Eink.u.Ertr.');
- foreach $item (sort({ $a <=> $b } keys %bwapos)) {
- my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $bwapos{$item}));
+ foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
+ my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $bwapos{$item}));
if ($item == $form->{pos_bwa}) {
$select_bwa .= qq|\n|;
- foreach $item ((1, 2, 3, 4)) {
+ my $select_bilanz = q|\n|;
+ foreach my $item ((1, 2, 3, 4)) {
if ($item == $form->{pos_bilanz}) {
$select_bilanz .= qq|\n|;
- %category = (
+ my $select_category = q|\n|;
+
+ my %category = (
'A' => $locale->text('Asset'),
'L' => $locale->text('Liability'),
'Q' => $locale->text('Equity'),
- 'I' => $locale->text('Revenue'),
+ 'I' => $locale->text('Revenue'),
'E' => $locale->text('Expense'),
'C' => $locale->text('Costs'),
);
- foreach $item ( sort({ $a <=> $b } keys %category) ) {
+ foreach my $item ( sort({ $a <=> $b } keys %category) ) {
if ($item eq $form->{category}) {
$select_category .= qq|