X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=4258b82d5ea994a30f3f0555a9a78b3140966d87;hb=bc2cc52d7aa7ec4d14631b8eda7b5b2db15e9c42;hp=3d694cb8935e819cb0d752b848d1377bd99735f8;hpb=1b4381897c2b4a3217dada2486f873f2396e62a4;p=Pman.Core

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index 3d694cb8..4258b82d 100644
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -39,12 +39,19 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     function loadRates()
     {
         
+        static $checked = false;
+        if ($checked ) {
+            return true;
+        }
+        $checked  = true;
+        
         // how often do we need to know this..?
         // let's assume we do it once a week..
         $x = DB_DataObject::Factory('core_curr_rate');
         $x->whereAdd('to_date > NOW()');
         if ($x->count()) {
             // got some data for beyond today..
+            
             return;
         }
         
@@ -135,8 +142,13 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
         $r = DB_DataObject::factory('core_curr_rate');
         $r->curr = $cur;
-        $r->whereAdd('from_dt < when_dt
+        $r->whereAdd("from_dt < '" . date('Y-m-d H:i:s', strtotime($when)) . "'");
         
+        $r->orderBy('to_dt ASC');
+        $r->limit(1);
+        if ($r->find(true)) {
+            return $r->rate;
+        }
     }
     
     function convert($val, $from, $to, $when = false)