in progress

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index cb8c10588b4ddc5fa8ef482db9704eba10561860..138af425876d53c9c9c86122b442d488addbdc40 100644 (file)
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -1,11 +1,27 @@
 <?php
+function view_link($dummy, $order_no)
+{
+       return  get_customer_trans_view_str(ST_SALESORDER, $order_no);
+}
+
+function order_link($row)
+{
+  return pager_link( _("Sales Order"),
+       "/sales/sales_order_entry.php?NewQuoteToSalesOrder=" .$row['order_no'], ICON_DOC);
+}
+
 function get_order_details_extra($customer_id) {
-       $sql = "SELECT so.order_no 
+       $sql = "SELECT so.order_no
+       , stk_code
+       , quantity - qty_sent
+       , required_date
+       , comment
        FROM ".TB_PREF."sales_order_details sod
        JOIN ".TB_PREF."sales_orders so ON (so.order_no = sod.order_no
                AND so.trans_type = sod.trans_type
                AND so.debtor_no = $customer_id
        )
+       WHERE quantity > qty_sent
        ";
 
        return $sql;

diff --git a/order_lines_view.php b/order_lines_view.php
index 6f076140977391679876cfa784fc81a8d3eb3334..6a45716eb6c00782e0671b5444c0d37293d9ef0b 100644 (file)
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -50,12 +50,15 @@ end_table(1);
 //
 $customer_id = $_POST['customer_id'];
 if(isset($customer_id)) {
-label_cell($customer_id);
        $sql = get_order_details_extra($customer_id);
 
 
        $cols = array(
-               _("Order #")
+               _("Order #") => array('fun'=>'view_link', 'ord' => '')
+       ,_("Item Code") => array('ord' => '')
+               ,_("Quantity")
+,_("Required Date") => array('type' => 'Date')
+,_("Comment")
        );
 }
 else {

diff --git a/sql/alter_sales_order_details.sql b/sql/alter_sales_order_details.sql
index 3eb20597613d7f4ca0a650d6c63c087581cce922..a6a6d63116ac791758c69f813d7dbe01e2d7f1ef 100644 (file)
--- a/sql/alter_sales_order_details.sql
+++ b/sql/alter_sales_order_details.sql
@@ -1,4 +1,5 @@
 ALTER TABlE 0_sales_order_details
 ADD COLUMN required_date DATE,
-ADD COLUMN comments TEXT,
+ADD COLUMN comment TEXT,
+ADD COLUMN ref STRING,
 ADD COLUMN priority INTEGER;

diff --git a/sql/clean_sales_order_details.sql b/sql/clean_sales_order_details.sql
index 2b5fc165194c35ff13654504280c2d1694270565..920210379603b0b0bb177ef71473618da1a632ca 100644 (file)
--- a/sql/clean_sales_order_details.sql
+++ b/sql/clean_sales_order_details.sql
@@ -1,4 +1,4 @@
 ALTER TABlE 0_sales_order_details
 DROP COLUMN required_date ,
-DROP COLUMN comments ,
+DROP COLUMN comment ,
 DROP COLUMN priority ;