Fixed amibiguity in few text messages to make translations easier, updated gettext...

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

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 552d4e04fbcde05e19b6a22a0aa2fba4afb72a3d..49261dcbd770c3ef6f3d4c0ca2eca63fe155ca78 100644 (file)
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -14,9 +14,9 @@ $path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js);
@@ -61,7 +61,6 @@ function supplier_settings(&$supplier_id)
                $_POST['credit_limit']  = price_format($myrow["credit_limit"]);
                $_POST['tax_group_id'] = $myrow["tax_group_id"];
                $_POST['tax_included'] = $myrow["tax_included"];
-               $_POST['tax_algorithm'] = $myrow["tax_algorithm"];
                $_POST['payable_account']  = $myrow["payable_account"];
                $_POST['purchase_account']  = $myrow["purchase_account"];
                $_POST['payment_discount_account'] = $myrow["payment_discount_account"];
@@ -75,7 +74,6 @@ function supplier_settings(&$supplier_id)
                $_POST['dimension_id'] = 0;
                $_POST['dimension2_id'] = 0;
                $_POST['tax_included'] = 0;
-               $_POST['tax_algorithm'] = 1;
                $_POST['sales_type'] = -1;
                $_POST['gst_no'] = $_POST['bank_account'] = '';
                $_POST['payment_terms']  = '';
@@ -95,7 +93,8 @@ function supplier_settings(&$supplier_id)
 
        text_row(_("GSTNo:"), 'gst_no', null, 42, 40);
        link_row(_("Website:"), 'website', null, 35, 55);
-       if ($supplier_id && !is_new_supplier($supplier_id)) 
+       if ($supplier_id && !is_new_supplier($supplier_id) && (key_in_foreign_table($_POST['supplier_id'], 'supp_trans', 'supplier_id') ||
+               key_in_foreign_table($_POST['supplier_id'], 'purch_orders', 'supplier_id'))) 
        {
                label_row(_("Supplier's Currency:"), $_POST['curr_code']);
                hidden('curr_code', $_POST['curr_code']);
@@ -121,7 +120,6 @@ function supplier_settings(&$supplier_id)
                hidden('tax_included');
                label_row(_("Prices contain tax included:"), $_POST['tax_included'] ? _('Yes') : _('No'));
        }
-       tax_algorithm_list_row(_("Tax Calculation Algorithm:"), 'tax_algorithm', null);
 
        if (!$supplier_id) table_section(2);
 
@@ -140,6 +138,8 @@ function supplier_settings(&$supplier_id)
                email_row(_("E-mail:"), 'email', null, 35, 55);
                languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default'));
        }
+       else
+               table_section(2);
        $dim = get_company_pref('use_dimension');
        if ($dim >= 1)
        {
@@ -152,8 +152,8 @@ function supplier_settings(&$supplier_id)
                hidden('dimension_id', 0);
        if ($dim < 2)
                hidden('dimension2_id', 0);
-       table_section(2);
-
+       if (!$supplier_id)      
+               table_section(2);
 
        table_section_title(_("Addresses"));
        textarea_row(_("Mailing Address:"), 'address', null, 35, 5);
@@ -217,7 +217,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'], get_post('tax_included', 0), get_post('tax_algorithm'));
+                               $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0));
                        update_record_status($_POST['supplier_id'], $_POST['inactive'],
                                'suppliers', 'supplier_id');
 
@@ -230,7 +230,7 @@ if (isset($_POST['submit']))
                                $_POST['gst_no'], $_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'], check_value('tax_included'), get_post('tax_algorithm'));
+                               $_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included'));
 
                        $supplier_id = $_POST['supplier_id'] = db_insert_id();
 
@@ -339,4 +339,3 @@ end_form();
 
 end_page(@$_REQUEST['popup']);
 
-?>