# end of main
sub reconciliation {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('cash');
-
- RC->paymentaccounts(\%myconfig, \%$form);
-
- my $selection = "";
- map { $selection .= "<option>$_->{accno}--$_->{description}\n" }
- @{ $form->{PR} };
-
- $form->{title} = $locale->text('Reconciliation');
- $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
- $form->{"jsscript"} = 1;
- $form->header;
- my $onload = qq|focus()|;
- $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
-
- print qq|
-<body onLoad="$onload">
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Account') . qq|</th>
- <td colspan=3><select name=accno>$selection</select>
- </td>
- </tr>
- <tr>
- <th align=right>| . $locale->text('From') . qq|</th>
- <td><input name=fromdate id=fromdate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
- <input type="button" name="fromdate" id="trigger_fromdate" value="?"></td>
- <th align=right>| . $locale->text('Until') . qq|</th>
- <td><input name=todate id=todate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
- <input type="button" name="todate" id="trigger_todate" value="?"></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-| . $form->write_trigger(\%myconfig, 2,
- "fromdate", "BL", "trigger_fromdate",
- "todate", "BL", "trigger_todate") . qq|
-
-<br>
-<input type=hidden name=nextsub value=get_payments>
-
-<input type=submit class=submit name=action value="|
- . $locale->text('Continue') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
- $main::lxdebug->leave_sub();
-}
+ $::lxdebug->enter_sub;
+ $::auth->assert('cash');
-sub continue { call_sub($main::form->{"nextsub"}); }
+ RC->paymentaccounts(\%::myconfig, $::form);
-sub get_payments {
- $main::lxdebug->enter_sub();
+ $::form->header;
+ print $::form->parse_html_template('rc/step1', {
+ selection_sub => sub { ("$_[0]{accno}--$_[0]{description}")x2 },
+ });
- my $form = $main::form;
- my %myconfig = %main::myconfig;
+ $::lxdebug->leave_sub;
+}
- $main::auth->assert('cash');
+sub continue { call_sub($::form->{"nextsub"}); }
- ($form->{accno}, $form->{account}) = split /--/, $form->{accno};
+sub get_payments {
+ $::lxdebug->enter_sub;
+ $::auth->assert('cash');
- RC->payment_transactions(\%myconfig, \%$form);
+ ($::form->{accno}, $::form->{account}) = split /--/, $::form->{accno};
- &display_form;
+ RC->payment_transactions(\%::myconfig, $::form);
- $main::lxdebug->leave_sub();
+ display_form();
+
+ $::lxdebug->leave_sub;
}
sub display_form {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('cash');
-
- my @column_index = qw(cleared transdate source name credit debit balance);
- my %column_header;
- $column_header{cleared} = "<th> </th>";
- $column_header{source} =
- "<th class=listheading>" . $locale->text('Source') . "</a></th>";
- $column_header{name} =
- "<th class=listheading>" . $locale->text('Description') . "</a></th>";
- $column_header{transdate} =
- "<th class=listheading>" . $locale->text('Date') . "</a></th>";
-
- if ($form->{category} eq 'A') {
- $column_header{debit} =
- "<th class=listheading>" . $locale->text('Deposit') . "</a></th>";
- $column_header{credit} =
- "<th class=listheading>" . $locale->text('Payment') . "</a></th>";
- } else {
- $column_header{debit} =
- "<th class=listheading>" . $locale->text('Decrease') . "</a></th>";
- $column_header{credit} =
- "<th class=listheading>" . $locale->text('Increase') . "</a></th>";
- }
-
- $column_header{balance} =
- "<th class=listheading>" . $locale->text('Balance') . "</a></th>";
-
- my $option;
- if ($form->{fromdate}) {
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('From') . " "
- . $locale->date(\%myconfig, $form->{fromdate}, 0);
- }
- if ($form->{todate}) {
- $option .= "\n<br>" if ($option);
- $option .=
- $locale->text('Until') . " "
- . $locale->date(\%myconfig, $form->{todate}, 0);
- }
-
- $form->{title} = "$form->{accno}--$form->{account}";
-
- $form->header;
-
- print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>$option</td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr class=listheading>
-|;
-
- map { print "\n$column_header{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- my $ml = ($form->{category} eq 'A') ? -1 : 1;
- $form->{beginningbalance} *= $ml;
- my $balance = $form->{beginningbalance};
- my $clearedbalance = $balance;
- my $i = 0;
- my $id = 0;
-
- my %column_data;
- map { $column_data{$_} = "<td> </td>" }
- qw(cleared transdate source name debit credit);
- $column_data{balance} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $balance, 2, 0) . "</td>";
- my $j = 0;
- print qq|
- <tr class=listrow$j>
-|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- my $cleared;
- my $totaldebits;
- my $totalcredits;
- my $fx_transaction;
- my $fx;
- foreach my $ref (@{ $form->{PR} }) {
-
- $balance += $ref->{amount} * $ml;
- $cleared += $ref->{amount} * $ml if $ref->{cleared};
-
- $column_data{name} = "<td>$ref->{name} </td>";
- $column_data{source} = qq|<td>$ref->{source} </a>
- </td>|;
- $column_data{transdate} = "<td>$ref->{transdate} </td>";
-
- $column_data{debit} = "<td> </td>";
- $column_data{credit} = "<td> </td>";
-
- if ($ref->{amount} < 0) {
- $totaldebits += $ref->{amount} * -1;
- $column_data{debit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ref->{amount} * -1, 2, " ")
- . "</td>";
- } else {
- $totalcredits += $ref->{amount};
- $column_data{credit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ref->{amount}, 2, " ")
- . "</td>";
- }
-
- $column_data{balance} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $balance, 2, 0) . "</td>";
-
- if ($ref->{fx_transaction}) {
- $i++ unless $id == $ref->{id};
- $fx_transaction = 1;
- $fx += $ref->{amount} * $ml;
- $column_data{cleared} = qq|<td align=center>
- <input type=hidden name="fxoid_$i" value=$ref->{oid}>
- </td>|;
- } else {
- $i++ unless ($fx_transaction && $id == $ref->{id});
- $fx_transaction = 0;
- $column_data{cleared} = qq|<td>
- <input name="cleared_$i" type=checkbox class=checkbox value=1 $ref->{cleared}>
- <input type=hidden name="oid_$i" value=$ref->{oid}>
- </td>|;
- }
- $id = $ref->{id};
-
- $j++;
- $j %= 2;
- print qq|
- <tr class=listrow$j>
-|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- print qq|
- </tr>
-|;
-
- }
-
- # print totals
- map { $column_data{$_} = "<td> </td>" } @column_index;
-
- $column_data{debit} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totaldebits, 2, " ") . "</th>";
- $column_data{credit} =
- "<th class=listtotal align=right>"
- . $form->format_amount(\%myconfig, $totalcredits, 2, " ") . "</th>";
-
- print qq|
- <tr class=listtotal>
-|;
-
- map { print "\n$column_data{$_}" } @column_index;
-
- $form->{statementbalance} =
- $form->parse_amount(\%myconfig, $form->{statementbalance});
- my $difference =
- $form->format_amount(\%myconfig,
- $form->{statementbalance} - $clearedbalance - $cleared,
- 2, 0);
-
- $form->{statementbalance} =
- $form->format_amount(\%myconfig, $form->{statementbalance}, 2, 0);
-
- $clearedbalance = $form->format_amount(\%myconfig, $clearedbalance, 2, 0);
-
- my $exchdiff;
- if ($fx) {
- $fx = $form->format_amount(\%myconfig, $fx, 2, 0);
- $exchdiff = qq|
- <th align=right nowrap>| . $locale->text('Exchangerate Difference') . qq|</th>
- <td width=10%></td>
- <td align=right>$fx</td>
-|;
+ $::lxdebug->enter_sub;
+ $::auth->assert('cash');
+
+ my @options;
+ push @options, $::locale->text('From') . " " . $::locale->date(\%::myconfig, $::form->{fromdate}, 0) if $::form->{fromdate};
+ push @options, $::locale->text('Until') . " " . $::locale->date(\%::myconfig, $::form->{todate}, 0) if $::form->{todate};
+
+ my $ml = ($::form->{category} eq 'A') ? -1 : 1;
+ my $beginningbalance = $::form->{beginningbalance} * $ml;
+ my $clearedbalance =
+ my $balance = $beginningbalance;
+ my $i = 0;
+ my $last_id = 0;
+ my ($last_fx, @rows, $cleared, $totaldebits, $totalcredits, $fx);
+
+ for my $ref (@{ $::form->{PR} }) {
+ $balance += $ref->{amount} * $ml;
+ $cleared += $ref->{amount} * $ml if $ref->{cleared};
+ $totaldebits += $ref->{amount} * -1 if $ref->{amount} < 0;
+ $totalcredits += $ref->{amount} if $ref->{amount} >= 0;
+ $fx += $ref->{amount} * $ml if $ref->{fx_transaction};
+ $i++ if (!$ref->{fx_transaction} && !$last_fx) || $last_id != $ref->{id};
+ $last_fx = $ref->{fx_transaction};
+ $last_id = $ref->{id};
+
+ push @rows, { %$ref, balance => $balance, i => $i };
}
- print qq|
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Cleared Balance') . qq|</th>
- <td width=10%></td>
- <td align=right>$clearedbalance</td>
- </tr>
- <tr>
- $exchdiff
- </tr>
- </table>
- </td>
- <td align=right>
- <table>
- <tr>
- <th align=right nowrap>| . $locale->text('Statement Balance') . qq|</th>
- <td width=10%></td>
- <td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td>
- </tr>
- <tr>
- <th align=right nowrap>| . $locale->text('Difference') . qq|</th>
- <td width=10%></td>
- <td align=right><input name=null size=11 value=$difference></td>
- <input type=hidden name=difference value=$difference>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<input type=hidden name=rowcount value=$i>
-<input type=hidden name=accno value=$form->{accno}>
-<input type=hidden name=account value="$form->{account}">
-
-<input type=hidden name=fromdate value=$form->{fromdate}>
-<input type=hidden name=todate value=$form->{todate}>
-
-<br>
-<input type=submit class=submit name=action value="|
- . $locale->text('Update') . qq|">
-<input type=submit class=submit name=action value="|
- . $locale->text('Select all') . qq|">
-<input type=submit class=submit name=action value="|
- . $locale->text('Done') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
- $main::lxdebug->leave_sub();
+ my $statementbalance = $::form->parse_amount(\%::myconfig, $::form->{statementbalance});
+ my $difference = $statementbalance - $clearedbalance - $cleared;
+
+ $::form->header;
+ print $::form->parse_html_template('rc/step2', {
+ is_asset => $::form->{category} eq 'A',
+ option => \@options,
+ DATA => \@rows,
+ total => {
+ credit => $totalcredits,
+ debit => $totaldebits,
+ },
+ balance => {
+ beginning => $beginningbalance,
+ cleared => $clearedbalance,
+ statement => $statementbalance,
+ },
+ difference => $difference,
+ rowcount => $i,
+ fx => $fx,
+ });
+
+ $::lxdebug->leave_sub;
}
sub update {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
+ $::lxdebug->enter_sub;
+ $::auth->assert('cash');
- $main::auth->assert('cash');
-
- RC->payment_transactions(\%myconfig, \%$form);
+ RC->payment_transactions(\%::myconfig, $::form);
my $i;
- foreach my $ref (@{ $form->{PR} }) {
- if (!$ref->{fx_transaction}) {
- $i++;
- $ref->{cleared} = ($form->{"cleared_$i"}) ? "checked" : "";
- }
+ for my $ref (@{ $::form->{PR} }) {
+ next if $ref->{fx_transaction};
+ $i++;
+ $ref->{cleared} = $::form->{"cleared_$i"};
}
- &display_form;
+ display_form();
- $main::lxdebug->leave_sub();
-}
-
-sub select_all {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('cash');
-
- RC->payment_transactions(\%myconfig, \%$form);
-
- map { $_->{cleared} = "checked" unless $_->{fx_transaction} }
- @{ $form->{PR} };
-
- &display_form;
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub done {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('cash');
+ $::lxdebug->enter_sub;
+ $::auth->assert('cash');
- $form->{callback} = "$form->{script}?action=reconciliation";
+ $::form->{callback} = "$::form->{script}?action=reconciliation";
- $form->error($locale->text('Out of balance!')) if ($form->{difference} *= 1);
+ $::form->error($::locale->text('Out of balance!')) if $::form->{difference} *= 1;
- RC->reconcile(\%myconfig, \%$form);
- $form->redirect;
+ RC->reconcile(\%::myconfig, $::form);
+ $::form->redirect;
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
--- /dev/null
+[%- USE HTML %]
+[%- USE L %]
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- L.javascript_tag('jquery.checkall') %]
+<body>
+
+<h1>[% accno | html %]--[% account | html %]</h1>
+
+<p>[% FOREACH row IN option %][% row %][% ', ' UNLESS loop.last %][% END %]</p>
+
+<form method=post action="[% script %]">
+
+<table width=100%>
+ <tr class=listheading>
+ <th>[% L.checkbox_tag('checkall_checkboxes', checkall='input.checkall') %]</th>
+ <th>[% 'Date' | $T8 %]</th>
+ <th>[% 'Source' | $T8 %]</th>
+ <th>[% 'Description' | $T8 %]</th>
+[%- IF is_asset %]
+ <th>[% 'Deposit' | $T8 %]</th>
+ <th>[% 'Payment' | $T8 %]</th>
+[%- ELSE %]
+ <th>[% 'Decrease' | $T8 %]</th>
+ <th>[% 'Increase' | $T8 %]</th>
+[%- END %]
+ <th>[% 'Balance' | $T8 %]</th>
+ </tr>
+ <tr class="listrow[% row.j %]">
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td class='numeric'></td>
+ <td class='numeric'></td>
+ <td class='numeric'>[% LxERP.format_amount(balance.beginning, 2, 0) %]</td>
+ </tr>
+[% FOREACH row = DATA %]
+ <tr class="listrow[% loop.count % 2 %]">
+ <td>
+[%- IF row.fx_transaction %]
+ [% L.hidden_tag('fxoid_' _ row.i, row.oid) %]
+[%- ELSE %]
+ [% L.checkbox_tag('cleared_' _ row.i, class='checkall', checked=row.cleared) %]
+ [% L.hidden_tag('oid_' _ row.i, row.oid) %]
+[%- END %]
+ </td>
+ <td>[% row.transdate %]</td>
+ <td>[% row.source %]</td>
+ <td>[% row.name %]</td>
+ <td class='numeric'>[% LxERP.format_amount(row.amount, 2) IF row.amount > 0 %]</td>
+ <td class='numeric'>[% LxERP.format_amount(row.amount * -1, 2) IF row.amount < 0 %]</td>
+ <td class='numeric'>[% LxERP.format_amount(row.balance, 2, 0) %]</td>
+ </tr>
+[% END %]
+ <tr class=listtotal>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td class='numeric'>[% LxERP.format_amount(total.credit, 2, 0) %]</td>
+ <td class='numeric'>[% LxERP.format_amount(total.debit, 2, 0) %]</td>
+ <td class='numeric'></td>
+ </tr>
+</table>
+
+ <table width=100%>
+ <tr valign=top>
+ <td>
+ <table>
+ <tr>
+ <th align=right nowrap>[% 'Cleared Balance' | $T8 %]</th>
+ <td width=10%></td>
+ <td align=right>[% LxERP.format_amount(balance.cleared, 2, 0) %]</td>
+ </tr>
+ <tr>
+[%- IF fx %]
+ <th align=right nowrap>[% 'Exchangerate Difference' | $T8 %]</th>
+ <td width=10%></td>
+ <td align=right>[% LxERP.format_amount(fx, 2, 0) %]</td>
+[%- END %]
+ </tr>
+ </table>
+ </td>
+ <td align=right>
+ <table>
+ <tr>
+ <th align=right nowrap>[% 'Statement Balance' | $T8 %]</th>
+ <td width=10%></td>
+ <td align=right><input name="statementbalance" size=11 value="[% LxERP.format_amount(balance.statement, 2, 0) %]"></td>
+ </tr>
+ <tr>
+ <th align=right nowrap>[% 'Difference' | $T8 %]</th>
+ <td width=10%></td>
+ <td align=right><input name=null size=11 value="[% LxERP.format_amount(difference, 2, 0) %]"></td>
+ <input type=hidden name=difference value="[% LxERP.format_amount(difference, 2, 0) %]">
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+<hr size=3 noshade>
+<br>
+
+<input type=hidden name=rowcount value="[% rowcount %]">
+<input type=hidden name=accno value="[% accno %]">
+<input type=hidden name=account value="[% account %]">
+
+<input type=hidden name=fromdate value="[% fromdate %]">
+<input type=hidden name=todate value="[% todate %]">
+
+<br>
+<input type=submit class=submit name=action value="[% 'Update' | $T8 %]">
+<input type=submit class=submit name=action value="[% 'Done' | $T8 %]">
+
+</form>
+
+</body>
+</html>
projects / mfinanz.git / commitdiff