[wiaflos-devel] COMMIT - r222 - trunk/wiaflos/client/cmdline

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-08-10 17:18:37 +0000 (Sun, 10 Aug 2008)
New Revision: 222

Modified:
   trunk/wiaflos/client/cmdline/Receipting.pm
Log:
* Added support to commandline tool to allocate receipts to transactions


Modified: trunk/wiaflos/client/cmdline/Receipting.pm
===================================================================
--- trunk/wiaflos/client/cmdline/Receipting.pm	2008-08-10 17:17:49 UTC (rev 221)
+++ trunk/wiaflos/client/cmdline/Receipting.pm	2008-08-10 17:18:37 UTC (rev 222)
@@ -79,7 +79,7 @@
 							MenuItem 	=> "Allocate",
 							Regex		=> "alloc(?:ate)?",
 							Desc		=> "Allocate monies from a receipt",
-							Help		=> 'allocate receipt="<receipt number>" invoice="<client invoice>" amount="<amount to allocate>"',
+							Help		=> 'allocate receipt="<receipt number>" [invoice="<client invoice>"] [transaction="<transaction number>"] amount="<amount to allocate>"',
 							Function	=> \&createAllocation,
 						},
 						{
@@ -239,8 +239,8 @@
 		return ERR_C_PARAM;
 	}
 
-	if (!defined($parms->{'invoice'})) {
-		print($OUT "  => ERROR: Parameter 'invoice' not defined\n");
+	if (!defined($parms->{'invoice'}) && !defined($parms->{'transaction'})) {
+		print($OUT "  => ERROR: Parameter 'invoice' and 'transaction' not defined\n");
 		return ERR_C_PARAM;
 	}
 
@@ -253,6 +253,7 @@
 	my $detail;
 	$detail->{'ReceiptNumber'} = $parms->{'receipt'};
 	$detail->{'InvoiceNumber'} = $parms->{'invoice'};
+	$detail->{'TransactionNumber'} = $parms->{'transaction'};
 	$detail->{'Amount'} = $parms->{'amount'};
 	my $res = soapCall($OUT,"Receipting","createReceiptAllocation",$detail);
 	# Save this ID
@@ -344,7 +345,7 @@
 	foreach my $alloc (@{$allocs}) {
 		$balance->badd($alloc->{'Amount'}) if ($alloc->{'Posted'});
 		$unposted->badd($alloc->{'Amount'}) if (!$alloc->{'Posted'});
-		print swrite(<<'END', $alloc->{'ID'}, $alloc->{'InvoiceNumber'}, sprintf('%.2f',$alloc->{'Amount'}), $alloc->{'Posted'}, $alloc->{'Posted'} ? $balance->bstr() : '');
+		print swrite(<<'END', $alloc->{'ID'}, defined($alloc->{'InvoiceNumber'}) ? $alloc->{'InvoiceNumber'} : 'Transaction', sprintf('%.2f',$alloc->{'Amount'}), $alloc->{'Posted'}, $alloc->{'Posted'} ? $balance->bstr() : '');
 | @<<<< | @<<<<<<<<<<<<<<<<<< | @>>>>>>>>>>> | @||||| | @>>>>>>>>>>> |
 END
 	}