From e8ae3516539a520338117f25d401c0fc234973a4 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 16 Mar 2009 19:44:31 +0000
Subject: [PATCH] SID & start_form() cleanup.

---
 .htaccess                                          |  2 ++
 access/logout.php                                  |  2 +-
 admin/attachments.php                              |  2 +-
 admin/backups.php                                  |  2 +-
 admin/create_coy.php                               |  2 +-
 admin/inst_lang.php                                |  2 +-
 admin/inst_module.php                              |  2 +-
 admin/view_print_transaction.php                   |  2 +-
 admin/void_transaction.php                         |  2 +-
 dimensions/inquiry/search_dimensions.php           |  2 +-
 gl/bank_transfer.php                               |  2 +-
 gl/gl_bank.php                                     |  2 +-
 gl/inquiry/gl_trial_balance.php                    |  2 +-
 gl/manage/exchange_rates.php                       |  2 +-
 inventory/adjustments.php                          |  2 +-
 inventory/cost_update.php                          |  2 +-
 inventory/inquiry/stock_movements.php              |  2 +-
 inventory/inquiry/stock_status.php                 |  2 +-
 inventory/manage/item_codes.php                    |  2 +-
 inventory/manage/sales_kits.php                    |  2 +-
 inventory/prices.php                               |  2 +-
 inventory/purchasing_data.php                      |  2 +-
 inventory/reorder_level.php                        |  2 +-
 inventory/transfers.php                            |  2 +-
 manufacturing/inquiry/bom_cost_inquiry.php         |  2 +-
 manufacturing/manage/bom_edit.php                  |  4 +---
 manufacturing/search_work_orders.php               |  2 +-
 manufacturing/work_order_issue.php                 |  2 +-
 purchasing/allocations/supplier_allocate.php       |  2 +-
 purchasing/inquiry/po_search.php                   |  8 +++-----
 purchasing/inquiry/po_search_completed.php         |  2 +-
 purchasing/inquiry/supplier_allocation_inquiry.php |  2 +-
 purchasing/inquiry/supplier_inquiry.php            |  2 +-
 purchasing/po_entry_items.php                      |  2 +-
 purchasing/po_receive_items.php                    |  2 +-
 purchasing/supplier_credit.php                     |  2 +-
 purchasing/supplier_invoice.php                    |  2 +-
 purchasing/supplier_payment.php                    |  2 +-
 sales/allocations/customer_allocate.php            |  2 +-
 sales/credit_note_entry.php                        |  2 +-
 sales/customer_credit_invoice.php                  |  2 +-
 sales/customer_delivery.php                        |  2 +-
 sales/customer_invoice.php                         |  2 +-
 sales/includes/ui/sales_credit_ui.inc              |  2 +-
 sales/inquiry/customer_allocation_inquiry.php      |  2 +-
 sales/inquiry/sales_deliveries_view.php            |  2 +-
 sales/inquiry/sales_orders_view.php                | 10 +++++-----
 47 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/.htaccess b/.htaccess
index b923b02e..03410fbc 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,8 @@
 # register_globals ON
 php_flag magic_quotes_gpc Off
 php_flag register_globals Off
+# do not use SID in url
+php_flag session.use_trans_sid Off
 
 #Sometimes neccessary to add those
 #
diff --git a/access/logout.php b/access/logout.php
index 716bbfe1..46357a15 100644
--- a/access/logout.php
+++ b/access/logout.php
@@ -40,7 +40,7 @@ page(_("Logout"), true, false, "", get_js_png_fix());
   <tr>
     <td><div align="center">
         <?php
-     echo "<a href='$path_to_root/index.php?" . SID ."'><b>" . _("Click here to Login Again.") . "</b></a>";
+     echo "<a href='$path_to_root/index.php'><b>" . _("Click here to Login Again.") . "</b></a>";
 ?>
       </div></td>
   </tr>
