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

Fix export accounting, added Domain List

Browse Source
This commit is contained in:
Deon George
2014-01-07 23:29:18 +11:00
parent 82c51de550
commit 3cbf48721b
7 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoice/classes/Model/Invoice.php
View File

@@ -191,7 +191,7 @@ class Model_Invoice extends ORM_OSB implements Cartable {
$processed = array();
foreach ($this->subitems() as $iio) {
if (in_array($iio->id,$processed))
if ($iio->id AND in_array($iio->id,$processed))
continue;
if ($iio->recurring_schedule) {

4
modules/invoice/classes/Model/Invoice/Item.php
View File

@@ -189,8 +189,8 @@ class Model_Invoice_Item extends ORM_OSB {
$result = array();
foreach ($this->subitems() as $iito) {
if (! isset($result[$iit->tax_id]))
$result[$iit->tax_id] = 0;
if (! isset($result[$iito->tax_id]))
$result[$iito->tax_id] = 0;
$result[$iito->tax_id] += $iito->amount;
}