From 91980b891e3651cbc9350a4f692b9969c8142618 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 11 Oct 2013 11:00:16 +1100
Subject: [PATCH] Minor cleanup and fixes for Tasks

---
 modules/adsl/classes/Task/Adsl/Trafficget.php |  4 ++++
 modules/invoice/classes/Model/Invoice.php     | 19 +++++++++++--------
 modules/task/classes/Task/Task/Clean.php      |  2 --
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modules/adsl/classes/Task/Adsl/Trafficget.php b/modules/adsl/classes/Task/Adsl/Trafficget.php
index 5cae66e9..b2cf7d41 100644
--- a/modules/adsl/classes/Task/Adsl/Trafficget.php
+++ b/modules/adsl/classes/Task/Adsl/Trafficget.php
@@ -10,6 +10,10 @@
  * @license    http://dev.osbill.net/license.html
  */
 class Task_Adsl_Trafficget extends Minion_Task {
+	protected $_options = array(
+		'verbose'=>FALSE,
+	);
+
 	protected function _traffic_suppliers($active=FALSE) {
 		$suppliers = ORM::factory('ADSL_Supplier');
 
diff --git a/modules/invoice/classes/Model/Invoice.php b/modules/invoice/classes/Model/Invoice.php
index 2cc5d97e..8034b62c 100644
--- a/modules/invoice/classes/Model/Invoice.php
+++ b/modules/invoice/classes/Model/Invoice.php
@@ -657,11 +657,14 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 		return parent::list_autocomplete($term,$index,$value,$label,$limit,$options);
 	}
 
-	private function _list_due() {
+	private function _list_due($authorised) {
 		static $result = array();
 
+		if ($authorised)
+			$this->where_authorised();
+
 		if (! $result)
-			foreach ($this->_where_active()->_where_unprocessed()->where_authorised()->find_all() as $io)
+			foreach ($this->_where_active()->_where_unprocessed()->find_all() as $io)
 				if ($io->due())
 					array_push($result,$io);
 
@@ -679,13 +682,13 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 	/**
 	 * Identify all the invoices that are due
 	 */
-	public function list_overdue($time=NULL) {
+	public function list_overdue($time=NULL,$authorised=TRUE) {
 		$result = array();
 
 		if (is_null($time))
 			$time = time();
 
-		foreach ($this->_list_due() as $io)
+		foreach ($this->_list_due($authorised) as $io)
 			if ($io->due_date <= $time)
 				array_push($result,$io);
 
@@ -714,23 +717,23 @@ class Model_Invoice extends ORM_OSB implements Cartable {
 	/**
 	 * Return a list of invoices that are due, excluding overdue.
 	 */
-	public function list_due($time=NULL) {
+	public function list_due($time=NULL,$authorised=TRUE) {
 		$result = array();
 
 		if (is_null($time))
 			$time = time();
 
-		foreach ($this->_list_due() as $io)
+		foreach ($this->_list_due($authorised) as $io)
 			if ($io->due_date > $time)
 				array_push($result,$io);
 
 		return $result;
 	}
 
-	public function list_due_total($format=FALSE,$time=NULL) {
+	public function list_due_total($format=FALSE,$time=NULL,$authorised=TRUE) {
 		$result = 0;
 
-		foreach ($this->list_due($time) as $io)
+		foreach ($this->list_due($time,$authorised) as $io)
 			$result += $io->due();
 
 		return $format ? Currency::display($result) : Currency::round($result);
diff --git a/modules/task/classes/Task/Task/Clean.php b/modules/task/classes/Task/Task/Clean.php
index 67be814a..c736094e 100644
--- a/modules/task/classes/Task/Task/Clean.php
+++ b/modules/task/classes/Task/Task/Clean.php
@@ -68,8 +68,6 @@ class Task_Task_Clean extends Minion_Task {
 				$to->delete();
 				continue;
 			}
-continue;
-print_r(array($to->object(),$to->display('date_orig')));die();
 		}
 	}
 }