Purchase Order View: fixed dates, added overdue delivery marker.

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 065b2c7d04fa0162df19529e402d9282c09d5fa4..d3cee3398e5a1e45c872df53caa53fc24579e9be 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -255,7 +255,7 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date)
 function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
        $is_invoiced_only=false, $invoice_no=0, $begin="", $end="")
 {
-    $sql = "SELECT grn.*, grn_item.*,
+    $sql = "SELECT grn.*, grn_item.*, po_item.delivery_date as req_del_date,
                grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')."  quantity_inv,
        po_item.unit_price,
        po_item.act_price,
@@ -346,7 +346,7 @@ function read_grn_items_to_order($grn_batch, &$order)
 
                        $order->add_to_order($order->lines_on_order, $myrow["item_code"],
                                $myrow["qty_recd"],$myrow["description"], $myrow["unit_price"],$units,
-                               sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
+                               sql2date($myrow["req_del_date"]), $myrow["quantity_inv"],
                                $myrow["qty_recd"]);
 
                        $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index a0ab2c4822827b6c782e8d4e5eca198a8dd8841d..1112ce077f1e0cadcd72a137be1826c5f30bf25f 100644 (file)
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -25,7 +25,7 @@ function display_grn_summary(&$po)
     label_cells(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
        "class='tableheader2'");
 
-       label_cells(_("Ordered On"), $po->orig_order_date, "class='tableheader2'");
+       label_cells(_("Delivery Date"), $po->orig_order_date, "class='tableheader2'"); // FIXME: delivery date
        end_row();
 
        start_row();

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 236c462283ff316f328f76e81412a9378cc356ca..b2d95bb8e26390226249069d414976456536ef51 100644 (file)
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -37,20 +37,30 @@ display_grn_summary($purchase_order);
 display_heading2(_("Line Details"));
 
 start_table(TABLESTYLE, "width='90%'");
-$th = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"),
+$th = array(_("Item Code"), _("Item Description"), _("Required by"), _("Quantity"),
        _("Unit"), _("Price"), _("Line Total"), _("Quantity Invoiced"));
 
 table_header($th);
 
 $total = 0;
 $k = 0;  //row colour counter
+$overdue_items = false;
 
 foreach ($purchase_order->line_items as $stock_item)
 {
 
        $line_total = $stock_item->qty_received * $stock_item->price;
 
-       alt_table_row_color($k);
+       // if overdue and outstanding quantities, then highlight as so
+       if (date1_greater_date2($purchase_order->orig_order_date, $stock_item->req_del_date))
+       {
+       start_row("class='overduebg'");
+       $overdue_items = true;
+       }
+       else
+       {
+               alt_table_row_color($k);
+       }
 
        label_cell($stock_item->stock_id);
        label_cell($stock_item->item_description);
@@ -83,6 +93,9 @@ end_row();
 
 end_table(1);
 
+if ($overdue_items)
+       display_note(_("Marked items were delivered overdue."), 0, 0, "class='overduefg'");
+
 is_voided_display(ST_SUPPRECEIVE, $_GET['trans_no'], _("This delivery has been voided."));
 
 end_page(true, false, false, ST_SUPPRECEIVE, $_GET['trans_no']);