From: Joe Hunt Date: Fri, 19 Jul 2019 08:45:28 +0000 (+0200) Subject: Paged transaction inquiries optimized for maximum links, continued. X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=3a4c0d65011d8577d7c300e7492a17bf5250c827;hp=97c5e11dd178b2b10edd2b99276b3347470fafc8;p=fa-stable.git Paged transaction inquiries optimized for maximum links, continued. --- diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 6d23976f..4eb25480 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -17,6 +17,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); @@ -117,6 +118,12 @@ function edit_link($row) "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); } +function prt_link($row) +{ + return print_document_link($row['id'], _("Print"), true, ST_DIMENSION, ICON_PRINT); +} + + $sql = get_sql_for_search_dimensions($dim, $_POST['FromDate'], $_POST['ToDate'], $_POST['OrderNumber'], $_POST['type_'], check_value('OpenOnly'), check_value('OverdueOnly')); @@ -129,7 +136,8 @@ $cols = array( _("Due Date") => array('name'=>'due_date', 'type'=>'date', 'ord'=>'asc'), _("Closed") => array('fun'=>'is_closed'), _("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'sum_dimension'), - array('insert'=>true, 'fun'=>'edit_link') + array('insert'=>true, 'fun'=>'edit_link'), + array('insert'=>true, 'fun'=>'prt_link') ); if ($outstanding_only) { diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 1c407b64..4762881f 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -16,6 +16,8 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); + $js = ""; if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); @@ -145,6 +147,11 @@ function view_gl_link($row) return get_gl_view_str(ST_WORKORDER, $row['id']); } +function prt_link($row) +{ + return print_document_link($row['id'], _("Print"), true, ST_WORKORDER, ICON_PRINT); +} + function dec_amount($row, $amount) { return number_format2($amount, $row['decimals']); @@ -163,11 +170,12 @@ $cols = array( _("Manufactured") => array('fun'=>'dec_amount', 'align'=>'right'), _("Date") => array('name'=>'date_', 'type'=>'date', 'ord'=>'desc'), _("Required By") => array('type'=>'date', 'ord'=>''), + array('insert'=>true, 'fun'=> 'view_gl_link'), array('insert'=>true, 'fun'=> 'edit_link'), array('insert'=>true, 'fun'=> 'release_link'), array('insert'=>true, 'fun'=> 'costs_link'), array('insert'=>true, 'fun'=> 'produce_link'), - array('insert'=>true, 'fun'=> 'view_gl_link') + array('insert'=>true, 'fun'=> 'prt_link') ); $table =& new_db_pager('orders_tbl', $sql, $cols); diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 4b0d200a..3c036b9a 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -181,9 +181,9 @@ $cols = array( _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), _("Balance") => array('align'=>'right', 'type'=>'amount'), array('insert'=>true, 'fun'=>'gl_view'), + array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'credit_link'), - array('insert'=>true, 'fun'=>'prt_link'), - array('insert'=>true, 'fun'=>'edit_link') + array('insert'=>true, 'fun'=>'prt_link') ); if ($_POST['supplier_id'] != ALL_TEXT) diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc index 6062ddca..0267687d 100644 --- a/reporting/includes/reporting.inc +++ b/reporting/includes/reporting.inc @@ -117,6 +117,16 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, 'PARAM_3' => '', 'PARAM_4' => $def_orientation); break; + case ST_DIMENSION : + $rep = 501; + // from, to, email, comments, orientation + $ar = array( + 'PARAM_0' => $doc_no, + 'PARAM_1' => $doc_no, + 'PARAM_2' => 1, + 'PARAM_3' => '', + 'PARAM_4' => $def_orientation); + break; default: return null; } diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 4674989f..2183dd1b 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -209,8 +209,8 @@ $cols = array( _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), _("Balance") => array('align'=>'right', 'type'=>'amount'), array('insert'=>true, 'fun'=>'gl_view'), - array('insert'=>true, 'fun'=>'credit_link'), array('insert'=>true, 'fun'=>'edit_link'), + array('insert'=>true, 'fun'=>'credit_link'), array('insert'=>true, 'fun'=>'prt_link') ); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index bc2c15f9..bc088899 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -282,8 +282,9 @@ else ); if ($_POST['order_view_mode'] == 'OutstandingOnly') { array_append($cols, array( + array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'dispatch_link'), - array('insert'=>true, 'fun'=>'edit_link'))); + array('insert'=>true, 'fun'=>'prt_link'))); } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') { array_substitute($cols, 4, 1, _("Description")); @@ -307,8 +308,8 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') { } elseif ($trans_type == ST_SALESORDER) { array_append($cols,array( _("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'), - array('insert'=>true, 'fun'=>'dispatch_link'), array('insert'=>true, 'fun'=>'edit_link'), + array('insert'=>true, 'fun'=>'dispatch_link'), array('insert'=>true, 'fun'=>'prt_link'))); };