use SL::RP;
use SL::Iconv;
use SL::ReportGenerator;
+use Data::Dumper;
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
# $locale->text('Non-taxable Sales')
# $locale->text('Non-taxable Purchases')
+# $form->parse_html_template('rp/html_report_susa')
+
+my $rp_access_map = {
+ 'projects' => 'report',
+ 'ar_aging' => 'general_ledger',
+ 'ap_aging' => 'general_ledger',
+ 'receipts' => 'cash',
+ 'payments' => 'cash',
+ 'trial_balance' => 'report',
+ 'income_statement' => 'report',
+ 'bwa' => 'report',
+ 'balance_sheet' => 'report',
+};
+
+sub check_rp_access {
+ my $right = $rp_access_map->{$form->{report}};
+ $right ||= 'DOES_NOT_EXIST';
+
+ $auth->assert($right);
+}
+
sub report {
$lxdebug->enter_sub();
+ check_rp_access();
+
%title = ('balance_sheet' => 'Balance Sheet',
'income_statement' => 'Income Statement',
'trial_balance' => 'Trial Balance',
$form->all_departments(\%myconfig);
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|
$value_2 = "";
$trigger_2 = "trigger2";
} elsif (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
- $name_1 = "";
- $id_1 = "";
- $value_1 = "";
- $trigger_1 = "";
+ $name_1 = "fromdate";
+ $id_1 = "fromdate";
+ $value_1 = "$form->{fromdate}";
+ $trigger_1 = "trigger1";
$name_2 = "todate";
$id_2 = "todate";
$value_2 = "";
# with JavaScript Calendar
if ($form->{jsscript}) {
if ($name_1 eq "") {
-
- $button1 = qq|
- <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
- $button1_2 = qq|
- <input type=button name=$name_2 id="$trigger_2" value=|
- . $locale->text('button') . qq|>|;
+ $button1 = qq| <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button1_2 = qq| <input type=button name=$name_2 id="$trigger_2" value=| . $locale->text('button') . qq|>|;
#write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
+ $jsscript = Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
} else {
- $button1 = qq|
- <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value="$value_1" onBlur=\"check_right_date_format(this)\">|;
- $button1_2 = qq|
- <input type=button name=$name_1 id="$trigger_1" value=|
- . $locale->text('button') . qq|>|;
- $button2 = qq|
- <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
- $button2_2 = qq|
- <input type=button name=$name_2 id="$trigger_2" value=|
- . $locale->text('button') . qq|>
- |;
+ $button1 = qq| <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value="$value_1" onBlur=\"check_right_date_format(this)\">|;
+ $button1_2 = qq| <input type=button name=$name_1 id="$trigger_1" value=| . $locale->text('button') . qq|>|;
+ $button2 = qq| <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button2_2 = qq| <input type=button name=$name_2 id="$trigger_2" value=| . $locale->text('button') . qq|> |;
#write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1",
- "$name_2", "BL", "$trigger_2");
+ $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|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button1 = qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
} else {
- $button1 =
- qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1 onBlur=\"check_right_date_format(this)\">|;
- $button2 =
- qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
+ $button1 = qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1 onBlur=\"check_right_date_format(this)\">|;
+ $button2 = qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
}
}
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
<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>
+ <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
</table>
<table>
<tr>
- <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
- . $locale->text('Customized Report') . qq|</th>
+ <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>
+ <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>
+ <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 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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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
$button1_2
</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>
+ <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
</table>
<table>
<tr>
- <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
- . $locale->text('Customized Report') . qq|</th>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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
$button1_2
</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>
+ <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>
+ <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
<td><input name=decimalplaces size=3 value="2"></td>
</tr>
-
+
$jsscript
|;
}
<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>
+ <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>
+ <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>
<input type=hidden name=nextsub value=generate_trial_balance>
- <input type=hidden name=eur value=$eur>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td>
- $button1
- $button1_2
- </td>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td>
- $button2
- $button2_2
+</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>
+|;
+
+ 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>
+|;
+ $checked = "checked";
+ print qq|
+ <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>
+ <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
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
</td>
+ </tr>
+ <tr>
+ <td colspan=5><hr size=3 noshade></td>
</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|
- <input name=all_accounts class=checkbox type=checkbox value=Y> |
- . $locale->text('All Accounts') . qq|</td>
+ <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>
+ </tr>
+ <tr>
+ <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
+ <td><input name=decimalplaces size=3 value="2"></td>
+ </tr>
$jsscript
|;
</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>
+ <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>
<td>$vc</td>
</tr>
<tr>
- <th align=right>| . $locale->text('Bis') . qq|</th>
- <td>
- $button1
- $button1_2
+ <td align=left colspan=4>| . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
</td>
</tr>
<input type=hidden name=type value=statement>
</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>
+ <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
</tr>
$jsscript
</table>
<br>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=submit class=submit name=action value="|
- . $locale->text('Continue') . qq|">
+<input type=submit class=submit name=action value="| . $locale->text('Continue') . qq|">
</form>
sub get_project {
$lxdebug->enter_sub();
+
+ $auth->assert('report');
+
my $nextsub = shift;
$form->{project_id} = $form->{project_id_1};
$form->{projectnumber_1} = $form->{projectnumber};
delete $form->{sort};
- &check_project;
+ check_project('generate_projects');
# if there is one only, assign id
$form->{project_id} = $form->{project_id_1};
sub generate_income_statement {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
$form->{padding} = " ";
$form->{bold} = "<b>";
$form->{endbold} = "</b>";
sub generate_balance_sheet {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
+ $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
$form->{padding} = " ";
$form->{bold} = "<b>";
$form->{endbold} = "</b>";
$form->{br} = "<br>";
- RP->balance_sheet(\%myconfig, \%$form);
+ my $data = RP->balance_sheet(\%myconfig, \%$form);
$form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
- $form->{period} =
- $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+ $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
($form->{department}) = split /--/, $form->{department};
# define Current Earnings account
$padding = ($form->{l_heading}) ? $form->{padding} : "";
- push(@{ $form->{equity_account} },
- $padding . $locale->text('Current Earnings'));
+ 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->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
$form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_};
- $form->{$_} =~ s/\\n/\n/g; }
- (qw(company address businessnumber nativecurr));
+ map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
$form->{templates} = $myconfig{templates};
- $form->parse_template;
+ $form->header();
+ print $form->parse_html_template('rp/balance_sheet', $data);
+# $form->parse_template();
$lxdebug->leave_sub();
}
sub generate_projects {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
&get_project(generate_projects);
$form->{projectnumber} = $form->{projectnumber_1};
sub generate_trial_balance {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
+ 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;
+ };
+ }
+ }
+
+
# get for each account initial balance, debits and credits
- RP->trial_balance(\%myconfig, \%$form);
+ RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1);
+
+
+ $form->{rowcount} = scalar @{ $form->{TB} };
+ $form->{title} = sprintf($locale->text('Trial balance between %s and %s'), $form->{fromdate}, $form->{todate});
+
+ my @columns = (
+ "accno", "description",
+ "last_transaction", "soll_eb",
+ "haben_eb",
+ "soll", "haben",
+ "soll_kumuliert", "haben_kumuliert",
+ "soll_saldo", "haben_saldo"
+ );
+
+
+ my $attachment_basename = $locale->text('trial_balance');
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+ my @hidden_variables = qw(fromdate todate year cash);
+
+ my $href = build_std_url('action=generate_trial_balance', grep { $form->{$_} } @hidden_variables);
+
+ my %column_defs = (
+ 'accno' => { 'text' => $locale->text('Account'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'last_transaction' => { 'text' => $locale->text('Last Transaction'), },
+ 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), },
+ 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), },
+ 'soll' => { 'text' => $locale->text('Debit'), },
+ 'haben' => { 'text' => $locale->text('Credit'), },
+ 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), },
+ 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), },
+ 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), },
+ 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
+ );
+
+
+
+ my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
- $form->{nextsub} = "generate_trial_balance";
- $form->{title} = $locale->text('Trial Balance');
- list_accounts('generate_trial_balance');
+ map { $column_defs{$_}->{visible} = 1 } @columns;
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+
+ $report->set_export_options('generate_trial_balance', @hidden_variables);
+
+ my @options;
+
+
+ $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $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});
+
+
+ $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $report->set_options('output_format' => 'HTML',
+ 'top_info_text' => join("\n", @options),
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ 'html_template' => 'rp/html_report_susa',
+ 'pdf_template' => 'rp/html_report_susa',
+ );
+ $report->set_options_from_form();
+
+ # 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 @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my %totals = map { $_ => 0 } @subtotal_columns;
+
+ my $edit_url = build_std_url('action=edit', 'type', 'vc');
+
+ foreach $accno (@{ $form->{TB} }) {
+
+ $accno->{soll} = $accno->{debit};
+ $accno->{haben} = $accno->{credit};
+ map { $totals{$_} += $accno->{$_} } @subtotal_columns;
+
+ map { $accno->{$_} = $accno->{$_} == 0 ? '' : $form->format_amount(\%myconfig, $accno->{$_}, 2) }
+ qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my $row = { };
+
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $accno->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
+
+
+ $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->add_data($row_set);
+
+ $idx++;
+ }
+
+ $report->add_separator();
+
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+ $report->generate_with_headers();
+
+ $lxdebug->leave_sub();
+
+}
+
+sub create_subtotal_row {
+ $lxdebug->enter_sub();
+
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
+
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
$lxdebug->leave_sub();
+
+ return $row;
}
sub create_list_accounts_subtotal_row {
$report->set_export_options($action, @hidden_variables);
- $report->set_sort_indicator('accno', 1);
-
my @totals_columns = qw(credit debit begbalance endbalance);
my %subtotals = map { $_ => 0 } @totals_columns;
my %totals = map { $_ => 0 } @totals_columns;
sub generate_ar_aging {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
# split customer
($form->{customer}) = split(/--/, $form->{customer});
sub generate_ap_aging {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
# split vendor
($form->{vendor}) = split(/--/, $form->{vendor});
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
foreach (@{ $periods }) {
- $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+ $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
$subtotals->{$_} = 0;
}
sub aging {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
my $report = SL::ReportGenerator->new(\%myconfig, $form);
- my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90);
+ my @columns = qw(statement ct invnumber transdate duedate amount open);
my %column_defs = (
'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, },
'invnumber' => { 'text' => $locale->text('Invoice'), },
'transdate' => { 'text' => $locale->text('Date'), },
'duedate' => { 'text' => $locale->text('Due'), },
- 'c0' => { 'text' => $locale->text('Current'), },
- 'c30' => { 'text' => '30', },
- 'c60' => { 'text' => '60', },
- 'c90' => { 'text' => '90', },
+ 'amount' => { 'text' => $locale->text('Amount'), },
+ 'open' => { 'text' => $locale->text('Open'), },
);
my %column_alignment = ('statement' => 'center',
- map { $_ => 'right' } qw(c0 c30 c60 c90));
+ map { $_ => 'right' } qw(open amount));
$report->set_options('std_column_visibility' => 1);
$report->set_columns(%column_defs);
$report->set_export_options('generate_' . ($form->{arap} eq 'ar' ? 'ar' : 'ap') . '_aging', @hidden_variables);
my @options;
+ my $attachment_basename;
if ($form->{department}) {
my ($department) = split /--/, $form->{department};
if (($form->{arap} eq 'ar') && $form->{customer}) {
push @options, $form->{customer};
+ $attachment_basename = $locale->text('ar_aging_list');
+ $form->{title} = sprintf($locale->text('Ar aging on %s'), $form->{todate});
}
if (($form->{arap} eq 'ap') && $form->{vendor}) {
push @options, $form->{vendor};
+ $attachment_basename = $locale->text('ap_aging_list');
+ $form->{title} = sprintf($locale->text('Ap aging on %s'), $form->{todate});
}
- push @options, $locale->text('for Period') . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ if ($form->{fromdate}) {
+ push @options, $locale->text('for Period') . " " . $locale->text('From') . " " .$locale->date(\%myconfig, $form->{fromdate}, 1) . " " . $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ } else {
+ 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');
my $previous_ctid = 0;
my $row_idx = 0;
- my @periods = qw(0 30 60 90);
+ my @periods = qw(open amount);
my %subtotals = map { $_ => 0 } @periods;
my %totals = map { $_ => 0 } @periods;
}
foreach my $key (@periods) {
- $subtotals{$key} += $ref->{"c${key}"};
- $totals{$key} += $ref->{"c${key}"};
- $ref->{"c${key}"} = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : '';
+ $subtotals{$key} += $ref->{"$key"};
+ $totals{$key} += $ref->{"$key"};
+ $ref->{"$key"} = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : '';
}
my $row = { };
if ($previous_ctid != $ref->{ctid}) {
$row->{statement}->{raw_data} =
- $cgi->hidden('-name' => "customer_id_${row_idx}", '-value' => $ref->{ctid})
- . $cgi->checkbox('-name' => "statement_${row_idx}", '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
+ $cgi->hidden('-name' => "customer_id_" . ($row_idx + 1), '-value' => $ref->{ctid})
+ . $cgi->checkbox('-name' => "statement_" . ($row_idx + 1), '-value' => 1, '-label' => '', 'checked' => $ref->{checked});
$row->{ct}->{data} = $ref->{name};
$row_idx++;
$report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
if ($form->{arap} eq 'ar') {
- $raw_top_info_text = $form->parse_html_template2('rp/aging_ar_top');
- $raw_bottom_info_text = $form->parse_html_template2('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
- 'PRINT_OPTIONS' => print_options(inline => 1), });
+ $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,
+ '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);
}
sub e_mail {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
# get name and email addresses
for $i (1 .. $form->{rowcount}) {
if ($form->{"statement_$i"}) {
# save all other variables
foreach $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|;
}
sub send_email {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
sub print {
$lxdebug->enter_sub();
+ $auth->assert('general_ledger');
+
if ($form->{media} eq 'printer') {
$form->error($locale->text('Select postscript or PDF!'))
if ($form->{format} !~ /(postscript|pdf)/);
sub print_form {
$lxdebug->enter_sub();
- my %replacements =
- (
- "ä" => "ae", "ö" => "oe", "ü" => "ue",
- "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
- "ß" => "ss",
- " " => "_"
- );
-
- foreach my $key (keys %replacements) {
- my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
- $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
- }
+ $auth->assert('general_ledger');
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
}
$form->{IN} = "$form->{type}.$suffix";
- $form->{OUT} =
- $form->{media} eq 'email' ? $sendmail :
- $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
+ $form->{OUT} = $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};
$form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
} (c0, c30, c60, c90, "");
- $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
- map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+ $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->{what_done} = $form->{type};
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
$lxdebug->leave_sub();
}
sub statement_details {
$lxdebug->enter_sub();
+
+ $auth->assert('general_ledger');
+
my ($ref) = @_;
push @{ $form->{invnumber} }, $ref->{invnumber};
sub generate_tax_report {
$lxdebug->enter_sub();
+ $auth->assert('report');
+
RP->tax_report(\%myconfig, \%$form);
$descvar = "$form->{accno}_description";
# construct href
$href =
- "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+ "$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}";
# construct callback
$description = $form->escape($form->{$descvar}, 1);
$department = $form->escape($form->{department}, 1);
$callback =
- "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+ "$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}";
$title = $form->escape($form->{title});
$href .= "&title=$title";
$option .= "<br>" if $option;
$option .= "$form->{period}";
- $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>|;
- $column_header{netamount} =
- qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
- $column_header{tax} =
- qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
- $column_header{amount} =
- qq|<th class=listheading>| . $locale->text('Total') . qq|</th>|;
-
- $column_header{name} =
- qq|<th><a class=listheading href=$href&sort=name>$name</th>|;
+ $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>|;
+ $column_header{netamount} = qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
+ $column_header{tax} = qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
+ $column_header{amount} = qq|<th class=listheading>| . $locale->text('Total') . qq|</th>|;
+
+ $column_header{name} = qq|<th><a class=listheading href=$href&sort=name>$name</th>|;
$form->header;
$column_data{id} = qq|<td>$ref->{id}</td>|;
$column_data{invnumber} =
- qq|<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
+ qq|<td><a href=$module?action=edit&id=$ref->{id}&callback=$callback>$ref->{invnumber}</a></td>|;
$column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
$column_data{name} = qq|<td>$ref->{name} </td>|;
sub list_payments {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
if ($form->{account}) {
($form->{paymentaccounts}) = split /--/, $form->{account};
}
$option = $locale->text('Department') . " : $department";
}
+ report_generator_set_default_sort('transdate', 1);
+
RP->payments(\%myconfig, \%$form);
my @hidden_variables = qw(account title department reference source memo fromdate todate
);
my %column_alignment = ('paid' => 'right');
- map { $column_defs{$_}->{link} = $href . "&sort=$_" } grep { $_ ne 'paid' } @columns;
+ foreach my $name (grep { $_ ne 'paid' } @columns) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=${name}&sortdir=$sortdir";
+ }
my @options;
if ($form->{fromdate}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{fromdate}, 1);
}
if ($form->{todate}) {
- push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
+ push @options, $locale->text('bis') . " " . $locale->date(\%myconfig, $form->{todate}, 1);
}
my $report = SL::ReportGenerator->new(\%myconfig, $form);
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('list_payments', @hidden_variables);
+ $report->set_export_options('list_payments', @hidden_variables, qw(sort sortdir));
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
my $total_paid = 0;
sub generate_bwa {
$lxdebug->enter_sub();
+
+ $auth->assert('report');
+
$form->{padding} = " ";
$form->{bold} = "<b>";
$form->{endbold} = "</b>";
projects / kivitendo-erp.git / blobdiff