X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=287849ff9d765c980a9fb1d73fa9da04aa6cff6c;hb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;hp=b2ad33c7f47d370fbef07571f553fe9a32f3bf0b;hpb=bd3023c1b5e64429043358a691b3aae20eb54c09;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index b2ad33c7..287849ff 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -11,9 +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) + $js .= get_js_open_window(900, 500); +if ($use_date_picker) + $js .= get_js_date_picker(); -page(_($help_context = "Suppliers"), @$_REQUEST['popup']); +page(_($help_context = "Suppliers"), @$_REQUEST['popup'], false, "", $js); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/ui/contacts_view.inc"); @@ -54,6 +60,8 @@ function supplier_settings(&$supplier_id) $_POST['payment_terms'] = $myrow["payment_terms"]; $_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"]; @@ -66,6 +74,8 @@ function supplier_settings(&$supplier_id) $_POST['tax_group_id'] = $_POST['website'] = $_POST['supp_account_no'] = $_POST['notes'] = ''; $_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'] = ''; @@ -74,7 +84,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']; } @@ -85,7 +95,7 @@ function supplier_settings(&$supplier_id) text_row(_("GSTNo:"), 'gst_no', null, 42, 40); link_row(_("Website:"), 'website', null, 35, 55); - if ($supplier_id) + if ($supplier_id && !is_new_supplier($supplier_id)) { label_row(_("Supplier's Currency:"), $_POST['curr_code']); hidden('curr_code', $_POST['curr_code']); @@ -97,26 +107,38 @@ function supplier_settings(&$supplier_id) tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null); text_row(_("Our Customer No:"), 'supp_account_no', null, 42, 40); - 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); - 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_title(_("Purchasing")); text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40); amount_row(_("Credit Limit:"), 'credit_limit', null); 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 was done for the supplier. + // + if (is_new_supplier($supplier_id)) + check_row(_("Prices contain tax included:"), 'tax_included'); + else { + 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']); + 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); + if (!$supplier_id) { + table_section_title(_("Contact Data")); + 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')); + } $dim = get_company_pref('use_dimension'); if ($dim >= 1) { @@ -129,6 +151,7 @@ function supplier_settings(&$supplier_id) hidden('dimension_id', 0); if ($dim < 2) hidden('dimension2_id', 0); + table_section(2); table_section_title(_("Addresses")); @@ -139,7 +162,6 @@ function supplier_settings(&$supplier_id) textarea_row(_("General Notes:"), 'notes', null, 35, 5); if ($supplier_id) record_status_list_row(_("Supplier status:"), 'inactive'); - end_outer_table(1); div_start('controls'); @@ -194,7 +216,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['notes'], $_POST['tax_group_id'], @$_POST['tax_included'], get_post('tax_algorithm')); update_record_status($_POST['supplier_id'], $_POST['inactive'], 'suppliers', 'supplier_id'); @@ -207,7 +229,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']); + $_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(); @@ -283,8 +305,10 @@ 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), + 'transactions' => array(_('&Transactions'), $supplier_id), + 'orders' => array(_('Purchase &Orders'), $supplier_id), )); switch (get_post('_tabs_sel')) { @@ -296,13 +320,22 @@ tabbed_content_start('tabs', array( $contacts = new contacts('contacts', $supplier_id, 'supplier'); $contacts->show(); 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']); ?>