$line->discount_percent)";
db_query($sql, "order Details Cannot be Added");
+ // Now mark quotation line as processed
+ if ($order->trans_type == ST_SALESORDER && $line->src_id)
+ update_parent_line(ST_SALESORDER, $line->src_id, $line->qty_dispatched); // clear all the quote despite all or the part was ordered
} /* inserted line items into sales order details */
-
add_audit_trail($order->trans_type, $order_no, $order->document_date);
$Refs->save($order->trans_type, $order_no, $order->reference);
."stype.sales_type, "
."stype.id AS sales_type_id, "
."stype.tax_included, "
- ."ship.shipper_name, "
+ ."stype.factor, "
+ ."ship.shipper_name, "
."tax_group.name AS tax_group_name , "
- ."tax_group.id AS tax_group_id "
- ."FROM ".TB_PREF."sales_orders sorder, "
+ ."tax_group.id AS tax_group_id, "
+ ."cust.tax_id "
+ ."FROM ".TB_PREF."sales_orders sorder LEFT JOIN ".TB_PREF."shippers ship ON ship.shipper_id = sorder.ship_via,"
.TB_PREF."debtors_master cust,"
.TB_PREF."sales_types stype, "
.TB_PREF."tax_groups tax_group, "
.TB_PREF."cust_branch branch,"
- .TB_PREF."locations loc, "
- .TB_PREF."shippers ship
+ .TB_PREF."locations loc
WHERE sorder.order_type=stype.id
AND branch.branch_code = sorder.branch_code
AND branch.tax_group_id = tax_group.id
AND sorder.debtor_no = cust.debtor_no
AND loc.loc_code = sorder.from_stk_loc
- AND ship.shipper_id = sorder.ship_via
AND sorder.trans_type = " . db_escape($trans_type) ."
AND sorder.order_no = " . db_escape($order_no );
.TB_PREF."sales_order_details.quantity,
discount_percent,
qty_sent as qty_done, "
- .TB_PREF."stock_master.units,
- ".TB_PREF."stock_master.material_cost + "
+ .TB_PREF."stock_master.units,"
+ .TB_PREF."stock_master.mb_flag,"
+ .TB_PREF."stock_master.material_cost + "
.TB_PREF."stock_master.labour_cost + "
.TB_PREF."stock_master.overhead_cost AS standard_cost
FROM ".TB_PREF."sales_order_details, ".TB_PREF."stock_master
$myrow["tax_group_name"], $myrow["contact_phone"]);
$order->set_sales_type($myrow["sales_type_id"], $myrow["sales_type"],
- $myrow["tax_included"], 0); // no default price calculations on edit
+ $myrow["tax_included"], $myrow["factor"]); // no default price calculations on edit
$order->set_location($myrow["from_stk_loc"], $myrow["location_name"]);
return db_query($sql,"Customer Branch Record Retreive");
}
-function get_sql_for_sales_orders_view($selected_customer, $trans_type)
+function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter,
+ $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT)
{
- global $selected_stock_item;
-
+
$sql = "SELECT
sorder.order_no,
sorder.reference,
debtor.name,
branch.br_name,"
- .($_POST['order_view_mode']=='InvoiceTemplates'
- || $_POST['order_view_mode']=='DeliveryTemplates' ?
+ .($filter=='InvoiceTemplates'
+ || $filter=='DeliveryTemplates' ?
"sorder.comments, " : "sorder.customer_ref, ")
."sorder.ord_date,
sorder.delivery_date,
AND sorder.branch_code = branch.branch_code
AND debtor.debtor_no = branch.debtor_no";
- if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
+ if (isset($trans_no) && $trans_no != "")
{
// search orders with number like
- $number_like = "%".$_POST['OrderNumber'];
- $sql .= " AND sorder.order_no LIKE ".db_escape($number_like)
- ." GROUP BY sorder.order_no";
+ $number_like = "%".$trans_no;
+ $sql .= " AND sorder.order_no LIKE ".db_escape($number_like);
+// ." GROUP BY sorder.order_no";
}
- elseif (isset($_POST['OrderReference']) && $_POST['OrderReference'] != "")
+ elseif ($ref != "")
{
// search orders with reference like
- $number_like = "%".$_POST['OrderReference']."%";
- $sql .= " AND sorder.reference LIKE ".db_escape($number_like)
- ." GROUP BY sorder.order_no";
+ $number_like = "%".$ref."%";
+ $sql .= " AND sorder.reference LIKE ".db_escape($number_like);
+// ." GROUP BY sorder.order_no";
}
else // ... or select inquiry constraints
{
- if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates')
+ if ($filter!='DeliveryTemplates' && $filter!='InvoiceTemplates' && $filter!='OutstandingOnly')
{
- $date_after = date2sql($_POST['OrdersAfterDate']);
- $date_before = date2sql($_POST['OrdersToDate']);
+ $date_after = date2sql($from);
+ $date_before = date2sql($to);
$sql .= " AND sorder.ord_date >= '$date_after'"
." AND sorder.ord_date <= '$date_before'";
}
+ }
if ($trans_type == ST_SALESQUOTE && !check_value('show_all'))
- $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."'";
+ $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."' AND line.qty_sent=0"; // show only outstanding, not realized quotes
+
if ($selected_customer != -1)
$sql .= " AND sorder.debtor_no=".db_escape($selected_customer);
- if (isset($selected_stock_item))
- $sql .= " AND line.stk_code=".db_escape($selected_stock_item);
+ if (isset($stock_item))
+ $sql .= " AND line.stk_code=".db_escape($stock_item);
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
- $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation']);
+ if ($location)
+ $sql .= " AND sorder.from_stk_loc = ".db_escape($location);
- if ($_POST['order_view_mode']=='OutstandingOnly')
+ if ($filter=='OutstandingOnly')
$sql .= " AND line.qty_sent < line.quantity";
- elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
+
+ elseif ($filter=='InvoiceTemplates' || $filter=='DeliveryTemplates')
$sql .= " AND sorder.type=1";
+
+ //Chaiatanya : New Filter
+ if ($customer_id != ALL_TEXT)
+ $sql .= " AND sorder.debtor_no = ".db_escape($customer_id);
$sql .= " GROUP BY sorder.order_no,
sorder.debtor_no,
sorder.customer_ref,
sorder.ord_date,
sorder.deliver_to";
- }
return $sql;
}
?>
\ No newline at end of file
projects / fa-stable.git / blobdiff