X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=77d8878ffdb1e7390b41a6e548830a8468eabded;hb=991315859c7b0f25da49baad4822492510b6b3bb;hp=ca1ee4c0d89b75ed1b3fcf9f4a17b198a20ae3a3;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index ca1ee4c0d..77d8878ff 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -35,6 +35,10 @@ use SL::AM;
use SL::CA;
use SL::Form;
use SL::User;
+use SL::USTVA;
+use SL::Iconv;
+use CGI::Ajax;
+use CGI;
use Data::Dumper;
@@ -86,134 +90,108 @@ sub edit_account {
sub account_header {
$lxdebug->enter_sub();
+ 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 . '%';
+ }
- if ($item->{tax} == $form->{tax}) {
- $form->{selecttaxkey} .=
- "";
+ $form->{selectnewaccount} = qq||;
}
foreach $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|;
%eur = (1 => "Umsatzerlöse",
2 => "sonstige Erlöse",
3 => "Privatanteile",
@@ -246,22 +224,16 @@ sub account_header {
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}));
if ($item == $form->{pos_eur}) {
- $form->{selecteur} .= "\n|;
} else {
- $form->{selecteur} .= "\n|;
}
}
- $eur = qq|
-
- | . $locale->text('EUER') . qq| |
- |
-
-
|;
-
- $form->{selectbwa} = "\n|;
%bwapos = (1 => 'Umsatzerlöse',
2 => 'Best.Verdg.FE/UE',
@@ -286,194 +258,89 @@ sub account_header {
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}));
if ($item == $form->{pos_bwa}) {
- $form->{selectbwa} .= "\n|;
+ foreach $item ((1, 2, 3, 4)) {
+ if ($item == $form->{pos_bilanz}) {
+ $select_bilanz .= qq|