From: Sven Schöling Date: Tue, 20 Sep 2011 17:33:55 +0000 (+0200) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.7.0beta1~270 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/159556ca90d5aa0662964ea5f2db8f8f3a716ea8?hp=9c228f168c91f538bd70278a481462618a782e0b Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index e0631b863..0ed2a8784 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -224,7 +224,7 @@ sub options_for_select { my @elements = (); push @elements, [ undef, $options{empty_title} || '' ] if $options{with_empty}; push @elements, map [ - $value_title_sub ? $value_title_sub->($_) : ( + $value_title_sub ? @{ $value_title_sub->($_) } : ( $access->($_, 0, $value_key, $value_sub), $access->($_, 1, $title_key, $title_sub), ) diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl index 0f01ac98a..7d4245bfe 100644 --- a/bin/mozilla/rc.pl +++ b/bin/mozilla/rc.pl @@ -42,431 +42,117 @@ use strict; # 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 .= "

[% 'Account' \| $T8 %]	[% L.select_tag('accno', L.options_for_select(PR, value_title_sub=\selection_sub)) %]
[% 'From' \| $T8 %]	[% L.date_tag('fromdate') %]	[% 'Until' \| $T8 %]	[% L.date_tag('todate') %]

[% L.checkbox_tag('checkall_checkboxes', checkall='input.checkall') %]	[% 'Date' \| $T8 %]	[% 'Source' \| $T8 %]	[% 'Description' \| $T8 %]	[% 'Deposit' \| $T8 %]	[% 'Payment' \| $T8 %]	[% 'Decrease' \| $T8 %]
						[% LxERP.format_amount(balance.beginning, 2, 0) %]
+[%- 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 %] +	[% row.transdate %]	[% row.source %]	[% row.name %]	[% LxERP.format_amount(row.amount, 2) IF row.amount > 0 %]	[% LxERP.format_amount(row.amount * -1, 2) IF row.amount < 0 %]	[% LxERP.format_amount(row.balance, 2, 0) %]
				[% LxERP.format_amount(total.credit, 2, 0) %]	[% LxERP.format_amount(total.debit, 2, 0) %]

[% 'Reconciliation' | $T8 %]

[% accno | html %]--[% account | html %]