X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=f00a88dab6364a8a6e51674adb1531c8e4047e3f;hb=389721f442ea4dc96ba1cafd65919e717e0d8746;hp=cd7d7dc3e0bba54de307af84327a0e9a52c0ec36;hpb=e91772a2716825a6aeb358d1defba47d5f3892c1;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index cd7d7dc3..f00a88da 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -11,12 +11,14 @@ ***********************************************************************/ $path_to_root=".."; $page_security = 3; +include_once($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); 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 . "/sales/includes/sales_db.inc"); +//include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc"); $js = ""; if ($use_popup_windows) { @@ -25,6 +27,8 @@ if ($use_popup_windows) { if ($use_date_picker) { $js .= get_js_date_picker(); } +add_js_file('payalloc.js'); + page(_("Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- @@ -34,16 +38,21 @@ check_db_has_customers(_("There are no customers defined in the system.")); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); //---------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['customer_id'])) - $_POST['customer_id'] = $ret['customer_id']; - if(isset($ret['branch_id'])) - $_POST['BranchID'] = $ret['branch_id']; + +if (list_updated('BranchID')) { + // when branch is selected via external editor also customer can change + $br = get_branch(get_post('BranchID')); + $_POST['customer_id'] = $br['debtor_no']; + $Ajax->activate('customer_id'); } -if (isset($_POST['_customer_id_editor'])) { - context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], - array( 'customer_id', 'BranchID', 'bank_account', 'DateBanked', - 'ref', 'amount', 'discount', 'memo_') ); + +if (!isset($_POST['customer_id'])) + $_POST['customer_id'] = get_global_customer(false); +if (!isset($_POST['DateBanked'])) { + $_POST['DateBanked'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DateBanked'])) { + $_POST['DateBanked'] = end_fiscalyear(); + } } if (isset($_GET['AddedID'])) { @@ -53,7 +62,7 @@ if (isset($_GET['AddedID'])) { display_note(get_gl_view_str(12, $payment_no, _("&View the GL Journal Entries for this Customer Payment"))); - hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12"); +// hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12"); hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); br(1); @@ -93,6 +102,12 @@ function can_process() return false; } + if (isset($_POST['charge']) && !check_num('charge', 0)) { + display_error(_("The entered amount is invalid or negative and cannot be processed.")); + set_focus('charge'); + 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.")); @@ -117,7 +132,8 @@ function can_process() return false; } - return true; + $_SESSION['alloc']->amount = input_num('amount'); + return check_allocations(); } //---------------------------------------------------------------------------------------------- @@ -136,6 +152,10 @@ if (isset($_POST['_customer_id_button'])) { if (isset($_POST['_DateBanked_changed'])) { $Ajax->activate('_ex_rate'); } +if (list_updated('customer_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------------- if (isset($_POST['AddPaymentItem'])) { @@ -152,7 +172,11 @@ if (isset($_POST['AddPaymentItem'])) { $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_'], $rate); + input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge')); + + $_SESSION['alloc']->trans_no = $payment_no; + $_SESSION['alloc']->write(); + meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -175,24 +199,17 @@ function read_customer_data() $_POST['ref'] = references::get_next(12); } -//------------------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------------- -function display_item_form() -{ - global $table_style2; +start_form(); - start_outer_table($table_style2, 5); + start_outer_table("$table_style2 width=60%", 5); table_section(1); - if (!isset($_POST['customer_id'])) - $_POST['customer_id'] = get_global_customer(false); - if (!isset($_POST['DateBanked'])) { - $_POST['DateBanked'] = new_doc_date(); - if (!is_date_in_fiscalyear($_POST['DateBanked'])) { - $_POST['DateBanked'] = end_fiscalyear(); - } - } customer_list_row(_("From Customer:"), 'customer_id', null, false, true); + if (!isset($_POST['bank_account'])) // first page call + $_SESSION['alloc'] = new allocation(12,0); + if (db_customer_has_branches($_POST['customer_id'])) { customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); } else { @@ -208,17 +225,18 @@ function display_item_form() } else { $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%"; - amount_row(_("Amount:"), 'amount'); + table_section(2); - amount_row(_("Amount of Discount:"), 'discount'); + bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - label_row(_("Customer prompt payment discount :"), $display_discount_percent); + + text_row(_("Reference:"), 'ref', null, 20, 40); + + table_section(3); date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true); - table_section(2); - bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); $cust_currency = get_customer_currency($_POST['customer_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); @@ -227,28 +245,35 @@ function display_item_form() exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true); } - text_row(_("Reference:"), 'ref', null, 20, 40); - - textarea_row(_("Memo:"), 'memo_', null, 22, 4); + amount_row(_("Bank Charge:"), 'charge'); end_outer_table(1); + if ($cust_currency == $bank_currency) { + div_start('alloc_tbl'); + show_allocatable(false); + div_end(); + } + + start_table("$table_style width=60%"); + + label_row(_("Customer prompt payment discount :"), $display_discount_percent); + amount_row(_("Amount of Discount:"), 'discount'); + + amount_row(_("Amount:"), 'amount'); + + textarea_row(_("Memo:"), 'memo_', null, 22, 4); + end_table(1); + if ($cust_currency != $bank_currency) display_note(_("Amount and discount are in customer's currency.")); - echo"
"; + br(); submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); } - echo "
"; -} - -//---------------------------------------------------------------------------------------------- - -start_form(); - -display_item_form(); + br(); end_form(); end_page();