Customer Delivery: fixed regression after last commit.

[fa-stable.git] / sales / customer_payments.php

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 1f60e058068e745caccce1e6099f48a0690e033f..10742c88dac54381fc360a932bd108ab593dfc98 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -21,10 +21,10 @@ include_once($path_to_root . "/sales/includes/sales_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');
@@ -49,18 +49,20 @@ if (!isset($_POST['bank_account'])) { // first page call
        if (isset($_GET['SInvoice'])) {
                //  get date and supplier
                $inv = get_customer_trans($_GET['SInvoice'], ST_SALESINVOICE);
+               $dflt_act = get_default_bank_account($inv['curr_code']);
+               $_POST['bank_account'] = $dflt_act['id'];
                if($inv) {
-                       $_POST['customer_id'] = $inv['debtor_no'];
+                       $_SESSION['alloc']->person_id = $_POST['customer_id'] = $inv['debtor_no'];
+                       $_SESSION['alloc']->read();
+                       $_POST['BranchID'] = $inv['branch_code'];
                        $_POST['DateBanked'] = sql2date($inv['tran_date']);
                        foreach($_SESSION['alloc']->allocs as $line => $trans) {
                                if ($trans->type == ST_SALESINVOICE && $trans->type_no == $_GET['SInvoice']) {
                                        $un_allocated = $trans->amount - $trans->amount_allocated;
-                                       if($un_allocated){
-                                       $_POST['amount'] = $_SESSION['alloc']->amount = 
-//                                             price_format($trans->amount);
-                                       $_SESSION['alloc']->allocs[$line]->current_allocated =
-//                                             $trans->amount;
-                                               price_format($un_allocated);}
+                                       if ($un_allocated){
+                                               $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+                                               $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
+                                       }
                                        break;
                                }
                        }
@@ -152,27 +154,12 @@ function can_process()
                set_focus('DateBanked');
                return false;
        } elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) {
-               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('DateBanked');
                return false;
        }
 
-       if (!$Refs->is_valid($_POST['ref'])) {
-               display_error(_("You must enter a reference."));
-               set_focus('ref');
-               return false;
-       }
-
-       //Chaitanya : 13-OCT-2011 - To support Edit feature
-       if (isset($_POST['trans_no']) && $_POST['trans_no'] == 0 && (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT))) {
-               display_error(_("The entered reference is already in use."));
-               set_focus('ref');
-               return false;
-       }
-       //Avoid duplicate reference while modifying
-       elseif ($_POST['ref'] != $_POST['old_ref'] && !is_new_reference($_POST['ref'], ST_CUSTPAYMENT))
-       {
-               display_error( _("The entered reference is already in use."));
+       if (!check_reference($_POST['ref'], ST_CUSTPAYMENT, @$_POST['trans_no'])) {
                set_focus('ref');
                return false;
        }
@@ -189,7 +176,7 @@ function can_process()
                return false;
        }
        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');
@@ -246,9 +233,6 @@ if (isset($_POST['_customer_id_button'])) {
 //     unset($_POST['branch_id']);
        $Ajax->activate('BranchID');
 }
-//if (isset($_POST['_DateBanked_changed'])) {
-//  $Ajax->activate('_ex_rate');
-//}
 
 //----------------------------------------------------------------------------------------------
 
@@ -282,12 +266,12 @@ function read_customer_data()
        //Chaitanya : 13-OCT-2011 - To support Edit feature
        //If page is called first time and New entry fetch the nex reference number
        if (!$_SESSION['alloc']->trans_no && !isset($_POST['charge'])) 
-               $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT);
+               $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT, null, array(
+                       'customer' => get_post('customer_id'), 'date' => get_post('DateBanked')));
 }
 
 //----------------------------------------------------------------------------------------------
 $new = 1;
-$old_ref = 0;
 
 //Chaitanya : 13-OCT-2011 - To support Edit feature
 if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
@@ -301,7 +285,6 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
        $_POST['BranchID'] = $myrow["branch_code"];
        $_POST['bank_account'] = $myrow["bank_act"];
        $_POST['ref'] =  $myrow["reference"];
-       $old_ref = $myrow["reference"];
        $charge = get_cust_bank_charge(ST_CUSTPAYMENT, $_POST['trans_no']);
        $_POST['charge'] =  price_format($charge);
        $_POST['DateBanked'] =  sql2date($myrow['tran_date']);
@@ -315,7 +298,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
                $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']);
        else
        {
-               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0);
+               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, $_POST['trans_no']);
                $Ajax->activate('alloc_tbl');
        }
 }
@@ -325,9 +308,8 @@ $new = !$_SESSION['alloc']->trans_no;
 start_form();
 
        hidden('trans_no');
-       hidden('old_ref', $old_ref);
 
-       start_outer_table(TABLESTYLE2, "width=60%", 5);
+       start_outer_table(TABLESTYLE2, "width='60%'", 5);
 
        table_section(1);
 
@@ -340,6 +322,12 @@ start_form();
                hidden('customer_id', $_POST['customer_id']);
        }
 
+       if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
+               $_SESSION['alloc']->read();
+               $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = '';
+               $Ajax->activate('alloc_tbl');
+       }
+
        if (db_customer_has_branches($_POST['customer_id'])) {
                customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
        } else {
@@ -387,7 +375,7 @@ start_form();
        show_allocatable(false);
        div_end();
 
-       start_table(TABLESTYLE, "width=60%");
+       start_table(TABLESTYLE, "width='60%'");
 
        label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
@@ -407,4 +395,3 @@ start_form();
 
 end_form();
 end_page();
-?>