X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=89026989718c7f136b204db5fe9cf1bc68bcc9fd;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=287849ff9d765c980a9fb1d73fa9da04aa6cff6c;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 287849ff..89026989 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -14,12 +14,12 @@ $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); +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"); @@ -35,7 +35,8 @@ $supplier_id = get_post('supplier_id'); //-------------------------------------------------------------------------------------------- function supplier_settings(&$supplier_id) { - + global $page_nested; + start_outer_table(TABLESTYLE2); table_section(1); @@ -61,7 +62,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 +75,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 +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']); @@ -121,7 +121,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); @@ -132,6 +131,7 @@ 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")); @@ -139,6 +139,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) { @@ -151,8 +153,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); @@ -165,10 +167,11 @@ function supplier_settings(&$supplier_id) end_outer_table(1); div_start('controls'); + if (@$_REQUEST['popup']) hidden('popup', 1); if ($supplier_id) { submit_center_first('submit', _("Update Supplier"), - _('Update supplier data'), @$_REQUEST['popup'] ? true : 'default'); + _('Update supplier data'), $page_nested ? true : 'default'); submit_return('select', get_post('supplier_id'), _("Select this supplier and return to document entry.")); submit_center_last('delete', _("Delete Supplier"), _('Delete supplier data if have been never used'), true); @@ -216,7 +219,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'], get_post('tax_algorithm')); + $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included')); update_record_status($_POST['supplier_id'], $_POST['inactive'], 'suppliers', 'supplier_id'); @@ -229,7 +232,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(); @@ -276,6 +279,7 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") unset($_SESSION['supplier_id']); $supplier_id = ''; $Ajax->activate('_page_body'); + display_notification("#" . $_POST['supplier_id'] . " " . _("Supplier has been deleted.")); } //end if Delete supplier } @@ -284,7 +288,6 @@ start_form(); if (db_has_suppliers()) { start_table(false, "", 3); -// start_table(TABLESTYLE_NOBORDER); start_row(); supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, _('New supplier'), true, check_value('show_inactive')); @@ -307,8 +310,8 @@ if (!$supplier_id) tabbed_content_start('tabs', array( 'settings' => array(_('&General settings'), $supplier_id), 'contacts' => array(_('&Contacts'), $supplier_id), - 'transactions' => array(_('&Transactions'), $supplier_id), - 'orders' => array(_('Purchase &Orders'), $supplier_id), + 'transactions' => array(_('&Transactions'), (user_check_access('SA_SUPPTRANSVIEW') ? $supplier_id : null)), + 'orders' => array(_('Purchase &Orders'), (user_check_access('SA_SUPPTRANSVIEW') ? $supplier_id : null)), )); switch (get_post('_tabs_sel')) { @@ -322,20 +325,15 @@ tabbed_content_start('tabs', array( break; case 'transactions': $_GET['supplier_id'] = $supplier_id; - $_GET['popup'] = 1; include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php"); break; case 'orders': $_GET['supplier_id'] = $supplier_id; - $_GET['popup'] = 1; include_once($path_to_root."/purchasing/inquiry/po_search_completed.php"); break; }; br(); tabbed_content_end(); -hidden('popup', @$_REQUEST['popup']); end_form(); +end_page(); -end_page(@$_REQUEST['popup']); - -?>