X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_payments.php;h=5c871834e8e3540d7d172dfd305f9d6ce296e65d;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=03639e75482a03983bf9c3c89b23af3a34b7a138;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 03639e75..5c871834 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $path_to_root=".."; $page_security = 3; include_once($path_to_root . "/includes/session.inc"); @@ -84,6 +93,18 @@ function can_process() return false; } + if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001)) + { + display_error(_("The exchange rate must be numeric and greater than zero.")); + set_focus('_ex_rate'); + return false; + } + + if ($_POST['discount'] == "") + { + $_POST['discount'] = 0; + } + if (!check_num('discount')) { display_error(_("The entered discount is not a valid number.")); set_focus('discount'); @@ -118,9 +139,18 @@ if (isset($_POST['_DateBanked_changed'])) { //---------------------------------------------------------------------------------------------- if (isset($_POST['AddPaymentItem'])) { + + $cust_currency = get_customer_currency($_POST['customer_id']); + $bank_currency = get_bank_account_currency($_POST['bank_account']); + $comp_currency = get_company_currency(); + if ($comp_currency != $bank_currency && $bank_currency != $cust_currency) + $rate = 0; + else + $rate = input_num('_ex_rate'); + $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'], $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'], - input_num('amount'), input_num('discount'), $_POST['memo_']); + input_num('amount'), input_num('discount'), $_POST['memo_'], $rate); meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -148,10 +178,9 @@ function read_customer_data() function display_item_form() { global $table_style2; - start_table($table_style2, 5, 7); - echo "