SF.net SVN: ledger-smb:[4283] branches/1.3

[..hidden..]

Revision: 4283
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4283&view=rev
Author:   einhverfr
Date:     2012-01-31 05:03:56 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Fixing missing exchange rate box on batch payment interface and correcting input of database routines

Modified Paths:
--------------
    branches/1.3/UI/payments/payments_detail.html
    branches/1.3/scripts/payment.pl
    branches/1.3/sql/modules/Payment.sql

Modified: branches/1.3/UI/payments/payments_detail.html
===================================================================
--- branches/1.3/UI/payments/payments_detail.html	2012-01-24 09:53:58 UTC (rev 4282)
+++ branches/1.3/UI/payments/payments_detail.html	2012-01-31 05:03:56 UTC (rev 4283)
@@ -145,17 +145,17 @@
 		END # If a.accno... ?><?lsmb
 	END # FOREACH a ?>
       </span>
-     </div>
-     <?lsmb  IF defaultcurrency != curr ?>
+     </div> 
+     <?lsmb  IF default_currency != currency ?>
       <div class="info" id="exrate_row">
          <?lsmb PROCESS input element_data= {
-		label = text('Exchange Rate')
-		type = text
+		label = text('Exchange Rate') #'
+		type = 'text'
 		class = "numeric"
 		name = 'exchange_rate'
 		value = exchange_rate
 		size = 20
-	} # ' ?>
+	}  ?>
 	</div>
      <?lsmb END ?>
      <?lsmb IF business ?>

Modified: branches/1.3/scripts/payment.pl
===================================================================
--- branches/1.3/scripts/payment.pl	2012-01-24 09:53:58 UTC (rev 4282)
+++ branches/1.3/scripts/payment.pl	2012-01-31 05:03:56 UTC (rev 4283)
@@ -561,6 +561,7 @@
 sub display_payments {
     my ($request) = @_;
     my $payment =  LedgerSMB::DBObject::Payment->new({'base' => $request});
+    $payment->{default_currency} =  $payment->get_default_currency();;
     $payment->get_payment_detail_data();
     $payment->open_form();
     $payment->{dbh}->commit;

Modified: branches/1.3/sql/modules/Payment.sql
===================================================================
--- branches/1.3/sql/modules/Payment.sql	2012-01-24 09:53:58 UTC (rev 4282)
+++ branches/1.3/sql/modules/Payment.sql	2012-01-31 05:03:56 UTC (rev 4283)
@@ -444,7 +444,7 @@
 (in_transactions numeric[], in_batch_id int, in_source text, in_total numeric,
         in_ar_ap_accno text, in_cash_accno text, 
         in_payment_date date, in_account_class int,
-        in_exchangerate numeric, in_curr text)
+        in_exchangerate numeric, in_currency text)
 RETURNS int AS
 $$
 DECLARE 
@@ -474,7 +474,7 @@
           from defaults 
          where setting_key = 'curr';
 
-        IF (in_curr IS NULL OR in_curr = t_currs[0]) THEN
+        IF (in_currency IS NULL OR in_currency = t_currs[0]) THEN
                 t_exchangerate := 1;
         ELSE 
                 t_exchangerate := in_exchangerate;
@@ -502,7 +502,7 @@
             t_cash_sign := -1;
         END IF;
 
-        IF (in_curr IS NULL OR in_curr = t_currs[0]) THEN
+        IF (in_currency IS NULL OR in_currency = t_currs[0]) THEN
             UPDATE bulk_payments_in
                SET fxrate = 1;
         ELSE
@@ -575,7 +575,7 @@
 (in_transactions numeric[], in_batch_id int, in_source text, in_total numeric,
         in_ar_ap_accno text, in_cash_accno text, 
         in_payment_date date, in_account_class int, 
-	in_exchangerate numeric, in_curr text)
+	in_exchangerate numeric, in_currency text)
 IS
 $$ This posts the payments for large batch workflows.
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.