Additional sql parameters cleanup.

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

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index cb4741a0004f6f564d595b64196ee3edf6a8b23e..a2c2b450b15a1e0dd001a9156cbc3eb4ab76c7ac 100644 (file)
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -76,7 +76,7 @@ function supplier_settings(&$supplier_id)
                $company_record = get_company_prefs();
                $_POST['curr_code']  = $company_record["curr_default"];
                $_POST['payable_account'] = $company_record["creditors_act"];
-               $_POST['purchase_account'] = $company_record["default_cogs_act"];
+               $_POST['purchase_account'] = ''; // default/item's cogs account
                $_POST['payment_discount_account'] = $company_record['pyt_discount_act'];
        }
 
@@ -124,7 +124,8 @@ function supplier_settings(&$supplier_id)
        }
        table_section_title(_("Accounts"));
        gl_all_accounts_list_row(_("Accounts Payable Account:"), 'payable_account', $_POST['payable_account']);
-       gl_all_accounts_list_row(_("Purchase Account:"), 'purchase_account', $_POST['purchase_account']);
+       gl_all_accounts_list_row(_("Purchase Account:"), 'purchase_account', $_POST['purchase_account'],
+               false, false, _("Use Item Inventory/COGS Account"));
        gl_all_accounts_list_row(_("Purchase Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']);
 
        table_section(2);
@@ -205,7 +206,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'], check_value('tax_included'));
+                               $_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included']);
                        update_record_status($_POST['supplier_id'], $_POST['inactive'],
                                'suppliers', 'supplier_id');
 
@@ -294,8 +295,8 @@ if (!$supplier_id)
        unset($_POST['_tabs_sel']); // force settings tab for new customer
 
 tabbed_content_start('tabs', array(
-               'settings' => array('&General settings', $supplier_id),
-               'contacts' => array('&Contacts', $supplier_id),
+               'settings' => array(_('&General settings'), $supplier_id),
+               'contacts' => array(_('&Contacts'), $supplier_id),
        ));
        
        switch (get_post('_tabs_sel')) {