X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=368a627161bddaa0d5491dfa512db952e2dd7b74;hb=4aa816112a8b9f2d2959c92cfaa2f2954bdeceb2;hp=e34957f94782ee98d4663ee0b2bd61d093593895;hpb=b12e8d1411cb7af3a1a9b6f7637692f0758b4741;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index e34957f94..368a62716 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -31,67 +31,63 @@
#
#======================================================================
+use utf8;
+
+use SL::Auth;
+use SL::Auth::PasswordPolicy;
use SL::AM;
use SL::CA;
use SL::Form;
use SL::User;
+use SL::USTVA;
+use SL::Iconv;
+use SL::TODO;
+use SL::Printer;
+use CGI::Ajax;
+use CGI;
-use Data::Dumper;
-
-1;
-
+require "bin/mozilla/common.pl";
+use strict;
-require "$form->{path}/common.pl";
+1;
# end of main
-sub add { &{"add_$form->{type}"} }
-sub delete { &{"delete_$form->{type}"} }
-
-sub display {
- if ($form->{display_nextsub}) {
- &{ $form->{display_nextsub} }();
- } else {
- &{ $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 save {
- if ($form->{save_nextsub}) {
- &{ $form->{save_nextsub} }();
- } else {
- &{ $form->{nextsub} }();
- }
-}
+sub add_account {
+ $main::lxdebug->enter_sub();
-sub edit {
- if ($form->{edit_nextsub}) {
- &{ $form->{edit_nextsub} }();
- } else {
- &{ "edit_$form->{type}" }();
- }
-}
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
-sub add_account {
- $lxdebug->enter_sub();
+ $main::auth->assert('config');
$form->{title} = "Add";
$form->{charttype} = "A";
AM->get_account(\%myconfig, \%$form);
- $form->{callback} =
- "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{callback} = "am.pl?action=list_account" unless $form->{callback};
&account_header;
&form_footer;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit_account {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
+ $main::auth->assert('config');
$form->{title} = "Edit";
AM->get_account(\%myconfig, \%$form);
@@ -103,163 +99,144 @@ 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;
+
+ $main::auth->assert('config');
+
+ if ( $form->{action} eq 'edit_account') {
+ $form->{account_exists} = '1';
+ }
$form->{title} = $locale->text("$form->{title} Account");
- $checked{ $form->{charttype} } = "checked";
- $checked{"$form->{category}_"} = "checked";
- $checked{CT_tax} = ($form->{CT_tax}) ? "" : "checked";
+ $form->{"$form->{charttype}_checked"} = "checked";
+ $form->{"$form->{category}_checked"} = "checked";
- $form->{description} =~ s/\"/"/g;
+ $form->{select_tax} = "";
+
+ my @tax_report_pos = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ calc => '',
+ });
if (@{ $form->{TAXKEY} }) {
foreach my $item (@{ $form->{TAXKEY} }) {
-
$item->{rate} = $item->{rate} * 100 . '%';
+ }
+
+ # Fill in empty row for new Taxkey
+ my $newtaxkey_ref = {
+ id => '',
+ chart_id => '',
+ accno => '',
+ tax_id => '',
+ taxdescription => '',
+ rate => '',
+ taxkey_id => '',
+ pos_ustva => '',
+ startdate => '',
+ };
+
+ push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
+
+ my $i = 0;
+ foreach my $taxkey_used (@{ $form->{ACCOUNT_TAXKEYS} } ) {
+
+ # Fill in a runningnumber
+ $form->{ACCOUNT_TAXKEYS}[$i]{runningnumber} = $i;
+
+ # Fill in the Taxkeys as select options
+ foreach my $item (@{ $form->{TAXKEY} }) {
+ if ($item->{id} == $taxkey_used->{tax_id}) {
+ $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+ qq|";
+ $form->{selectnewaccount} = qq||;
}
- foreach $item (@{ $form->{NEWACCOUNT} }) {
+ foreach my $item (@{ $form->{NEWACCOUNT} }) {
if ($item->{id} == $form->{new_chart_id}) {
$form->{selectnewaccount} .=
- "";
+ qq||;
} elsif (!$form->{new_chart_valid}) {
$form->{selectnewaccount} .=
- "";
+ qq||;
}
}
}
- $newaccount = qq|
-
-
-
- |
-
|;
-
- $form->{selectustva} = "\n|;
+ my %eur = (
+ 1 => "Umsatzerlöse",
+ 2 => "sonstige Erlöse",
3 => "Privatanteile",
- 4 => "Zinserträge",
- 5 => "Ausserordentliche Erträge",
+ 4 => "Zinserträge",
+ 5 => "Ausserordentliche Erträge",
6 => "Vereinnahmte Umsatzst.",
7 => "Umsatzsteuererstattungen",
- 8 => "Wareneingänge",
- 9 => "Löhne und Gehälter",
+ 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",
+ 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",
- 21 => "Miete für Einrichtungen",
+ 20 => "Fachzeitschriften, Bücher",
+ 21 => "Miete für Einrichtungen",
22 => "Rechts- und Beratungskosten",
- 23 => "Bürobedarf, Porto, Telefon",
+ 23 => "Bürobedarf, Porto, Telefon",
24 => "Sonstige Aufwendungen",
25 => "Abschreibungen auf Anlagever.",
26 => "Abschreibungen auf GWG",
@@ -268,249 +245,138 @@ sub account_header {
29 => "Zinsaufwand",
30 => "Ausserordentlicher Aufwand",
31 => "Betriebliche Steuern");
- foreach $item (sort({ $a <=> $b } keys(%eur))) {
+ foreach my $item (sort({ $a <=> $b } keys(%eur))) {
+ my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
if ($item == $form->{pos_eur}) {
- $form->{selecteur} .= "\n|;
} else {
- $form->{selecteur} .= "\n|;
}
}
- $eur = qq|
-
- | . $locale->text('EUER') . qq| |
- |
-
-
|;
+ my $select_bwa = q|\n|;
- $form->{selectbwa} = "\n|;
+ foreach my $item ((1, 2, 3, 4)) {
+ if ($item == $form->{pos_bilanz}) {
+ $select_bilanz .= qq|\n|;
+
+ my %category = (
+ 'A' => $locale->text('Asset'),
+ 'L' => $locale->text('Liability'),
+ 'Q' => $locale->text('Equity'),
+ 'I' => $locale->text('Revenue'),
+ 'E' => $locale->text('Expense'),
+ 'C' => $locale->text('Costs'),
+ );
+ foreach my $item ( sort({ $a <=> $b } keys %category) ) {
+ if ($item eq $form->{category}) {
+ $select_category .= qq|