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

[..hidden..]

Revision: 5588
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5588&view=rev
Author:   einhverfr
Date:     2013-01-16 07:52:16 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
Merging from trunk: Correcting incorrect default amount to pay when unchecking apply discount and blanking out the to pay box

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/scripts/payment.pl

Property Changed:
----------------
    branches/1.3/Changelog
    branches/1.3/scripts/payment.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-16 07:49:22 UTC (rev 5587)
+++ branches/1.3/Changelog	2013-01-16 07:52:16 UTC (rev 5588)
@@ -13,6 +13,8 @@
 * Added wrapper div around pricegroup field in contact screen to allow cssp,
 Chris T.
 * Fixed inverted tax numbers in vendor taxable sales report (Chris T, 3600002)
+* Fixed cash/receipt and payment screen calculating to pay wrong (Chris T,
+3599995)
 
 Changelog for 1.3.28
 * Added db list to setup.pl when no db is entered and credentials allow login


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587

Modified: branches/1.3/scripts/payment.pl
===================================================================
--- branches/1.3/scripts/payment.pl	2013-01-16 07:49:22 UTC (rev 5587)
+++ branches/1.3/scripts/payment.pl	2013-01-16 07:52:16 UTC (rev 5588)
@@ -965,7 +965,7 @@
       $request->{"optional_discount_$array_options[$ref]->{invoice_id}"} = $request->{first_load}? "on":  $request->{"optional_discount_$array_options[$ref]->{invoice_id}"};
 
 # LETS SET THE EXCHANGERATE VALUES
-   my $due_fx = $request->{"optional_discount_$array_options[$ref]->{invoice_id}"} ? $request->round_amount($array_options[$ref]->{due_fx}) : $request->round_amount($array_options[$ref]->{due_fx}) +  $array_options[$ref]->{discount_fx} ;
+   my $due_fx = $request->{"optional_discount_$array_options[$ref]->{invoice_id}"} ? $request->round_amount($array_options[$ref]->{due_fx}) : $request->round_amount($array_options[$ref]->{due_fx});
    my $topay_fx_value;
    if ("$exchangerate") {
        $topay_fx_value =   $due_fx;


Property changes on: branches/1.3/scripts/payment.pl
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/LedgerSMB/Scripts/payment.pm:5587

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