4863: Dimension not defaulted on po entry, po modify. @Braath Waate and @joe fixed
[fa-stable.git] / purchasing / includes / db / po_db.inc
index d3135f56c52c9d6ed6f11d3830fdadea549cf9bd..a82eb9a584649c0b0d90f35441b1d09eacd40b27 100644 (file)
@@ -9,32 +9,80 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+// ------------------------------------------------------------------------------
+
+function get_supplier_details_to_order(&$order, $supplier_id)
+{
+       $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, dimension_id, dimension2_id,
+                       supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
+                               * (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
+                               terms.terms, terms.days_before_due, terms.day_in_following_month
+               FROM ".TB_PREF."suppliers supp
+                        LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id
+                        LEFT JOIN ".TB_PREF."payment_terms terms ON supp.payment_terms=terms.terms_indicator
+               WHERE supp.supplier_id = ".db_escape($supplier_id)."
+               GROUP BY
+                         supp.supp_name";
+
+       $result = db_query($sql, "The supplier details could not be retreived");
+       $myrow = db_fetch($result);
+
+       $order->credit = $myrow["cur_credit"];
+       $order->terms = array( 
+               'description' => $myrow['terms'],
+               'days_before_due' => $myrow['days_before_due'], 
+               'day_in_following_month' => $myrow['day_in_following_month'] );
+
+       $_POST['supplier_id'] = $supplier_id;
+       $_POST['supplier_name'] = $myrow["supp_name"];
+       $_POST['curr_code'] = $myrow["curr_code"];
+       $_POST['dimension'] = $myrow["dimension_id"];
+       $_POST['dimension2'] = $myrow["dimension2_id"];
+
+       $order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"], 
+               $myrow["tax_group_id"], $myrow["tax_included"]);
+}
+
 //----------------------------------------------------------------------------------------
 
 function delete_po($po)
 {
-       $sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no=" . $po;
+       global $Refs;
+
+       begin_transaction();
+       hook_db_prevoid($po, ST_PURCHORDER);
+       $sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no=".db_escape($po);
        db_query($sql, "The order header could not be deleted");
 
-       $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no =" . $po;
+       $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no =".db_escape($po);
        db_query($sql, "The order detail lines could not be deleted");
+
+       $Refs->restore_last(ST_PURCHORDER, $po);
+       commit_transaction();
 }
 
 //----------------------------------------------------------------------------------------
 
 function add_po(&$po_obj)
 {
+       global $Refs;
+
        begin_transaction();
+       hook_db_prewrite($po_obj, ST_PURCHORDER);
 
      /*Insert to purchase order header record */
-     $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, requisition_no, into_stock_location, delivery_address) VALUES(";
+     $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, 
+       requisition_no, into_stock_location, delivery_address, total, tax_included, prep_amount) VALUES(";
      $sql .= db_escape($po_obj->supplier_id) . "," .
          db_escape($po_obj->Comments) . ",'" .
-         date2sql($po_obj->orig_order_date) . "', '" .
-                $po_obj->reference . "', " .
-         db_escape($po_obj->requisition_no) . ", " .
+         date2sql($po_obj->orig_order_date) . "', " .
+                db_escape($po_obj->reference) . ", " .
+         db_escape($po_obj->supp_ref) . ", " .
          db_escape($po_obj->Location) . ", " .
-         db_escape($po_obj->delivery_address) . ")";
+         db_escape($po_obj->delivery_address) . ", " .
+         db_escape($po_obj->get_trans_total()). ", " .
+         db_escape($po_obj->tax_included). ", " .
+         db_escape($po_obj->prep_amount). ")";
 
        db_query($sql, "The purchase order header record could not be inserted");
 
@@ -42,24 +90,22 @@ function add_po(&$po_obj)
      $po_obj->order_no = db_insert_id();
 
      /*Insert the purchase order detail records */
-     foreach ($po_obj->line_items as $po_line)
+     foreach ($po_obj->line_items as $line_no => $po_line)
      {
-       if ($po_line->Deleted == false)
-       {
-               $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date,    unit_price,     quantity_ordered) VALUES (";
-               $sql .= $po_obj->order_no . ", " . db_escape($po_line->stock_id). "," .
-                       db_escape($po_line->item_description). ",'" .
-                       date2sql($po_line->req_del_date) . "'," .
-                       $po_line->price . ", " .
-                       $po_line->quantity . ")";
-                       db_query($sql, "One of the purchase order detail records could not be inserted");
-       }
+               $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date,    unit_price,     quantity_ordered) VALUES (";
+               $sql .= $po_obj->order_no . ", " . db_escape($po_line->stock_id). "," .
+               db_escape($po_line->item_description). ",'" .
+               date2sql($po_line->req_del_date) . "'," .
+               db_escape($po_line->price) . ", " .
+               db_escape($po_line->quantity). ")";
+               db_query($sql, "One of the purchase order detail records could not be inserted");
+               $po_obj->line_items[$line_no]->po_detail_rec = db_insert_id();
      }
 
-       references::save_last($po_obj->reference, systypes::po());
-
-       //add_comments(systypes::po(), $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
+       $Refs->save(ST_PURCHORDER, $po_obj->order_no, $po_obj->reference);
 
+       add_audit_trail(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date);
+       hook_db_postwrite($po_obj, ST_PURCHORDER);
        commit_transaction();
 
        return $po_obj->order_no;
@@ -70,53 +116,44 @@ function add_po(&$po_obj)
 function update_po(&$po_obj)
 {
        begin_transaction();
+       hook_db_prewrite($po_obj, ST_PURCHORDER);
 
     /*Update the purchase order header with any changes */
     $sql = "UPDATE ".TB_PREF."purch_orders SET Comments=" . db_escape($po_obj->Comments) . ",
-               requisition_no= ". db_escape( $po_obj->requisition_no). ",
+               requisition_no= ". db_escape( $po_obj->supp_ref). ",
                into_stock_location=" . db_escape($po_obj->Location). ",
                ord_date='" . date2sql($po_obj->orig_order_date) . "',
-               delivery_address=" . db_escape($po_obj->delivery_address);
+               delivery_address=" . db_escape($po_obj->delivery_address).",
+               total=". db_escape($po_obj->get_trans_total()).",
+               prep_amount=". db_escape($po_obj->prep_amount).",
+               tax_included=". db_escape($po_obj->tax_included);
     $sql .= " WHERE order_no = " . $po_obj->order_no;
        db_query($sql, "The purchase order could not be updated");
 
+       $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no="
+               .db_escape($po_obj->order_no);
+       db_query($sql, "could not delete old purch order details");
+
     /*Now Update the purchase order detail records */
     foreach ($po_obj->line_items as $po_line)
     {
-
-               if ($po_line->Deleted==True)
-               {
-                       // Sherifoz 21.06.03 Handle deleting existing lines
-                       if ($po_line->po_detail_rec!='')
-                       {
-                               $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE po_detail_item='" . $po_line->po_detail_rec . "'";
-                               db_query($sql, "could not query purch order details");
-                       }
-               }
-               else if ($po_line->po_detail_rec == '')
-               {
-                       // Sherifoz 21.06.03 Handle adding new lines vs. updating. if no key(po_detail_rec) then it's a new line
-                       $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date, unit_price,        quantity_ordered) VALUES (";
-                       $sql .= $po_obj->order_no . "," .
-                               db_escape($po_line->stock_id). "," .
-                               db_escape($po_line->item_description). ",'" .
-                               date2sql($po_line->req_del_date) . "'," .
-                               $po_line->price . ", " . $po_line->quantity . ")";
-               }
-               else
-               {
-                       $sql = "UPDATE ".TB_PREF."purch_order_details SET item_code='" . $po_line->stock_id . "',
-                               description =" . db_escape($po_line->item_description). ",
-                               delivery_date ='" . date2sql($po_line->req_del_date) . "',
-                               unit_price=" . $po_line->price . ",
-                               quantity_ordered=" . $po_line->quantity . "
-                               WHERE po_detail_item=" . $po_line->po_detail_rec;
-               }
+       $sql = "INSERT INTO ".TB_PREF."purch_order_details (po_detail_item, order_no, item_code, 
+               description, delivery_date, unit_price, quantity_ordered, quantity_received) VALUES ("
+                       .db_escape($po_line->po_detail_rec ? $po_line->po_detail_rec : 0). ","
+                       .$po_obj->order_no . ","
+                       .db_escape($po_line->stock_id). ","
+                       .db_escape($po_line->item_description). ",'"
+                       .date2sql($po_line->req_del_date) . "',"
+                       .db_escape($po_line->price) . ", "
+                       .db_escape($po_line->quantity) . ", "
+                       .db_escape($po_line->qty_received) . ")";
                db_query($sql, "One of the purchase order detail records could not be updated");
     }
 
-       //add_comments(systypes::po(), $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
+       reallocate_payments($po_obj->order_no, ST_PURCHORDER, $po_obj->orig_order_date, $po_obj->get_trans_total(), $po_obj->prepayments, $po_obj->supplier_id);
 
+       add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated."));
+       hook_db_postwrite($po_obj, ST_PURCHORDER);
        commit_transaction();
 
        return $po_obj->order_no;
@@ -126,12 +163,13 @@ function update_po(&$po_obj)
 
 function read_po_header($order_no, &$order)
 {
-       $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,
-               ".TB_PREF."suppliers.curr_code, ".TB_PREF."locations.location_name
-               FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
-               WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
-               AND ".TB_PREF."locations.loc_code = into_stock_location
-               AND ".TB_PREF."purch_orders.order_no = " . $order_no;
+       $sql = "SELECT po.*, supplier.*, loc.location_name 
+               FROM ".TB_PREF."purch_orders po,"
+                       .TB_PREF."suppliers supplier,"
+                       .TB_PREF."locations loc
+               WHERE po.supplier_id = supplier.supplier_id
+               AND loc.loc_code = into_stock_location
+               AND po.order_no = ".db_escape($order_no);
 
        $result = db_query($sql, "The order cannot be retrieved");
 
@@ -140,17 +178,23 @@ function read_po_header($order_no, &$order)
 
        $myrow = db_fetch($result);
 
+       $order->trans_type = ST_PURCHORDER;
        $order->order_no = $order_no;
-       $order->supplier_id = $myrow["supplier_id"];
-       $order->supplier_name = $myrow["supp_name"];
-       $order->curr_code = $myrow["curr_code"];
+
+       $order->set_supplier($myrow["supplier_id"], $myrow["supp_name"], $myrow["curr_code"],
+               $myrow['tax_group_id'], $myrow["tax_included"]);
+
+               $order->credit = get_current_supp_credit($order->supplier_id);
 
        $order->orig_order_date = sql2date($myrow["ord_date"]);
        $order->Comments = $myrow["comments"];
        $order->Location = $myrow["into_stock_location"];
-       $order->requisition_no = $myrow["requisition_no"];
+       $order->supp_ref = $myrow["requisition_no"];
        $order->reference = $myrow["reference"];
        $order->delivery_address = $myrow["delivery_address"];
+       $order->alloc = $myrow["alloc"];
+       $order->prep_amount = $myrow["prep_amount"];
+       $order->prepayments = get_payments_for($order_no, ST_PURCHORDER, $myrow["supplier_id"]);
 
        return true;
        }
@@ -165,14 +209,13 @@ function read_po_items($order_no, &$order, $open_items_only=false)
 {
        /*now populate the line po array with the purchase order details records */
 
-       $sql = "SELECT ".TB_PREF."purch_order_details.*, units
-               FROM ".TB_PREF."purch_order_details
-               LEFT JOIN ".TB_PREF."stock_master
-               ON ".TB_PREF."purch_order_details.item_code=".TB_PREF."stock_master.stock_id
-               WHERE order_no =$order_no ";
+       $sql = "SELECT poline.*, units
+               FROM ".TB_PREF."purch_order_details poline
+                       LEFT JOIN ".TB_PREF."stock_master item  ON poline.item_code=item.stock_id
+               WHERE order_no =".db_escape($order_no);
 
     if ($open_items_only)
-               $sql .= " AND (".TB_PREF."purch_order_details.quantity_ordered > ".TB_PREF."purch_order_details.quantity_received) ";
+               $sql .= " AND (poline.quantity_ordered > poline.quantity_received) ";
 
        $sql .= " ORDER BY po_detail_item";
 
@@ -180,7 +223,6 @@ function read_po_items($order_no, &$order, $open_items_only=false)
 
     if (db_num_rows($result) > 0)
     {
-
                while ($myrow = db_fetch($result))
         {
                $data = get_purchase_data($order->supplier_id, $myrow['item_code']);
@@ -188,8 +230,6 @@ function read_po_items($order_no, &$order, $open_items_only=false)
                {
                        if ($data['supplier_description'] != "")
                                $myrow['description'] = $data['supplier_description'];
-                       if ($data['suppliers_uom'] != "")
-                               $myrow['units'] = $data['suppliers_uom'];
                }               
             if (is_null($myrow["units"]))
             {
@@ -200,13 +240,12 @@ function read_po_items($order_no, &$order, $open_items_only=false)
                 $units = $myrow["units"];
             }
 
-            $order->add_to_order($order->lines_on_order+1, $myrow["item_code"],
+            if ($order->add_to_order($order->lines_on_order, $myrow["item_code"],
                $myrow["quantity_ordered"],$myrow["description"],
                $myrow["unit_price"],$units, sql2date($myrow["delivery_date"]),
-               $myrow["qty_invoiced"], $myrow["quantity_received"]);
-
-            $order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"];
-            $order->line_items[$order->lines_on_order]->standard_cost = $myrow["std_cost_unit"];  /*Needed for receiving goods and GL interface */
+               $myrow["qty_invoiced"], $myrow["quantity_received"])) {
+                               $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];
+                       }
         } /* line po from purchase order details */
     } //end of checks on returned data set
 }
@@ -223,5 +262,136 @@ function read_po($order_no, &$order, $open_items_only=false)
 
 //----------------------------------------------------------------------------------------
 
+function get_po_items($order_no)
+{
+       $sql = "SELECT item_code, quantity_ordered, quantity_received, qty_invoiced
+               FROM ".TB_PREF."purch_order_details
+               WHERE order_no=".db_escape($order_no)
+               ." ORDER BY po_detail_item";
+
+       $result = db_query($sql, "could not query purch order details");
+    check_db_error("Could not check that the details of the purchase order had not been changed by another user ", $sql);
+    return $result;
+}
+//----------------------------------------------------------------------------------------
+
+function get_short_info($stock_id)
+{
+       $sql = "SELECT description, units, mb_flag
+               FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id);
+
+       return db_query($sql,"The stock details for " . $stock_id . " could not be retrieved");
+}
+
+function get_sql_for_po_search_completed($from, $to, $supplier_id=ALL_TEXT, $location=ALL_TEXT,
+       $order_number = '', $stock_id = '', $also_closed=false)
+{
+       $sql = "SELECT 
+               porder.order_no, 
+               porder.reference, 
+               supplier.supp_name, 
+               location.location_name,
+               porder.requisition_no, 
+               porder.ord_date, 
+               supplier.curr_code, 
+               Sum(line.unit_price*line.quantity_ordered) AS OrderValue,
+               porder.into_stock_location,
+               chk.isopen
+               FROM ".TB_PREF."purch_orders as porder
+                               LEFT JOIN (
+                                       SELECT order_no, SUM(quantity_ordered-quantity_received + quantity_ordered-qty_invoiced) isopen
+                                       FROM ".TB_PREF."purch_order_details
+                                       GROUP BY order_no
+                               ) chk ON chk.order_no=porder.order_no,"
+                       .TB_PREF."purch_order_details as line, "
+                       .TB_PREF."suppliers as supplier, "
+                       .TB_PREF."locations as location
+               WHERE porder.order_no = line.order_no
+               AND porder.supplier_id = supplier.supplier_id
+               AND location.loc_code = porder.into_stock_location ";
+
+       if ($supplier_id != ALL_TEXT)
+               $sql .= "AND supplier.supplier_id=".$supplier_id." ";
+       if ($order_number != "")
+       {
+               $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
+       }
+       else
+       {
+
+               $data_after = date2sql($from);
+               $date_before = date2sql($to);
+
+               $sql .= " AND porder.ord_date >= '$data_after'";
+               $sql .= " AND porder.ord_date <= '$date_before'";
+
+               if ($location != ALL_TEXT)
+               {
+                       $sql .= " AND porder.into_stock_location = ".db_escape($location);
+               }
+               if ($stock_id !== '')
+               {
+                       $sql .= " AND line.item_code=".db_escape($stock_id);
+               }
+               if ($supplier_id != ALL_TEXT)
+                       $sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
+
+       }
+
+       if (!$also_closed)
+               $sql .= " AND isopen";
+       $sql .= " GROUP BY porder.order_no";
+       return $sql;
+}
+
+function get_sql_for_po_search($from, $to, $supplier_id=ALL_TEXT, $location=ALL_TEXT, $order_number='', $stock_id='')
+{
+       $sql = "SELECT 
+               porder.order_no, 
+               porder.reference,
+               supplier.supp_name, 
+               location.location_name,
+               porder.requisition_no, 
+               porder.ord_date,
+               supplier.curr_code,
+               Sum(line.unit_price*line.quantity_ordered) AS OrderValue,
+               Sum(line.delivery_date < '". date2sql(Today()) ."'
+               AND (line.quantity_ordered > line.quantity_received)) As OverDue
+               FROM ".TB_PREF."purch_orders as porder,"
+                       .TB_PREF."purch_order_details as line, "
+                       .TB_PREF."suppliers as supplier, "
+                       .TB_PREF."locations as location
+               WHERE porder.order_no = line.order_no
+               AND porder.supplier_id = supplier.supplier_id
+               AND location.loc_code = porder.into_stock_location
+               AND (line.quantity_ordered > line.quantity_received) ";
+
+       if ($order_number != "")
+       {
+               $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
+       }
+       else
+       {
+               $data_after = date2sql($from);
+               $data_before = date2sql($to);
+
+               $sql .= "  AND porder.ord_date >= '$data_after'";
+               $sql .= "  AND porder.ord_date <= '$data_before'";
+
+               if ($location != ALL_TEXT)
+               {
+                       $sql .= " AND porder.into_stock_location = ".db_escape($location);
+               }
+
+               if ($stock_id != '')
+               {
+                       $sql .= " AND line.item_code=".db_escape($stock_id);
+               }
+               if ($supplier_id != ALL_TEXT)
+                       $sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
+       } //end not order number selected
+
+       $sql .= " GROUP BY porder.order_no";
+       return $sql;
+}
 
-?>
\ No newline at end of file