X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=e32f5a8f58ab1e181eed4df3bc098eaa068a983d;hb=04dff793a8f4f93e4234f1ba313350ae1fc34550;hp=b4551702a4c0ec8e347582e59a27513c73e6c166;hpb=66a8ddac71c0fafa8e3f2a24fd99b7f3c433f023;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index b4551702..e32f5a8f 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -18,7 +18,6 @@ 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 = "";
@@ -39,16 +38,51 @@ 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 (isset($_GET['customer_id']))
+{
+	$_POST['customer_id'] = $_GET['customer_id'];
+}
+
+if (!isset($_POST['bank_account'])) { // first page call
+	$_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, 0, get_post('customer_id'));
+
+	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) {
+			$_SESSION['alloc']->person_id = $_POST['customer_id'] = $inv['debtor_no'];
+			$_SESSION['alloc']->read();
+			$_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){
+						$_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+						$_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
+					}
+					break;
+				}
+			}
+			unset($inv);
+		} else
+			display_error(_("Invalid sales invoice number."));
+	}
+}
 
 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'];
+	$_SESSION['alloc']->person_id = $br['debtor_no'];
 	$Ajax->activate('customer_id');
 }
 
-if (!isset($_POST['customer_id']))
-	$_POST['customer_id'] = get_global_customer(false);
+if (!isset($_POST['customer_id'])) {
+	$_SESSION['alloc']->person_id = $_POST['customer_id'] = get_global_customer(false);
+	$_SESSION['alloc']->read();
+}
 if (!isset($_POST['DateBanked'])) {
 	$_POST['DateBanked'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['DateBanked'])) {
@@ -56,6 +90,7 @@ if (!isset($_POST['DateBanked'])) {
 	}
 }
 
+
 if (isset($_GET['AddedID'])) {
 	$payment_no = $_GET['AddedID'];
 
@@ -63,12 +98,33 @@ if (isset($_GET['AddedID'])) {
 
 	submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt');
 
+	submenu_view(_("&View this Customer Payment"), ST_CUSTPAYMENT, $payment_no);
+
+	submenu_option(_("Enter Another &Customer Payment"), "/sales/customer_payments.php");
+	submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes");
+	submenu_option(_("Enter Payment to &Supplier"), "/purchasing/supplier_payment.php");
+	submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes");
+	submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php");
+
+	display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
+
+	display_footer_exit();
+}
+elseif (isset($_GET['UpdatedID'])) {
+	$payment_no = $_GET['UpdatedID'];
+
+	display_notification_centered(_("The customer payment has been successfully updated."));
+
+	submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt');
+
 	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/inquiry/customer_inquiry.php?", _("Select Another Customer Payment for &Edition"));
+
 	hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
-	
+
 	display_footer_exit();
 }
 
@@ -78,14 +134,14 @@ function can_process()
 {
 	global $Refs;
 
-	if (!get_post('customer_id')) 
+	if (!get_post('customer_id'))
 	{
 		display_error(_("There is no customer selected."));
 		set_focus('customer_id');
 		return false;
 	} 
 	
-	if (!get_post('BranchID')) 
+	if (!get_post('BranchID'))
 	{
 		display_error(_("This customer has no branch defined."));
 		set_focus('BranchID');
@@ -108,11 +164,19 @@ function can_process()
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT)) {
+	//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."));
+		set_focus('ref');
+		return false;
+	}
 
 	if (!check_num('amount', 0)) {
 		display_error(_("The entered amount is invalid or negative and cannot be processed."));
@@ -134,14 +198,14 @@ function can_process()
 		}	
 	}
 
