X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=86091ebf3c5e745984fa912abded3367d35197e1;hb=615c63fbc4aea4d0e136e868993e71190aacadd2;hp=f6883b534631ca160a45c67368db26a98c940b71;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index f6883b53..86091ebf 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -18,7 +18,7 @@ include($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 600); if (user_use_date_picker()) $js .= get_js_date_picker(); @@ -99,7 +99,7 @@ start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['Outst start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("#:"), 'DeliveryNumber', '',null, '', true); -date_cells(_("from:"), 'DeliveryAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); +date_cells(_("from:"), 'DeliveryAfterDate', '', null, -user_transaction_days()); date_cells(_("to:"), 'DeliveryToDate', '', null, 1); locations_list_cells(_("Location:"), 'StockLocation', null, true); @@ -140,8 +140,7 @@ function batch_checkbox($row) function edit_link($row) { return $row["Outstanding"]==0 ? '' : - pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery=" - .$row['trans_no'], ICON_EDIT); + trans_editor_link(ST_CUSTDELIVERY, $row['trans_no']); } function prt_link($row) @@ -162,7 +161,7 @@ function check_overdue($row) $row["Outstanding"]!=0; } //------------------------------------------------------------------------------------------------ -$sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post('DeliveryToDate'), get_post('customer_id'), +$sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post('DeliveryToDate'), get_post('customer_id'), get_post('SelectStockFromList'), get_post('StockLocation'), get_post('DeliveryNumber'), get_post('OutstandingOnly')); $cols = array(