| | . $locale->text('Method') . qq| |
|
@@ -807,8 +798,6 @@ $jsscript
}
if ($form->{report} =~ /^nontaxable_/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
print qq|
@@ -872,8 +861,6 @@ $jsscript
}
if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $gifi = "";
-
if ($form->{report} eq 'ar_aging') {
$label = $locale->text('Customer');
$form->{vc} = 'customer';
@@ -922,8 +909,6 @@ $jsscript
# above action can be removed if there is more than one input field
if ($form->{report} =~ /(receipts|payments)$/) {
- $gifi = "";
-
$form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
RP->paymentaccounts(\%myconfig, \%$form);
@@ -1001,9 +986,8 @@ $jsscript
. $locale->text('Continue') . qq|">
|;
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- get_config($userspath, 'finanzamt.ini');
+ # Hier Aufruf von get_config zum Einlesen der Finanzamtdaten
+ USTVA->get_config($userspath, 'finanzamt.ini');
$disabled = qq|disabled="disabled"|;
$disabled = '' if ($form->{elster} eq '1');
@@ -1030,7 +1014,7 @@ $jsscript
$lxdebug->leave_sub();
}
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
sub get_project {
$lxdebug->enter_sub();
@@ -1062,10 +1046,6 @@ sub generate_income_statement {
$form->{endbold} = "";
$form->{br} = "
";
- &get_project(generate_income_statement);
-
- $form->{projectnumber} = $form->{projectnumber_1};
-
if ($form->{reporttype} eq "custom") {
#forgotten the year --> thisyear
@@ -1253,7 +1233,8 @@ sub generate_balance_sheet {
$form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_} }
+ map { $form->{$_} = $myconfig{$_};
+ $form->{$_} =~ s/\\n/\n/g; }
(qw(company address businessnumber nativecurr));
$form->{templates} = $myconfig{templates};
@@ -1345,11 +1326,6 @@ sub list_accounts {
$column_header{endbalance} =
qq| | | . $locale->text('Balance') . qq| | |;
- if ($form->{accounttype} eq 'gifi') {
- $column_header{accno} =
- qq|| . $locale->text('GIFI') . qq| | |;
- }
-
$form->header;
print qq|
@@ -1380,20 +1356,12 @@ sub list_accounts {
$description = $form->escape($ref->{description});
$href =
- qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
-
- if ($form->{accounttype} eq 'gifi') {
- $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
- $na = $locale->text('N/A');
- map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno};
- } else {
- $href .= "&accno=$ref->{accno}&description=$description";
- }
+ qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|;
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
- $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
- $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
+ $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " ";
+ $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " ";
$begbalance =
$form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " ");
$endbalance =
@@ -1672,14 +1640,14 @@ sub aging {
$i++;
if ($subtotal) {
- $c0subtotal =
- $form->format_amount(\%myconfig, $c0subtotal, 2, " ");
- $c30subtotal =
- $form->format_amount(\%myconfig, $c30subtotal, 2, " ");
- $c60subtotal =
- $form->format_amount(\%myconfig, $c60subtotal, 2, " ");
- $c90subtotal =
- $form->format_amount(\%myconfig, $c90subtotal, 2, " ");
+ $c0subtotal = ($c0subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : "";
+ $c30subtotal = ($c30subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : "";
+ $c60subtotal = ($c60subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : "";
+ $c90subtotal = ($c90subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : "";
}
$column_data{ct} = qq| | |;
@@ -1735,10 +1703,10 @@ sub aging {
$c60total += $ref->{c60};
$c90total += $ref->{c90};
- $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, " ");
- $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, " ");
- $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, " ");
- $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, " ");
+ $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : "";
+ $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : "";
+ $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : "";
+ $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : "";
$href =
qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
@@ -1850,16 +1818,10 @@ sub aging {
-|;
- }
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('E-mail') . qq|">|;
+}
- print qq|
+print qq|
@@ -1881,66 +1843,6 @@ sub select_all {
$lxdebug->leave_sub();
}
-sub print_options {
- $lxdebug->enter_sub();
-
- $form->{sendmode} = "attachment";
- $form->{copies} = 2 unless $form->{copies};
-
- $form->{PD}{ $form->{type} } = "selected";
- $form->{DF}{ $form->{format} } = "selected";
- $form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{sendmode} } = "selected";
-
- $type = qq|
-