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

[..hidden..]

Revision: 5740
          http://sourceforge.net/p/ledger-smb/code/5740
Author:   einhverfr
Date:     2013-05-02 10:45:06 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Merging Nick P's patch for cash transfer enforces ticked 'FX' boxes, issue 802

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

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-02 10:43:10 UTC (rev 5739)
+++ branches/1.3/Changelog	2013-05-02 10:45:06 UTC (rev 5740)
@@ -7,6 +7,7 @@
 * Fixed multiple blank line handling for pdfs (Chris T)
 * Fixed multiple repeat entries in chart of accounts drop down (Nick P, 812)
 * Fixed transaction list empty if searched by creditor name (Nick P, 806)
+* Fixed cash transfer enforces ticked 'FX' boxes (Nick P, 802)
 
 Nick P is Nick Prater
 

Modified: branches/1.3/UI/journal/journal_entry.html
===================================================================
--- branches/1.3/UI/journal/journal_entry.html	2013-05-02 10:43:10 UTC (rev 5739)
+++ branches/1.3/UI/journal/journal_entry.html	2013-05-02 10:45:06 UTC (rev 5740)
@@ -165,18 +165,18 @@
 		      <td>
 
 			    <?lsmb IF  displayrow.fx_transactionset == 1 ?>
-					    <?lsmb PROCESS label element_data = {
-					      text = text('x')
-					      align = 'right'
-				              id = "fxt_$INDEX"
-                                               } 
-					      ?>
-			   
+			                   <?lsmb PROCESS input element_data = {
+					      value = 1
+					      type = "checkbox"
+					      checked = "true"
+					      name = "fx_transaction_$INDEX"
+					      id = "fxt_$INDEX"
+                                              } ?>
 			    <?lsmb ELSE ?>
 			                   <?lsmb PROCESS input element_data = {
 					      value = 1
 					      type = "checkbox"
-					      checked = 1
+					      checked = ""
 					      name = "fx_transaction_$INDEX"
 					      id = "fxt_$INDEX"
                                               } ?>

Modified: branches/1.3/bin/gl.pl
===================================================================
--- branches/1.3/bin/gl.pl	2013-05-02 10:43:10 UTC (rev 5739)
+++ branches/1.3/bin/gl.pl	2013-05-02 10:45:06 UTC (rev 5740)
@@ -410,7 +410,6 @@
 			      if ( $i < $form->{rowcount} )
 			      {					      
 						    $temphash1->{accno}=$form->{"accno_$i"};
-						    $temhash1->{fx_transaction}=$form->{"fx_transaction_$i"};
 
 						    if ( $form->{projectset} and $form->{"projectnumber_$i"} ) {
 							$temphash1->{projectnumber}=$form->{"projectnumber_$i"}; 
@@ -420,7 +419,7 @@
 						    
 						    if ( $form->{transfer} and $form->{"fx_transaction_$i"})
 						    {
-							  $hiddens{"fx_transaction_$i"}=1; 
+							$temphash1->{fx_transactionset}=1; 
 						    }
 						    else 
 						    {

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