projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed hardcoded trans days in inquiries (30) to be a user preference.
[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 5f23e891a989b0aa497b711da1e71c645e7e9f12..f8309de9789b3e6de565f41b340ba6e95adf667d 100644
(file)
--- a/
sales/inquiry/sales_orders_view.php
+++ b/
sales/inquiry/sales_orders_view.php
@@
-11,9
+11,9
@@
***********************************************************************/
$path_to_root = "../..";
***********************************************************************/
$path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
-include($path_to_root . "/sales/includes/sales_ui.inc");
+include
_once
($path_to_root . "/includes/db_pager.inc");
+include
_once
($path_to_root . "/includes/session.inc");
+include
_once
($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
$page_security = 'SA_SALESTRANSVIEW';
include_once($path_to_root . "/reporting/includes/reporting.inc");
$page_security = 'SA_SALESTRANSVIEW';
@@
-25,12
+25,6
@@
set_page_security( @$_POST['order_view_mode'],
'InvoiceTemplates' => 'SA_SALESINVOICE')
);
'InvoiceTemplates' => 'SA_SALESINVOICE')
);
-$js = "";
-if ($use_popup_windows)
- $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
- $js .= get_js_date_picker();
-
if (get_post('type'))
$trans_type = $_POST['type'];
elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
if (get_post('type'))
$trans_type = $_POST['type'];
elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@
-66,6
+60,12
@@
else
$_POST['order_view_mode'] = "Quotations";
$_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
}
$_POST['order_view_mode'] = "Quotations";
$_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
}
+
+$js = "";
+if ($use_popup_windows)
+ $js .= get_js_open_window(900, 600);
+if ($use_date_picker)
+ $js .= get_js_date_picker();
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['selected_customer']))
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['selected_customer']))
@@
-118,6
+118,10
@@
function prt_link($row)
function edit_link($row)
{
function edit_link($row)
{
+ global $page_nested;
+
+ if ($page_nested)
+ return '';
global $trans_type;
$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
return pager_link( _("Edit"),
global $trans_type;
$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
return pager_link( _("Edit"),
@@
-159,9
+163,12
@@
function order_link($row)
function tmpl_checkbox($row)
{
function tmpl_checkbox($row)
{
- global $trans_type;
+ global $trans_type
, $page_nested
;
if ($trans_type == ST_SALESQUOTE)
return '';
if ($trans_type == ST_SALESQUOTE)
return '';
+
+ if ($page_nested)
+ return '';
$name = "chgtpl" .$row['order_no'];
$value = $row['type'] ? 1:0;
$name = "chgtpl" .$row['order_no'];
$value = $row['type'] ? 1:0;
@@
-218,7
+225,7
@@
ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
if ($show_dates)
{
ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
if ($show_dates)
{
- date_cells(_("from:"), 'OrdersAfterDate', '', null, -
30
);
+ date_cells(_("from:"), 'OrdersAfterDate', '', null, -
$_SESSION["wa_current_user"]->prefs->transaction_days()
);
date_cells(_("to:"), 'OrdersToDate', '', null, 1);
}
locations_list_cells(_("Location:"), 'StockLocation', null, true);
date_cells(_("to:"), 'OrdersToDate', '', null, 1);
}
locations_list_cells(_("Location:"), 'StockLocation', null, true);
@@
-231,7
+238,8
@@
if($show_dates) {
start_row();
}
stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
start_row();
}
stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-
+if (!@$_GET['popup'])
+ customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
if ($trans_type == ST_SALESQUOTE)
check_cells(_("Show All:"), 'show_all');
if ($trans_type == ST_SALESQUOTE)
check_cells(_("Show All:"), 'show_all');
@@
-246,7
+254,7
@@
end_table(1);
// Orders inquiry table
//
$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
// Orders inquiry table
//
$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
- @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation']);
+ @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation']
, $_POST['customer_id']
);
if ($trans_type == ST_SALESORDER)
$cols = array(
if ($trans_type == ST_SALESORDER)
$cols = array(
@@
-278,7
+286,9
@@
else
);
if ($_POST['order_view_mode'] == 'OutstandingOnly') {
//array_substitute($cols, 3, 1, _("Cust Order Ref"));
);
if ($_POST['order_view_mode'] == 'OutstandingOnly') {
//array_substitute($cols, 3, 1, _("Cust Order Ref"));
- array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
+ array_append($cols, array(
+ array('insert'=>true, 'fun'=>'dispatch_link'),
+ array('insert'=>true, 'fun'=>'edit_link')));
} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
array_substitute($cols, 3, 1, _("Description"));
} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
array_substitute($cols, 3, 1, _("Description"));