X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;h=e851f747ecab892c10cd9a643463456c45707963;hb=ae115f787d84c11c6140137b054261a398b2f077;hp=d72f10c82135cf39816844d36fe9392817acfdf1;hpb=0534ae2c9397863e2d7c7cbcf296a84c5e9ed716;p=fa-stable.git diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index d72f10c8..e851f747 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -12,7 +12,7 @@ //---------------------------------------------------------------------------------------- function add_sales_order(&$order) { - global $loc_notification, $path_to_root, $Refs; + global $SysPrefs, $path_to_root, $Refs; begin_transaction(); hook_db_prewrite($order, $order->trans_type); @@ -22,7 +22,7 @@ function add_sales_order(&$order) $total = $order->get_trans_total(); $sql = "INSERT INTO ".TB_PREF."sales_orders (order_no, type, debtor_no, trans_type, branch_code, customer_ref, reference, comments, ord_date, order_type, ship_via, deliver_to, delivery_address, contact_phone, - freight_cost, from_stk_loc, delivery_date, payment_terms, total) + freight_cost, from_stk_loc, delivery_date, payment_terms, total, prep_amount) VALUES (" .db_escape($order_no) . "," .db_escape($order_type) . "," . db_escape($order->customer_id) . ", " .db_escape($order->trans_type) . "," .db_escape($order->Branch) . ", ". db_escape($order->cust_ref) .",". @@ -38,13 +38,14 @@ function add_sales_order(&$order) db_escape($order->Location) .", " . db_escape($del_date) . "," . db_escape($order->payment) . "," . - db_escape($total). ")"; + db_escape($total) . "," . + db_escape($order->prep_amount).")"; db_query($sql, "order Cannot be Added"); $order->trans_no = array($order_no=>0); - if ($loc_notification == 1) + if ($SysPrefs->loc_notification() == 1) { include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $st_ids = array(); @@ -54,30 +55,8 @@ function add_sales_order(&$order) } foreach ($order->line_items as $line) { - if ($loc_notification == 1 && is_inventory_item($line->stock_id)) - { - $sql = "SELECT ".TB_PREF."loc_stock.*, ".TB_PREF."locations.location_name, ".TB_PREF."locations.email - FROM ".TB_PREF."loc_stock, ".TB_PREF."locations - WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code - AND ".TB_PREF."loc_stock.stock_id = '" . $line->stock_id . "' - AND ".TB_PREF."loc_stock.loc_code = '" . $order->Location . "'"; - $res = db_query($sql,"a location could not be retreived"); - $loc = db_fetch($res); - if ($loc['email'] != "") - { - $qoh = get_qoh_on_date($line->stock_id, $order->Location); - $qoh -= get_demand_qty($line->stock_id, $order->Location); - $qoh -= get_demand_asm_qty($line->stock_id, $order->Location); - $qoh -= $line->quantity; - if ($qoh < $loc['reorder_level']) - { - $st_ids[] = $line->stock_id; - $st_names[] = $line->item_description; - $st_num[] = $qoh - $loc['reorder_level']; - $st_reorder[] = $loc['reorder_level']; - } - } - } + if ($SysPrefs->loc_notification() == 1 && is_inventory_item($line->stock_id)) + $loc = calculate_reorder_level($order->Location, $line, $st_ids, $st_names, $st_num, $st_reorder); $sql = "INSERT INTO ".TB_PREF."sales_order_details (order_no, trans_type, stk_code, description, unit_price, quantity, discount_percent) VALUES ("; $sql .= $order_no . ",".$order->trans_type . @@ -91,30 +70,15 @@ function add_sales_order(&$order) 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); hook_db_postwrite($order, $order->trans_type); commit_transaction(); - if ($loc_notification == 1 && count($st_ids) > 0) - { - require_once($path_to_root . "/reporting/includes/class.mail.inc"); - $company = get_company_prefs(); - $mail = new email($company['coy_name'], $company['email']); - $from = $company['coy_name'] . " <" . $company['email'] . ">"; - $to = $loc['location_name'] . " <" . $loc['email'] . ">"; - $subject = _("Stocks below Re-Order Level at " . $loc['location_name']); - $msg = "\n"; - for ($i = 0; $i < count($st_ids); $i++) - $msg .= $st_ids[$i] . " " . $st_names[$i] . ", " . _("Re-Order Level") . ": " . $st_reorder[$i] . ", " . _("Below") . ": " . $st_num[$i] . "\n"; - $msg .= "\n" . _("Please reorder") . "\n\n"; - $msg .= $company['coy_name']; - $mail->to($to); - $mail->subject($subject); - $mail->text($msg); - $ret = $mail->send(); - } + if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0) + send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder); return $order_no; } @@ -156,7 +120,7 @@ function update_sales_order_version($order) function update_sales_order($order) { - global $loc_notification, $path_to_root, $Refs; + global $SysPrefs, $path_to_root, $Refs; $del_date = date2sql($order->due_date); $ord_date = date2sql($order->document_date); @@ -167,6 +131,9 @@ function update_sales_order($order) begin_transaction(); hook_db_prewrite($order, $order->trans_type); + if ($order->trans_type == ST_SALESORDER) + $allocs = get_payments_for($order_no, ST_SALESORDER); + $sql = "UPDATE ".TB_PREF."sales_orders SET type =".db_escape($order->so_type)." , debtor_no = " . db_escape($order->customer_id) . ", branch_code = " . db_escape($order->Branch) . ", @@ -184,16 +151,24 @@ function update_sales_order($order) delivery_date = " .db_escape($del_date). ", version = ".($version+1).", payment_terms = " .db_escape($order->payment). ", - total = ". db_escape($total) ." + total = ". db_escape($total). ", + prep_amount = ". db_escape($order->prep_amount) ." WHERE order_no=" . db_escape($order_no) ." AND trans_type=".$order->trans_type." AND version=".$version; db_query($sql, "order Cannot be Updated, this can be concurrent edition conflict"); + $id_tokeep = array(); + foreach ($order->line_items as $line) { + array_push($id_tokeep , $line->id); + } + $id_list = implode(', ', $id_tokeep); + $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no =" . db_escape($order_no) . " AND trans_type=".$order->trans_type; + $sql .= " AND id NOT IN ($id_list)"; db_query($sql, "Old order Cannot be Deleted"); - if ($loc_notification == 1) + if ($SysPrefs->loc_notification() == 1) { include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $st_ids = array(); @@ -203,75 +178,45 @@ function update_sales_order($order) } foreach ($order->line_items as $line) { - if ($loc_notification == 1 && is_inventory_item($line->stock_id)) - { - $sql = "SELECT ".TB_PREF."loc_stock.*, " - .TB_PREF."locations.location_name, " - .TB_PREF."locations.email - FROM ".TB_PREF."loc_stock, " - .TB_PREF."locations - WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code - AND ".TB_PREF."loc_stock.stock_id = ".db_escape($line->stock_id)." - AND ".TB_PREF."loc_stock.loc_code = ".db_escape($order->Location); - $res = db_query($sql,"a location could not be retreived"); - $loc = db_fetch($res); - if ($loc['email'] != "") - { - $qoh = get_qoh_on_date($line->stock_id, $order->Location); - $qoh -= get_demand_qty($line->stock_id, $order->Location); - $qoh -= get_demand_asm_qty($line->stock_id, $order->Location); - $qoh -= $line->quantity; - if ($qoh < $loc['reorder_level']) - { - $st_ids[] = $line->stock_id; - $st_names[] = $line->item_description; - $st_num[] = $qoh - $loc['reorder_level']; - $st_reorder[] = $loc['reorder_level']; - } - } - } - $sql = "INSERT INTO ".TB_PREF."sales_order_details - (id, order_no, trans_type, stk_code, description, unit_price, quantity, - discount_percent, qty_sent) - VALUES ("; - $sql .= db_escape($line->id ? $line->id : 0) . "," - .$order_no . ",".$order->trans_type."," - .db_escape($line->stock_id) . "," - .db_escape($line->item_description) . ", " - .db_escape($line->price) . ", " - .db_escape($line->quantity) . ", " - .db_escape($line->discount_percent) . ", " - .db_escape($line->qty_done) ." )"; - - db_query($sql, "Old order Cannot be Inserted"); - + if ($SysPrefs->loc_notification() == 1 && is_inventory_item($line->stock_id)) + $loc = calculate_reorder_level($order->Location, $line, $st_ids, $st_names, $st_num, $st_reorder); + + if (!$line->id) //new line + $sql = "INSERT INTO ".TB_PREF."sales_order_details + (order_no, trans_type, stk_code, description, unit_price, quantity, + discount_percent, qty_sent) + VALUES (".$order_no . ",".$order->trans_type."," + .db_escape($line->stock_id) . "," + .db_escape($line->item_description) . ", " + .db_escape($line->price) . ", " + .db_escape($line->quantity) . ", " + .db_escape($line->discount_percent) . ", " + .db_escape($line->qty_done) ." )"; + else + $sql = "UPDATE ".TB_PREF."sales_order_details + SET id=".db_escape($line->id).", + order_no=$order_no, + trans_type=".$order->trans_type.", + stk_code=".db_escape($line->stock_id).", + description=".db_escape($line->item_description).", + unit_price=".db_escape($line->price).", + quantity=".db_escape($line->quantity).", + discount_percent=".db_escape($line->discount_percent).", + qty_sent=".db_escape($line->qty_done)." + WHERE id = ".db_escape($line->id); + + db_query($sql, "Old order Cannot be updated"); } /* inserted line items into sales order details */ + if ($order->trans_type == ST_SALESORDER) + reallocate_payments($order_no, ST_SALESORDER, $ord_date, $total, $allocs); add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated.")); $Refs->save($order->trans_type, $order_no, $order->reference); hook_db_postwrite($order, $order->trans_type); commit_transaction(); - if ($loc_notification == 1 && count($st_ids) > 0) - { - require_once($path_to_root . "/reporting/includes/class.mail.inc"); - $company = get_company_prefs(); - $mail = new email($company['coy_name'], $company['email']); - $from = $company['coy_name'] . " <" . $company['email'] . ">"; - $to = $loc['location_name'] . " <" . $loc['email'] . ">"; - $subject = _("Stocks below Re-Order Level at " . $loc['location_name']); - $msg = "\n"; - for ($i = 0; $i < count($st_ids); $i++) - $msg .= $st_ids[$i] . " " . $st_names[$i] . ", " - . _("Re-Order Level") . ": " . $st_reorder[$i] . ", " - . _("Below") . ": " . $st_num[$i] . "\n"; - $msg .= "\n" . _("Please reorder") . "\n\n"; - $msg .= $company['coy_name']; - $mail->to($to); - $mail->subject($subject); - $mail->text($msg); - $ret = $mail->send(); - } + if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0) + send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder); } //---------------------------------------------------------------------------------------- @@ -291,8 +236,18 @@ function get_sales_order_header($order_no, $trans_type) ."ship.shipper_name, " ."tax_group.name AS tax_group_name , " ."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," + ."cust.tax_id," + ."sorder.alloc," + ."IFNULL(allocs.ord_allocs, 0)+IFNULL(inv.inv_allocs ,0) AS sum_paid," + ."sorder.prep_amount>0 as prepaid" + ." FROM ".TB_PREF."sales_orders sorder + LEFT JOIN (SELECT trans_no_to, sum(amt) ord_allocs FROM ".TB_PREF."cust_allocations + WHERE trans_type_to=".ST_SALESORDER." AND trans_no_to=".db_escape($order_no)." GROUP BY trans_no_to) + allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no + LEFT JOIN (SELECT order_, sum(alloc) inv_allocs FROM ".TB_PREF."debtor_trans + WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($order_no)." GROUP BY order_) + inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no + 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, " @@ -374,6 +329,12 @@ function read_sales_order($order_no, &$order, $trans_type) $order->due_date = sql2date($myrow["delivery_date"]); $order->document_date = sql2date($myrow["ord_date"]); + $order->prepaid = $myrow["prepaid"]; + $order->alloc = $myrow['alloc']; + $order->sum_paid = $myrow["sum_paid"]; // sum of all prepayments to so (also invoiced) + $order->prep_amount = $myrow["prep_amount"]; + $order->prepayments = get_payments_for($order_no, $myrow['trans_type']); + $result = get_sales_order_details($order_no, $order->trans_type); if (db_num_rows($result) > 0) { @@ -437,8 +398,10 @@ function get_invoice_duedate($terms, $invdate) if ($myrow['day_in_following_month'] > 0) $duedate = add_days(end_month($invdate), $myrow['day_in_following_month']); - else + elseif ($myrow['days_before_due'] > 0) $duedate = add_days($invdate, $myrow['days_before_due']); + else + $duedate = $invdate; return $duedate; } @@ -493,8 +456,16 @@ function get_branch_to_order($customer_id, $branch_id) { return db_query($sql,"Customer Branch Record Retreive"); } -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) +/* + Supported filters: + + InvoiceTemplates + DeliveryTemplates + OutstandingOnly + PrepaidOrders +*/ +function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, + $stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT) { $sql = "SELECT @@ -512,8 +483,18 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n sorder.type, debtor.curr_code, Sum(line.qty_sent) AS TotDelivered, - Sum(line.quantity) AS TotQuantity - FROM ".TB_PREF."sales_orders as sorder, " + Sum(line.quantity) AS TotQuantity, + Sum(line.invoiced) AS TotInvoiced, + alloc, + prep_amount, + allocs.ord_payments, + inv.inv_payments, + sorder.total + FROM ".TB_PREF."sales_orders as sorder + LEFT JOIN (SELECT trans_no_to, sum(amt) ord_payments FROM ".TB_PREF."cust_allocations WHERE trans_type_to=".ST_SALESORDER." GROUP BY trans_no_to) + allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no + LEFT JOIN (SELECT order_, sum(prep_amount) inv_payments FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." GROUP BY order_) + inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no," .TB_PREF."sales_order_details as line, " .TB_PREF."debtors_master as debtor, " .TB_PREF."cust_branch as branch @@ -534,8 +515,7 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n elseif ($ref != "") { // search orders with reference like - $number_like = "%".$ref."%"; - $sql .= " AND sorder.reference LIKE ".db_escape($number_like); + $sql .= " AND sorder.reference LIKE ".db_escape('%' . $ref . '%'); // ." GROUP BY sorder.order_no"; } else // ... or select inquiry constraints @@ -552,21 +532,24 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n if ($trans_type == ST_SALESQUOTE && !check_value('show_all')) $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 ($selected_customer != -1) + // $sql .= " AND sorder.debtor_no=".db_escape($selected_customer); - if (isset($stock_item)) + if ($stock_item != ALL_TEXT) $sql .= " AND line.stk_code=".db_escape($stock_item); - if ($location) + if ($location != ALL_TEXT) $sql .= " AND sorder.from_stk_loc = ".db_escape($location); if ($filter=='OutstandingOnly') $sql .= " AND line.qty_sent < line.quantity"; + if ($filter=='PrepaidOrders') + $sql .= " AND prep_amount>0"; + 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); @@ -579,4 +562,46 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n sorder.deliver_to"; return $sql; } -?> \ No newline at end of file + +//-------------------------------------------------------------------------------------------------- +function update_prepaid_so_line($line_id, $qty_invoiced) +{ + $sql = "UPDATE ".TB_PREF."sales_order_details + SET invoiced = invoiced + ".(float)$qty_invoiced." + WHERE id=".db_escape($line_id); + + db_query($sql, "The document detail record could not be updated with invoiced qty"); + return true; +} +/* + Returns array of all issued invoices to sales order $order_no, optinally up to trans_no==$up_to +*/ +function get_sales_order_invoices($order_no) +{ + $sql = "SELECT trans_no, dt.type as type, tran_date, reference, prep_amount + FROM ".TB_PREF."debtor_trans dt + LEFT JOIN ".TB_PREF."voided v ON v.type=dt.type AND v.id=dt.trans_no + WHERE ISNULL(v.id) AND dt.type=".ST_SALESINVOICE." AND dt.order_=".db_escape($order_no) + ." ORDER BY dt.tran_date, dt.reference, dt.trans_no"; + + return db_query($sql, "cannot retrieve sales invoices for sales order"); +} + +function is_sales_order_started($order_no) +{ + $sql = "SELECT count(*) FROM ".TB_PREF."sales_order_details WHERE order_no=".db_escape($order_no)." AND trans_type=".ST_SALESORDER + ." AND (invoiced!=0 OR qty_sent!=0)"; + + $result = db_fetch(db_query($sql, "cannot retrieve sales invoices for sales order")); + return $result[0]; +} + +//--------------------------------------------------------------------------------------------- +// +// Mark/unmark sales order as template. +// +function sales_order_set_template($id, $status) +{ + $sql = "UPDATE ".TB_PREF."sales_orders SET type = ".db_escape($status)." WHERE order_no=".db_escape($id); + db_query($sql, "Can't change sales order type"); +}