SF.net SVN: ledger-smb:[5775] branches/1.3

[..hidden..]

Revision: 5775
          http://sourceforge.net/p/ledger-smb/code/5775
Author:   einhverfr
Date:     2013-05-12 08:47:20 +0000 (Sun, 12 May 2013)
Log Message:
-----------
Merging cash transfer draft fixes from trunk, commit 5774

Modified Paths:
--------------
    branches/1.3/UI/journal/journal_entry.html
    branches/1.3/bin/gl.pl

Modified: branches/1.3/UI/journal/journal_entry.html
===================================================================
--- branches/1.3/UI/journal/journal_entry.html	2013-05-12 08:43:58 UTC (rev 5774)
+++ branches/1.3/UI/journal/journal_entry.html	2013-05-12 08:47:20 UTC (rev 5775)
@@ -124,9 +124,7 @@
       <table width="100%">
 	  <tr class="listheading">
 	  <th class="listheading"><?lsmb text('Account') ?></th>
-	  <?lsmb IF form.transfer == 1 ?>
-	     <th class="listheading"><?lsmb text('FX') ?></th>
-	  <?lsmb END ?>
+	  <th class="listheading"><?lsmb text('FX') ?></th>
           <th class="listheading"><?lsmb text('Debit') ?></th>
 	  <th class="listheading"><?lsmb text('Credit') ?></th>
 	  <th class="listheading"><?lsmb text('Source') ?></th>
@@ -161,7 +159,6 @@
 	  
 		 </td>
 	      
-		  <?lsmb IF form.transfer == 1 ?>
 		      <td>
 
 			    <?lsmb IF  displayrow.fx_transactionset == 1 ?>
@@ -185,7 +182,6 @@
 
 		      </td>
 		
-		  <?lsmb END ?>
 		  
 		  <td>
 			  <?lsmb PROCESS input element_data = {
@@ -262,9 +258,7 @@
 	<?lsmb END ?>
         <tr class="listtotal">
 	  <th>&nbsp;</th>
-	  <?lsmb IF form.transfer == 1 ?>
 	     <th class="listheading">&nbsp;</th>
-	  <?lsmb END ?>
 	  <th class="listtotal" align="right">
 			<?lsmb form.totaldebit ?>
 	  </th>

Modified: branches/1.3/bin/gl.pl
===================================================================
--- branches/1.3/bin/gl.pl	2013-05-12 08:43:58 UTC (rev 5774)
+++ branches/1.3/bin/gl.pl	2013-05-12 08:47:20 UTC (rev 5775)
@@ -311,7 +311,7 @@
 			value => $locale->text('Post as Saved') };
 		$a{approve} = 1;
 		$a{edit_and_approve} = 1;
-		if (grep /^lsmb_$form->{company}__draft_modify$/, @{$form->{_roles}}){
+		if (grep /__draft_edit$/, @{$form->{_roles}}){
 		    $button{edit_and_approve} = { 
 			ndx   => 4, 
 			key   => 'O', 

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