Committing David Mora's single payment updates

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2185 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 8 insertions, 4 deletions

diff --git a/bin/am.pl b/bin/am.pl
index b30b4fe2..f92e380e 100644
--- a/bin/am.pl
+++ b/bin/am.pl
@@ -195,7 +195,7 @@ sub save_account {
         ) if length $a > 2;
 
         for (
-            qw(AR_amount AR_tax AR_paid AR_overpayment AP_amount AP_tax AP_paid AP_overpayment IC_taxpart IC_taxservice IC_sale IC_cogs IC_income IC_expense)
+            qw(AR_amount AR_tax AR_paid AR_overpayment AR_discount AP_amount AP_tax AP_paid AP_overpayment AP_discount IC_taxpart IC_taxservice IC_sale IC_cogs IC_income IC_expense)
           )
         {
             $form->error(
@@ -208,7 +208,7 @@ sub save_account {
 
     foreach $item ( "AR", "AP" ) {
         $i = 0;
-        for ( "${item}_amount", "${item}_paid", "${item}_tax", "${item}_overpayment" ) {
+        for ( "${item}_amount", "${item}_paid", "${item}_tax", "${item}_overpayment", "${item}_discount" ) {
             $i++ if $form->{$_};
         }
         $form->error(
diff --git a/bin/arapprn.pl b/bin/arapprn.pl
index 3b733004..2cc37f46 100644
--- a/bin/arapprn.pl
+++ b/bin/arapprn.pl
@@ -289,10 +289,13 @@ sub print_check {
 
     my $template = LedgerSMB::Template->new( 
         user => \%myconfig, template => $form->{'formname'}, 
-        format => uc $form->{'format'} );
+        format => uc $form->{'format'},
+	no_auto_output => 1,
+        output_args => $form,
+    );
     try {
         $template->render($form);
-        $template->output(%{$form});
+        $template->output($form);
     }
     catch Error::Simple with {
         my $E = shift;
@@ -557,6 +560,7 @@ sub print_transaction {
 
     my $template = LedgerSMB::Template->new(
         user => \%myconfig, template => $form->{'formname'}, 
+	no_auto_output => 1,
         format => uc $form->{format} );
     try {
         $template->render($form);