[0005738] Additional search options for sales order (delivery date, excluding auto...

[fa-stable.git] / sales / inquiry / sales_orders_view.php

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index c3e63ab5ff839e51bafe30bfeb1859ce56a23f4a..3873114bc167b3417216385d8c220791c744ddce 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -232,11 +232,17 @@ start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
 ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
+
+if ($show_dates)
+    yesno_list_cells('', 'by_delivery', null, ($trans_type==ST_SALESORDER ? _("Delivery date") : _("Valid until")).':',
+         ($trans_type==ST_SALESORDER ? _("Order date") : _("Quotation date")).':');
+
 if ($show_dates)
 {
        date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days());
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
+
 locations_list_cells(_("Location:"), 'StockLocation', null, true, true);
 
 if($show_dates) {
@@ -254,6 +260,9 @@ if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
 if ($trans_type == ST_SALESORDER)
        check_cells(_("Zero values"), 'show_voided');
+if ($show_dates && $trans_type == ST_SALESORDER)
+       check_cells(_("No auto"), 'no_auto');
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 hidden('order_view_mode', $_POST['order_view_mode']);
 hidden('type', $trans_type);
@@ -265,7 +274,8 @@ end_table(1);
 //     Orders inquiry table
 //
 $sql = get_sql_for_sales_orders_view($trans_type, get_post('OrderNumber'), get_post('order_view_mode'),
-       get_post('SelectStockFromList'), get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('OrderReference'), get_post('StockLocation'), get_post('customer_id'), check_value('show_voided'));
+       get_post('SelectStockFromList'), get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('OrderReference'), get_post('StockLocation'), get_post('customer_id'), check_value('show_voided'),
+       get_post('by_delivery'), get_post('no_auto'));
 
 if ($trans_type == ST_SALESORDER)
        $cols = array(