Additional changes for delivery notes implementation

diff --git a/includes/systypes.inc b/includes/systypes.inc
index 0c9aa0483ee9186bfdff630759d35127017ef1d1..e9aa69871d677a51010e54944a05dba232f3f4e2 100644 (file)
--- a/includes/systypes.inc
+++ b/includes/systypes.inc
@@ -35,6 +35,7 @@ function get_systype_db_info($type)
         case     10 : return array("".TB_PREF."debtor_trans", "type", "trans_no", "reference", "tran_date");
         case     11 : return array("".TB_PREF."debtor_trans", "type", "trans_no", "reference", "tran_date");
         case     12 : return array("".TB_PREF."debtor_trans", "type", "trans_no", "reference", "tran_date");
+        case     13 : return array("".TB_PREF."debtor_trans", "type", "trans_no", "reference", "tran_date");
         case     16 : return array("".TB_PREF."stock_moves", "type", "trans_no", "reference", "tran_date");
         case     17 : return array("".TB_PREF."stock_moves", "type", "trans_no", "reference", "tran_date");
         case     18 : return array("".TB_PREF."purch_orders", null, "order_no", "reference", "tran_date");

diff --git a/includes/types.inc b/includes/types.inc
index 1d8eeb545c5e4c320283f4213c5e00be0dda5d28..c8c5f90482dec7bffa1b6c8fe05691f1f958270f 100644 (file)
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -10,6 +10,7 @@ $systypes_array = array (
                     10=> array ('name' => _("Sales Invoice")),
                     11=> array ('name' => _("Customer Credit Note")),
                     12=> array ('name' => _("Customer Payment")),
+                    13=> array ('name' => _("Delivery Note")),
                     16=> array ('name' => _("Location Transfer")),
                     17=> array ('name' => _("Inventory Adjustment")),
                     18=> array ('name' => _("Purchase Order")),
@@ -52,6 +53,11 @@ class systypes
                return 12;
        }
 
+       function cust_dispatch() 
+       {
+               return 13;
+       }
+
        function location_transfer() 
        {
                return 16;

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 8e815e73473415518e422cf686fca027e91a47f5..2d5a927492da986c53a0d8ed85691e6deca37095 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -103,9 +103,13 @@ function hyperlink_params_td($target, $label, $params)
 
 //-----------------------------------------------------------------------------------
 
-function hyperlink_params_separate($target, $label, $params)
+function hyperlink_params_separate($target, $label, $params, $center=false)
 {
+       if ($center)
+               echo "<br><center>";
        echo "<a target='_blank' href='$target?$params" . SID . "'>$label</a>\n";
+       if ($center)
+               echo "</center>";
 }
 
 function hyperlink_params_separate_td($target, $label, $params)

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 3c7fd1e59ee23bc73e5f09a2fa4abf32f2bd760a..687c035eedccf87261123b83182df277975f90f9 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2079,6 +2079,7 @@ function cust_allocations_list_cells($label, $name, $selected)
        echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
        echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
        echo "<option " . ($selected == '4'?" selected ":"") . " value='4'>" . _("Credit Notes"). "</option>\n";
+       echo "<option " . ($selected == '5'?" selected ":"") . " value='5'>" . _("Delivery Notes"). "</option>\n";
        echo "</select></td>\n";
 }
 

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index a2e965644097b62df4fdd80ecac206d5c7b410e5..21bb3f2f27d5bacd25a700d21c97816e60e394d0 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -79,24 +79,34 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
                $viewer = "view_credit.php";
        elseif ($type == 12)
                $viewer = "view_receipt.php";
+       elseif ($type == 13)
+               $viewer = "view_dispatch.php";
        elseif ($type == 30)
                $viewer = "view_sales_order.php";
        else
                return null;
+   
+  if(!is_array($trans_no)) $trans_no = array($trans_no);
 
+  $lbl = $label;
+  $preview_str = '';
+  foreach($trans_no as $trans) {
        if ($label == "")
-               $label = $trans_no;
+               $lbl = $trans;
+
+       if($preview_str!='') $preview_str .= ',';
 
        if ($viewer != "")
        {
                if ($use_popup_windows)
-                       $preview_str = "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
+                       $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$lbl</a>";
                else
-                       $preview_str = "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans_no'>$label</a>";
+                       $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans'>$lbl</a>";
        }               
        else
-               $preview_str = $label;
-
+               $preview_str .= $lbl;
+  }
+  
        return $preview_str;
 }
 

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 9b16d753396a44c634f5771061adcbce1292540a..e9ffcf60f7b367338a9585aca92aebe10f0356d0 100644 (file)
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -66,11 +66,11 @@ while ($myrow = db_fetch($loc_details))
 
        alt_table_row_color($k);
 
-       $sql = "SELECT Sum(".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_invoiced) AS DEM
+       $sql = "SELECT Sum(".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent) AS DEM
                FROM ".TB_PREF."sales_order_details, ".TB_PREF."sales_orders
                WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
                AND ".TB_PREF."sales_orders.from_stk_loc='" . $myrow["loc_code"] . "'
-               AND ".TB_PREF."sales_order_details.qty_invoiced < ".TB_PREF."sales_order_details.quantity
+               AND ".TB_PREF."sales_order_details.qty_sent < ".TB_PREF."sales_order_details.quantity
                AND ".TB_PREF."sales_order_details.stk_code='" . $_POST['stock_id'] . "'";
 
        $demand_result = db_query($sql,"Could not retreive demand for item");