diff --git a/application/classes/Config.php b/application/classes/Config.php
index a55e4405..0527e6b5 100644
--- a/application/classes/Config.php
+++ b/application/classes/Config.php
@@ -65,7 +65,7 @@ class Config extends Kohana_Config {
}
public static function date($date) {
- return date(Company::instance()->date_format(),($date ? $date : time()));
+ return is_null($date) ? NULL : date(Company::instance()->date_format(),$date);
}
/**
diff --git a/application/classes/Model/Module/Method/Token.php b/application/classes/Model/Module/Method/Token.php
index dc47f564..02f17580 100644
--- a/application/classes/Model/Module/Method/Token.php
+++ b/application/classes/Model/Module/Method/Token.php
@@ -10,6 +10,9 @@
* @license http://dev.osbill.net/license.html
*/
class Model_Module_Method_Token extends ORM_OSB {
+ // This module doesnt keep track of column updates automatically
+ protected $_updated_column = FALSE;
+
// Relationships
protected $_belongs_to = array(
'account'=>array(),
@@ -19,9 +22,6 @@ class Model_Module_Method_Token extends ORM_OSB {
'record_id'=>array(),
);
- // This module doesnt keep track of column updates automatically
- protected $_update_column = FALSE;
-
public function method(array $modmeth) {
list($module,$method) = $modmeth;
diff --git a/application/classes/ORM.php b/application/classes/ORM.php
index 6eb68d52..a80fa536 100644
--- a/application/classes/ORM.php
+++ b/application/classes/ORM.php
@@ -115,6 +115,10 @@ abstract class ORM extends Kohana_ORM {
return $value;
}
+ public function display_filters(array $filters) {
+ $this->_display_filters = Arr::merge($this->_display_filters,$filters);
+ }
+
/**
* Function help to find records that are active
*/
diff --git a/application/classes/ORM/OSB.php b/application/classes/ORM/OSB.php
index 70930531..0237aed2 100644
--- a/application/classes/ORM/OSB.php
+++ b/application/classes/ORM/OSB.php
@@ -171,6 +171,10 @@ abstract class ORM_OSB extends ORM {
return array_key_exists($key,$this->$column) ? $this->{$column}[$key] : NULL;
}
+ final public function module() {
+ return ORM::factory(Kohana::classname($this->name));
+ }
+
final public function mid() {
return ORM::factory('Module',array('name'=>$this->_table_name));
}
diff --git a/application/classes/StaticList/Module.php b/application/classes/StaticList/Module.php
deleted file mode 100644
index ffd33df5..00000000
--- a/application/classes/StaticList/Module.php
+++ /dev/null
@@ -1,91 +0,0 @@
-from($table)->where($skey,'=',$value)->execute();
-
- if ($db->count() !== 1)
- return sprintf('No Value (%s)',$value);
- else
- return $db->get($key);
- }
-
- /**
- * This function is to return the cached value of the current active record
- * This is so that a follow up call to get an attribute of a value retrieved
- * can reuse the active record values.
- * This gets over a limitation where the query to form() to get a default
- * no longer exists (or is invalid) and you want other attributes of the
- * remaining active record, which may not be the default record.
- */
- public static function record($table,$attribute,$skey,$value) {
- if (empty(static::$record[$table]))
- return static::display($table,$attribute,$skey,$value);
- else
- return static::$record[$table][$attribute];
- }
-
- /**
- * Renders form input
- */
- public static function form($name,$default='',$addblank=FALSE) {
- // Override our argument list as defined in parent
- list($name,$table,$default,$key,$value,$where,$addblank,$attributes) = func_get_args();
-
- $db = DB::select()->from($table);
-
- foreach ($where as $k=>$v) {
- list ($op,$v) = explode(':',$v);
- $db->where($k,$op,$v);
- }
-
- $db = $db->execute();
-
- // If we only have one record, dont make a select list
- if ($db->count() == 1) {
- static::$record[$table] = $db->as_array();
- static::$record[$table] = array_shift(static::$record[$table]);
-
- return Form::hidden($name,$db->get($key)).$db->get($value);
- }
-
- // Else we return a select list
- $x = array();
- if ($addblank)
- $x[] = '';
-
- foreach ($db as $record) {
- $x[$record[$key]] = $record[$value];
-
- // Save our static record, in case we reference this item again.
- if ($record[$key] == $default)
- static::$record[$table] = $record;
- }
-
- return Form::select($name,$x,$default,$attributes);
- }
-
- public static function get($value) {
- return static::factory()->_get($value);
- }
-}
-?>
diff --git a/application/views/account/user/edit.php b/application/views/account/user/edit.php
index b7545e7f..bde82b3f 100644
--- a/application/views/account/user/edit.php
+++ b/application/views/account/user/edit.php
@@ -52,8 +52,8 @@