Fixing issues with adding ap/ar vouchers to existing batch

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

2 files changed, 8 insertions, 8 deletions

diff --git a/bin/aa.pl b/bin/aa.pl
index 7a79fde5..da60e1b4 100644
--- a/bin/aa.pl
+++ b/bin/aa.pl
@@ -887,7 +887,7 @@ sub form_footer {
             'delete' =>
               { ndx => 8, key => 'D', value => $locale->text('Delete') },
         );
-        if (!$form->{approved}){
+        if (!$form->{approved} && !$form->{batch_id}){
            $button{approve} = { ndx => 3, key => 'O', value => $locale->text('Post') };
            delete $button{post_as_new};
            delete $button{print_and_post_as_new};
@@ -895,13 +895,11 @@ sub form_footer {
            delete $button{print_and_post};
         }
 
-        if ($form->{separate_duties}){
+        if ($form->{separate_duties} || $form->{batch_id}){
             $button{post}->{value} = $locale->text('Save');
             $form->hide_form('separate_duties');
         }
-
         if ( $form->{id} ) {
-
             if ( $form->{locked} || ( $transdate && $transdate <= $closedto ) )
             {
                 for ( "post", "print_and_post", "delete" ) {
@@ -923,7 +921,7 @@ sub form_footer {
             }
             delete $button{"print_and_post"} if !${LedgerSMB::Sysconfig::latex};
 
-            if ( $transdate && $transdate <= $closedto ) {
+            if ( $transdate && ($transdate <= $closedto) ) {
                 for ( "post", "print_and_post" ) { delete $button{$_} }
             }
         }
diff --git a/scripts/vouchers.pl b/scripts/vouchers.pl
index 047afcb7..5173045a 100644
--- a/scripts/vouchers.pl
+++ b/scripts/vouchers.pl
@@ -72,10 +72,10 @@ sub add_vouchers {
     my $batch = LedgerSMB::Batch->new({base => $request});
     our $vouchers_dispatch = 
     {
-        payable    => {script => 'bin/ap.pl', function => sub {add()}},
-        receivable => {script => 'bin/ar.pl', function => sub {add()}},
+        ap         => {script => 'bin/ap.pl', function => sub {add()}},
+        ar         => {script => 'bin/ar.pl', function => sub {add()}},
         gl         => {script => 'bin/gl.pl', function => sub {add()}},
-        receipt   => {script => 'scripts/payment.pl', 
+        receipt    => {script => 'scripts/payment.pl', 
 	             function => sub {
 				my ($request) = @_;
 				$request->{account_class} = 2;
@@ -124,6 +124,8 @@ sub add_vouchers {
     my $script = $vouchers_dispatch->{$request->{batch_type}}{script};
     $form->{script} = $script;
     $form->{script} =~ s|.*/||;
+    delete $form->{id};
+    delete $request->{id};
     if ($script =~ /^bin/){
 
         # Note that the line below is generally considered incredibly bad form.