From 4815ab592f3bfc992f25c0ea6c25929fbfa0ab4b Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Wed, 30 Jan 2008 20:25:16 +0000
Subject: Correcting date range dropdown issues in AP Outstanding report.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2066 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/AA.pm   | 4 +++-
 LedgerSMB/Form.pm | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'LedgerSMB')

diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index 3e112e11..0834d255 100644
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -746,10 +746,12 @@ sub transactions {
         $table   = 'ap';
         $buysell = 'sell';
     }
+    $form->{db_dateformat} = $myconfig->{dateformat};
 
     ( $form->{transdatefrom}, $form->{transdateto} ) =
       $form->from_to( $form->{year}, $form->{month}, $form->{interval} )
-      if $form->{year} && $form->{month};
+      if (($form->{year} && $form->{month}) && 
+          (!$form->{transdatefrom} && !$form->{transdateto}));
 
     my @paidargs = ();
     if ( $form->{outstanding} ) {
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index ff0166a1..05a23165 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -3408,7 +3408,7 @@ sub from_to {
     $t[3] = substr( "0$t[3]", -2 );
     $t[5] += 1900;
 
-    ( $self->format_date($fromdate), $self->format_date("$t[5]-$t[4]-$t[3]") );
+    return ( $self->format_date($fromdate), $self->format_date("$t[5]-$t[4]-$t[3]") );
 }
 
 =item $form->audittrail($dbh, $myconfig, $audittrail);
-- 
cgit v1.2.3