X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8c7e44938a661e035f62840e1e177353240ace5d..e69e3657:/bin/mozilla/ca.pl diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index a4de2310e..0558ae6ba 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -78,6 +78,10 @@ sub chart_of_accounts { $form->{title} = $locale->text('Chart of Accounts'); + if ($eur) { + $form->{method} = "cash"; + } + CA->all_accounts(\%myconfig, \%$form); my @columns = qw(accno description debit credit); @@ -107,6 +111,7 @@ sub chart_of_accounts { my %totals = ('debit' => 0, 'credit' => 0); foreach my $ca (@{ $form->{CA} }) { + next unless defined $ca->{amount}; my $row = { }; foreach (qw(debit credit)) { @@ -142,6 +147,7 @@ sub list { $form->{title} = $locale->text('List Transactions'); $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}"; + $year = (localtime)[5] + 1900; # get departments $form->all_departments(\%myconfig); @@ -160,13 +166,76 @@ sub list { | if $form->{selectdepartment}; + $accrual = ($eur) ? "" : "checked"; + $cash = ($eur) ? "checked" : ""; + + $name_1 = "fromdate"; + $id_1 = "fromdate"; + $value_1 = "$form->{fromdate}"; + $trigger_1 = "trigger1"; + $name_2 = "todate"; + $id_2 = "todate"; + $value_2 = ""; + $trigger_2 = "trigger2"; + + + # with JavaScript Calendar + if ($form->{jsscript}) { + if ($name_1 eq "") { + + $button1 = qq| + |; + $button1_2 = qq| + text('button') . qq|>|; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2"); + } else { + $button1 = qq| + |; + $button1_2 = qq| + text('button') . qq|>|; + $button2 = qq| + |; + $button2_2 = qq| + text('button') . qq|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1", + "$name_2", "BL", "$trigger_2"); + } + } else { + + # without JavaScript Calendar + if ($name_1 eq "") { + $button1 = + qq||; + } else { + $button1 = + qq||; + $button2 = + qq||; + } + } + $form->{javascript} .= qq||; + $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; + $form->header; $form->{description} =~ s/\"/"/g; print qq| - +

{script}> @@ -177,28 +246,120 @@ sub list { {accounttype}> - - - - - +|; + + print qq| + + + + + + + + +|; + $checked = "checked"; + print qq| + +|; + $checked = ""; + print qq| + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +$jsscript +

$form->{title}

- - $department + + + + +

$form->{title}

+ - - - - + - - + + -

\| . $locale->text('From') . qq\|		\| . $locale->text('To') . qq\|		\| + . $locale->text('Customized Report') . qq\|
\| . $locale->text('Include in Report') . qq\|	- \| - . $locale->text('Subtotal') . qq\|			\| . $locale->text('Year') . qq\|

+ | . $locale->text('Yearly') . qq|

| . $locale->text('Quarterly') . qq|

| . $locale->text('Monthly') . qq|

1. | + . $locale->text('Quarter') . qq|

| + . $locale->text('January') . qq|

| + . $locale->text('May') . qq|

| + . $locale->text('September') . qq|

2. | + . $locale->text('Quarter') . qq|

| + . $locale->text('February') . qq|

| + . $locale->text('June') . qq|

| + . $locale->text('October') . qq|

3. | + . $locale->text('Quarter') . qq|

| + . $locale->text('March') . qq|

| + . $locale->text('July') . qq|

| + . $locale->text('November') . qq|

4. | + . $locale->text('Quarter') . qq|

| + . $locale->text('April') . qq|

| + . $locale->text('August') . qq|

| + . $locale->text('December') . qq|

| + . $locale->text('Free report period') . qq|

| . $locale->text('From') . qq| + $button1 + $button1_2 + | . $locale->text('Bis') . qq| + $button2 + $button2_2 +

| . $locale->text('Method') . qq|

| + . $locale->text('Accrual') . qq| + | + . $locale->text('EUR') . qq|

| + . $locale->text('Decimalplaces') + . qq|

| . $locale->text('Subtotal') . qq|

{accno} - $form->{description}"; + if ($form->{reporttype} eq "custom") { + + #forgotten the year --> thisyear + if ($form->{year} !~ m/^\d\d\d\d$/) { + $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~ + /(\d\d\d\d)/; + $form->{year} = $1; + } + + #yearly report + if ($form->{duetyp} eq "13") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + } + + #Quater reports + if ($form->{duetyp} eq "A") { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; + } + if ($form->{duetyp} eq "B") { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; + } + if ($form->{duetyp} eq "C") { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; + } + if ($form->{duetyp} eq "D") { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + } + + #Monthly reports + SWITCH: { + $form->{duetyp} eq "1" && do { + $form->{fromdate} = "1.1.$form->{year}"; + $form->{todate} = "31.1.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "2" && do { + $form->{fromdate} = "1.2.$form->{year}"; + + #this works from 1901 to 2099, 1900 and 2100 fail. + $leap = ($form->{year} % 4 == 0) ? "29" : "28"; + $form->{todate} = "$leap.2.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "3" && do { + $form->{fromdate} = "1.3.$form->{year}"; + $form->{todate} = "31.3.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "4" && do { + $form->{fromdate} = "1.4.$form->{year}"; + $form->{todate} = "30.4.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "5" && do { + $form->{fromdate} = "1.5.$form->{year}"; + $form->{todate} = "31.5.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "6" && do { + $form->{fromdate} = "1.6.$form->{year}"; + $form->{todate} = "30.6.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "7" && do { + $form->{fromdate} = "1.7.$form->{year}"; + $form->{todate} = "31.7.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "8" && do { + $form->{fromdate} = "1.8.$form->{year}"; + $form->{todate} = "31.8.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "9" && do { + $form->{fromdate} = "1.9.$form->{year}"; + $form->{todate} = "30.9.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "10" && do { + $form->{fromdate} = "1.10.$form->{year}"; + $form->{todate} = "31.10.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "11" && do { + $form->{fromdate} = "1.11.$form->{year}"; + $form->{todate} = "30.11.$form->{year}"; + last SWITCH; + }; + $form->{duetyp} eq "12" && do { + $form->{fromdate} = "1.12.$form->{year}"; + $form->{todate} = "31.12.$form->{year}"; + last SWITCH; + }; + } + } + CA->all_transactions(\%myconfig, \%$form); + $form->{saldo_old} += $form->{beginning_balance}; + $form->{saldo_new} += $form->{beginning_balance}; + my $saldo_old = format_debit_credit($form->{saldo_old}); + my $eb_string = format_debit_credit($form->{beginning_balance}); + $form->{balance} = $form->{saldo_old}; + my @options; if ($form->{department}) { my ($department) = split /--/, $form->{department}; @@ -249,25 +531,69 @@ sub list_transactions { push @options, $period; - my @columns = qw(transdate reference description debit credit balance); + $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0); + push (@options, $form->{print_date}); + + $form->{company} = $locale->text('Company') . " " . $myconfig{company}; + push (@options, $form->{company}); + + my @columns = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance); my %column_defs = ( 'transdate' => { 'text' => $locale->text('Date'), }, 'reference' => { 'text' => $locale->text('Reference'), }, 'description' => { 'text' => $locale->text('Description'), }, 'debit' => { 'text' => $locale->text('Debit'), }, 'credit' => { 'text' => $locale->text('Credit'), }, - 'balance' => { 'text' => $locale->text('Balance'), }, - ); - my %column_alignment = map { $_ => 'right' } qw(debit credit balance); + 'gegenkonto' => { 'text' => $locale->text('Gegenkonto'), }, + 'ustkonto' => { 'text' => $locale->text('USt-Konto'), }, + 'balance' => { 'text' => $locale->text('Balance'), }, + 'ustrate' => { 'text' => $locale->text('Satz %'), }, + ); - my @hidden_variables = qw(accno fromdate todate description accounttype l_heading l_subtotal department projectnumber project_id sort); + my @hidden_variables = qw(accno fromdate todate description accounttype l_heading subtotal department projectnumber project_id sort); my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables); - map { $column_defs{$_}->{link} = $link . "&sort=$_" } qw(transdate reference description); $form->{callback} = $link . '&sort=' . E($form->{sort}); + my %column_alignment = map { $_ => 'right' } qw(debit credit); + + @custom_headers = (); + # Zeile 1: + push @custom_headers, [ + { 'text' => 'Letzte Buchung', }, + { 'text' => 'EB-Wert', }, + { 'text' => 'Saldo alt', 'colspan' => 2, }, + { 'text' => 'Jahresverkehrszahlen alt', 'colspan' => 2, }, + { 'text' => '', 'colspan' => 2, }, + ]; + push @custom_headers, [ + { 'text' => $form->{last_transaction}, }, + { 'text' => $eb_string, }, + { 'text' => $saldo_old, 'colspan' => 2, }, + { 'text' => $form->format_amount(\%myconfig, abs($form->{old_balance_debit}), 2) . " S", }, + { 'text' => $form->format_amount(\%myconfig, $form->{old_balance_credit}, 2) . " H", }, + { 'text' => '', 'colspan' => 2, }, + ]; + # Zeile 2: + push @custom_headers, [ + { 'text' => $locale->text('Date'), 'link' => $link . "&sort=transdate", }, + { 'text' => $locale->text('Reference'), 'link' => $link . "&sort=reference", }, + { 'text' => $locale->text('Description'), 'link' => $link . "&sort=description", }, + { 'text' => $locale->text('Gegenkonto'), }, + { 'text' => $locale->text('Debit'), }, + { 'text' => $locale->text('Credit'), }, + { 'text' => $locale->text('USt-Konto'), }, + { 'text' => $locale->text('Satz %'), }, + { 'text' => $locale->text('Balance'), }, + ]; + + + + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + $report->set_custom_headers(@custom_headers); $report->set_options('top_info_text' => join("\n", @options), 'output_format' => 'HTML', @@ -284,20 +610,10 @@ sub list_transactions { $report->set_sort_indicator($form->{sort}, 1); - $column_defs->{balance}->{visible} = $form->{accno} ? 1 : 0; + $column_defs->{balance}->{visible} = 1; my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1; - if ($form->{accno} && $form->{balance}) { - my $row = { - 'balance' => { - 'data' => $form->format_amount(\%myconfig, $form->{balance} * $ml, 2), - 'align' => 'right', - }, - }; - - $report->add_data($row); - } my $idx = 0; my %totals = ( 'debit' => 0, 'credit' => 0 ); @@ -305,18 +621,44 @@ sub list_transactions { my ($previous_index, $row_set); foreach my $ca (@{ $form->{CA} }) { - $form->{balance} += $ca->{amount}; foreach (qw(debit credit)) { $subtotals{$_} += $ca->{$_}; $totals{$_} += $ca->{$_}; + if ($_ =~ /debit.*/) { + $ml = -1; + } else { + $ml = 1; + } + $form->{balance}= $form->{balance} + $ca->{$_} * $ml; $ca->{$_} = $form->format_amount(\%myconfig, $ca->{$_}, 2) if ($ca->{$_} != 0); } - $ca->{balance} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); + my $do_subtotal = 0; + if (($form->{subtotal}) + && (($idx == scalar @{ $form->{CA} } - 1) + || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) { + $do_subtotal = 1; + } my $row = { }; + $ca->{ustrate} = $form->format_amount(\%myconfig, $ca->{ustrate} * 100, 2) if ($ca->{ustrate} != 0); + + if ($ca->{memo} ne "") { + $ca->{description} .= " \n " . $ca->{memo}; + } + + + + foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) { + if ($ca->{gegenkonto} eq "") { + $ca->{gegenkonto} = $gegenkonto->{accno}; + } else { + $ca->{gegenkonto} .= ", " . $gegenkonto->{accno}; + } + } + foreach (@columns) { $row->{$_} = { 'data' => $ca->{$_}, @@ -324,28 +666,31 @@ sub list_transactions { }; } + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR'); + if ($ca->{index} ne $previous_index) { - $report->add_data($row_set) if ($row_set); +# $report->add_data($row_set) if ($row_set); - $row_set = [ ]; +# $row_set = [ ]; $previous_index = $ca->{index}; $row->{reference}->{link} = build_std_url("script=$ca->{module}.pl", 'action=edit', 'id=' . E($ca->{id}), 'callback'); - } else { + } elsif ($ca->{index} eq $previous_index) { map { $row->{$_}->{data} = '' } qw(reference description); $row->{transdate}->{data} = '' if ($form->{sort} eq 'transdate'); } + my $row_set = []; + push @{ $row_set }, $row; - if (($form->{l_subtotal} eq 'Y') - && (($idx == scalar @{ $form->{CA} } - 1) - || ($ca->{$form->{sort}} ne $form->{CA}->[$idx + 1]->{$form->{sort}}))) { - $report->add_data(create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal')); - } + push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, 'listsubtotal') if ($do_subtotal); + $idx++; + $report->add_data($row_set); + } $report->add_data($row_set) if ($row_set); @@ -353,7 +698,73 @@ sub list_transactions { $report->add_separator(); my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal'); - $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance} * $ml, 2); + + + $row->{balance}->{data} = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR'); + + $report->add_data($row); + + + $report->add_separator(); + my $row = { + 'transdate' => { + 'data' => "", + 'class' => 'listtotal', + }, + 'reference' => { + 'data' => $locale->text('EB-Wert'), + 'class' => 'listtotal', + }, + 'description' => { + 'data' => $locale->text('Saldo neu'), + 'colspan' => 2, + 'class' => 'listtotal', + }, + 'debit' => { + 'data' => $locale->text('Jahresverkehrszahlen neu'), + 'colspan' => 2, + 'align' => 'left', + 'class' => 'listtotal', + }, + 'ustkonto' => { + 'data' => '', + 'colspan' => 2, + 'align' => 'left', + 'class' => 'listtotal', + }, + }; + + $report->add_data($row); + my $saldo_new = format_debit_credit($form->{saldo_new}); + my $row = { + 'transdate' => { + 'data' => "", + 'class' => 'listtotal', + }, + 'reference' => { + 'data' => $eb_string, + 'class' => 'listtotal', + }, + 'description' => { + 'data' => $saldo_new, + 'colspan' => 2, + 'class' => 'listtotal', + }, + 'debit' => { + 'data' => $form->format_amount(\%myconfig, abs($form->{current_balance_debit}) , 2) . " S", + 'class' => 'listtotal', + }, + 'credit' => { + 'data' => $form->format_amount(\%myconfig, $form->{current_balance_credit}, 2) . " H", + 'class' => 'listtotal', + }, + 'ustkonto' => { + 'data' => "", + 'colspan' => 2, + 'class' => 'listtotal', + }, + }; + $report->add_data($row); $report->generate_with_headers();