Merged changes up to 2.3.16 into unstable
[fa-stable.git] / purchasing / supplier_payment.php
index 0c8aa7dd4940c75979d984fafdf4f6ec9e786a93..800591df6baff9227e1cf8d9bde9235806e70094 100644 (file)
@@ -17,7 +17,6 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
-//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
@@ -58,14 +57,35 @@ if (isset($_POST['_DatePaid_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 
-if (list_updated('supplier_id') || list_updated('bank_account')) {
-  $_SESSION['alloc']->read();
-  $Ajax->activate('alloc_tbl');
-}
 //----------------------------------------------------------------------------------------
 
-if (isset($_GET['AddedID'])) 
-{
+if (!isset($_POST['bank_account'])) { // first page call
+         $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+
+       if (isset($_GET['PInvoice'])) {
+               //  get date and supplier
+               $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
+               if($inv) {
+                       $_POST['supplier_id'] = $inv['supplier_id'];
+                       $_POST['DatePaid'] = sql2date($inv['tran_date']);
+//                     $_POST['discount'] = price_format(0);
+//             $_POST['bank_account'], $_POST['ref']
+                       $_POST['memo_'] = $inv['supp_reference'];
+                       foreach($_SESSION['alloc']->allocs as $line => $trans) {
+                               if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
+                                       $_POST['amount'] =
+                                               $_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
+                                       $_SESSION['alloc']->allocs[$line]->current_allocated =
+                                               $_SESSION['alloc']->allocs[$line]->amount;
+                                       break;
+                               }
+                       }
+                       unset($inv);
+               } else
+                       display_error(_("Invalid purchase invoice number."));
+       }
+}
+if (isset($_GET['AddedID'])) {
        $payment_id = $_GET['AddedID'];
 
        display_notification_centered( _("Payment has been sucessfully entered"));
@@ -73,11 +93,12 @@ if (isset($_GET['AddedID']))
        submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
        submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
 
-    display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
+    display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")));
 
+       hyperlink_no_params($path_to_root . "/purchasing/inquiry/supplier_allocation_inquiry.php?supplier_id=", _("Select Another &Supplier Transaction for Payment"));
 //    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Supplier &Payment"), "supplier_id=" . $_POST['supplier_id']);
 
        display_footer_exit();
 }
@@ -88,6 +109,13 @@ function check_inputs()
 {
        global $Refs;
 
+       if (!get_post('supplier_id')) 
+       {
+               display_error(_("There is no supplier selected."));
+               set_focus('supplier_id');
+               return false;
+       } 
+       
        if ($_POST['amount'] == "") 
        {
                $_POST['amount'] = price_format(0);
@@ -107,7 +135,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');
@@ -134,7 +162,8 @@ function check_inputs()
                return false;
        }
 
-       if (input_num('amount') - input_num('discount') <= 0) 
+       //if (input_num('amount') - input_num('discount') <= 0) 
+       if (input_num('amount') <= 0) 
        {
                display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
                set_focus('amount');
@@ -149,10 +178,20 @@ function check_inputs()
        } 
        elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('DatePaid');
                return false;
        }
+
+       $limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
+
+       if ($limit != null && ($limit < input_num('amount')))
+       {
+               display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
+               set_focus('amount');
+               return false;
+       }
+
     if (!$Refs->is_valid($_POST['ref'])) 
     {
                display_error(_("You must enter a reference."));
@@ -167,6 +206,8 @@ function check_inputs()
                return false;
        }
 
+       if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
+               return false;
        $_SESSION['alloc']->amount = -input_num('amount');
 
        if (isset($_POST["TotalNumberOfAllocs"]))
@@ -185,7 +226,11 @@ function handle_add_payment()
        if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
                $rate = 0;
        else
+       {
                $rate = input_num('_ex_rate');
+               $supplier_amount = input_num('allocated_amount'); 
+                       if($supplier_amount) $rate = input_num('amount')/$supplier_amount;
+       }
 
        $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
                $_POST['bank_account'], input_num('amount'), input_num('discount'), 
@@ -223,19 +268,27 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-       start_outer_table("$table_style2 width=60%", 5);
+       start_outer_table(TABLESTYLE2, "width=60%", 5);
 
        table_section(1);
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
-       if (!isset($_POST['bank_account'])) // first page call
-                 $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+       if (list_updated('supplier_id') || list_updated('bank_account')) {
+         $_SESSION['alloc']->read();
+         $_POST['memo_'] = $_POST['amount'] = '';
+         $Ajax->activate('alloc_tbl');
+       }
 
        set_global_supplier($_POST['supplier_id']);
-       
+
+       if (!list_updated('bank_account'))
+               $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);              
+
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
+       bank_balance_row($_POST['bank_account']);
+
        table_section(2);
 
     ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
@@ -248,7 +301,7 @@ start_form();
        $bank_currency = get_bank_account_currency($_POST['bank_account']);
        if ($bank_currency != $supplier_currency) 
        {
-               exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true);
+               amount_row("Supplier Amount:", 'allocated_amount', null, '', $supplier_currency, 2);
        }
 
        amount_row(_("Bank Charge:"), 'charge');
@@ -257,12 +310,12 @@ start_form();
        end_outer_table(1); // outer table
 
        if ($bank_currency == $supplier_currency) {
-       div_start('alloc_tbl');
+               div_start('alloc_tbl');
                show_allocatable(false);
-       div_end();
+               div_end();
        }
 
-       start_table("$table_style width=60%");
+       start_table(TABLESTYLE, "width=60%");
        amount_row(_("Amount of Discount:"), 'discount');
        amount_row(_("Amount of Payment:"), 'amount');
        textarea_row(_("Memo:"), 'memo_', null, 22, 4);