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

Fixes to invoice display

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/export/classes/Export/Plugin/Quicken.php
View File

@@ -100,7 +100,7 @@ class Export_Plugin_Quicken extends Export_Plugin {
$items[$c]['INVITEM'] = $edo->map_data['item'];
} else {
throw HTTP_Exception::factory(501,'Missing product map data for :product (:id)',array(':product'=>$iio->product->title(),':id'=>$iio->product_id));
throw HTTP_Exception::factory(501,'Missing product map data for :product (:id)',array(':product'=>$iio->module()->title(),':id'=>$iio->module_ref));
}
$items[$c]['MEMO'] = sprintf('%s (%s)',$iio->module()->title(),$iio->period());
@@ -133,13 +133,13 @@ class Export_Plugin_Quicken extends Export_Plugin {
$items[$c]['TAXAMOUNT'] = 0;
}
// @todo This rounding should be a system config.
if ($iio->module() instanceof Model_Charge) {
$items[$c]['QNTY'] *= $iio->module()->quantity;
$items[$c]['PRICE'] = sprintf('%3.2f',round($iio->subtotal()-$iio->discount(),2));
$items[$c]['AMOUNT'] = sprintf('%3.2f',round($iio->module()->amount-$iio->discount(),2)*-1);
$items[$c]['PRICE'] = sprintf('%3.2f',round($iio->module()->amount-$iio->discount(),2));
$items[$c]['AMOUNT'] = sprintf('%3.2f',round($iio->subtotal()-$iio->discount(),2)*-1);
} else {
// @todo This rounding should be a system config.
$items[$c]['PRICE'] = sprintf('%3.2f',round($iio->subtotal()-$iio->discount(),2));
$items[$c]['AMOUNT'] = sprintf('%3.2f',round($iio->subtotal()-$iio->discount(),2)*-1);
}