#
# Contributors: Antonio Gallardo <agssa@ibw.com.ni>
# Benjamin Lee <benjaminlee@consultant.com>
-# Philip Reetz <p.reetz@linet-services.de>
-# Udo Spallek
+#
Philip Reetz <p.reetz@linet-services.de>
+# Udo Spallek
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
require "bin/mozilla/common.pl";
require "bin/mozilla/reportgenerator.pl";
-1;
-
-# end of main
+# note: this file was particularly hard to strictify.
+# alot of the vars are passed carelessly between invocations
+# should there be any missing vars, declare them globally
+use strict;
# this is for our long dates
# $locale->text('January')
# $locale->text('Trial Balance')
# $locale->text('AR Aging')
# $locale->text('AP Aging')
+# $locale->text('Search AR Aging')
+# $locale->text('Search AP Aging')
# $locale->text('Tax collected')
# $locale->text('Tax paid')
# $locale->text('Receipts')
# $locale->text('Project Transactions')
# $locale->text('Non-taxable Sales')
# $locale->text('Non-taxable Purchases')
+# $locale->text('Business evaluation')
# $form->parse_html_template('rp/html_report_susa')
};
sub check_rp_access {
+ my $form = $main::form;
+
my $right = $rp_access_map->{$form->{report}};
$right ||= 'DOES_NOT_EXIST';
- $auth->assert($right);
+ $main::auth->assert($right);
}
sub report {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_rp_access();
- %title = ('balance_sheet' => 'Balance Sheet',
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ my %title = (
+ 'balance_sheet' => 'Balance Sheet',
'income_statement' => 'Income Statement',
'trial_balance' => 'Trial Balance',
- 'ar_aging' => 'AR Aging',
- 'ap_aging' => 'Offene Verbindlichkeiten',
+ 'ar_aging' => 'Search AR Aging',
+ 'ap_aging' => 'Search AP Aging',
'tax_collected' => 'Tax collected',
'tax_paid' => 'Tax paid',
'nontaxable_sales' => 'Non-taxable Sales',
'receipts' => 'Receipts',
'payments' => 'Payments',
'projects' => 'Project Transactions',
- 'bwa' => 'Betriebswirtschaftliche Auswertung',);
+ 'bwa' => 'Business evaluation',
+ );
$form->{title} = $locale->text($title{ $form->{report} });
- $accrual = ($eur) ? "" : "checked";
- $cash = ($eur) ? "checked" : "";
+ my $accrual = $::lx_office_conf{system}->{eur} ? "" : "checked";
+ my $cash = $::lx_office_conf{system}->{eur} ? "checked" : "";
- $year = (localtime)[5] + 1900;
+ my $year = (localtime)[5] + 1900;
# get departments
$form->all_departments(\%myconfig);
- if (@{ $form->{all_departments} }) {
+ if (@{ $form->{all_departments} || [] }) {
$form->{selectdepartment} = "<option>\n";
- map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } @{ $form->{all_departments} };
+ map { $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}\n" } @{ $form->{all_departments} || [] };
}
- $department = qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Department') . qq|</th>
- <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
- </tr>
+ my $department = qq|
+ <tr>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+ <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+ </tr>
| if $form->{selectdepartment};
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
}
my $projectnumber =
- NTI($cgi->popup_menu('-name' => "project_id",
- '-values' => \@project_values,
- '-labels' => \%project_labels));
+ NTI($main::cgi->popup_menu('-name' => "project_id",
+ '-values' => \@project_values,
+ '-labels' => \%project_labels));
# use JavaScript Calendar or not
$form->{jsscript} = 1;
- $jsscript = "";
+ my $jsscript = "";
+ my ( $name_1, $id_1, $value_1, $trigger_1, $name_2, $id_2, $value_2, $trigger_2, );
if ($form->{report} eq "balance_sheet") {
$name_1 = "asofdate";
$id_1 = "asofdate";
$trigger_2 = "trigger2";
}
+ my ($button1, $button1_2, $button2, $button2_2);
+ my $checked;
+
# with JavaScript Calendar
if ($form->{jsscript}) {
if ($name_1 eq "") {
}
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->header;
- $onload = qq|focus()|;
+ my $onload = qq|focus()|;
$onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
$onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
print qq|
<input type=hidden name=title value="$form->{title}">
-<table width=100%>
+<table width=100% border="0">
<tr>
<th class=listtop>$form->{title}</th>
</tr>
<tr height="5"></tr>
<tr>
<td>
- <table>
+ <table border="0">
$department
|;
if ($form->{report} eq "projects") {
print qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Project') . qq|</th>
- <td colspan=5><input name=projectnumber size=25</td>
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+ <td colspan=5><input name=projectnumber size=25</td>
+ </tr>
<input type=hidden name=nextsub value=generate_projects>
<tr>
- <th align=right>| . $locale->text('From') . qq|</th>
+ <th align=right>| . $locale->text('From') . qq|</th>
<td>$button1</td>
<td>$button1_2</td>
- <th align=right>| . $locale->text('Bis') . qq|</th>
+ <th align=right>| . $locale->text('Bis') . qq|</th>
<td>$button2</td>
<td>$button2_2</td>
- </tr>
+ </tr>
</table>
</td>
</tr>
<tr>
<td>
<table>
- <tr>
- <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
- <td><input name=l_heading class=checkbox type=checkbox value=Y> | . $locale->text('Heading') . qq|
- <input name=l_subtotal class=checkbox type=checkbox value=Y> | . $locale->text('Subtotal') . qq|</td>
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+ <td><input name=l_heading class=checkbox type=checkbox value=Y> | . $locale->text('Heading') . qq|
+ <input name=l_subtotal class=checkbox type=checkbox value=Y> | . $locale->text('Subtotal') . qq|</td>
+ </tr>
$jsscript
|;
if ($form->{report} eq "income_statement") {
print qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Project') . qq|</th>
- <td colspan=3>$projectnumber</td>
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+ <td colspan=3>$projectnumber</td>
+ </tr>
<input type=hidden name=nextsub value=generate_income_statement>
</table>
<table>
- <tr>
- <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
- </tr>
- <tr>
- <th colspan=1>| . $locale->text('Year') . qq|</th>
- <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
- </tr>
+ <tr>
+ <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+ </tr>
+ <tr>
+ <th colspan=1>| . $locale->text('Year') . qq|</th>
+ <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+ </tr>
|;
print qq|
- <tr>
- <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
- <th align=left>| . $locale->text('Quarterly') . qq|</th>
- <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
- </tr>
- <tr>
- <td align=right> <input name=duetyp class=radio type=radio value="13" "checked"></td>
- <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
+ <tr>
+ <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+ <th align=left>| . $locale->text('Quarterly') . qq|</th>
+ <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+ </tr>
+ <tr>
+ <td align=right> <input name=duetyp class=radio type=radio value="13" "checked"></td>
+ <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
|;
$checked = "";
print qq|
- <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
- <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
-
- </tr>
- <tr>
- <td align= right> </td>
- <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
-
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
- <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
-
- </tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
+ <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
+
+ </tr>
+ <tr>
+ <td align= right> </td>
+ <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
+
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
+ <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
+
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
<th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
- <td align=left colspan=4>| . $locale->text('From') . qq|
- $button1
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
$button1_2
- | . $locale->text('Bis') . qq|
+ | . $locale->text('Bis') . qq|
$button2
$button2_2
</td>
</tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
- <th align=leftt>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
- </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
+ <th align=leftt>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
$jsscript
|;
if ($form->{report} eq "bwa") {
print qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Project') . qq|</th>
- <td colspan=3>$projectnumber</td>
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+ <td colspan=3>$projectnumber</td>
+ </tr>
<input type=hidden name=nextsub value=generate_bwa>
</table>
<table>
- <tr>
- <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
- </tr>
- <tr>
- <th colspan=1>| . $locale->text('Year') . qq|</th>
- <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
- </tr>
+ <tr>
+ <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+ </tr>
+ <tr>
+ <th colspan=1>| . $locale->text('Year') . qq|</th>
+ <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+ </tr>
|;
print qq|
- <tr>
- <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
- <th align=left>| . $locale->text('Quarterly') . qq|</th>
- <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
- </tr>
- <tr>
- <td align=right> <input name=duetyp class=radio type=radio value="13"
+ <tr>
+ <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+ <th align=left>| . $locale->text('Quarterly') . qq|</th>
+ <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+ </tr>
+ <tr>
+ <td align=right> <input name=duetyp class=radio type=radio value="13"
$checked></td>
- <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
|;
$checked = "checked";
print qq|
- <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
- <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
-
- </tr>
- <tr>
- <td align= right> </td>
- <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
-
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
- <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
-
- </tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
+ <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
+
+ </tr>
+ <tr>
+ <td align= right> </td>
+ <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
+
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
+ <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
+
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
<th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
- <td align=left colspan=4>| . $locale->text('From') . qq|
- $button1
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
$button1_2
- | . $locale->text('Bis') . qq|
- $button2
+ | . $locale->text('Bis') . qq|
+ $button2
$button2_2
</td>
</tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
- <th align=leftt>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
- </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
+ <th align=leftt>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
<tr>
<th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
<td><input name=decimalplaces size=3 value="2"></td>
if ($form->{report} eq "balance_sheet") {
print qq|
<input type=hidden name=nextsub value=generate_balance_sheet>
- <tr>
- <th align=right>| . $locale->text('as at') . qq|</th>
- <td>
+ <tr>
+ <th align=right>| . $locale->text('as at') . qq|</th>
+ <td>
$button1
$button1_2
</td>
- <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
- <td>
+ <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
+ <td>
$button2
$button2_2
</td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
- <td><input name=decimalplaces size=3 value="2"></td>
- </tr>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+ <td><input name=decimalplaces size=3 value="2"></td>
+ </tr>
</table>
</td>
</tr>
<tr>
<td>
<table>
- <tr>
- <th align=right>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
- </tr>
-
- <tr>
- <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
- <td><input name=l_heading class=checkbox type=checkbox value=Y> | . $locale->text('Heading') . qq|
- <input name=l_subtotal class=checkbox type=checkbox value=Y> | . $locale->text('Subtotal') . qq|
- <input name=l_accno class=checkbox type=checkbox value=Y> | . $locale->text('Account Number') . qq|</td>
- </tr>
+ <tr>
+ <th align=right>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
+
+ <tr>
+ <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+ <td><input name=l_heading class=checkbox type=checkbox value=Y> | . $locale->text('Heading') . qq|
+ <input name=l_subtotal class=checkbox type=checkbox value=Y> | . $locale->text('Subtotal') . qq|
+ <input name=l_accno class=checkbox type=checkbox value=Y> | . $locale->text('Account Number') . qq|</td>
+ </tr>
$jsscript
|;
if ($form->{report} eq "trial_balance") {
print qq|
- <tr>
- <th align=right nowrap>| . $locale->text('Project') . qq|</th>
- <td colspan=3>$projectnumber</td>
- </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+ <td colspan=3>$projectnumber</td>
+ </tr>
<input type=hidden name=nextsub value=generate_trial_balance>
</table>
<table>
- <tr>
- <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
- </tr>
- <tr>
- <th colspan=1>| . $locale->text('Year') . qq|</th>
- <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
- </tr>
+ <tr>
+ <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+ </tr>
+ <tr>
+ <th colspan=1>| . $locale->text('Year') . qq|</th>
+ <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+ </tr>
|;
print qq|
- <tr>
- <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
- <th align=left>| . $locale->text('Quarterly') . qq|</th>
- <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
- </tr>
- <tr>
- <td align=right> <input name=duetyp class=radio type=radio value="13" $checked></td>
- <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
+ <tr>
+ <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+ <th align=left>| . $locale->text('Quarterly') . qq|</th>
+ <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+ </tr>
+ <tr>
+ <td align=right> <input name=duetyp class=radio type=radio value="13" $checked></td>
+ <td><input name=duetyp class=radio type=radio value="A" $checked > 1. | . $locale->text('Quarter') . qq|</td>
|;
$checked = "checked";
print qq|
- <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="1" $checked > | . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
- <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
-
- </tr>
- <tr>
- <td align= right> </td>
- <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
-
- </tr>
- <tr>
- <td> </td>
- <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
- <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
- <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
-
- </tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
+ <td><input name=duetyp class=radio type=radio value="5" $checked > | . $locale->text('May') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="9" $checked > | . $locale->text('September') . qq|</td>
+
+ </tr>
+ <tr>
+ <td align= right> </td>
+ <td><input name=duetyp class=radio type=radio value="B" $checked> 2. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="2" $checked > | . $locale->text('February') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="6" $checked > | . $locale->text('June') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="10" $checked > | . $locale->text('October') . qq|</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="C" $checked> 3. | . $locale->text('Quarter') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="3" $checked > | . $locale->text('March') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="7" $checked > | . $locale->text('July') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="11" $checked > | . $locale->text('November') . qq|</td>
+
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name=duetyp class=radio type=radio value="D" $checked> 4. | . $locale->text('Quarter') . qq| </td>
+ <td><input name=duetyp class=radio type=radio value="4" $checked > | . $locale->text('April') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="8" $checked > | . $locale->text('August') . qq|</td>
+ <td><input name=duetyp class=radio type=radio value="12" $checked > | . $locale->text('December') . qq|</td>
+
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
<th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
- <td align=left colspan=4>| . $locale->text('From') . qq|
- $button1
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
$button1_2
- | . $locale->text('Bis') . qq|
- $button2
+ | . $locale->text('Bis') . qq|
+ $button2
$button2_2
</td>
</tr>
- <tr>
- <td colspan=5><hr size=3 noshade></td>
- </tr>
- <tr>
- <th align=leftt>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
- </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
+ </tr>
+ <tr>
+ <th align=leftt>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
<tr>
<th align=right colspan=4>| . $locale->text('All Accounts') . qq|</th>
<td><input name=all_accounts type=checkbox value=1></td>
print qq|
<input type=hidden name=nextsub value=generate_tax_report>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Report for') . qq|</th>
- <td colspan=3>
+ <tr>
+ <th align=right>| . $locale->text('From') . qq|</th>
+ <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
+ <th align=right>| . $locale->text('Bis') . qq|</th>
+ <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Report for') . qq|</th>
+ <td colspan=3>
|;
$checked = "checked";
- foreach $ref (@{ $form->{taxaccounts} }) {
+ foreach my $ref (@{ $form->{taxaccounts} }) {
print
qq|<input name=accno class=radio type=radio value=$ref->{accno} $checked> $ref->{description}
<input type=hidden name=db value=$form->{db}>
<input type=hidden name=sort value=transdate>
- </td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
- </tr>
+ </td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+ <input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+ </tr>
</table>
</td>
</tr>
<td>
<table>
<tr>
- <th align=right>| . $locale->text('Include in Report') . qq|</th>
- <td>
- <table>
- <tr>
- <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('ID') . qq|</td>
- <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Invoice') . qq|</td>
- <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Date') . qq|</td>
- </tr>
- <tr>
- <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
- <td>|;
+ <th align=right>| . $locale->text('Include in Report') . qq|</th>
+ <td>
+ <tr>
+ <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('ID') . qq|</td>
+ <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Invoice') . qq|</td>
+ <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Date') . qq|</td>
+ </tr>
+ <tr>
+ <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+ <td>|;
if ($form->{db} eq 'ar') {
print $locale->text('Customer');
print qq|</td>
<td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Amount') . qq|</td>
- <td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Tax') . qq|</td>
- <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Total') . qq|</td>
- </tr>
- <tr>
- <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Subtotal') . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
+ <td>| . $locale->text('Amount') . qq|</td>
+ <td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Tax') . qq|</td>
+ <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Total') . qq|</td>
+ </tr>
+ <tr>
+ <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Subtotal') . qq|</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
|;
}
<input type=hidden name=sort value=transdate>
<input type=hidden name=report value=$form->{report}>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Method') . qq|</th>
- <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
+ <tr>
+ <th align=right>| . $locale->text('From') . qq|</th>
+ <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
+ <th align=right>| . $locale->text('Bis') . qq|</th>
+ <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Method') . qq|</th>
+ <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
- <input name=method class=radio type=radio value=cash $cash>|
+ <input name=method class=radio type=radio value=cash $cash>|
. $locale->text('EUR') . qq|</td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('Include in Report') . qq|</th>
- <td colspan=3>
- <table>
- <tr>
- <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('ID') . qq|</td>
- <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Invoice') . qq|</td>
- <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Date') . qq|</td>
- </tr>
- <tr>
- <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
- <td>|;
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('Include in Report') . qq|</th>
+ <td colspan=3>
+ <tr>
+ <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('ID') . qq|</td>
+ <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Invoice') . qq|</td>
+ <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+ <td>| . $locale->text('Date') . qq|</td>
+ </tr>
+ <tr>
+ <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+ <td>|;
if ($form->{db} eq 'ar') {
print $locale->text('Customer');
print qq|</td>
<td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
- <td>| . $locale->text('Amount') . qq|</td>
- <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Total') . qq|</td>
- </tr>
- <tr>
- <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
- <td>| . $locale->text('Subtotal') . qq|</td>
- </tr>
- </table>
- </td>
- </tr>
+ <td>| . $locale->text('Amount') . qq|</td>
+ <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Total') . qq|</td>
+ </tr>
+ <tr>
+ <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+ <td>| . $locale->text('Subtotal') . qq|</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
|;
}
+ my ($label, $nextsub, $vc);
if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
if ($form->{report} eq 'ar_aging') {
$label = $locale->text('Customer');
: qq|<input name=$form->{vc} size=35>|;
print qq|
- <tr>
- <th align=right>| . $locale->text($label) . qq|</th>
- <td>$vc</td>
- </tr>
- <tr>
- <td align=left colspan=4>| . $locale->text('From') . qq|
- $button1
+ <tr>
+ <th align=right>| . $locale->text($label) . qq|</th>
+ <td>$vc</td>
+ </tr>
+ <tr>
+ <td>| . $locale->text('Review of Aging list') . qq|</td>
+ <td><select name="review_of_aging_list">
+ <option></option>
+ <option>0-30</option>
+ <option>30-60</option>
+ <option>60-90</option>
+ <option>90-120</option>
+ <option>> 120</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
$button1_2
- | . $locale->text('Bis') . qq|
- $button2
+ | . $locale->text('Bis') . qq|
+ $button2
$button2_2
</td>
- </tr>
+ </tr>
<input type=hidden name=type value=statement>
<input type=hidden name=format value=html>
- <input type=hidden name=media value=screen>
+ <input type=hidden name=media value=screen>
- <input type=hidden name=nextsub value=$nextsub>
- <input type=hidden name=action value=$nextsub>
+ <input type=hidden name=nextsub value=$nextsub>
+ <input type=hidden name=action value=$nextsub>
$jsscript
|;
# above action can be removed if there is more than one input field
+ my ($selection, $paymentaccounts);
if ($form->{report} =~ /(receipts|payments)$/) {
$form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
RP->paymentaccounts(\%myconfig, \%$form);
$selection = "<option>\n";
- foreach $ref (@{ $form->{PR} }) {
+ foreach my $ref (@{ $form->{PR} }) {
$paymentaccounts .= "$ref->{accno} ";
$selection .= "<option>$ref->{accno}--$ref->{description}\n";
}
print qq|
<input type=hidden name=nextsub value=list_payments>
<tr>
- <th align=right nowrap>| . $locale->text('Account') . qq|</th>
+ <th align=right nowrap>| . $locale->text('Account') . qq|</th>
<td colspan=3><select name=account>$selection</select>
- <input type=hidden name=paymentaccounts value="$paymentaccounts">
- </td>
- </tr>
+ <input type=hidden name=paymentaccounts value="$paymentaccounts">
+ </td>
+ </tr>
<tr>
- <th align=right>| . $locale->text('Reference') . qq|</th>
+ <th align=right>| . $locale->text('Reference') . qq|</th>
<td colspan=3><input name=reference></td>
- </tr>
+ </tr>
<tr>
- <th align=right nowrap>| . $locale->text('Source') . qq|</th>
+ <th align=right nowrap>| . $locale->text('Source') . qq|</th>
<td colspan=3><input name=source></td>
- </tr>
+ </tr>
<tr>
- <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
+ <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
<td colspan=3><input name=memo size=30></td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td>
+ </tr>
+ <tr>
+ <th align=right>| . $locale->text('From') . qq|</th>
+ <td>
$button1
$button1_2
</td>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td>
+ <th align=right>| . $locale->text('Bis') . qq|</th>
+ <td>
$button2
$button2_2
</td>
- </tr>
+ </tr>
<tr>
- <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
- <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
- </tr>
+ <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
+ <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
+ </tr>
$jsscript
- <input type=hidden name=db value=$form->{db}>
- <input type=hidden name=sort value=transdate>
+ <input type=hidden name=db value=$form->{db}>
+ <input type=hidden name=sort value=transdate>
|;
}
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub continue { call_sub($form->{"nextsub"}); }
+sub continue { call_sub($main::form->{"nextsub"}); }
sub get_project {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('report');
- $auth->assert('report');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
my $nextsub = shift;
$form->{project_id} = $form->{project_id_1};
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub generate_income_statement {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('report');
- $auth->assert('report');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
$form->{padding} = " ";
$form->{bold} = "<b>";
$form->{fromdate} = "1.2.$form->{year}";
#this works from 1901 to 2099, 1900 and 2100 fail.
- $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
$form->{todate} = "$leap.2.$form->{year}";
last SWITCH;
};
last SWITCH;
};
}
- }
+ hotfix_reformat_date();
+ } # Ende Bericht für vorgewählten Zeitraum (warum auch immer die Prüfung (custom eq true) ist ...
RP->income_statement(\%myconfig, \%$form);
$form->{todate} = $form->current_date(\%myconfig);
}
- $longtodate = $locale->date(\%myconfig, $form->{todate}, 1);
- $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
+ my $longtodate = $locale->date(\%myconfig, $form->{todate}, 1);
+ my $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0);
- $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
- $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
+ my $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
+ my $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
$form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
}
if ($form->{comparefromdate} || $form->{comparetodate}) {
- $longcomparefromdate =
- $locale->date(\%myconfig, $form->{comparefromdate}, 1);
- $shortcomparefromdate =
- $locale->date(\%myconfig, $form->{comparefromdate}, 0);
+ my $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1);
+ my $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0);
- $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
- $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
+ my $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
+ my $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
$form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
$form->{period} .=
}
# setup variables for the form
- @a = qw(company address businessnumber);
+ my @a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
$form->{templates} = $myconfig{templates};
$form->parse_template;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub generate_balance_sheet {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub;
+ $::auth->assert('report');
- $auth->assert('report');
+ $::form->{decimalplaces} = $::form->{decimalplaces} * 1 || 2;
+ $::form->{padding} = " ";
+ $::form->{bold} = "<b>";
+ $::form->{endbold} = "</b>";
+ $::form->{br} = "<br>";
- $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
- $form->{padding} = " ";
- $form->{bold} = "<b>";
- $form->{endbold} = "</b>";
- $form->{br} = "<br>";
+ my $data = RP->balance_sheet(\%::myconfig, $::form);
- my $data = RP->balance_sheet(\%myconfig, \%$form);
+ $::form->{asofdate} ||= $::form->current_date;
+ $::form->{period} = $::locale->date(\%::myconfig, $::form->current_date, 1);
- $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
- $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
-
- ($form->{department}) = split /--/, $form->{department};
+ ($::form->{department}) = split /--/, $::form->{department};
# define Current Earnings account
- $padding = ($form->{l_heading}) ? $form->{padding} : "";
- push(@{ $form->{equity_account} }, $padding . $locale->text('Current Earnings'));
+ my $padding = $::form->{l_heading} ? $::form->{padding} : "";
+ push @{ $::form->{equity_account} }, $padding . $::locale->text('Current Earnings');
- $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
- $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
+ $::form->{this_period} = $::locale->date(\%::myconfig, $::form->{asofdate}, 0);
+ $::form->{last_period} = $::locale->date(\%::myconfig, $::form->{compareasofdate}, 0);
- $form->{IN} = "balance_sheet.html";
+# $::form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
+ map { $::form->{$_} = $::myconfig{$_} } qw(company address businessnumber nativecurr);
- $form->{templates} = $myconfig{templates};
+ $::form->{templates} = $::myconfig{templates};
- $form->header();
- print $form->parse_html_template('rp/balance_sheet', $data);
-# $form->parse_template();
+ $::form->header;
+ print $::form->parse_html_template('rp/balance_sheet', $data);
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub generate_projects {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('report');
- $auth->assert('report');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- &get_project(generate_projects);
+ &get_project("generate_projects");
$form->{projectnumber} = $form->{projectnumber_1};
$form->{nextsub} = "generate_projects";
list_accounts('generate_projects');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
# Antonio Gallardo
# added headers and subtotals
#
sub generate_trial_balance {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('report');
+ $main::auth->assert('report');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
if ($form->{reporttype} eq "custom") {
$form->{fromdate} = "1.2.$form->{year}";
#this works from 1901 to 2099, 1900 and 2100 fail.
- $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
$form->{todate} = "$leap.2.$form->{year}";
last SWITCH;
};
last SWITCH;
};
}
+ hotfix_reformat_date();
}
RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1);
- $form->{rowcount} = scalar @{ $form->{TB} };
+ $form->{rowcount} = scalar @{ $form->{TB} || [] };
$form->{title} = sprintf($locale->text('Trial balance between %s and %s'), $form->{fromdate}, $form->{todate});
my @columns = (
'pdf_template' => 'rp/html_report_susa',
);
$report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
# add sort and escape callback, this one we use for the add sub
$form->{callback} = $href .= "&sort=$form->{sort}";
# escape callback for href
- $callback = $form->escape($href);
+ my $callback = $form->escape($href);
my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
my $edit_url = build_std_url('action=edit', 'type', 'vc');
- foreach $accno (@{ $form->{TB} }) {
+ my $idx;
+ foreach my $accno (@{ $form->{TB} || [] }) {
$accno->{soll} = $accno->{debit};
$accno->{haben} = $accno->{credit};
};
}
-
- $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
$row->{accno}->{link} = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($accno->{accno}), 'description=' . E($accno->{description}), 'fromdate=' . E($form->{fromdate}), 'todate=' . E($form->{todate}), 'method=' . E($form->{method}));
my $row_set = [ $row ];
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub create_subtotal_row {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
map { $totals->{$_} = 0 } @{ $subtotal_columns };
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}
sub create_list_accounts_subtotal_row {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($subtotals, $columns, $fields, $class) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $subtotals->{$_}, 2) } @{ $fields };
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}
sub list_accounts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($action) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
my @options;
if ($form->{department}) {
my ($department) = split /--/, $form->{department};
'std_column_visibility' => 1,
);
$report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
my %subtotals = map { $_ => 0 } @totals_columns;
my %totals = map { $_ => 0 } @totals_columns;
my $found_heading = 0;
- my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} };
+ my @tb = sort { $a->{accno} cmp $b->{accno} } @{ $form->{TB} || [] };
# sort the whole thing by account numbers and display
foreach my $idx (0 .. scalar(@tb) - 1) {
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub generate_ar_aging {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
# split customer
($form->{customer}) = split(/--/, $form->{customer});
RP->aging(\%myconfig, \%$form);
aging();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub generate_ap_aging {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger');
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
# split vendor
($form->{vendor}) = split(/--/, $form->{vendor});
RP->aging(\%myconfig, \%$form);
aging();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub create_aging_subtotal_row {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($subtotals, $columns, $periods, $class) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
foreach (@{ $periods }) {
$subtotals->{$_} = 0;
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $row;
}
sub aging {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
my $report = SL::ReportGenerator->new(\%myconfig, $form);
'invnumber' => { 'text' => $locale->text('Invoice'), },
'transdate' => { 'text' => $locale->text('Date'), },
'duedate' => { 'text' => $locale->text('Due'), },
- 'amount' => { 'text' => $locale->text('Amount'), },
- 'open' => { 'text' => $locale->text('Open'), },
+ 'amount' => { 'text' => $locale->text('Amount'), },
+ 'open' => { 'text' => $locale->text('Open'), },
);
my %column_alignment = ('statement' => 'center',
push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
}
- my $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
+ $attachment_basename = $form->{ct} eq 'customer' ? $locale->text('ar_aging_list') : $locale->text('ap_aging_list');
$report->set_options('top_info_text' => join("\n", @options),
'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
);
+ $report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
my $previous_ctid = 0;
my $row_idx = 0;
my %subtotals = map { $_ => 0 } @periods;
my %totals = map { $_ => 0 } @periods;
- foreach $ref (@{ $form->{AG} }) {
+ foreach my $ref (@{ $form->{AG} }) {
if ($row_idx && ($previous_ctid != $ref->{ctid})) {
$report->add_data(create_aging_subtotal_row(\%subtotals, \@columns, \@periods, 'listsubtotal'));
}
$report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
if ($form->{arap} eq 'ar') {
- $raw_top_info_text = $form->parse_html_template('rp/aging_ar_top');
- $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
+ my $raw_top_info_text = $form->parse_html_template('rp/aging_ar_top');
+ my $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
'PRINT_OPTIONS' => print_options(inline => 1), });
$report->set_options('raw_top_info_text' => $raw_top_info_text,
'raw_bottom_info_text' => $raw_bottom_info_text);
}
- $report->set_options_from_form();
-
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub select_all {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
RP->aging(\%myconfig, \%$form);
&aging;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub e_mail {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
# get name and email addresses
- for $i (1 .. $form->{rowcount}) {
+ my $selected = 0;
+ for my $i (1 .. $form->{rowcount}) {
if ($form->{"statement_$i"}) {
$form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
RP->get_customer(\%myconfig, \%$form);
$form->error($locale->text('Nothing selected!')) unless $selected;
+ my $bcc = '';
if ($myconfig{role} eq 'admin') {
$bcc = qq|
<th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
- <td><input name=bcc size=30 value="$form->{bcc}"></td>
+ <td><input name=bcc size=30 value="$form->{bcc}"></td>
|;
}
- $title = $locale->text('E-mail Statement to') . " $form->{$form->{ct}}";
+ my $title = $locale->text('E-mail Statement to') . " $form->{$form->{ct}}";
$form->{media} = "email";
<td>
<table width=100%>
<tr>
- <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
- <td><input name=email size=30 value="$form->{email}"></td>
- <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
- <td><input name=cc size=30 value="$form->{cc}"></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
- <td><input name=subject size=30 value="$form->{subject}"></td>
- $bcc
- </tr>
+ <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
+ <td><input name=email size=30 value="$form->{email}"></td>
+ <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
+ <td><input name=cc size=30 value="$form->{cc}"></td>
+ </tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
+ <td><input name=subject size=30 value="$form->{subject}"></td>
+ $bcc
+ </tr>
</table>
</td>
</tr>
<td>
<table width=100%>
<tr>
- <th align=left nowrap>| . $locale->text('Message') . qq|</th>
- </tr>
- <tr>
- <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
- </tr>
+ <th align=left nowrap>| . $locale->text('Message') . qq|</th>
+ </tr>
+ <tr>
+ <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
+ </tr>
</table>
</td>
</tr>
qw(action email cc bcc subject message type sendmode format header);
# save all other variables
- foreach $key (keys %$form) {
+ foreach my $key (keys %$form) {
next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
$form->{$key} =~ s/\"/"/g;
print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub send_email {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
$form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}");
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('general_ledger');
+ $main::auth->assert('general_ledger');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
if ($form->{media} eq 'printer') {
$form->error($locale->text('Select postscript or PDF!'))
if ($form->{format} !~ /(postscript|pdf)/);
}
- for $i (1 .. $form->{rowcount}) {
+ my $selected = 0;
+ for my $i (1 .. $form->{rowcount}) {
if ($form->{"statement_$i"}) {
$form->{"$form->{ct}_id"} = $form->{"$form->{ct}_id_$i"};
$selected = 1;
$form->redirect($locale->text('Statements sent to printer!'))
if ($form->{media} eq 'printer');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};
- $i = 0;
+ my $i = 0;
+ my $ctid;
while (@{ $form->{AG} }) {
- $ref = shift @{ $form->{AG} };
+ my $ref = shift @{ $form->{AG} };
if ($ctid != $ref->{ctid}) {
if ($form->{"statement_$i"}) {
- @a =
- (name, street, zipcode, city, country, contact, email,
+ my @a =
+ ("name", "street", "zipcode", "city", "country", "contact", "email",
"$form->{ct}phone", "$form->{ct}fax");
map { $form->{$_} = $ref->{$_} } @a;
map { $form->{$_} = () } qw(invnumber invdate duedate);
$form->{total} = 0;
- foreach $item (qw(c0 c30 c60 c90)) {
+ foreach my $item (qw(c0 c30 c60 c90)) {
$form->{$item} = ();
$form->{"${item}total"} = 0;
}
map {
$form->{"${_}total"} =
$form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
- } (c0, c30, c60, c90, "");
+ } ('c0', 'c30', 'c60', 'c90', "");
$form->{attachment_filename} = $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix");
$form->{attachment_filename} =~ s/\s+/_/g;
- $form->parse_template(\%myconfig, $userspath);
+ $form->parse_template(\%myconfig);
}
}
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
$form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
- $form->{addition} = "PRINTED";
- $form->{what_done} = $form->{type};
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "PRINTED";
+ $form->{what_done} = $form->{type};
+ $form->save_history;
}
# /saving the history
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub statement_details {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('general_ledger');
- $auth->assert('general_ledger');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
my ($ref) = @_;
push @{ $form->{invdate} }, $ref->{transdate};
push @{ $form->{duedate} }, $ref->{duedate};
- foreach $item (qw(c0 c30 c60 c90)) {
+ foreach my $item (qw(c0 c30 c60 c90)) {
if ($ref->{exchangerate} * 1) {
$ref->{$item} =
$form->round_amount($ref->{$item} / $ref->{exchangerate}, 2);
$form->format_amount(\%myconfig, $ref->{$item}, 2);
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub generate_tax_report {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('report');
+ $main::auth->assert('report');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
RP->tax_report(\%myconfig, \%$form);
- $descvar = "$form->{accno}_description";
- $description = $form->escape($form->{$descvar});
- $ratevar = "$form->{accno}_rate";
+ my $descvar = "$form->{accno}_description";
+ my $description = $form->escape($form->{$descvar});
+ my $ratevar = "$form->{accno}_rate";
+ my ($subtotalnetamount, $subtotaltax, $subtotal) = (0, 0, 0);
- $department = $form->escape($form->{department});
+ my $department = $form->escape($form->{department});
# construct href
- $href =
- "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+ my $href =
+ "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&report=$form->{report}";
# construct callback
$description = $form->escape($form->{$descvar}, 1);
$department = $form->escape($form->{department}, 1);
- $callback =
- "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+ my $callback =
+ "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&report=$form->{report}";
- $title = $form->escape($form->{title});
+ my $title = $form->escape($form->{title});
$href .= "&title=$title";
$title = $form->escape($form->{title}, 1);
$callback .= "&title=$title";
$form->{title} = qq|$form->{title} $form->{"$form->{accno}_description"} |;
- @columns =
+ my @columns =
$form->sort_columns(qw(id transdate invnumber name netamount tax amount));
+ my @column_index;
- foreach $item (@columns) {
+ foreach my $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
$href .= "&l_subtotal=Y";
}
+ my $option;
if ($form->{department}) {
($department) = split /--/, $form->{department};
$option = $locale->text('Department') . " : $department";
}
+ my ($fromdate, $todate);
# if there are any dates
if ($form->{fromdate} || $form->{todate}) {
if ($form->{fromdate}) {
$locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
}
+ my ($name, $invoice, $arap);
if ($form->{db} eq 'ar') {
$name = $locale->text('Customer');
$invoice = 'is.pl';
$option .= "<br>" if $option;
$option .= "$form->{period}";
+ my %column_header;
$column_header{id} = qq|<th><a class=listheading href=$href&sort=id>| . $locale->text('ID') . qq|</th>|;
$column_header{invnumber} = qq|<th><a class=listheading href=$href&sort=invnumber>| . $locale->text('Invoice') . qq|</th>|;
$column_header{transdate} = qq|<th><a class=listheading href=$href&sort=transdate>| . $locale->text('Date') . qq|</th>|;
<table width=100%>
<tr>
- <th class=listtop colspan=$colspan>$form->{title}</th>
+ <th class=listtop>$form->{title}</th>
</tr>
<tr height="5"></tr>
<tr>
<tr>
<td>
<table width=100%>
- <tr class=listheading>
+ <tr class=listheading>
|;
map { print "$column_header{$_}\n" } @column_index;
print qq|
- </tr>
+ </tr>
|;
# add sort and escape callback
$callback = $form->escape($callback . "&sort=$form->{sort}");
+ my $sameitem;
if (@{ $form->{TR} }) {
$sameitem = $form->{TR}->[0]->{ $form->{sort} };
}
- foreach $ref (@{ $form->{TR} }) {
+ my ($totalnetamount, $totaltax);
+ my ($i);
+ foreach my $ref (@{ $form->{TR} }) {
- $module = ($ref->{invoice}) ? $invoice : $arap;
+ my $module = ($ref->{invoice}) ? $invoice : $arap;
if ($form->{l_subtotal} eq 'Y') {
if ($sameitem ne $ref->{ $form->{sort} }) {
- &tax_subtotal;
+ tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
$sameitem = $ref->{ $form->{sort} };
}
}
$ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, " ");
} qw(netamount tax amount);
+ my %column_data;
$column_data{id} = qq|<td>$ref->{id}</td>|;
$column_data{invnumber} =
qq|<td><a href=$module?action=edit&id=$ref->{id}&callback=$callback>$ref->{invnumber}</a></td>|;
$i++;
$i %= 2;
print qq|
- <tr class=listrow$i>
+ <tr class=listrow$i>
|;
map { print "$column_data{$_}\n" } @column_index;
print qq|
- </tr>
+ </tr>
|;
}
if ($form->{l_subtotal} eq 'Y') {
- &tax_subtotal;
+ tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
}
+ my %column_data;
map { $column_data{$_} = qq|<th> </th>| } @column_index;
print qq|
</tr>
- <tr class=listtotal>
+ <tr class=listtotal>
|;
- $total =
- $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, " ");
- $totalnetamount =
- $form->format_amount(\%myconfig, $totalnetamount, 2, " ");
- $totaltax = $form->format_amount(\%myconfig, $totaltax, 2, " ");
+ my $total = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, " ");
+ $totalnetamount = $form->format_amount(\%myconfig, $totalnetamount, 2, " ");
+ $totaltax = $form->format_amount(\%myconfig, $totaltax, 2, " ");
- $column_data{netamount} =
- qq|<th class=listtotal align=right>$totalnetamount</th>|;
+ $column_data{netamount} = qq|<th class=listtotal align=right>$totalnetamount</th>|;
$column_data{tax} = qq|<th class=listtotal align=right>$totaltax</th>|;
$column_data{amount} = qq|<th class=listtotal align=right>$total</th>|;
</html>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub tax_subtotal {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my ($column_index, $subtotalnetamount, $subtotaltax, $subtotal) = @_;
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
- map { $column_data{$_} = "<td> </td>" } @column_index;
+ my %column_data;
+ map { $column_data{$_} = "<td> </td>" } @{ $column_index };
- $subtotalnetamount =
- $form->format_amount(\%myconfig, $subtotalnetamount, 2, " ");
- $subtotaltax = $form->format_amount(\%myconfig, $subtotaltax, 2, " ");
- $subtotal =
- $form->format_amount(\%myconfig, $subtotalnetamount + $subtotaltax,
- 2, " ");
+ $$subtotalnetamount = $form->format_amount(\%myconfig, $$subtotalnetamount, 2, " ");
+ $$subtotaltax = $form->format_amount(\%myconfig, $$subtotaltax, 2, " ");
+ $$subtotal = $form->format_amount(\%myconfig, $$subtotalnetamount + $$subtotaltax, 2, " ");
- $column_data{netamount} =
- "<th class=listsubtotal align=right>$subtotalnetamount</th>";
- $column_data{tax} = "<th class=listsubtotal align=right>$subtotaltax</th>";
- $column_data{amount} = "<th class=listsubtotal align=right>$subtotal</th>";
+ $column_data{netamount} = "<th class=listsubtotal align=right>$$subtotalnetamount</th>";
+ $column_data{tax} = "<th class=listsubtotal align=right>$$subtotaltax</th>";
+ $column_data{amount} = "<th class=listsubtotal align=right>$$subtotal</th>";
- $subtotalnetamount = 0;
- $subtotaltax = 0;
+ $$subtotalnetamount = 0;
+ $$subtotaltax = 0;
print qq|
- <tr class=listsubtotal>
+ <tr class=listsubtotal>
|;
- map { print "\n$column_data{$_}" } @column_index;
+ map { print "\n$column_data{$_}" } @{ $column_index };
print qq|
</tr>
|;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub list_payments {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
- $auth->assert('cash');
+ $main::auth->assert('cash');
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
if ($form->{account}) {
($form->{paymentaccounts}) = split /--/, $form->{account};
}
+
+ my $option;
if ($form->{department}) {
- ($department, $form->{department_id}) = split /--/, $form->{department};
+ (my $department, $form->{department_id}) = split /--/, $form->{department};
$option = $locale->text('Department') . " : $department";
}
);
$report->set_options_from_form();
+ $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
+
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub print_options {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($dont_print) = @_;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
$form->{sendmode} = "attachment";
$form->{"format"} =
$form->{OP}{ $form->{media} } = "selected";
$form->{SM}{ $form->{sendmode} } = "selected";
- $type = qq|
- <option value=statement $form->{PD}{statement}>|
- . $locale->text('Statement');
+ my ($media);
+ my $type = qq|
+ <option value=statement $form->{PD}{statement}>| . $locale->text('Statement');
if ($form->{media} eq 'email') {
$media = qq|
- <option value=attachment $form->{SM}{attachment}>|
- . $locale->text('Attachment') . qq|
- <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+ <option value=attachment $form->{SM}{attachment}>| . $locale->text('Attachment') . qq|
+ <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
} else {
$media = qq|
- <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex_templates) {
+ <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
+ if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex}) {
$media .= qq|
- <option value=printer $form->{OP}{printer}>|
- . $locale->text('Printer');
+ <option value=printer $form->{OP}{printer}>| . $locale->text('Printer');
}
}
- if ($latex_templates) {
+ my $format;
+ if ($::lx_office_conf{print_templates}->{latex}) {
$format .= qq|
<option value=html $form->{DF}{html}>| . $locale->text('HTML')
. qq| <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF')
<td><select name=media>$media</select></td>
|;
- if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
+ if ($myconfig{printer} && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email') {
$output .= qq|
<td>| . $locale->text('Copies') . qq|
<input name=copies size=2 value=$form->{copies}></td>
print $output unless $dont_print;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $output;
}
sub generate_bwa {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ $main::auth->assert('report');
- $auth->assert('report');
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
$form->{padding} = " ";
$form->{bold} = "<b>";
$form->{fromdate} = "1.2.$form->{year}";
#this works from 1901 to 2099, 1900 and 2100 fail.
- $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
$form->{todate} = "$leap.2.$form->{year}";
$form->{comparefromdate} = "1.01.$form->{year}";
$form->{comparetodate} = "$leap.02.$form->{year}";
last SWITCH;
};
}
+ hotfix_reformat_date();
} else {
- ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{fromdate});
- $form->{fromdate} = "${dd}.${mm}.${yy}";
- ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{todate});
- $form->{todate} = "${dd}.${mm}.${yy}";
- $form->{comparefromdate} = "01.01.$yy";
- $form->{comparetodate} = $form->{todate};
+ # die konvertierungen nur dann durchführen, wenn auch daten gesetzt sind.
+ # ansonsten ist die prüfung in RP.pm
+ # if (defined ($form->{fromdate|todate}=='..'))
+ # immer wahr
+ if ($form->{fromdate}){
+ my ($yy, $mm, $dd) = $locale->parse_date(\%myconfig, $form->{fromdate});
+ my $datetime = $locale->parse_date_to_object(\%myconfig, $form->{fromdate});
+ $datetime->set( month => 1,
+ day => 1);
+ $form->{comparefromdate} = $locale->format_date(\%::myconfig, $datetime);
+ }
+ if ($form->{todate}){
+ $form->{comparetodate} = $form->{todate};
+ }
}
RP->bwa(\%myconfig, \%$form);
my %germandate = ("dateformat" => "dd.mm.yyyy");
- $longtodate = $locale->date(\%germandate, $form->{todate}, 1);
- $shorttodate = $locale->date(\%germandate, $form->{todate}, 0);
+ my $longtodate = $locale->date(\%germandate, $form->{todate}, 1);
+ my $shorttodate = $locale->date(\%germandate, $form->{todate}, 0);
- $longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1);
- $shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0);
+ my $longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1);
+ my $shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0);
$form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
}
# setup variables for the form
- @a = qw(company address businessnumber);
+ my @a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
$form->{templates} = $myconfig{templates};
$form->parse_template;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
+###
+# Hotfix, um das Datumsformat, die unten hart auf deutsches Datumsformat eingestellt
+# sind, entsprechend mit anderem Formaten (z.B. iso-kodiert) zum Laufen zu bringen (S.a.: Bug 1388)
+sub hotfix_reformat_date {
+
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ if ($myconfig{dateformat} ne 'dd.mm.yyyy'){
+ my $current_dateformat = $myconfig{dateformat};
+ $myconfig{dateformat} = 'dd.mm.yyyy';
+ $form->{fromdate} = $main::locale->reformat_date(\%myconfig, $form->{fromdate}, $current_dateformat);
+ $form->{todate} = $main::locale->reformat_date(\%myconfig, $form->{todate}, $current_dateformat);
+ $form->{comparefromdate} = $main::locale->reformat_date(\%myconfig, $form->{comparefromdate}, $current_dateformat)
+ unless (!defined ($form->{comparefromdate}));
+ $form->{comparetodate} = $main::locale->reformat_date(\%myconfig, $form->{comparetodate}, $current_dateformat)
+ unless (!defined ($form->{comparetodate}));
+
+ # Und wieder zurücksetzen
+ $myconfig{dateformat} = $current_dateformat; #'dd.mm.yyyy';
+ } # Ende Hotifx Bug 1388
+
+ $main::lxdebug->leave_sub();
+
+}
+1;
projects / kivitendo-erp.git / blobdiff