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

[..hidden..]

Revision: 3125
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3125&view=rev
Author:   einhverfr
Date:     2011-03-11 17:58:50 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
Minor number formatting fixes, and fixes for sales orders and receipts

Modified Paths:
--------------
    trunk/LedgerSMB/OE.pm
    trunk/LedgerSMB.pm
    trunk/scripts/vouchers.pl
    trunk/sql/modules/Payment.sql

Modified: trunk/LedgerSMB/OE.pm
===================================================================
--- trunk/LedgerSMB/OE.pm	2011-02-24 22:17:52 UTC (rev 3124)
+++ trunk/LedgerSMB/OE.pm	2011-03-11 17:58:50 UTC (rev 3125)
@@ -276,6 +276,7 @@
              $class_id = 1;
         } else {
              $numberfld = "ponumber";
+             $class_id = 2;
         }
     }
     else {

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2011-02-24 22:17:52 UTC (rev 3124)
+++ trunk/LedgerSMB.pm	2011-03-11 17:58:50 UTC (rev 3125)
@@ -633,7 +633,7 @@
     my $amount   = $args{amount};
 
     if ( ! defined $amount or $amount eq '' ) {
-        return 0;
+        return Math::BigFloat->bzero();
     }
 
     if ( UNIVERSAL::isa( $amount, 'Math::BigFloat' ) )

Modified: trunk/scripts/vouchers.pl
===================================================================
--- trunk/scripts/vouchers.pl	2011-02-24 22:17:52 UTC (rev 3124)
+++ trunk/scripts/vouchers.pl	2011-03-11 17:58:50 UTC (rev 3125)
@@ -295,7 +295,7 @@
     $template->render({ 
 	form    => $batch,
 	columns => ..hidden..,
-    heading => $column_heading,
+        heading => $column_heading,
         rows    => ..hidden..,
         hiddens => $hiddens,
         buttons => @buttons

Modified: trunk/sql/modules/Payment.sql
===================================================================
--- trunk/sql/modules/Payment.sql	2011-02-24 22:17:52 UTC (rev 3124)
+++ trunk/sql/modules/Payment.sql	2011-03-11 17:58:50 UTC (rev 3125)
@@ -1198,7 +1198,9 @@
  		JOIN payment_links pl ON (pl.entry_id=a.entry_id)
  		WHERE al.description in  
                        ('AP_paid', 'AP_discount', 'AR_paid', 'AR_discount') 
-                       and ((in_account_class = 1 AND al.description like 'AP%') or (in_account_class = 2 AND al.description like 'AR%')) 
+                       and ((in_account_class = 1 AND al.description like 'AP%')
+                       or (in_account_class = 2 AND al.description like 'AR%'))
+             ) am ON (true)
    WHERE p.id = in_payment_id
  LOOP
      RETURN NEXT out_payment;


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