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

[..hidden..]

Revision: 5912
          http://sourceforge.net/p/ledger-smb/code/5912
Author:   einhverfr
Date:     2013-07-22 13:51:23 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Merging in fix for cash account conflicts from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/bin/aa.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-07-22 13:49:10 UTC (rev 5911)
+++ branches/1.3/Changelog	2013-07-22 13:51:23 UTC (rev 5912)
@@ -7,6 +7,7 @@
 * Fixed date range when clicking through income statement to gl (Chris T, 836)
 * Fixed invoice screens not recognizing default payment account (Chris T, 837)
 * Fixed gl report criteria lost when returning from transaction (Chris T, 839)
+* Fixed incorrect payment account info in invoice screen (Chris T)
 
 Changelog for 1.3.33
 * Fixed <?lsmb YYMMMDD ?> interpolation in settings (Chris T)

Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2013-07-22 13:49:10 UTC (rev 5911)
+++ branches/1.3/bin/aa.pl	2013-07-22 13:51:23 UTC (rev 5912)
@@ -149,7 +149,6 @@
         }
 
     }
-
     &display_form;
 
 }
@@ -854,9 +853,9 @@
         </tr>
 ";
 
+    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     $form->{"select$form->{ARAP}_paid"} =~ /($form->{cash_accno}--[^<]*)/;
     $form->{"$form->{ARAP}_paid_$form->{paidaccounts}"} = $1;
-    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     for $i ( 1 .. $form->{paidaccounts} ) {
 
         $form->hide_form("cleared_$i");

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2013-07-22 13:49:10 UTC (rev 5911)
+++ branches/1.3/bin/ir.pl	2013-07-22 13:51:23 UTC (rev 5912)
@@ -786,9 +786,9 @@
 	</tr>
 |;
 
+    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     $form->{"selectAP_paid"} =~ /($form->{cash_accno}--[^<]*)/;
     $form->{"AP_paid_$form->{paidaccounts}"} = $1;
-    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     for $i ( 1 .. $form->{paidaccounts} ) {
 
         $form->hide_form("cleared_$i");

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-07-22 13:49:10 UTC (rev 5911)
+++ branches/1.3/bin/is.pl	2013-07-22 13:51:23 UTC (rev 5912)
@@ -863,9 +863,9 @@
     print "
         </tr>
 ";
+    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     $form->{"selectAR_paid"} =~ /($form->{cash_accno}--[^<]*)/;
     $form->{"AR_paid_$form->{paidaccounts}"} = $1;
-    $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     for $i ( 1 .. $form->{paidaccounts} ) {
 
         $form->hide_form("cleared_$i");

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