X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=2770fb22bf5357f21be8a18d323b5656fce5441c;hb=e8623dd6746abb8eec4eb3ddd583d208e531b8e7;hp=f8cc1afc04de81fa44aa78697e573d765b5fefd8;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index f8cc1afc..2770fb22 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -31,14 +31,14 @@ start_row();
 
 customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true);
 
-date_cells(_("from:"), 'TransAfterDate', null, -30);
-date_cells(_("to:"), 'TransToDate', null, 1);
+date_cells(_("from:"), 'TransAfterDate', '', null, -30);
+date_cells(_("to:"), 'TransToDate', '', null, 1);
 
 cust_allocations_list_cells(_("Type:"), 'filterType', null);
 
 check_cells(" " . _("show settled:"), 'showSettled', null);
 
-submit_cells('Refresh Inquiry', _("Search"));
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 
 set_global_customer($_POST['customer_id']);
 
@@ -55,14 +55,16 @@ function get_transactions()
 
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
 		".TB_PREF."debtors_master.name AS CustName, ".TB_PREF."debtors_master.curr_code AS CustCurrCode,
-    	(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)
+    	(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
+	.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
 		AS TotalAmount,
 		".TB_PREF."debtor_trans.alloc AS Allocated,
 		((".TB_PREF."debtor_trans.type = 10)
 		AND ".TB_PREF."debtor_trans.due_date < '" . date2sql(Today()) . "') AS OverDue
     	FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master
     	WHERE ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-			AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount != 0)
+			AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
+			.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount != 0)
     		AND ".TB_PREF."debtor_trans.tran_date >= '$data_after'
     		AND ".TB_PREF."debtor_trans.tran_date <= '$date_to'";
 
@@ -71,24 +73,26 @@ function get_transactions()
 
    	if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
    	{
-   		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') 
+   		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
    		{
    			$sql .= " AND ".TB_PREF."debtor_trans.type = 10 ";
-   		} 
-   		elseif ($_POST['filterType'] == '3') 
+   		}
+   		elseif ($_POST['filterType'] == '3')
    		{
 			$sql .= " AND ".TB_PREF."debtor_trans.type = " . systypes::cust_payment();
-   		} 
-   		elseif ($_POST['filterType'] == '4') 
+   		}
+   		elseif ($_POST['filterType'] == '4')
    		{
 			$sql .= " AND ".TB_PREF."debtor_trans.type = 11 ";
    		}
 
-    	if ($_POST['filterType'] == '2') 
+    	if ($_POST['filterType'] == '2')
     	{
     		$today =  date2sql(Today());
     		$sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today'
-				AND (round(abs(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) > 0) ";
+				AND (round(abs(".TB_PREF."debtor_trans.ov_amount + "
+				.TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + "
+				.TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) > 0) ";
     	}
    	}else
    	{
@@ -96,9 +100,11 @@ function get_transactions()
    	}
 
 
-   	if (!check_value('showSettled')) 
+   	if (!check_value('showSettled'))
    	{
-   		$sql .= " AND (round(abs(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) != 0) ";
+   		$sql .= " AND (round(abs(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
+		.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + "
+		.TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) != 0) ";
    	}
 
     $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -110,16 +116,19 @@ function get_transactions()
 
 $result = get_transactions();
 
-if (db_num_rows($result) == 0)
+//------------------------------------------------------------------------------------------------
+if(get_post('RefreshInquiry')) 
 {
-	display_note(_("The selected customer has no transactions for the given dates."), 1, 1);
-	end_page();
-	exit;
+	$Ajax->activate('doc_tbl');
 }
-
 //------------------------------------------------------------------------------------------------
+div_start('doc_tbl');
+if (db_num_rows($result) == 0)
+{
+	display_note(_("The selected customer has no transactions for the given dates."), 1, 1);
+} else {
 
-start_table("$table_style width='80%'");
+	start_table("$table_style width='80%'");
 
 if ($_POST['customer_id'] == reserved_words::get_all())
 	$th = array(_("Type"), _("Number"), _("Reference"), _("Order"), _("Date"), _("Due Date"),
@@ -134,14 +143,14 @@ table_header($th);
 $j = 1;
 $k = 0; //row colour counter
 $over_due = false;
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
 
 	if ($myrow['OverDue'] == 1 && (abs($myrow["TotalAmount"]) - $myrow["Allocated"] != 0))
 	{
 		start_row("class='overduebg'");
 		$over_due = true;
-	} 
+	}
 	else
 		alt_table_row_color($k);
 
@@ -160,27 +169,26 @@ while ($myrow = db_fetch($result))
 
 	if ($myrow["type"] == 10)
 		$due_date_str = sql2date($myrow["due_date"]);
-	elseif ($myrow["type"] == 11 && $myrow['TotalAmount'] < 0) 
+	elseif ($myrow["type"] == 11 && $myrow['TotalAmount'] > 0)
 	{
 		/*its a credit note which could have an allocation */
 		$allocations_str = $allocations;
 
-	} 
-	elseif ($myrow["type"] == systypes::cust_payment() && 
-		($myrow['TotalAmount'] + $myrow['Allocated']) < 0) 
+	}
+	elseif (($myrow["type"] == systypes::cust_payment() || $myrow["type"] == systypes::bank_deposit()) &&
+		($myrow['TotalAmount'] - $myrow['Allocated']) > 0)
 	{
 		/*its a receipt  which could have an allocation*/
 		$allocations_str = $allocations;
 
-	} 
-	elseif ($myrow["type"] == systypes::cust_payment() && $myrow['TotalAmount'] > 0) 
+	}
+	elseif ($myrow["type"] == systypes::cust_payment() && $myrow['TotalAmount'] < 0)
 	{
 		/*its a negative receipt */
 	}
 
 	label_cell(systypes::name($myrow["type"]));
-
-	label_cell(get_customer_trans_view_str($myrow["type"], $myrow["trans_no"]));
+	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
 	label_cell($myrow["reference"]);
 	label_cell($preview_order_str);
 	label_cell(sql2date($myrow["tran_date"]), "nowrap");
@@ -189,8 +197,10 @@ while ($myrow = db_fetch($result))
 	{
 		label_cell($myrow["CustName"]);
 		label_cell($myrow["CustCurrCode"]);
-	}	
-	display_debit_or_credit_cells($myrow["TotalAmount"]);
+	}
+	display_debit_or_credit_cells(
+	    $myrow['type']==11 || $myrow['type']==12 || $myrow['type']==2 ?
+		-$myrow["TotalAmount"] : $myrow["TotalAmount"]);
 	amount_cell(abs($myrow["Allocated"]));
 	amount_cell(abs($myrow["TotalAmount"]) - $myrow["Allocated"]);
 	label_cell($allocations_str);
@@ -207,11 +217,11 @@ while ($myrow = db_fetch($result))
 //end of page full new headings if
 }
 //end of while loop
-
 end_table(1);
 if ($over_due)
 	display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'");
-	
+}
+div_end();
 end_page();
 
 ?>