0003761: Reorder email is not sent for items used work order. Fixed

[fa-stable.git] / gl / gl_bank.php

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 00ce078363d9d2e134252aa86f41ce680c13abcc..5bc7cecd4af4c8f806c878ccfc49c4c0fccfc112 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -280,7 +280,7 @@ function check_trans()
        if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true))
                $input_error = 1;
 
-       if (in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) {
+       if (isset($_POST['settled_amount']) && in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) {
                display_error(_("Settled amount have to be positive number."));
                set_focus('person_id');
                $input_error = 1;
@@ -295,13 +295,14 @@ if (isset($_POST['Process']) && !check_trans())
        $_SESSION['pay_items'] = &$_SESSION['pay_items'];
        $new = $_SESSION['pay_items']->order_id == 0;
 
+       add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
+
        $trans = write_bank_transaction(
                $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'],
                $_SESSION['pay_items'], $_POST['date_'],
                $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
                $_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null));
 
-       add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
        $trans_type = $trans[0];
        $trans_no = $trans[1];
        new_doc_date($_POST['date_']);
@@ -400,7 +401,7 @@ start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?