X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fam.pl;h=27b18e400fc77f1111e30112c5679d57d4fc7e6c;hb=fe73e0d261229f181e8133283b530509773d2151;hp=d75766a3fcb1da47b2f4ebe319ab90f4aefc6b7b;hpb=e848dbf1f17a606e22afb161cb3fb7bd88895f92;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index d75766a3f..27b18e400 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -31,39 +31,61 @@
#
#======================================================================
+use SL::Auth;
use SL::AM;
use SL::CA;
use SL::Form;
use SL::User;
+use SL::USTVA;
+use SL::Iconv;
+use SL::TODO;
+use CGI::Ajax;
+use CGI;
+
+use Data::Dumper;
+
+require "bin/mozilla/common.pl";
+
+use strict;
1;
# end of main
-sub add { &{"add_$form->{type}"} }
-sub edit { &{"edit_$form->{type}"} }
-sub save { &{"save_$form->{type}"} }
-sub delete { &{"delete_$form->{type}"} }
+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;
+
+ $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);
@@ -75,68 +97,122 @@ 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} }) {
- $form->{selecttaxkey} = "|;
}
+ foreach my $item (@{ $form->{NEWACCOUNT} }) {
+ if ($item->{id} == $form->{new_chart_id}) {
+ $form->{selectnewaccount} .=
+ qq||;
+ } elsif (!$form->{new_chart_valid}) {
+ $form->{selectnewaccount} .=
+ qq||;
+ }
+ }
}
- $ustva = qq|
-
- | . $locale->text('Umsatzsteuervoranmeldung') . qq| |
- |
-
-
|;
-
- $form->{selecteur} = "\n|;
+ my %eur = (
+ 1 => "Umsatzerlöse",
2 => "sonstige Erlöse",
3 => "Privatanteile",
4 => "Zinserträge",
@@ -152,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",
@@ -167,25 +243,20 @@ 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(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $eur{$item}));
if ($item == $form->{pos_eur}) {
- $form->{selecteur} .= "\n|;
} else {
- $form->{selecteur} .= "\n|;
}
}
- $eur = qq|
-
- | . $locale->text('EÜR') . qq| |
- |
-
-
|;
-
- $form->{selectbwa} = "\n|;
- %bwapos = (1 => 'Umsatzerlöse',
+ my %bwapos = (
+ 1 => 'Umsatzerlöse',
2 => 'Best.Verdg.FE/UE',
3 => 'Aktiv.Eigenleistung',
4 => 'Mat./Wareneinkauf',
@@ -207,216 +278,121 @@ sub account_header {
33 => 'Sonst.neutr.Ertrag',
34 => 'Verr.kalk.Kosten',
35 => 'Steuern Eink.u.Ertr.');
- foreach $item (sort({ $a <=> $b } keys %bwapos)) {
+ 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}) {
- $form->{selectbwa} .= "\n|;
+ foreach my $item ((1, 2, 3, 4)) {
if ($item == $form->{pos_bilanz}) {
- $form->{selectbilanz} .= "