X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=b90eacec5b5a41b3e637717ba31c3796a38f29a4;hb=d1babda7c01b314d35fb89f2d195553b55936532;hp=4508b2f2296a355f9296ea88055d904174e31fa0;hpb=5bcea56fca98eed8b140fdd34b42f891ed40c0e8;p=fa-stable.git

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 4508b2f2..b90eacec 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -18,15 +18,12 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
-if (!@$_GET['popup'])
-{
-	$js = "";
-	if ($use_popup_windows)
-		$js .= get_js_open_window(900, 500);
-	if ($use_date_picker)
-		$js .= get_js_date_picker();
-	page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
-}
+$js = "";
+if ($SysPrefs->use_popup_windows)
+	$js .= get_js_open_window(900, 500);
+if (user_use_date_picker())
+	$js .= get_js_date_picker();
+page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
 
 if (isset($_GET['customer_id']))
 {
@@ -35,8 +32,7 @@ if (isset($_GET['customer_id']))
 
 //------------------------------------------------------------------------------------------------
 
-if (!@$_GET['popup'])
-	start_form();
+start_form();
 
 if (!isset($_POST['customer_id']))
 	$_POST['customer_id'] = get_global_customer();
@@ -44,11 +40,11 @@ if (!isset($_POST['customer_id']))
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-if (!@$_GET['popup'])
+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(_("To:"), 'TransToDate', '', null, 1);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+date_cells(_("To:"), 'TransToDate', '', null);
 
 if (!isset($_POST['filterType']))
 	$_POST['filterType'] = 0;
@@ -76,7 +72,7 @@ function display_customer_summary($customer_record)
 	$pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
 	$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
     	$pastdue1, $pastdue2, _("Total Balance"));
     table_header($th);
@@ -142,7 +138,7 @@ function gl_view($row)
 function fmt_debit($row)
 {
 	$value =
-	    $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
+	    $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT || $row['type']==ST_JOURNAL ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>=0 ? price_format($value) : '';
 
@@ -151,14 +147,17 @@ function fmt_debit($row)
 function fmt_credit($row)
 {
 	$value =
-	    !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
+	    !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT || $row['type']==ST_JOURNAL) ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>0 ? price_format($value) : '';
 }
 
+
 function credit_link($row)
 {
-	if (@$_GET['popup'])
+	global $page_nested;
+
+	if ($page_nested)
 		return '';
 	return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
 		pager_link(_("Credit This") ,
@@ -167,36 +166,14 @@ function credit_link($row)
 
 function edit_link($row)
 {
-	$str = '';
+	global $page_nested;
 
-	if (@$_GET['popup'])
+	$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;
-	case ST_CUSTPAYMENT:
-  		if (get_voided_entry(ST_CUSTPAYMENT, $row["trans_no"]) === false)
-   			$str = "/sales/customer_payments.php?trans_no=".$row['trans_no'];
-		break;
-	}		
-	if ($str != "" && !is_closed_trans($row['type'], $row["trans_no"]))
-		return pager_link(_('Edit'), $str, ICON_EDIT);
-	return '';	
+
+	return $row['type'] == ST_CUSTCREDIT && $row['order_'] ? '' : 	// allow  only free hand credit notes edition
+			trans_editor_link($row['type'], $row['trans_no']);
 }
 
 function prt_link($row)
@@ -205,17 +182,18 @@ function prt_link($row)
 		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	
+ 	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");
@@ -254,9 +232,5 @@ $table->width = "85%";
 
 display_db_pager($table);
 
-if (!@$_GET['popup'])
-{
-	end_form();
-	end_page(@$_GET['popup'], false, false);
-}
-?>
+end_form();
+end_page();