-	if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
-	{
-		display_error(_("The exchange rate must be numeric and greater than zero."));
-		set_focus('_ex_rate');
-		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."));
+//		set_focus('_ex_rate');
+//		return false;
+//	}
 
-	if ($_POST['discount'] == "") 
+	if (@$_POST['discount'] == "") 
 	{
 		$_POST['discount'] = 0;
 	}
@@ -154,11 +218,21 @@ function can_process()
 
 	//if ((input_num('amount') - input_num('discount') <= 0)) {
 	if (input_num('amount') <= 0) {
-		display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
+		display_error(_("The balance of the amount and discount is zero or negative. Please enter valid amounts."));
 		set_focus('discount');
 		return false;
 	}
 
+	if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0)
+	{
+		display_error(_("The entered payment amount is zero or negative."));
+		set_focus('bank_amount');
+		return false;
+	}
+
+	if (!db_has_currency_rates(get_customer_currency($_POST['customer_id']), $_POST['DateBanked'], true))
+		return false;
+
 	$_SESSION['alloc']->amount = input_num('amount');
 
 	if (isset($_POST["TotalNumberOfAllocs"]))
@@ -169,45 +243,31 @@ function can_process()
 
 //----------------------------------------------------------------------------------------------
 
-// validate inputs
-if (isset($_POST['AddPaymentItem'])) {
-
-	if (!can_process()) {
-		unset($_POST['AddPaymentItem']);
-	}
-}
 if (isset($_POST['_customer_id_button'])) {
 //	unset($_POST['branch_id']);
 	$Ajax->activate('BranchID');
 }
-if (isset($_POST['_DateBanked_changed'])) {
-  $Ajax->activate('_ex_rate');
-}
-if (list_updated('customer_id') || list_updated('bank_account')) {
-  $Ajax->activate('alloc_tbl');
-}
+//if (isset($_POST['_DateBanked_changed'])) {
+//  $Ajax->activate('_ex_rate');
+//}
+
 //----------------------------------------------------------------------------------------------
 
-if (isset($_POST['AddPaymentItem'])) {
-	
-	$cust_currency = get_customer_currency($_POST['customer_id']);
-	$bank_currency = get_bank_account_currency($_POST['bank_account']);
-	$comp_currency = get_company_currency();
-	if ($comp_currency != $bank_currency && $bank_currency != $cust_currency)
-		$rate = 0;
-	else
-		$rate = input_num('_ex_rate');
+if (get_post('AddPaymentItem') && can_process()) {
 
 	new_doc_date($_POST['DateBanked']);
 
-	$payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'],
+	$new_pmt = !$_SESSION['alloc']->trans_no;
+	//Chaitanya : 13-OCT-2011 - To support Edit feature
+	$payment_no = write_customer_payment($_SESSION['alloc']->trans_no, $_POST['customer_id'], $_POST['BranchID'],
 		$_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'],
-		input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge'));
+		input_num('amount'), input_num('discount'), $_POST['memo_'], 0, input_num('charge'), input_num('bank_amount', input_num('amount')));
 
 	$_SESSION['alloc']->trans_no = $payment_no;
 	$_SESSION['alloc']->write();
 
-	meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
+	unset($_SESSION['alloc']);
+	meta_forward($_SERVER['PHP_SELF'], $new_pmt ? "AddedID=$payment_no" : "UpdatedID=$payment_no");
 }
 
 //----------------------------------------------------------------------------------------------
@@ -220,19 +280,66 @@ function read_customer_data()
 
 	$_POST['HoldAccount'] = $myrow["dissallow_invoices"];
 	$_POST['pymt_discount'] = $myrow["pymt_discount"];
-	$_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT);
+	//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);
 }
 
 //----------------------------------------------------------------------------------------------
+$new = 1;
+$old_ref = 0;
+
+//Chaitanya : 13-OCT-2011 - To support Edit feature
+if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
+{
+	$_POST['trans_no'] = $_GET['trans_no'];
+
+	$new = 0;
+	$myrow = get_customer_trans($_POST['trans_no'], ST_CUSTPAYMENT);
+	$_POST['customer_id'] = $myrow["debtor_no"];
+	$_POST['customer_name'] = $myrow["DebtorName"];
+	$_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']);
+	$_POST["amount"] = price_format($myrow['Total'] - $myrow['ov_discount']);
+	$_POST["bank_amount"] = price_format($myrow['bank_amount']+$charge);
+	$_POST["discount"] = price_format($myrow['ov_discount']);
+	$_POST["memo_"] = get_comments_string(ST_CUSTPAYMENT,$_POST['trans_no']);
+
+	//Prepare allocation cart 
+	if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 )
+		$_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']);
+	else
+	{
+		$_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0);
+		$Ajax->activate('alloc_tbl');
+	}
+}
 
