SF.net SVN: ledger-smb:[3552] addons/1.3/templatetrans

[..hidden..]

Revision: 3552
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3552&view=rev
Author:   einhverfr
Date:     2011-07-21 19:36:03 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
Merging changes to make the patch apply properly

Modified Paths:
--------------
    addons/1.3/templatetrans/tags/1.0/patches/aa_gl.patch
    addons/1.3/templatetrans/trunk/patches/aa_gl.patch

Modified: addons/1.3/templatetrans/tags/1.0/patches/aa_gl.patch
===================================================================
--- addons/1.3/templatetrans/tags/1.0/patches/aa_gl.patch	2011-07-21 06:12:57 UTC (rev 3551)
+++ addons/1.3/templatetrans/tags/1.0/patches/aa_gl.patch	2011-07-21 19:36:03 UTC (rev 3552)
@@ -1,17 +1,17 @@
 Index: bin/aa.pl
 ===================================================================
---- bin/aa.pl	(revision 2784)
+--- bin/aa.pl	(revision 3546)
 +++ bin/aa.pl	(working copy)
-@@ -959,6 +959,8 @@
+@@ -992,6 +992,8 @@
  
              'save_info' => 
                { ndx => 9, key => 'I', value => $locale->text('Save Info') },
 +            'save_temp' =>
 +              { ndx => 10, key => 'T', value => $locale->text('Save Template')},
+             'new_screen' => # Create a blank ar/ap invoice.
+              { ndx => 10, key=> 'N', value => $locale->text('New') }
          );
-         if (!$form->{approved} && !$form->{batch_id}){
-            $button{approve} = { 
-@@ -1028,6 +1030,41 @@
+@@ -1074,6 +1076,41 @@
  |;
  }
  
@@ -55,9 +55,9 @@
      use LedgerSMB;
 Index: bin/gl.pl
 ===================================================================
---- bin/gl.pl	(revision 2792)
+--- bin/gl.pl	(revision 3546)
 +++ bin/gl.pl	(working copy)
-@@ -246,6 +246,10 @@
+@@ -251,6 +251,10 @@
  		  'update' =>
  		    { ndx => 1, key => 'U', value => $locale->text('Update') },
  		  'post' => { ndx => 3, key => 'O', value => $locale->text('Post') },
@@ -68,15 +68,15 @@
  		  'post_as_new' =>
  		    { ndx => 6, key => 'N', value => $locale->text('Post as new') },
  		  'schedule' =>
-@@ -259,6 +263,7 @@
- 		  $button{post}->{value} = $locale->text('Save'); 
+@@ -281,6 +285,7 @@
+ 		  }
  	      }
- 	      %a = ();
+               $a{update} = 1;
 +              $a{save_temp} = 1;
- 	      if ( $form->{id} ) {
  
- 		  for ( 'update', 'post_as_new', 'schedule' ) { $a{$_} = 1 }
-@@ -340,7 +345,37 @@
+ 	      if (!$form->{approved} && !$form->{batch_id}){
+ 		$button{approve} = { 
+@@ -345,7 +350,37 @@
  }
   
  

Modified: addons/1.3/templatetrans/trunk/patches/aa_gl.patch
===================================================================
--- addons/1.3/templatetrans/trunk/patches/aa_gl.patch	2011-07-21 06:12:57 UTC (rev 3551)
+++ addons/1.3/templatetrans/trunk/patches/aa_gl.patch	2011-07-21 19:36:03 UTC (rev 3552)
@@ -1,17 +1,17 @@
 Index: bin/aa.pl
 ===================================================================
---- bin/aa.pl	(revision 2784)
+--- bin/aa.pl	(revision 3546)
 +++ bin/aa.pl	(working copy)
-@@ -959,6 +959,8 @@
+@@ -992,6 +992,8 @@
  
              'save_info' => 
                { ndx => 9, key => 'I', value => $locale->text('Save Info') },
 +            'save_temp' =>
 +              { ndx => 10, key => 'T', value => $locale->text('Save Template')},
+             'new_screen' => # Create a blank ar/ap invoice.
+              { ndx => 10, key=> 'N', value => $locale->text('New') }
          );
-         if (!$form->{approved} && !$form->{batch_id}){
-            $button{approve} = { 
-@@ -1028,6 +1030,41 @@
+@@ -1074,6 +1076,41 @@
  |;
  }
  
@@ -55,9 +55,9 @@
      use LedgerSMB;
 Index: bin/gl.pl
 ===================================================================
---- bin/gl.pl	(revision 2792)
+--- bin/gl.pl	(revision 3546)
 +++ bin/gl.pl	(working copy)
-@@ -246,6 +246,10 @@
+@@ -251,6 +251,10 @@
  		  'update' =>
  		    { ndx => 1, key => 'U', value => $locale->text('Update') },
  		  'post' => { ndx => 3, key => 'O', value => $locale->text('Post') },
@@ -68,15 +68,15 @@
  		  'post_as_new' =>
  		    { ndx => 6, key => 'N', value => $locale->text('Post as new') },
  		  'schedule' =>
-@@ -259,6 +263,7 @@
- 		  $button{post}->{value} = $locale->text('Save'); 
+@@ -281,6 +285,7 @@
+ 		  }
  	      }
- 	      %a = ();
+               $a{update} = 1;
 +              $a{save_temp} = 1;
- 	      if ( $form->{id} ) {
  
- 		  for ( 'update', 'post_as_new', 'schedule' ) { $a{$_} = 1 }
-@@ -340,7 +345,37 @@
+ 	      if (!$form->{approved} && !$form->{batch_id}){
+ 		$button{approve} = { 
+@@ -345,7 +350,37 @@
  }
   
  


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