diff --git a/admin/attachments.php b/admin/attachments.php
index 8f517e8a..12bab651 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -144,7 +144,7 @@ if ($Mode == 'RESET')
 
 function viewing_controls()
 {
-    start_form(false, true);
+    start_form();
 
     start_table("class='tablestyle_noborder'");
 
diff --git a/admin/backups.php b/admin/backups.php
index f1353193..46442458 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -32,7 +32,7 @@ handle_form($db_connections[$db_name]);
 page(_("Backup and Restore Database"), false, false, '', '', true);
 
 //-------------------------------------------------------------------------------
-start_form(true, true);
+start_form(true);
 
 $cmb = get_backup_file_combo();
 $compr = get_compr_combo();
diff --git a/admin/create_coy.php b/admin/create_coy.php
index 8ec0fc4a..eec63648 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -264,7 +264,7 @@ function display_company_edit($selected_id)
 	else
 		$n = count($db_connections);
 
-	start_form(true, true);
+	start_form(true);
 
 	echo "
 		<script language='javascript'>
diff --git a/admin/inst_lang.php b/admin/inst_lang.php
index ccdd3d8e..b5d5c16a 100644
--- a/admin/inst_lang.php
+++ b/admin/inst_lang.php
@@ -297,7 +297,7 @@ function display_language_edit($selected_id)
 	else
 		$n = count($installed_languages);
 
-	start_form(true, true);
+	start_form(true);
 
 	echo "
 		<script language='javascript'>
diff --git a/admin/inst_module.php b/admin/inst_module.php
index 809252df..622f5305 100644
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -314,7 +314,7 @@ function display_module_edit($selected_id)
 	else
 		$n = count($installed_modules);
 
-	start_form(true, true);
+	start_form(true);
 
 	echo "
 		<script language='javascript'>
diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index 98bf8d9e..b9931d44 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -160,7 +160,7 @@ if (isset($_POST['ProcessSearch']))
 
 //----------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form(false);
 	viewing_controls();
 	handle_search();
 end_form(2);
diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 3d967ec2..31f8506b 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -102,7 +102,7 @@ function voiding_controls()
 {
 	global $table_style2;
 	
-	start_form(false, true);
+	start_form();
 
 	start_table($table_style2);
 
diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 67bffa5e..8e43471f 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -65,7 +65,7 @@ if (isset($_GET["stock_id"]))
 
 //--------------------------------------------------------------------------------------
 
-start_form(false, true, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only . SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only");
 
 start_table("class='tablestyle_noborder'");
 start_row();
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index c390f7a0..36e28a6a 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -56,7 +56,7 @@ function gl_payment_controls()
 	global $table_style2;
 	$home_currency = get_company_currency();
 
-	start_form(false, true);
+	start_form();
 
 	start_table($table_style2, 5, 7);
 	echo "<tr><td valign=top>"; // outer table
diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index fa78eeb2..ff7f196a 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -276,7 +276,7 @@ if (isset($_POST['go']))
 }
 //-----------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 27fc37df..093307c9 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -121,7 +121,7 @@ function display_trial_balance()
 			continue;
 		alt_table_row_color($k);
 
-		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?" . SID . "TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "'>" . $account["account_code"] . "</a>";
+		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "'>" . $account["account_code"] . "</a>";
 
 		label_cell($url);
 		label_cell($account["account_name"]);
diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index 493509f9..19ac833e 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -170,7 +170,7 @@ if ($Mode == 'Delete')
 
 //---------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['curr_abrev']))
 	$_POST['curr_abrev'] = get_global_curr_code();
diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index bf3f290f..bd8f1bed 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -217,7 +217,7 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
 }
 
 //-----------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
 
 display_order_header($_SESSION['adj_items']);
 
diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index c35e81b5..0cf4fb6d 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -77,7 +77,7 @@ if (list_updated('stock_id'))
 	$Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index e9c05c49..cd225d52 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -39,7 +39,7 @@ if (isset($_GET['stock_id']))
 	$_POST['stock_id'] = $_GET['stock_id'];
 }
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 9c8aff5b..87073965 100644
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -33,7 +33,7 @@ if (list_updated('stock_id'))
 
 check_db_has_stock_items(_("There are no items defined in the system."));
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php
index 4b9fcd79..ce802e2c 100644
--- a/inventory/manage/item_codes.php
+++ b/inventory/manage/item_codes.php
@@ -97,7 +97,7 @@ if (list_updated('stock_id'))
 
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 6040fcd8..59ca9e4d 100644
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -181,7 +181,7 @@ if ($Mode == 'RESET')
 
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 echo "<center>" . _("Select a sale kit:") . "&nbsp;";
 sales_kits_list('item_code', null, _('New kit'), true);
diff --git a/inventory/prices.php b/inventory/prices.php
index fb323a47..67de34c8 100644
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -48,7 +48,7 @@ if (!isset($_POST['curr_abrev']))
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 85e8aded..4371c829 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -116,7 +116,7 @@ if (list_updated('stock_id'))
 	$Ajax->activate('price_table');
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index 2c5de464..7fe5f7d9 100644
--- a/inventory/reorder_level.php
+++ b/inventory/reorder_level.php
@@ -35,7 +35,7 @@ if (list_updated('stock_id'))
 }
 //------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