+//----------------------------------------------------------------------------------------------
+$new = !$_SESSION['alloc']->trans_no;
 start_form();
 
-	start_outer_table(TABLESTYLE2, "width=60%", 5);
+	hidden('trans_no');
+	hidden('old_ref', $old_ref);
+
+	start_outer_table(TABLESTYLE2, "width='60%'", 5);
+
 	table_section(1);
 
-	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);
+	bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
+
+	if ($new)
+		customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
+	else {
+		label_cells(_("From Customer:"), $_SESSION['alloc']->person_name, "class='label'");
+		hidden('customer_id', $_POST['customer_id']);
+	}
 
 	if (db_customer_has_branches($_POST['customer_id'])) {
 		customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
@@ -240,65 +347,62 @@ start_form();
 		hidden('BranchID', ANY_NUMERIC);
 	}
 
+	if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
+		$_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER);
+		$_SESSION['alloc']->read();
+		$_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = '';
+		$Ajax->activate('alloc_tbl');
+	}
+
 	read_customer_data();
 
 	set_global_customer($_POST['customer_id']);
-	if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0)	{
-		end_outer_table();
-		display_error(_("This customer account is on hold."));
-	} else {
-		$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
-
-		table_section(2);
-		if (!list_updated('bank_account'))
-			$_POST['bank_account'] = get_default_customer_bank_account($_POST['customer_id']);		
-		bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
+	if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0)	
+		display_warning(_("This customer account is on hold."));
+	$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
+	table_section(2);
 
-		text_row(_("Reference:"), 'ref', null, 20, 40);
+	date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
 
-		table_section(3);
+	ref_row(_("Reference:"), 'ref','' , null, '', ST_CUSTPAYMENT);
 
-		date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
+	table_section(3);
 
+	$comp_currency = get_company_currency();
+	$cust_currency = $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER);
+	if (!$cust_currency)
+		$cust_currency = $comp_currency;
+	$_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
+	if ($cust_currency != $bank_currency)
+	{
+		amount_row(_("Payment Amount:"), 'bank_amount', null, '', $bank_currency);
+	}
 
-		$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'], ($bank_currency == $comp_currency));
-		}
-
-		amount_row(_("Bank Charge:"), 'charge');
-
-		end_outer_table(1);
+	amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
 
-		if ($cust_currency == $bank_currency) {
-	  		div_start('alloc_tbl');
- 	 		$_SESSION['alloc']->read();
-			show_allocatable(false);
-			div_end();
-		}
+	end_outer_table(1);
 
-		start_table(TABLESTYLE, "width=60%");
+	div_start('alloc_tbl');
+	show_allocatable(false);
+	div_end();
 
-		label_row(_("Customer prompt payment discount :"), $display_discount_percent);
-		amount_row(_("Amount of Discount:"), 'discount');
+	start_table(TABLESTYLE, "width='60%'");
 
-		amount_row(_("Amount:"), 'amount');
+	label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-		textarea_row(_("Memo:"), 'memo_', null, 22, 4);
-		end_table(1);
+	amount_row(_("Amount of Discount:"), 'discount', null, '', $cust_currency);
 
-		if ($cust_currency != $bank_currency)
-			display_note(_("Amount and discount are in customer's currency."));
+	amount_row(_("Amount:"), 'amount', null, '', $cust_currency);
 
-		br();
+	textarea_row(_("Memo:"), 'memo_', null, 22, 4);
+	end_table(1);
 
+	if ($new)
 		submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default');
-	}
+	else
+		submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default');
 
 	br();