X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=b67df99c774a1b3c06c22e2dd64faab2879c7ed9;hb=bac6bc5d595dab716bb3c65e451e81d724b8de2d;hp=24c6e0cd594e418c9032a918b112d218fdb5e622;hpb=f018643dc04ce130f1729e16a65458af443308a0;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 24c6e0cd..b67df99c 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -9,8 +9,8 @@
     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");
@@ -19,6 +19,7 @@ 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) {
@@ -29,7 +30,7 @@ if ($use_date_picker) {
 }
 add_js_file('payalloc.js');
 
-page(_("Customer Payment Entry"), false, false, "", $js);
+page(_($help_context = "Customer Payment Entry"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------
 
@@ -38,8 +39,6 @@ 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."));
 
 //----------------------------------------------------------------------------------------
-set_editor('customer', 'customer_id' , 'sales_type');
-set_editor('branch', 'BranchID' , 'bank_account');
 
 if (list_updated('BranchID')) {
 	// when branch is selected via external editor also customer can change
@@ -62,20 +61,37 @@ 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');
+
+	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 (!get_post('customer_id')) 
+	{
+		display_error(_("There is no customer selected."));
+		set_focus('customer_id');
+		return false;
+	} 
+	
+	if (!get_post('BranchID')) 
+	{
+		display_error(_("This customer has no branch defined."));
+		set_focus('BranchID');
+		return false;
+	} 
+	
 	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');
@@ -86,13 +102,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;
@@ -109,6 +125,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))
 	{
@@ -128,14 +152,19 @@ function can_process()
 		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 balance of the amount and discout is zero or negative. Please enter valid amounts."));
 		set_focus('discount');
 		return false;
 	}
 
 	$_SESSION['alloc']->amount = input_num('amount');
-	return check_allocations();
+
+	if (isset($_POST["TotalNumberOfAllocs"]))
+		return check_allocations();
+	else
+		return true;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -186,36 +215,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'] . "'";
-
-	$result = db_query($sql, "could not query customers");
+	global $Refs;
 
-	$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);
 }
 
 //----------------------------------------------------------------------------------------------
 
 start_form();
 
-	start_outer_table("$table_style2 width=60%", 5);
+	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(12,0);
+		  $_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();
@@ -240,11 +263,12 @@ start_form();
 
 
 
+		$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));
 		}
 
 		amount_row(_("Bank Charge:"), 'charge');
@@ -257,7 +281,7 @@ start_form();
 			div_end();
 		}
 
-		start_table("$table_style width=60%");
+		start_table(TABLESTYLE, "width=60%");
 
 		label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 		amount_row(_("Amount of Discount:"), 'discount');