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

[..hidden..]

Revision: 5888
          http://sourceforge.net/p/ledger-smb/code/5888
Author:   einhverfr
Date:     2013-06-04 10:13:53 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Payment checkdown now recognized by invoice and transaction screens

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/AA.pm
    trunk/bin/aa.pl
    trunk/bin/ir.pl
    trunk/bin/is.pl

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2013-05-30 19:33:32 UTC (rev 5887)
+++ trunk/Changelog	2013-06-04 10:13:53 UTC (rev 5888)
@@ -88,6 +88,7 @@
 Changelog for 1.3.34
 * Fixed some SQL syntax issues on using overpayments (Chris T)
 * Fixed date range when clicking through income statement to gl (Chris T, 836)
+* Fixed invoice screens not recognizing default payment account (Chris T, 837)
 
 Changelog for 1.3.33
 * Fixed <?lsmb YYMMMDD ?> interpolation in settings (Chris T)

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2013-05-30 19:33:32 UTC (rev 5887)
+++ trunk/LedgerSMB/AA.pm	2013-06-04 10:13:53 UTC (rev 5888)
@@ -837,9 +837,11 @@
 			  b.discount AS tradediscount, 
 		          b.description AS business, 
 			  entity.control_code as entity_control_code,
-			  c.meta_number, ecl.*, ctf.default_reportable
+			  c.meta_number, ecl.*, ctf.default_reportable,
+                          c.cash_account_id, ca.accno as cash_accno
 		     FROM entity_credit_account c
 		     JOIN entity ON (entity.id = c.entity_id)
+                LEFT JOIN account ca ON c.cash_account_id = ca.id
 		LEFT JOIN business b ON (b.id = c.business_id)
                 LEFT JOIN country_tax_form ctf ON ctf.id = c.taxform_id
                 LEFT JOIN (SELECT coalesce(line_one, '')

Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl	2013-05-30 19:33:32 UTC (rev 5887)
+++ trunk/bin/aa.pl	2013-06-04 10:13:53 UTC (rev 5888)
@@ -865,6 +865,8 @@
         </tr>
 ";
 
+    $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} ) {
 

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2013-05-30 19:33:32 UTC (rev 5887)
+++ trunk/bin/ir.pl	2013-06-04 10:13:53 UTC (rev 5888)
@@ -822,6 +822,8 @@
 	</tr>
 |;
 
+    $form->{"selectAP_paid"} =~ /($form->{cash_accno}--[^<]*)/;
+    $form->{"AP_paid_$form->{paidaccounts}"} = $1;
     $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     for $i ( 1 .. $form->{paidaccounts} ) {
 

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2013-05-30 19:33:32 UTC (rev 5887)
+++ trunk/bin/is.pl	2013-06-04 10:13:53 UTC (rev 5888)
@@ -877,7 +877,8 @@
     print "
         </tr>
 ";
-
+    $form->{"selectAR_paid"} =~ /($form->{cash_accno}--[^<]*)/;
+    $form->{"AR_paid_$form->{paidaccounts}"} = $1;
     $form->{paidaccounts}++ if ( $form->{"paid_$form->{paidaccounts}"} );
     for $i ( 1 .. $form->{paidaccounts} ) {
 

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