SF.net SVN: ledger-smb:[3771] trunk

[..hidden..]

Revision: 3771
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3771&view=rev
Author:   einhverfr
Date:     2011-09-28 19:35:52 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/bin/gl.pl
    trunk/scripts/vouchers.pl

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3767
   + /branches/1.3:3711-3770

Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl	2011-09-28 16:04:27 UTC (rev 3770)
+++ trunk/bin/gl.pl	2011-09-28 19:35:52 UTC (rev 3771)
@@ -290,7 +290,7 @@
 		  for ( 'post_as_new', 'schedule' ) { $a{$_} = 1 }
 
 		  if ( !$form->{locked} ) {
-		      if ( $transdate > $closedto ) {
+		      if ( $transdate ge $closedto) {
 			  for ( 'post', 'delete' ) { $a{$_} = 1 }
 		      }
 		  }
@@ -302,7 +302,7 @@
 		  }
 	      }
 
-	      if (!$form->{approved} && !$form->{batch_id}){
+	      if ($form->{id} && (!$form->{approved} && !$form->{batch_id})){
 		$button{approve} = { 
 			ndx   => 3, 
 			key   => 'S', 

Modified: trunk/scripts/vouchers.pl
===================================================================
--- trunk/scripts/vouchers.pl	2011-09-28 16:04:27 UTC (rev 3770)
+++ trunk/scripts/vouchers.pl	2011-09-28 19:35:52 UTC (rev 3771)
@@ -478,6 +478,10 @@
     batch_delete(@_);
 }
 
+sub get_batch_batch_delete {
+    batch_delete(@_);
+}
+
 # alias for batch_post, needed for form-dynatable
 sub list_batches_batch_approve {
     batch_approve(@_);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.