Merging from trunk: Correcting incorrect default amount to pay when u…

…nchecking apply discount and blanking out the to pay box

git-svn-id: svn://svn.code.sf.net/p/ledger-smb/code/branches/1.3@5588 4979c152-3d1c-0410-bac9-87ea11338e46

Changelog

@@ -13,6 +13,8 @@ T, 3599945)
 * 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

scripts/payment.pl

@@ -965,7 +965,7 @@ sub payment2 {
       $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;