X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=5687d0fcdbe47ed800870410a82b2263f5551981;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=8bd2d4c72babe5de35ba9bc3128b3de69be8fa9c;hpb=5f06887dedd4d14701864fb72994d7e20352086d;p=fa-stable.git

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 8bd2d4c7..5687d0fc 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -11,7 +11,7 @@
 ***********************************************************************/
 $page_security = 'SA_SALESTRANSVIEW';
 $path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
@@ -21,10 +21,9 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-page(_($help_context = "Customer Transactions"), false, false, "", $js);
-
+page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
 
 if (isset($_GET['customer_id']))
 {
@@ -38,12 +37,13 @@ start_form();
 if (!isset($_POST['customer_id']))
 	$_POST['customer_id'] = get_global_customer();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+if (!$page_nested)
+	customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 date_cells(_("To:"), 'TransToDate', '', null, 1);
 
 if (!isset($_POST['filterType']))
@@ -61,8 +61,6 @@ set_global_customer($_POST['customer_id']);
 
 function display_customer_summary($customer_record)
 {
-	global $table_style;
-
 	$past1 = get_company_pref('past_due_days');
 	$past2 = 2 * $past1;
     if ($customer_record["dissallow_invoices"] != 0)
@@ -74,7 +72,7 @@ function display_customer_summary($customer_record)
 	$pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
 	$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 
-    start_table("width=80% $table_style");
+    start_table(TABLESTYLE, "width=80%");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
     	$pastdue1, $pastdue2, _("Total Balance"));
     table_header($th);
@@ -156,56 +154,45 @@ function fmt_credit($row)
 
 function credit_link($row)
 {
-	return $row['type'] == ST_SALESINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
-		pager_link(_("Credit This"),
-			"/sales/customer_credit_invoice.php?InvoiceNumber=".
-			$row['trans_no'], ICON_CREDIT)
-			: '';
+	global $page_nested;
+	
+	if ($page_nested)
+		return '';
+	return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
+		pager_link(_("Credit This") ,
+			"/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT):'';
 }
 
 function edit_link($row)
 {
+	global $page_nested;
+
 	$str = '';
+	if ($page_nested)
+		return '';
 
-	switch($row['type']) {
-	case ST_SALESINVOICE:
-		if (get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) === false && $row['Allocated'] == 0)
-			$str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
-		break;
-	case ST_CUSTCREDIT:
-  		if (get_voided_entry(ST_CUSTCREDIT, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt
-		{	 
-			if ($row['order_']==0) // free-hand credit note
-			    $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
-			else	// credit invoice
-			    $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
-		}	    
-		break;
-	 case ST_CUSTDELIVERY:
-  		if (get_voided_entry(ST_CUSTDELIVERY, $row["trans_no"]) === false)
-   			$str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
-		break;
-	}
-	if ($str != "" && !is_closed_trans($row['type'], $row["trans_no"]))
-		return pager_link(_('Edit'), $str, ICON_EDIT);
-	return '';	
+	return edit_trans_link($row['type'], $row['trans_no'], $row['type']==ST_CUSTCREDIT && $row['order_']==0 ?
+		"/sales/credit_note_entry.php?ModifyCredit=%d" : 0);
 }
 
 function prt_link($row)
 {
-  	if ($row['type'] != ST_CUSTPAYMENT && $row['type'] != ST_BANKDEPOSIT) // customer payment or bank deposit printout not defined yet.
- 		return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
- 	else	
+  	if ($row['type'] == ST_CUSTPAYMENT || $row['type'] == ST_BANKDEPOSIT) 
 		return print_document_link($row['trans_no']."-".$row['type'], _("Print Receipt"), true, ST_CUSTPAYMENT, ICON_PRINT);
+  	elseif ($row['type'] == ST_BANKPAYMENT) // bank payment printout not defined yet.
+		return '';
+ 	else	
+ 		return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
 }
 
 function check_overdue($row)
 {
 	return $row['OverDue'] == 1
-		&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
+		&& floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_customer_inquiry();
+$sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+	get_post('customer_id'), get_post('filterType'));
 
 //------------------------------------------------------------------------------------------------
 db_query("set @bal:=0");
@@ -246,5 +233,4 @@ display_db_pager($table);
 
 end_form();
 end_page();
-
 ?>