deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Updates from lnApp

Browse Source
This commit is contained in:
Deon George
2011-07-14 08:59:32 +10:00
parent 5c9750e957
commit 46c3b9a075
31 changed files with 991 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoice/classes/model/invoice.php
View File

@@ -17,7 +17,7 @@ class Model_Invoice extends ORMOSB {
'account'=>array()
);
protected $_has_many = array(
'invoice_item'=>array(),
'invoice_item'=>array('far_key'=>'id'),
'invoice_item_tax'=>array(),
'service'=>array('through'=>'invoice_item'),
'payment'=>array('through'=>'payment_item'),

4
modules/invoice/classes/model/invoice/item.php
View File

@@ -17,7 +17,7 @@ class Model_Invoice_Item extends ORMOSB {
'service'=>array()
);
protected $_has_many = array(
'invoice_item_tax'=>array()
'invoice_item_tax'=>array('far_key'=>'id')
);
protected $_updated_column = FALSE; // @todo No update columns
@@ -52,7 +52,7 @@ class Model_Invoice_Item extends ORMOSB {
return ($this->price_base+$this->price_setup)*$this->quantity+$this->tax_amt-$this->discount_amt;
}
public function save() {
public function save(Validation $validation = NULL) {
// Save the invoice item
parent::save();