Ignore tags

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..6e92f57
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+tags

diff --git a/includes/db_order_lines.inc b/includes/db_order_lines.inc
index ffb30e4b5db169af064ae70b68b615b15e2ae8bf..a0675f47b62f928e18567817e7f3ee29116afb83 100644 (file)
--- a/includes/db_order_lines.inc
+++ b/includes/db_order_lines.inc
@@ -117,15 +117,27 @@ function clear_qoh_for_item($stock_id=null) {
 }
 
 function update_order_detail_defaults() {
+       // Set priority to current time.
        $sql  = "UPDATE ".TB_PREF."sales_order_details
                                        SET priority = now()
                                        WHERE priority is null";
        db_query($sql);
+       // Set hold_until_date to delivery_date 
        $sql  = "UPDATE ".TB_PREF."sales_order_details
                                                NATURAL JOIN  0_sales_orders 
                                        SET hold_until_date = delivery_date
                                        WHERE hold_until_date is null";
        db_query($sql);
+
+       // Set expiry date to 6 weeks + delivery date
+       // or 2 weeks + required date. Stuff with an 
+       // explicit required date should expire quickly the 
+       // required date has been missed.
+       $sql  = "UPDATE ".TB_PREF."sales_order_details
+                                       SET expiry_date = if(required_date is null, hold_until_date + INTERVAL 6 WEEK,
+                                                                                                                                                                                       required_date + INTERVAL 2 WEEK)
+                                       WHERE expiry_date is null";
+       db_query($sql);
 }
 
 ?>