Fixed printing api.

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index da479c6ba01006fb8a7139735602193f5107ac27..48a0e176c2aa5b0e2b11599ad47a19b8595477a4 100644 (file)
--- 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 b4bac8022719dd13c91c8c3e2247d67a38ff2612..c6c290bdced92544c8278ee60a41e9a482500259 100644 (file)
--- 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("<a href=$modify>" . _("Edit") . "</a>");
-       label_cell(print_document_link($myrow['order_no'], _("Print")));
+       label_cell(print_document_link($myrow['order_no'], _("Print"), true, 18));
        label_cell("<a href=$receive>" . _("Receive") . "</a>");
        end_row();
 

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index 7e2f7f61a652086816a4448665881540b1789f96..30d5de4db2f2991671da7df7cc9c966677e3cd14 100644 (file)
--- 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 ca1db0bd210799716d1f993205418c85d495fea5..d87653e0847e2193de13bfa8bb278717dc534585 100644 (file)
--- 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 4b6726efa1e21690c87a22a4ecfec0f60827db7f..8e5da8e8b8efa69c67045591a3fe1cb6a6fe2b02 100644 (file)
--- 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 35d59fb78a7fff8c205169bb834ca1b7c0fa2aa8..ca3df67fb3a1693b3bfee5dd8e030b3c9563481e 100644 (file)
--- 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 715de08ae6495e2f2a429cfb4c18657f37be6a81..1e2aa7f18bdcbd08a46565ba96593955572b4b30 100644 (file)
--- 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 98d17a7490b51efce0f4fcec9d66a4bfb859e2e2..ce039d12c4ab07307ee37636c56b13b7bf9ecf66 100644 (file)
--- 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("<a href='$modify_page'>" . _("Edit") . "</a>");
-                       label_cell(print_document_link($myrow['trans_no'], _("Print")));
+                       label_cell(print_document_link($myrow['trans_no'], _("Print"), true, 13));
 
                label_cell($not_closed ? "<a href='$invoice_page'>" . _("Invoice") . "</a>" : '');
 

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index bcf416caece07fa14f3cf5239fcc7cbef9091d6e..22cb06c91cedb535ef607f5a536f43f997bf16f8 100644 (file)
--- 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("<a href='$modify_page'>" . _("Edit") . "</a>");
-                       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 70ca31a4ca672e89ec55eb8554a1bfd38b07e4f2..5b0841bfb201541bdaa00e0e7386dacc21be1eb1 100644 (file)
--- 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));