diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-03-28 00:20:52 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-03-28 00:20:52 +0000 |
| commit | 9941434d2690d04e04e720f26874ff349c3dc971 (patch) | |
| tree | e531d59fabcfb1367330f6a3da7a6de49e91497d | |
| parent | ed583d044015d3e76d52ce22dd36df7854c622da (diff) | |
Correcting issues with payment:
1) paying against negative transactions causes *positive* payments
2) payment screen is corrupted on return
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2120 4979c152-3d1c-0410-bac9-87ea11338e46
| -rw-r--r-- | LedgerSMB/DBObject/Payment.pm | 2 | ||||
| -rw-r--r-- | scripts/payment.pl | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/LedgerSMB/DBObject/Payment.pm b/LedgerSMB/DBObject/Payment.pm index 7e85e049..02f3aad5 100644 --- a/LedgerSMB/DBObject/Payment.pm +++ b/LedgerSMB/DBObject/Payment.pm @@ -472,7 +472,7 @@ sub post_bulk { if ($invoice_subarray !~ /^\{\d+\,\-?\d*\.?\d+\}$/){ $self->error("Invalid subarray: $invoice_subarray"); } - $invoice_subarray =~ s/[^0123456789{},.]//; + $invoice_subarray =~ s/[^0123456789{},.-]//; if ($invoice_array eq '{}'){ # Omit comma $invoice_array = "{$invoice_subarray}"; } else { diff --git a/scripts/payment.pl b/scripts/payment.pl index 5b56e1f3..d50eb15b 100644 --- a/scripts/payment.pl +++ b/scripts/payment.pl @@ -247,13 +247,7 @@ sub post_payments_bulk { format => 'HTML', ); } else { - $template = LedgerSMB::Template->new( - user => $request->{_user}, - locale => $request->{_locale}, - path => 'UI/payments', - template => 'payments_filter', - format => 'HTML', - ); + payments($request); } $template->render($payment); } |