X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=e8b51f9943243ebe631d25d911cc5f3cc82f6d12;hb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;hp=a184b079d31f70c2d2020174edde60e1a647dcf8;hpb=f20f229779b9db77c3f978fac90dfcb571bd551c;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index a184b079..e8b51f99 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -9,14 +9,17 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$path_to_root="..";
-$page_security = 3;
+$page_security = 'SA_SALESPAYMNT';
+$path_to_root = "..";
+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");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
 if ($use_popup_windows) {
@@ -25,7 +28,9 @@ if ($use_popup_windows) {
 if ($use_date_picker) {
 	$js .= get_js_date_picker();
 }
-page(_("Customer Payment Entry"), false, false, "", $js);
+add_js_file('payalloc.js');
+
+page(_($help_context = "Customer Payment Entry"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------
 
@@ -34,16 +39,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'])) {
@@ -51,20 +61,23 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(_("The customer payment has been successfully entered."));
 
-	display_note(get_gl_view_str(12, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
+	submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt');
 
-	hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
+	display_note(get_gl_view_str(ST_CUSTPAYMENT, $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_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
-	br(1);
-	end_page();
-	exit;
+	
+	display_footer_exit();
 }
 
 //----------------------------------------------------------------------------------------------
 
 function can_process()
 {
+	global $Refs;
+
 	if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) {
 		display_error(_("The entered date is invalid. Please enter a valid date for the payment."));
 		set_focus('DateBanked');
@@ -75,13 +88,13 @@ function can_process()
 		return false;
 	}
 
-	if (!references::is_valid($_POST['ref'])) {
+	if (!$Refs->is_valid($_POST['ref'])) {
 		display_error(_("You must enter a reference."));
 		set_focus('ref');
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], 12)) {
+	if (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT)) {
 		display_error(_("The entered reference is already in use."));
 		set_focus('ref');
 		return false;
@@ -98,6 +111,14 @@ function can_process()
 		set_focus('charge');
 		return false;
 	}
+	if (isset($_POST['charge']) && input_num('charge') > 0) {
+		$charge_acct = get_company_pref('bank_charge_act');
+		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');
+			return false;
+		}	
+	}
 
 	if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
 	{
@@ -123,7 +144,12 @@ function can_process()
 		return false;
 	}
 
-	return true;
+	$_SESSION['alloc']->amount = input_num('amount');
+
+	if (isset($_POST["TotalNumberOfAllocs"]))
+		return check_allocations();
+	else
+		return true;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -142,6 +168,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'])) {
@@ -159,6 +189,10 @@ 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('charge'));
+
+	$_SESSION['alloc']->trans_no = $payment_no;
+	$_SESSION['alloc']->write();
+
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
 
@@ -166,43 +200,30 @@ if (isset($_POST['AddPaymentItem'])) {
 
 function read_customer_data()
 {
-	$sql = "SELECT ".TB_PREF."debtors_master.pymt_discount,
-		".TB_PREF."credit_status.dissallow_invoices
-		FROM ".TB_PREF."debtors_master, ".TB_PREF."credit_status
-		WHERE ".TB_PREF."debtors_master.credit_status = ".TB_PREF."credit_status.id
-			AND ".TB_PREF."debtors_master.debtor_no = '" . $_POST['customer_id'] . "'";
+	global $Refs;
 
-	$result = db_query($sql, "could not query customers");
-
-	$myrow = db_fetch($result);
+	$myrow = get_customer_habit($_POST['customer_id']);
 
 	$_POST['HoldAccount'] = $myrow["dissallow_invoices"];
 	$_POST['pymt_discount'] = $myrow["pymt_discount"];
-	$_POST['ref'] = references::get_next(12);
+	$_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT);
 }
 
-//-------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------
 
-function display_item_form()
-{
-	global $table_style2;
+start_form();
 
-	start_outer_table($table_style2, 5);
+	start_outer_table(TABLESTYLE2, "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(ST_CUSTPAYMENT,0);
+
 	if (db_customer_has_branches($_POST['customer_id'])) {
 		customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
 	} else {
-		hidden('BranchID', reserved_words::get_any_numeric());
+		hidden('BranchID', ANY_NUMERIC);
 	}
 
 	read_customer_data();
@@ -214,33 +235,47 @@ 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);
 
-		amount_row(_("Bank Charge:"), 'charge');
+		text_row(_("Reference:"), 'ref', null, 20, 40);
 
-		table_section(2);
+		table_section(3);
 
 		date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
 
-		bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 
+
+		$comp_currency = get_company_currency();
 		$cust_currency = get_customer_currency($_POST['customer_id']);
 		$bank_currency = get_bank_account_currency($_POST['bank_account']);
 
 		if ($cust_currency != $bank_currency) {
-			exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true);
+			exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency));
 		}
 
-		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(TABLESTYLE, "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."));
 
@@ -250,13 +285,6 @@ function display_item_form()
 	}
 
 	br();
-}
-
-//----------------------------------------------------------------------------------------------
-
-start_form();
-
-display_item_form();
 
 end_form();
 end_page();