X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=a14c4dcd67745086feb918ac9de94d59edfa3d10;hb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;hp=34ab0bae116a27349689c65bcead7faa99278895;hpb=575fa4304beb3cd570a0352d52ee6c6aeb3864f7;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 34ab0bae..a14c4dcd 100644 --- 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 (user_use_date_picker()) + $js .= get_js_date_picker(); page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js); @@ -58,6 +61,7 @@ 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"]; @@ -71,6 +75,7 @@ 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'] = ''; @@ -90,7 +95,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 +114,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 +122,10 @@ 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); + 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 +133,14 @@ 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); $dim = get_company_pref('use_dimension'); if ($dim >= 1) { @@ -140,6 +153,7 @@ function supplier_settings(&$supplier_id) hidden('dimension_id', 0); if ($dim < 2) hidden('dimension2_id', 0); + table_section(2); table_section_title(_("Addresses")); @@ -150,13 +164,6 @@ function supplier_settings(&$supplier_id) textarea_row(_("General Notes:"), 'notes', null, 35, 5); if ($supplier_id) record_status_list_row(_("Supplier status:"), 'inactive'); - else { - table_section_title(_("Contact Data")); - text_row(_("Contact Person:"), 'contact', null, 42, 40); - 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')); - } end_outer_table(1); div_start('controls'); @@ -211,7 +218,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), get_post('tax_algorithm')); update_record_status($_POST['supplier_id'], $_POST['inactive'], 'suppliers', 'supplier_id'); @@ -224,7 +231,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')); + $_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included'), get_post('tax_algorithm')); $supplier_id = $_POST['supplier_id'] = db_insert_id(); @@ -302,7 +309,8 @@ if (!$supplier_id) tabbed_content_start('tabs', array( 'settings' => array(_('&General settings'), $supplier_id), 'contacts' => array(_('&Contacts'), $supplier_id), - 'transactions' => array(_('&Supplier Inquiry'), $supplier_id), + 'transactions' => array(_('&Transactions'), $supplier_id), + 'orders' => array(_('Purchase &Orders'), $supplier_id), )); switch (get_post('_tabs_sel')) { @@ -317,16 +325,18 @@ 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; + 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']); -?>