Translation conflicts in Bank Deposit/Payment. The 'To' should be 'Into'.

[fa-stable.git] / purchasing / manage / suppliers.php

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 91f16d6401b465b7c15dcbfdf346aa6104eb630a..35ba173d69aba02efd1b3e04fae0d4c0b7fa6f9d 100644 (file)
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -11,10 +11,13 @@
 ***********************************************************************/
 $page_security = 'SA_SUPPLIER';
 $path_to_root = "../..";
-include($path_to_root . "/includes/session.inc");
+include($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/session.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+       $js .= get_js_date_picker();
 
 page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js);
 
@@ -211,7 +214,7 @@ if (isset($_POST['submit']))
                                $_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], 
                                input_num('credit_limit', 0), $_POST['dimension_id'], $_POST['dimension2_id'], $_POST['curr_code'],
                                $_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'], $_POST['payment_discount_account'],
-                               $_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included']);
+                               $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0));
                        update_record_status($_POST['supplier_id'], $_POST['inactive'],
                                'suppliers', 'supplier_id');
 
@@ -318,13 +321,11 @@ tabbed_content_start('tabs', array(
                case 'transactions':
                        $_GET['supplier_id'] = $supplier_id;
                        $_GET['popup'] = 1;
-                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
                        include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php");
                        break;
                case 'orders':
                        $_GET['supplier_id'] = $supplier_id;
                        $_GET['popup'] = 1;
-                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
                        include_once($path_to_root."/purchasing/inquiry/po_search_completed.php");
                        break;
        };
@@ -333,6 +334,6 @@ tabbed_content_end();
 hidden('popup', @$_REQUEST['popup']);
 end_form();
 
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>