Fixed handling extended journal entries in various places.

[fa-stable.git] / purchasing / supplier_payment.php

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index b3fe7ceeaefc241a3a35141d238e500edd2c969a..955bd23ca331d4ec822cb33d342c84768cbe51d2 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 add_js_file('payalloc.js');
@@ -71,16 +71,16 @@ if (!isset($_POST['bank_account'])) { // first page call
 
        if (isset($_GET['PInvoice'])) {
                //  get date and supplier
-               $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
+               $inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']);
                $dflt_act = get_default_bank_account($inv['curr_code']);
                $_POST['bank_account'] = $dflt_act['id'];
-               if($inv) {
+               if ($inv) {
                        $_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
                        $_SESSION['alloc']->read();
                        $_POST['DatePaid'] = sql2date($inv['tran_date']);
                        $_POST['memo_'] = $inv['supp_reference'];
                        foreach($_SESSION['alloc']->allocs as $line => $trans) {
-                               if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
+                               if ($trans->type == $_GET['trans_type'] && $trans->type_no == $_GET['PInvoice']) {
                                        $un_allocated = abs($trans->amount) - $trans->amount_allocated;
                                        $_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
                                        $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
@@ -144,7 +144,7 @@ function check_inputs()
        }
 
        if (isset($_POST['charge']) && input_num('charge') > 0) {
-               $charge_acct = get_company_pref('bank_charge_act');
+               $charge_acct = get_bank_charge_account($_POST['bank_account']);
                if (get_gl_account($charge_acct) == false) {
                        display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
                        set_focus('charge');
@@ -237,6 +237,7 @@ function handle_add_payment()
        new_doc_date($_POST['DatePaid']);
 
        $_SESSION['alloc']->trans_no = $payment_id;
+       $_SESSION['alloc']->date_ = $_POST['DatePaid'];
        $_SESSION['alloc']->write();
 
        unset($_POST['bank_account']);
@@ -267,7 +268,7 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-       start_outer_table(TABLESTYLE2, "width=60%", 5);
+       start_outer_table(TABLESTYLE2, "width='60%'", 5);
 
        table_section(1);
 
@@ -318,7 +319,7 @@ start_form();
        show_allocatable(false);
        div_end();
 
-       start_table(TABLESTYLE, "width=60%");
+       start_table(TABLESTYLE, "width='60%'");
        amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency);
        amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency);
        textarea_row(_("Memo:"), 'memo_', null, 22, 4);
@@ -329,4 +330,3 @@ start_form();
 end_form();
 
 end_page();
-?>