OSB enhancements to date

2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions
--- a/modules/charge/charge.inc.php
+++ b/modules/charge/charge.inc.php
@@ -29,322 +29,172 @@
 * @subpackage Module:Charge
 */
 class charge extends OSB_module {
-	var $xmlrpc=false;
+	private $xmlrpc = false;

-	function sweep_daily() {
-		$this->sweep('0');
+	public function task_SweepDaily() {
+		$this->sweep(0);
 	}

-	function sweep_weekly() {
-		$this->sweep('1');
+	public function task_SweepWeekly() {
+		$this->sweep(1);
 	}

-	function sweep_monthly() {
-		$this->sweep('2');
+	public function task_SweepMonthly() {
+		$this->sweep(2);
 	}

-	function sweep_quarterly() {
-		$this->sweep('3');
+	public function task_SweepQuarterly() {
+		$this->sweep(3);
 	}

-	function sweep_semi_annually() {
-		$this->sweep('4');
+	public function task_SweepSemiAnnually() {
+		$this->sweep(4);
 	}

-	function sweep_annually() {
-		$this->sweep('5');
+	public function task_SweepAnnually() {
+		$this->sweep(5);
 	}

-	function sweep($type) {
-		include_once(PATH_MODULES.'account_billing/account_billing.inc.php');
-		$account_billing = new account_billing;
+	private function sweep($type) {
+		global $C_list;

-		include_once(PATH_MODULES.'tax/tax.inc.php');
-		$taxObj = new tax;
+		# Load required elements
+		include_once(PATH_MODULES.'invoice/invoice.inc.php');
+		include_once(PATH_MODULES.'account/account.inc.php');

-		include_once(PATH_MODULES.'discount/discount.inc.php');
+		$account_billing = false;
+		if ($C_list->is_installed('account_billing')) {
+			include_once(PATH_MODULES.'account_billing/account_billing.inc.php');
+			$abo = new account_billing;
+		}

+		$charges = $this->sql_GetRecords(array('where'=>array('status'=>0,'sweep_type'=>$type),'orderby'=>'account_id,date_orig'));
+
+		# No charges
+		if (! count($charges))
+			return true;
+
+		# Start a transaction
 		$db = &DB();
-		$sql = "SELECT DISTINCT
-					".AGILE_DB_PREFIX."charge.id,
-					".AGILE_DB_PREFIX."charge.account_id,
-					".AGILE_DB_PREFIX."charge.service_id,
-					".AGILE_DB_PREFIX."charge.amount,
-					".AGILE_DB_PREFIX."charge.taxable,
-					".AGILE_DB_PREFIX."charge.attributes,
-					".AGILE_DB_PREFIX."charge.quantity,
-					".AGILE_DB_PREFIX."charge.product_id,
-					".AGILE_DB_PREFIX."charge.description,
-					".AGILE_DB_PREFIX."account.affiliate_id,
-					".AGILE_DB_PREFIX."account.reseller_id,
-					".AGILE_DB_PREFIX."account.country_id,
-					".AGILE_DB_PREFIX."account.currency_id,
-					".AGILE_DB_PREFIX."account.state
-				FROM
-					".AGILE_DB_PREFIX."charge
-				LEFT JOIN
-					".AGILE_DB_PREFIX."account
-				ON
-					".AGILE_DB_PREFIX."account.id 		 = " . AGILE_DB_PREFIX."charge.account_id
-				WHERE
-					".AGILE_DB_PREFIX."charge.site_id 	 = " . $db->qstr(DEFAULT_SITE) . "
-				AND
-					".AGILE_DB_PREFIX."account.site_id 	 = " . $db->qstr(DEFAULT_SITE) . "
-				AND
-					".AGILE_DB_PREFIX."charge.status 	 = " . $db->qstr('0') ."
-				AND
-					".AGILE_DB_PREFIX."charge.sweep_type = " . $db->qstr($type) ."
-				ORDER BY
-					".AGILE_DB_PREFIX."charge.account_id";
-		$rs = $db->Execute($sql);
-		if ($rs === false) {
-			global $C_debug;
-			$C_debug->error('charge.inc.php','charge :: sweep()', $db->ErrorMsg(). "\r\n\r\n". $sql);
-			return false;
+		if (AGILE_DB_TYPE == 'mysqlt') {
+			$db->StartTrans();
+
+			if (! $db->hasTransactions) {
+				global $C_debug;
+
+				$msg = "Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver";
+				$C_debug->alert($msg);
+				$C_debug->error(__FILE__,__METHOD__,$msg);
+
+				return false;
+			}
 		}

-		$account_id = false;
-		$invoice_id = false;
-		$i 			= false;
-		$i_total 	= false;
-
-		$invoice_count = 0;
-		$sweep_count = 0;
-
-		while(!$rs->EOF)
-		{
-			if( $rs->fields['account_id'] != $account_id )
-			{
-				$account_id = $rs->fields['account_id'];
-				$i=0;
-				$i_total = $this->count_account_charges($account_id, $rs->CurrentRow(), $rs);
-
-				$sub_total = 0;
-				$taxable_amount = 0;
-				$this_discount_total = 0;
-				$tax_amt = 0;
-				$discount_amt = 0;
-
-				# Start a new transaction
-				$trans = &DB();
-				$trans->StartTrans();
-
-				# Start a new invoice
-				$invoice_id = $db->GenID(AGILE_DB_PREFIX . 'invoice_id');
-
-				# check for any discounts for the parent invoice or account_id (applied at checkout and should continue to be applied if recurring type discount)
-				$discountObj = new discount;
-
-				# get parent invoice id if service specified (for discount checking)
-				$parent_invoice_id = false;
-				if($rs->fields['service_id']) {
-					$parentinv = $db->Execute(sqlSelect($db,"service","invoice_id","id={$rs->fields['service_id']}"));
-					if($parentinv && $parentinv->RecordCount()) {
-						$parent_invoice_id = $parentinv->fields['invoice_id'];
-					}
-				}
-
-				# get available discounts to this account/service
-				$discountObj->available_discounts($account_id, 1, $parent_invoice_id);
+		$ao = false;
+		$io = false;
+		foreach ($charges as $charge) {
+			# First Run
+			if (! $ao) {
+				$ao = new account($charge['account_id']);
 			}

+			# Next run, are we onto a new account?
+			if ($ao->getRecordAttr('id') != $charge['account_id']) {
+				$rs = $io->sql_SaveRecord(true);

+				if (! $rs) {
+					global $C_debug;

-			###########################
-			##### LINE ITEM ACTIONS ###
-			###########################
+					$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
+					$db->FailTrans();

-			if( !empty($account_id) )
-			{
-				### Get the line item id
-				$invoice_item_id = $db->GenID(AGILE_DB_PREFIX . 'invoice_item_id');
-
-				### Set the invoice item details:
-				$product_id = $rs->fields['product_id'];
-				if(!empty($product_id) && empty($this->product["$product_id"]))
-				{
-					$sql = "SELECT sku FROM ".AGILE_DB_PREFIX."product WHERE
-							id 	= " . $db->qstr($product_id) . " AND
-							site_id = " . $db->qstr(DEFAULT_SITE);
-					$prod = $db->Execute($sql);
-					if($prod->RecordCount() > 0)
-					{
-						$sku = $prod->fields['sku'];
-						$this->product["$product_id"] = $sku;
-						$product_attr = '';
-						if(!empty($rs->fields['description']))
-							$product_attr = "Description=={$rs->fields['description']}\r\n";
-						$product_attr .= $rs->fields['attributes'];
-					}
-					else
-					{
-						$sku = $rs->fields['description'];
-						$this->product["$product_id"] = $sku;
-						$product_attr = $rs->fields['attributes'];
-					}
-				} elseif (!empty($this->product["$product_id"])) {
-					$sku = $this->product["$product_id"];
-					$product_attr = $rs->fields['attributes'];
-				} else {
-					$sku = $rs->fields['description'];
-					$product_attr = $rs->fields['attributes'];
+					return false;
 				}

-				$quantity = $rs->fields['quantity'];
-				$price_base = $rs->fields['amount'];
-				$item_total_amt = ($price_base * $quantity);
+				if (AGILE_DB_TYPE == 'mysqlt')
+					$db->CompleteTrans();

-				// Calculate any recurring discounts for this account
-				$item_discount_amt = $discountObj->calc_all_discounts(1, $invoice_item_id, $rs->fields['product_id'], $item_total_amt, $account_id, $sub_total+$item_total_amt);
-				$item_total_amt -= $item_discount_amt;
-				$sub_total += $item_total_amt;
-				$discount_amt += $item_discount_amt;
+				# Start next invoice
+				$io = false;

-				# calculate any taxes for this item
-				$item_tax_amt=0;
-				if($rs->fields['taxable']) {
-					$item_tax_arr = $taxObj->calculate($item_total_amt, $rs->fields['country_id'], $rs->fields['state']);
-					if(is_array($item_tax_arr)) foreach($item_tax_arr as $tx) $item_tax_amt += $tx['rate'];
-					$tax_amt += $item_tax_amt;
-				}
-
-				### Add line item to new invoice
-				$sql	= "INSERT INTO ".AGILE_DB_PREFIX."invoice_item SET
-						id					    = ".$db->qstr( $invoice_item_id ) .",
-						site_id				    = ".$db->qstr( DEFAULT_SITE ).",
-						invoice_id			    = ".$db->qstr( $invoice_id ).",
-						account_id				= ".$db->qstr( $account_id ).",
-						date_orig			    = ".$db->qstr( time() ).",
-						product_id			    = ".$db->qstr( $product_id ).",
-						sku					    = ".$db->qstr( $sku ).",
-						quantity			    = ".$db->qstr( $quantity ).",
-						item_type			    = ".$db->qstr( '0' ).",
-						product_attr		    = ".$db->qstr( $product_attr ).",
-						price_type              = ".$db->qstr( '0' ).",
-						price_base			    = ".$db->qstr( $price_base ).",
-						price_setup			    = ".$db->qstr( 0 ) .",
-						tax_amt					= ".$db->qstr($item_tax_amt) . ",
-						total_amt				= ".$db->qstr($item_total_amt) . ",
-						discount_amt			= ".$db->qstr($item_discount_amt);
-				$trans->Execute($sql);
-
-				# Insert tax records
-				$taxObj->invoice_item($invoice_id, $invoice_item_id, $account_id, @$item_tax_arr);
-
-				# Insert discount records
-				$discountObj->invoice_item($invoice_id, $invoice_item_id, $account_id);
-
-				### Update this charge status to billed
-				$sql  = "UPDATE ".AGILE_DB_PREFIX."charge SET
-						status   	= ".$db->qstr( '1' ) ."
-						WHERE
-						site_id	    = ".$db->qstr( DEFAULT_SITE )." AND
-						id		    = ".$db->qstr( $rs->fields['id'] ) ;
-				$trans->Execute($sql);
-				$i++;
-				$sweep_count++;
+				# Load our new account object
+				$ao = new account($charge['account_id']);
 			}

+			if (! $io) {
+				# Generate an invoice id
+				$io = new invoice();
+				$io->setRecordAttr('id',sqlGenID($db,'invoice'));
+				$io->setRecordAttr('account_id',$charge['account_id']);
+				$io->setRecordAttr('billed_currency_id',$ao->getRecordAttr('currency_id'));
+				$io->setRecordAttr('actual_billed_currency_id',DEFAULT_CURRENCY);
+				$io->setRecordAttr('reseller_id',$ao->getRecordAttr('reseller_id'));
+				$io->setRecordAttr('checkout_plugin_id',$ao->getRecordAttr('checkout_plugin_id'));
+				$io->setRecordAttr('checkout_plugin_data',$ao->getRecordAttr('checkout_plugin_data'));
+				$io->setRecordAttr('grace_period',$ao->getRecordAttr('invoice_grace'));
+				$io->setRecordAttr('affiliate_id',$ao->getRecordAttr('affiliate_id'));
+				$io->setRecordAttr('campaign_id',null);
+				$io->setRecordAttr('notice_next_date',time());
+				$io->setRecordAttr('billing_status',0);
+				$io->setRecordAttr('print_status',0);
+				$io->setRecordAttr('process_status',0);
+				$io->setRecordAttr('status',1);
+//				$io->setRecordAttr('suspend_billing',0);
+				$io->setRecordAttr('billed_amt',0);
+				$io->setRecordAttr('actual_billed_amt',0);
+				$io->setRecordAttr('notice_count',0);
+				$io->setRecordAttr('type',1);
+				$io->setRecordAttr('notice_max',MAX_BILLING_NOTICE);
+				$io->setRecordAttr('account_billing_id',null);

-
-			#######################
-			### INVOICE ACTIONS ###
-			#######################
-			if($i_total == $i || $i == $rs->RecordCount())
-			{
-				if( $invoice_id )
-				{
-					### Get the most recent billing id for this client:
-					if(!isset($billing_id["$account_id"]))
-					{
-						$billing_arr = $account_billing->default_billing($account_id);
-						$billing_id["$account_id"] = $billing_arr['billing_id'];
-						$checkout_plugin_id["$account_id"] = $billing_arr['checkout_plugin_id'];
-					}
-
-					### Affiliate & Reseller info:
-					$affiliate_id = $rs->fields['affiliate_id'];
-					$reseller_id  = $rs->fields['reseller_id'];
-					$actual_billed_currency_id = $rs->fields['currency_id'];
-
-					# calculate any taxes
-					@$total = $sub_total + $tax_amt;
-
-					if($total <= 0) {
-						$process_status = 1;
-						$billing_status = 1;
-					} else {
-						$process_status = 0;
-						$billing_status = 0;
-					}
-
-					### Generate the invoice insert SQL:
-					$sql = "INSERT INTO ".AGILE_DB_PREFIX."invoice SET
-								id							= ".$db->qstr($invoice_id).",
-								site_id						= ".$db->qstr(DEFAULT_SITE).",
-								date_orig					= ".$db->qstr(time()).",
-								date_last					= ".$db->qstr(time()).",
-								process_status				= ".$db->qstr($process_status).",
-								billing_status				= ".$db->qstr($billing_status).",
-								print_status				= ".$db->qstr('0').",
-								account_id					= ".$db->qstr($account_id).",
-								account_billing_id			= ".$db->qstr($billing_id["$account_id"]).",
-								affiliate_id				= ".$db->qstr($affiliate_id).",
-								reseller_id					= ".$db->qstr($reseller_id).",
-								checkout_plugin_id			= ".$db->qstr($checkout_plugin_id["$account_id"]).",
-								tax_amt						= ".$db->qstr($tax_amt).",
-								discount_amt				= ".$db->qstr($discount_amt).",
-								actual_billed_currency_id	= ".$db->qstr($actual_billed_currency_id).",
-								actual_billed_amt			= ".$db->qstr('0').",
-								billed_currency_id			= ".$db->qstr(DEFAULT_CURRENCY).",
-								billed_amt					= ".$db->qstr('0').",
-								total_amt					= ".$db->qstr($total).",
-								notice_count				= ".$db->qstr('0').",
-								notice_max					= ".$db->qstr(MAX_BILLING_NOTICE).",
-								notice_next_date			= ".$db->qstr(time()).",
-								grace_period				= ".$db->qstr(GRACE_PERIOD).",
-								due_date					= ".$db->qstr(time());
-					$trans->Execute($sql);
-
-					### Close this transaction
-					$trans->CompleteTrans();
-
-					$i_total = false;
-					$i = false;
-					$account_id = false;
-					$invoice_id = false;
-					$discount = false;
-					$cookie = false;
-					$invoice_count++;
-				}
+				# @todo this should be a system default
+				$io->setRecordAttr('due_date',time()+7*86400);
 			}
-			$rs->MoveNext();
+
+			$io->aaddItem(array(
+				'charge_id'=>$charge['id'],
+				'date_start'=>$charge['date_orig'],
+				'date_stop'=>$charge['date_orig'],
+				'domain_name'=>null,
+				'domain_tld'=>null,
+				'domain_type'=>null,
+				'domain_term'=>null,
+				'item_type'=>5,
+				'price_setup'=>0,
+				'price_base'=>$charge['amount'],
+				'price_type'=>3,
+				'product_id'=>$charge['product_id'],
+				'product_name'=>$charge['description'],
+				'product_attr'=>$charge['attributes'],
+				'product_attr_cart'=>null,
+				'quantity'=>$charge['quantity'],
+				'recurring_schedule'=>null,
+				'service_id'=>$charge['service_id'],
+				'sku'=>null
+			));
+
+			# @todo Move this update, need to incase the charge add fails.
+			$db->Execute(sqlUpdate($db,'charge',array('status'=>1),array('id'=>$charge['id'])));
 		}

-		global $C_debug;
-		$C_debug->alert("Swept $sweep_count Charge(s) into $invoice_count Invoice(s).");
-		return true;
+		# Save invoice
+		if ($io) {
+			$rs = $io->sql_SaveRecord(true);
+
+			if (! $rs) {
+				global $C_debug;
+
+				$C_debug->error(__FILE__,__METHOD__,$db->ErrorMsg());
+				$db->FailTrans();
+
+				return false;
+			}
+
+			if (AGILE_DB_TYPE == 'mysqlt')
+				$db->CompleteTrans();
+		}
 	}

-	### Get total charges for an account
-	function count_account_charges($account, $start_pos, &$rs) {
-		$rs->Move($start_pos);
-		$i = 0;
-		while(!$rs->EOF) {
-			if($rs->fields['account_id'] != $account) {
-				$rs->Move($start_pos);
-				return $i;
-			}
-			$i++;
-			$rs->MoveNext();
-		}
-		$rs->Move($start_pos);
-		return $i;
-	}
-
-	##############################
-	##		API   		        ##
-	##############################
 	function api($VAR) {
 		$db = &DB();

@@ -368,8 +218,7 @@ class charge extends OSB_module {
 		} else {

 			# check the account id
-			if(!empty($VAR['account_id']))
-			{
+			if(!empty($VAR['account_id'])) {
 				$sql = "SELECT * FROM ".AGILE_DB_PREFIX."account WHERE
 						id = " . $db->qstr($VAR['account_id']) . " OR
 						username = " . $db->qstr($VAR['account_id']) . " AND
@@ -379,19 +228,14 @@ class charge extends OSB_module {
 					global $C_debug;
 					$C_debug->error('charge.inc.php','charge :: api()', $db->ErrorMsg(). "\r\n\r\n". $sql);
 				}
-				if($rs->RecordCount() == 1)
-				{
+				if($rs->RecordCount() == 1) {
 					$account_id = $rs->fields['id'];
-				}
-				else
-				{
+				} else {
 					return $this->api_return(0,'','The \'account_id\' value provided does not exist');
 				}
-			}

 			# check the service id
-			elseif(!empty($VAR['service_id']))
-			{
+			} elseif(!empty($VAR['service_id'])) {
 				$sql = "SELECT id,account_id FROM ".AGILE_DB_PREFIX."service WHERE
 						site_id = " . $db->qstr(DEFAULT_SITE) . " AND
 						id = " . $db->qstr($VAR['service_id']);
@@ -400,8 +244,7 @@ class charge extends OSB_module {
 					global $C_debug;
 					$C_debug->error('charge.inc.php','charge :: api()', $db->ErrorMsg(). "\r\n\r\n". $sql);
 				}
-				if($rs->RecordCount() == 1)
-				{
+				if($rs->RecordCount() == 1) {
 					$service_id = $VAR['service_id'];
 					$account_id = $rs->fields['account_id'];
 				} else {
@@ -468,15 +311,12 @@ class charge extends OSB_module {
 			global $C_debug;
 			$C_debug->error('charge.inc.php','charge :: api()', $db->ErrorMsg(). "\r\n\r\n". $sql);
 			return $this->api_return(0,'','The SQL insert failed!');
-		}
-		else
-		{
+		} else {
 			return $this->api_return(1,$id,'');
 		}
 		return true;
 	}

-
 	function api_return($status=0,$id='',$error='') {
 		if (! $this->xmlrpc) {
 			echo "status=={$status}++charge_id={$id}++error=={$error}";
@@ -489,7 +329,7 @@ class charge extends OSB_module {
 	/**
 	 * Add a record
 	 */
-	function add($VAR) {
+	public function add($VAR) {
 		if (! empty($VAR['attributes'])) {
 			$attr = '';

@@ -500,7 +340,7 @@ class charge extends OSB_module {
 			$VAR['charge_attributes'] = $attr;
 		}

-		return $this->add($VAR);
+		return parent::add($VAR);
 	}

 	/**
--- a/modules/charge/charge_construct.xml
+++ b/modules/charge/charge_construct.xml
@@ -88,22 +88,23 @@
 			<type>X2</type>
 		</attributes>
 		<description>
+			<display>Description</display>
 			<type>C(32)</type>
 		</description>
 	</field>

 	<!-- Methods for this class, and the fields they have access to, if applicable -->
 	<method>
-		<add>status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</add>
-		<search_export>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</search_export>
-		<update>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</update>
-		<export_excel>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_excel>
-		<delete>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</delete>
-		<export_xml>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_xml>
-		<view>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</view>
-		<export_tab>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_tab>
-		<search>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</search>
-		<export_csv>id,site_id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_csv>
+		<add>status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes,description</add>
+		<delete>id</delete>
+		<update>id,status,sweep_type,amount,quantity,taxable,attributes,description</update>
+		<search_export>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</search_export>
+		<search>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</search>
+		<view>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes,description</view>
+		<export_excel>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_excel>
+		<export_xml>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_xml>
+		<export_tab>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_tab>
+		<export_csv>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</export_csv>
 		<import>id,date_orig,status,sweep_type,account_id,product_id,service_id,amount,quantity,taxable,attributes</import>
 	</method>

--- a/modules/charge/charge_install.xml
+++ b/modules/charge/charge_install.xml
@@ -17,7 +17,7 @@
 		<!-- SUB Modules to install with this one -->
 		<sub_modules></sub_modules>
 		<!-- MODULE Type (core|base), core modules cannot be deleted, unrecognised types are ignored. -->
-		<type>base</type>
+		<type></type>
 	</module_properties>

 	<!-- Tree Menu & Module Methods to load, they will be assigned the group permissions on install time, as selected by the user. -->
--- a/modules/charge/classes/model/charge.php
+++ b/modules/charge/classes/model/charge.php
@@ -0,0 +1,24 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides charge item capabilities.
+ *
+ * @package    OSB
+ * @subpackage Charge
+ * @category   Models
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Model_Charge extends ORMOSB {
+	protected $_formats = array(
+		'amount'=>array('Currency::display'=>array()),
+	);
+
+	// Show our description on the invoice.
+	public function invoice_display() {
+		// @todo The rounding should be a global config
+		return sprintf('%s: %2s x %s (%s)',Config::date($this->date_orig),$this->quantity,$this->description,$this->display('amount'));
+	}
+}
+?>