From: Janusz Dobrowolski Date: Wed, 15 Oct 2008 13:32:02 +0000 (+0000) Subject: Fixed printing api. X-Git-Tag: v2.4.2~19^2~1848 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f6857ddce763542393996620848daa7ce519842d;p=fa-stable.git Fixed printing api. --- diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php index da479c6b..48a0e176 100644 --- a/admin/view_print_transaction.php +++ b/admin/view_print_transaction.php @@ -108,7 +108,6 @@ function handle_search() $print_type == systypes::po() || $print_type == systypes::sales_order()); if ($print_out) { - print_hidden_script($print_type); if ($trans_ref) $th = array(_("#"), _("Reference"), _("View"), _("Print"), _("GL")); else diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index b4bac802..c6c290bd 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -124,8 +124,6 @@ $sql .= " GROUP BY ".TB_PREF."purch_orders.order_no"; $result = db_query($sql,"No orders were returned"); -print_hidden_script(18); - /*show a table of the orders returned by the sql */ div_start('orders_tbl'); @@ -171,7 +169,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["curr_code"]); amount_cell($myrow["OrderValue"]); label_cell("" . _("Edit") . ""); - label_cell(print_document_link($myrow['order_no'], _("Print"))); + label_cell(print_document_link($myrow['order_no'], _("Print"), true, 18)); label_cell("" . _("Receive") . ""); end_row(); diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 7e2f7f61..30d5de4d 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -118,8 +118,6 @@ $sql .= " GROUP BY ".TB_PREF."purch_orders.order_no"; $result = db_query($sql,"No orders were returned"); -print_hidden_script(18); - div_start('orders_tbl'); start_table("$table_style colspan=7 width=80%"); @@ -150,7 +148,7 @@ while ($myrow = db_fetch($result)) label_cell($date); label_cell($myrow["curr_code"]); amount_cell($myrow["OrderValue"]); - label_cell(print_document_link($myrow['order_no'], _("Print"))); + label_cell(print_document_link($myrow['order_no'], _("Print"), true, 18)); end_row(); $j++; diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index ca1db0bd..d87653e0 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -39,7 +39,6 @@ page($_SESSION['page_title'], false, false, "", $js); if (isset($_GET['AddedID'])) { $credit_no = $_GET['AddedID']; $trans_type = 11; - print_hidden_script(11); display_notification_centered(_("Credit Note has been processed")); @@ -54,7 +53,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $credit_no = $_GET['UpdatedID']; $trans_type = 11; - print_hidden_script(11); display_notification_centered(_("Credit Note has been updated")); diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 4b6726ef..8e5da8e8 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -36,7 +36,6 @@ page($_SESSION['page_title'], false, false, "", $js); if (isset($_GET['AddedID'])) { $dispatch_no = $_GET['AddedID']; - print_hidden_script(13); display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true); @@ -55,7 +54,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $delivery_no = $_GET['UpdatedID']; - print_hidden_script(13); display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no)); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 35d59fb7..ca3df67f 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -40,7 +40,6 @@ if (isset($_GET['AddedID'])) { $invoice_no = $_GET['AddedID']; $trans_type = 10; - print_hidden_script(10); display_notification(_("Selected deliveries has been processed"), true); @@ -57,7 +56,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $invoice_no = $_GET['UpdatedID']; - print_hidden_script(10); display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no)); diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 715de08a..1e2aa7f1 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -166,7 +166,6 @@ if(get_post('RefreshInquiry')) $Ajax->activate('totals_tbl'); } //------------------------------------------------------------------------------------------------ -print_hidden_script(10); div_start('trans_tbl'); if (db_num_rows($result) == 0) diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index 98d17a74..ce039d12 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -98,7 +98,6 @@ if (get_post('SearchOrders')) } //----------------------------------------------------------------------------------- -print_hidden_script(13); start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=" . $_POST['OutstandingOnly'] .SID); @@ -260,7 +259,7 @@ if ($result) $modify_page = $path_to_root . "/sales/customer_delivery.php?" . SID . "ModifyDelivery=" . $myrow["trans_no"]; $invoice_page = $path_to_root . "/sales/customer_invoice.php?" . SID . "DeliveryNumber=" .$myrow["trans_no"]; label_cell("" . _("Edit") . ""); - label_cell(print_document_link($myrow['trans_no'], _("Print"))); + label_cell(print_document_link($myrow['trans_no'], _("Print"), true, 13)); label_cell($not_closed ? "" . _("Invoice") . "" : ''); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index bcf416ca..22cb06c9 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -182,8 +182,6 @@ $result = db_query($sql,"No orders were returned"); //----------------------------------------------------------------------------------- if ($result) { - print_hidden_script(30); - start_form(); /*show a table of the orders returned by the sql */ div_start('orders_tbl'); @@ -262,7 +260,7 @@ if ($result) $modify_page = $path_to_root . "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $myrow["order_no"]; label_cell("" . _("Edit") . ""); - label_cell(print_document_link($myrow['order_no'], _("Print"))); + label_cell(print_document_link($myrow['order_no'], _("Print"), true, 30)); } end_row();; diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 70ca31a4..5b0841bf 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -66,7 +66,6 @@ page($_SESSION['page_title'], false, false, "", $js); if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedID']; - print_hidden_script(30); display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no)); @@ -83,7 +82,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $order_no = $_GET['UpdatedID']; - print_hidden_script(30); display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no)); @@ -101,7 +99,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['AddedDN'])) { $delivery = $_GET['AddedDN']; - print_hidden_script(13); display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery)); @@ -122,7 +119,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['AddedDI'])) { $invoice = $_GET['AddedDI']; - print_hidden_script(10); display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice));