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

[..hidden..]

Revision: 6696
          http://sourceforge.net/p/ledger-smb/code/6696
Author:   einhverfr
Date:     2014-01-28 14:57:16 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
fixing payment report ignoring dates

Modified Paths:
--------------
    trunk/LedgerSMB/Report/Invoices/Payments.pm
    trunk/sql/modules/Payment.sql

Modified: trunk/LedgerSMB/Report/Invoices/Payments.pm
===================================================================
--- trunk/LedgerSMB/Report/Invoices/Payments.pm	2014-01-28 14:51:16 UTC (rev 6695)
+++ trunk/LedgerSMB/Report/Invoices/Payments.pm	2014-01-28 14:57:16 UTC (rev 6696)
@@ -188,9 +188,9 @@
     return [{name => 'meta_number', text => $meta_number },
             {name => 'cash_accno',  
              text => LedgerSMB::Report::text('Account Number') },
-            {name => 'date_from',   
+            {name => 'from_date',   
              text => LedgerSMB::Report::text('From Date')},
-            {name => 'date_to',
+            {name => 'to_date',
              text => LedgerSMB::Report::text('To Date')}
            ];
 }

Modified: trunk/sql/modules/Payment.sql
===================================================================
--- trunk/sql/modules/Payment.sql	2014-01-28 14:51:16 UTC (rev 6695)
+++ trunk/sql/modules/Payment.sql	2014-01-28 14:57:16 UTC (rev 6696)
@@ -1035,8 +1035,10 @@
         date_paid date
 );
 
+DROP FUNCTION IF EXISTS payment__search(text, date, date, int, text, int, char(3));
+
 CREATE OR REPLACE FUNCTION payment__search 
-(in_source text, in_date_from date, in_date_to date, in_credit_id int, 
+(in_source text, in_from_date date, in_to_date date, in_credit_id int, 
 	in_cash_accno text, in_entity_class int, in_currency char(3))
 RETURNS SETOF payment_record AS
 $$
@@ -1071,9 +1073,9 @@
                                                                     )))
                         AND (in_currency IS NULL OR in_currency = arap.curr)
 			AND (c.id = in_credit_id OR in_credit_id IS NULL)
-			AND (a.transdate >= in_date_from 
-				OR in_date_from IS NULL)
-			AND (a.transdate <= in_date_to OR in_date_to IS NULL)
+			AND (a.transdate >= in_from_date
+				OR in_from_date IS NULL)
+			AND (a.transdate <= in_to_date OR in_to_date IS NULL)
 			AND (source = in_source OR in_source IS NULL)
                         AND arap.approved AND a.approved
 		GROUP BY c.meta_number, c.id, co.legal_name, a.transdate, 

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


------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits