[wiaflos-devel] COMMIT - r273 - trunk/wiaflos/server

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-12-30 08:52:03 +0000 (Tue, 30 Dec 2008)
New Revision: 273

Modified:
   trunk/wiaflos/server/Invoicing.pm
Log:
* small fixes


Modified: trunk/wiaflos/server/Invoicing.pm
===================================================================
--- trunk/wiaflos/server/Invoicing.pm	2008-12-30 07:52:57 UTC (rev 272)
+++ trunk/wiaflos/server/Invoicing.pm	2008-12-30 08:52:03 UTC (rev 273)
@@ -1182,7 +1182,7 @@
 		'InvoiceNote' => defined($invoice->{'Note'}) ? $invoice->{'Note'} : "",
 
 		'InvoiceTotalExcl' => sprintf('%.2f',$invoice->{'SubTotal'}),
-		'InvoiceDiscountTotal' => (defined($invoice->{'DiscountTotal'}) && $invoice->{'DiscountTotal'} ne "0.00") 
+		'InvoiceDiscountTotal' => (defined($invoice->{'DiscountTotal'}) && $invoice->{'DiscountTotal'} ne "0") 
 				? sprintf('%.2f',$invoice->{'DiscountTotal'}) : "",
 		'InvoiceTotalTaxAmount' => sprintf('%.2f',$invoice->{'TaxTotal'}),
 		'InvoiceTotalIncl' => sprintf('%.2f',$invoice->{'Total'}),
@@ -1192,7 +1192,7 @@
 	foreach my $item (@{$invoiceItems}) {
 		my $titem;
 		# Various fixups & amount sanitizations
-		$titem->{'Code'} = $item->{'Code'};
+		$titem->{'Code'} = $item->{'InventoryCode'};
 		$titem->{'Description'} = $item->{'Description'};
 		($titem->{'Quantity'} = $item->{'Quantity'}) =~ s/\.0+$//;  # Remove .0's from quantity
 		$titem->{'Unit'} = "" if (!defined($item->{'Unit'}));