Fixes to invoice display

This commit is contained in:
Deon George
2014-01-08 15:48:42 +11:00
parent 3cbf48721b
commit ec88eb6926
3 changed files with 20 additions and 7 deletions

View File

@@ -56,9 +56,7 @@ class Model_Invoice_Item extends ORM_OSB {
switch ($this->item_type) {
// Service Charges
case 0:
case 7:
return ((! $this->service_id OR $this->product_id OR $this->charge_id OR $this->product_name OR ! $this->recurring_schedule OR ! $this->date_start OR ! $this->date_stop) ? '+ ' : '').$ii.' '.$this->period();
case 1:
// @todo
return $this->product_name;
@@ -70,6 +68,9 @@ class Model_Invoice_Item extends ORM_OSB {
case 6:
return ((! $this->service_id OR $this->product_id OR $this->charge_id OR $this->product_name OR $this->recurring_schedule OR ! $this->date_start OR ! $this->date_stop) ? '+ ' : '').$ii;
case 7:
return ((! $this->service_id OR $this->product_id OR $this->charge_id OR $this->product_name OR ! $this->date_start OR ! $this->date_stop) ? '+ ' : '').$ii.' '.$this->period();
case 8:
return $this->product_name;