X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=89026989718c7f136b204db5fe9cf1bc68bcc9fd;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=64b2cb5c9d0115e19160d7a7307ba927820ea6ed;hpb=ef5133a65092c38f70278a2ed22952e3625855dc;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 64b2cb5c..89026989 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -11,12 +11,15 @@ ***********************************************************************/ $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) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); +if (user_use_date_picker()) + $js .= get_js_date_picker(); -page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js); +page(_($help_context = "Suppliers"), false, false, "", $js); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/ui/contacts_view.inc"); @@ -32,7 +35,8 @@ $supplier_id = get_post('supplier_id'); //-------------------------------------------------------------------------------------------- function supplier_settings(&$supplier_id) { - + global $page_nested; + start_outer_table(TABLESTYLE2); table_section(1); @@ -90,7 +94,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']); @@ -108,7 +113,7 @@ function supplier_settings(&$supplier_id) payment_terms_list_row(_("Payment Terms:"), 'payment_terms', null); // // tax_included option from supplier record is used directly in update_average_cost() function, - // therefore we can't edit the option after any transaction waas done for the supplier. + // therefore we can't edit the option after any transaction was done for the supplier. // if (is_new_supplier($supplier_id)) check_row(_("Prices contain tax included:"), 'tax_included'); @@ -116,6 +121,9 @@ function supplier_settings(&$supplier_id) hidden('tax_included'); label_row(_("Prices contain tax included:"), $_POST['tax_included'] ? _('Yes') : _('No')); } + + if (!$supplier_id) table_section(2); + 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'], @@ -123,11 +131,16 @@ function supplier_settings(&$supplier_id) gl_all_accounts_list_row(_("Purchase Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']); if (!$supplier_id) { table_section_title(_("Contact Data")); + text_row(_("Contact Person:"), 'contact', null, 42, 40); text_row(_("Phone Number:"), 'phone', null, 32, 30); text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30); + table_section_title(_("Contact Data")); + text_row(_("Fax Number:"), 'fax', null, 32, 30); + email_row(_("E-mail:"), 'email', null, 35, 55); + languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default')); } - - table_section(2); + else + table_section(2); $dim = get_company_pref('use_dimension'); if ($dim >= 1) { @@ -140,7 +153,8 @@ function supplier_settings(&$supplier_id) hidden('dimension_id', 0); if ($dim < 2) hidden('dimension2_id', 0); - + if (!$supplier_id) + table_section(2); table_section_title(_("Addresses")); textarea_row(_("Mailing Address:"), 'address', null, 35, 5); @@ -149,31 +163,15 @@ function supplier_settings(&$supplier_id) table_section_title(_("General")); textarea_row(_("General Notes:"), 'notes', null, 35, 5); if ($supplier_id) - { record_status_list_row(_("Supplier status:"), 'inactive'); - if (!@$_REQUEST['popup']) - { - start_row(); - echo '