diff --git a/inventory/transfers.php b/inventory/transfers.php
index 299f4802..897b647c 100644
--- a/inventory/transfers.php
+++ b/inventory/transfers.php
@@ -219,7 +219,7 @@ if (isset($_GET['NewTransfer']) || !isset($_SESSION['transfer_items']))
 }
 
 //-----------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
 
 display_order_header($_SESSION['transfer_items']);
 
diff --git a/manufacturing/inquiry/bom_cost_inquiry.php b/manufacturing/inquiry/bom_cost_inquiry.php
index 02b25d4a..cedfe23b 100644
--- a/manufacturing/inquiry/bom_cost_inquiry.php
+++ b/manufacturing/inquiry/bom_cost_inquiry.php
@@ -27,7 +27,7 @@ if (isset($_GET['stock_id']))
 	$_POST['stock_id'] = $_GET['stock_id'];
 } 
 
-start_form(false, true));
+start_form();
 echo "<center> " . _("Item:") . " ";	
 stock_bom_items_list('stock_id', $_POST['stock_id'], false, true);
 
diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php
index 84f60733..3b2e70d6 100644
--- a/manufacturing/manage/bom_edit.php
+++ b/manufacturing/manage/bom_edit.php
@@ -213,7 +213,7 @@ if ($Mode == 'RESET')
 
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 echo "<center>" . _("Select a manufacturable item:") . "&nbsp;";
 stock_bom_items_list('stock_id', null, false, true);
@@ -233,10 +233,8 @@ if (get_post('stock_id') != '')
 
 start_form();
 	display_bom_items($selected_parent);
-//end_form();
 	//--------------------------------------------------------------------------------------
 	echo '<br>';
-//	start_form(false, true);
 
 	start_table($table_style2);
 
diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 15b466ce..348d283f 100644
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -60,7 +60,7 @@ if (isset($_GET["stock_id"]))
 
 //--------------------------------------------------------------------------------------
 
-start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only .SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only");
 
 start_table("class='tablestyle_noborder'");
 start_row();
diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php
index ee2b2950..1d994381 100644
--- a/manufacturing/work_order_issue.php
+++ b/manufacturing/work_order_issue.php
@@ -205,7 +205,7 @@ if (isset($_GET['trans_no']))
 display_wo_details($_SESSION['issue_items']->order_id);
 echo "<br>";
 
-start_form(false, true);
+start_form();
 
 start_table("$table_style width=90%", 10);
 echo "<tr><td>";
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index 6a0e83e3..8e3cabd4 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -185,7 +185,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 {
 	global $table_style;
 
-	start_form(false, true);
+	start_form();
 
     display_heading(_("Allocation of") . " " . systypes::name($_SESSION['alloc']->type) . " # " . $_SESSION['alloc']->trans_no);
 
diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index 3f23f5bb..49c9b306 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -55,7 +55,7 @@ if (get_post('SearchOrders'))
 
 //---------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 start_table("class='tablestyle_noborder'");
 start_row();
@@ -81,8 +81,7 @@ function trans_view($trans)
 function edit_link($row) 
 {
   return pager_link( _("Edit"),
-	"/purchasing/po_entry_items.php?" . SID 
-	. "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+	"/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
 }
 
 function prt_link($row)
@@ -93,8 +92,7 @@ function prt_link($row)
 function receive_link($row) 
 {
   return pager_link( _("Receive"),
-	"/purchasing/po_receive_items.php?" . SID 
-	. "PONumber=" . $row["order_no"], ICON_RECEIVE);
+	"/purchasing/po_receive_items.php?PONumber=" . $row["order_no"], ICON_RECEIVE);
 }
 
 function check_overdue($row)
diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index c949d469..a9ca0c56 100644
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -53,7 +53,7 @@ if (get_post('SearchOrders'))
 }
 //---------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 start_table("class='tablestyle_noborder'");
 start_row();
diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 55ab1678..4ede5ca0 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -37,7 +37,7 @@ if (isset($_GET['ToDate']))
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index cc94acd2..6814bba4 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -35,7 +35,7 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 2cb5a364..a394281c 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -397,7 +397,7 @@ if (isset($_GET['NewOrder']))
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_po_header($_SESSION['PO']);
 echo "<br>";
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index c8680d85..78bbff9a 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -302,7 +302,7 @@ if (isset($_POST['ProcessGoodsReceived']))
 
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_grn_summary($_SESSION['PO'], true);
 display_heading(_("Items to Receive"));
diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index fc16875c..625b9e4d 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -319,7 +319,7 @@ if (isset($_POST['go']))
 
 //--------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 148e7b92..34f15204 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -384,7 +384,7 @@ if (isset($_POST['go']))
 	$Ajax->activate('inv_tot');
 }
 
-start_form(false, true);
+start_form();
 
 invoice_header($_SESSION['supp_trans']);
 
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 0834f2a1..3dad427c 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -73,7 +73,7 @@ if (isset($_GET['AddedID']))
 function display_controls()
 {
 	global $table_style2;
-	start_form(false, true);
+	start_form();
 
 	if (!isset($_POST['supplier_id']))
 		$_POST['supplier_id'] = get_global_supplier(false);
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index c0785cb1..e8a5c5ec 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -195,7 +195,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 
     echo "<br>";
 
-	start_form(false, true);
+	start_form();
 	div_start('alloc_tbl');
     if (count($_SESSION['alloc']->allocs) > 0)
     {
diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index c53a080d..63c5ea2f 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -260,7 +260,7 @@ if (!processing_active()) {
 
 //-----------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 hidden('cart_id');
 
 $customer_error = display_credit_header($_SESSION['Items']);
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 4959c23c..23715748 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -229,7 +229,7 @@ function display_credit_items()
 {
 	global $table_style, $table_style2;
 
-    start_form(false, true);
+    start_form();
 	hidden('cart_id');
 
 	start_table("$table_style2 width=80%", 5);
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index ae077419..97f4ce02 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -307,7 +307,7 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
 	$Ajax->activate('Items');
 }
 //------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
 hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index d935978f..9836de48 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -334,7 +334,7 @@ $dspans[] = $spanlen;
 $is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
 
 $is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0;
-start_form(false, true);
+start_form();
 hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 4594758c..d27fd0a9 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -187,7 +187,7 @@ function display_credit_items($title, &$order)
 	{
 	    alt_table_row_color($k);
 
-    	    label_cell("<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?" . SID . "stock_id=" . $line->stock_id . "'>$line->stock_id</a>");
+    	    label_cell("<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=" . $line->stock_id . "'>$line->stock_id</a>");
     	    label_cell($line->item_description, "nowrap");
     	    qty_cell($line->qty_dispatched, false, get_qty_dec($line->stock_id));
     	    label_cell($line->units);
diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 325d848f..614cebe7 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -34,7 +34,7 @@ if (isset($_GET['customer_id']))
 if (!isset($_POST['customer_id']))
 	$_POST['customer_id'] = get_global_customer();
 
-start_form(false, true);
+start_form();
 
 start_table("class='tablestyle_noborder'");
 start_row();
diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 4ea1a824..36eaf063 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -96,7 +96,7 @@ if (get_post('_DeliveryNumber_changed'))
 
 //-----------------------------------------------------------------------------------
 
-start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=" . $_POST['OutstandingOnly'] .SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['OutstandingOnly']);
 
 start_table("class='tablestyle_noborder'");
 start_row();
diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 125cae8c..6422d690 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -91,25 +91,25 @@ function prt_link($row)
 function edit_link($row) 
 {
   return pager_link( _("Edit"),
-    "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $row['order_no'], ICON_EDIT);
+    "/sales/sales_order_entry.php?ModifyOrderNumber=" . $row['order_no'], ICON_EDIT);
 }
 
 function dispatch_link($row)
 {
   return pager_link( _("Dispatch"),
-	"/sales/customer_delivery.php?" . SID . "OrderNumber=" .$row['order_no'], ICON_DOC);
+	"/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC);
 }
 
 function invoice_link($row)
 {
   return pager_link( _("Invoice"),
-	"/sales/sales_order_entry.php?" . SID . "NewInvoice=" .$row["order_no"], ICON_DOC);
+	"/sales/sales_order_entry.php?NewInvoice=" .$row["order_no"], ICON_DOC);
 }
 
 function delivery_link($row)
 {
   return pager_link( _("Delivery"),
-	"/sales/sales_order_entry.php?" . SID . "NewDelivery=" .$row['order_no'], ICON_DOC);
+	"/sales/sales_order_entry.php?NewDelivery=" .$row['order_no'], ICON_DOC);
 }
 
 function tmpl_checkbox($row)
@@ -170,7 +170,7 @@ if (get_post('_OrderNumber_changed')) // enable/disable selection controls
 	$Ajax->activate('orders_tbl');
 }
 
-start_form(false, false, $_SERVER['PHP_SELF'] .SID);
+start_form();
 
 start_table("class='tablestyle_noborder'");
 start_row();
-- 
2.30.2