X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=2a0b017d88485a9913bed5a506abcfc4be71a4aa;hb=7e627484a9dbc0653469eb5ea22ba0cd2b036cc0;hp=3063b84c4dad173be12a90c1cb0ac044a7a10045;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 3063b84c..2a0b017d 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -34,18 +34,18 @@ elseif (isset($_POST['selected_customer']))
 else
 	$selected_customer = -1;
 	
-if(isset($_POST['BatchInvoice'])) {
+if (isset($_POST['BatchInvoice'])) {
 
 // checking batch integrity
     $del_count = 0;
     foreach($_SESSION['Batch'] as $delivery) {
 	  $checkbox = 'Sel_'.$delivery['trans'];
-	  if(check_value($checkbox)) {
-	    if(!$del_count) {
+	  if (check_value($checkbox)) {
+	    if (!$del_count) {
 		$del_customer = $delivery['cust'];
 		$del_branch = $delivery['branch'];
 	    } else {
-		if($del_customer!=$delivery['cust'] || $del_branch != $delivery['branch']) {
+		if ($del_customer!=$delivery['cust'] || $del_branch != $delivery['branch']) {
 		    $del_count=0; break;
 		}
 	    }
@@ -54,7 +54,7 @@ if(isset($_POST['BatchInvoice'])) {
 	  }
     }
 
-    if(!$del_count) {
+    if (!$del_count) {
 		display_error(_('For batch invoicing you should 
 		    select at least one delivery. All items must be dispatched to
 		    the same customer branch.'));
@@ -73,7 +73,7 @@ ref_cells(_("#:"), 'DeliveryNumber');
 date_cells(_("from:"), 'DeliveryAfterDate', null, -30);
 date_cells(_("to:"), 'DeliveryToDate', null, 1);
 
-//locations_list_cells(_("Location:"), 'StockLocation', null, true);
+locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
@@ -104,28 +104,31 @@ $sql = "SELECT ".TB_PREF."debtor_trans.trans_no, "
 	.TB_PREF."cust_branch.br_name, "
 	.TB_PREF."debtor_trans.reference, "
 	.TB_PREF."debtor_trans.tran_date, "
-	.TB_PREF."debtor_trans.due_date, ";
-//	.TB_PREF."sales_orders.customer_ref, "
-//	.TB_PREF."sales_orders.deliver_to, "
-$sql .= " Sum(".TB_PREF."debtor_trans_details.qty_done-"
-		 .TB_PREF."debtor_trans_details.quantity) AS Outstanding, ";
-$sql .= " Sum(".TB_PREF."debtor_trans_details.qty_done) AS Partial, ";
-
-$sql .= " Sum(".TB_PREF."-debtor_trans_details.unit_price*"
- .TB_PREF."debtor_trans_details.quantity*(1-"
- .TB_PREF."debtor_trans_details.discount_percent)) AS DeliveryValue
-	FROM "
-//	 .TB_PREF."sales_orders, "
+	.TB_PREF."debtor_trans.due_date, "
+	.TB_PREF."sales_orders.customer_ref, "
+	.TB_PREF."sales_orders.deliver_to, ";
+
+$sql .= " Sum(".TB_PREF."debtor_trans_details.quantity-"
+		 .TB_PREF."debtor_trans_details.qty_done) AS Outstanding, ";
+
+$sql .= " Sum(".TB_PREF."debtor_trans_details.qty_done) AS Done, ";
+
+//$sql .= " Sum(".TB_PREF."debtor_trans_details.unit_price*"
+// .TB_PREF."debtor_trans_details.quantity*(1-"
+// .TB_PREF."debtor_trans_details.discount_percent)) AS DeliveryValue";
+$sql .= "(ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue";
+$sql .=" FROM "
+	 .TB_PREF."sales_orders, "
 	 .TB_PREF."debtor_trans, "
 	 .TB_PREF."debtor_trans_details, "
 	 .TB_PREF."debtors_master, "
 	 .TB_PREF."cust_branch
 		WHERE "
-//		.TB_PREF."sales_orders.order_no = ".TB_PREF."debtor_trans.order_ AND "
+		.TB_PREF."sales_orders.order_no = ".TB_PREF."debtor_trans.order_ AND "
 		.TB_PREF."debtor_trans.debtor_no = ".TB_PREF."debtors_master.debtor_no
 			AND ".TB_PREF."debtor_trans.type = 13
-			AND ".TB_PREF."debtor_trans_details.debtor_trans_no = debtor_trans.trans_no 
-			AND ".TB_PREF."debtor_trans_details.debtor_trans_type = debtor_trans.type 
+			AND ".TB_PREF."debtor_trans_details.debtor_trans_no = ".TB_PREF."debtor_trans.trans_no 
+			AND ".TB_PREF."debtor_trans_details.debtor_trans_type = ".TB_PREF."debtor_trans.type 
 			AND ".TB_PREF."debtor_trans.branch_code = ".TB_PREF."cust_branch.branch_code
 			AND ".TB_PREF."debtor_trans.debtor_no = ".TB_PREF."cust_branch.debtor_no ";
 
@@ -149,11 +152,11 @@ else
 	if (isset($selected_stock_item))
 		$sql .= " AND ".TB_PREF."debtor_trans_details.stock_id='". $selected_stock_item ."' ";
 
-//	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
-//		$sql .= " AND ".TB_PREF."sales_orders.from_stk_loc = '". $_POST['StockLocation'] . "' ";
+	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
+		$sql .= " AND ".TB_PREF."sales_orders.from_stk_loc = '". $_POST['StockLocation'] . "' ";
 
 	if ($_POST['OutstandingOnly'] == true) {
-	 $sql .= " AND ".TB_PREF."-debtor_trans_details.qty_done < ".TB_PREF."-debtor_trans_details.quantity ";
+	 $sql .= " AND ".TB_PREF."debtor_trans_details.qty_done < ".TB_PREF."debtor_trans_details.quantity ";
 	}
 	
 	$sql .= " GROUP BY ".TB_PREF."debtor_trans.trans_no ";
@@ -167,7 +170,7 @@ else
 $result = db_query($sql,"No deliveries were returned");
 
 //-----------------------------------------------------------------------------------
-if(isset($_SESSION['Batch'])) {
+if (isset($_SESSION['Batch'])) {
     foreach($_SESSION['Batch'] as $trans=>$del) unset($_SESSION['Batch'][$trans]);
     unset($_SESSION['Batch']);
 }
@@ -187,7 +190,7 @@ if ($result)
 	$k = 0; //row colour counter
 	$overdue_items = false;
 	while ($myrow = db_fetch($result)) 
-	{
+	{ 
 	    $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"],
 	    'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] );
 	    
@@ -216,7 +219,7 @@ if ($result)
 		label_cell($formated_due_date);
 		amount_cell($myrow["DeliveryValue"]);
 		label_cell($myrow["curr_code"]);
-		if(!$myrow['Partial'])
+		if (!$myrow['Done'])
 		    check_cells(null,'Sel_'. $myrow['trans_no'],0,false);
 		else
     		    label_cell("");