All date columns are editable.

[order_line_extra.git] / includes / order_lines.inc

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index dc09a6bcf57d12ddd710fbadfdaa24ebf310e22e..d17022263c86f66a4052aa8485eb25f989999b91 100644 (file)
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -149,7 +149,10 @@ function get_order_details_extra($customer_id, $location) {
        , sod.quantity - qty_sent quantity
        , GREATEST(0, LEAST(qoh.quantity  - quantity_before, sod.quantity - qty_sent))
        , quantity_before
+       , sod.`priority`
+       , hold_until_date
        , required_date
+       , expiry_date
        ,comment
        FROM ".TB_PREF."sales_order_details sod
        JOIN ".TB_PREF."sales_orders so ON (so.order_no = sod.order_no
@@ -196,7 +199,7 @@ function get_order_summary($location) {
        , sum(sub.amount) as amount
        , sum(greatest(least(sub.quantity, qoh.quantity - quantity_before), 0))
        , sum(sub.amount*greatest(least(sub.quantity, qoh.quantity - quantity_before), 0)/sub.quantity)
-       ,  `min(required_date)`
+       ,  min(`min(required_date)`)
        , group_concat(distinct order_comment separator ';') as order_comment
        , group_concat(distinct detail_comment separator ';') as detail_comment
                                FROM $sub sub