X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=89026989718c7f136b204db5fe9cf1bc68bcc9fd;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=5fa45bcceb88619e99a7e40017d828f93ec8ac6e;hpb=e6cf9a74a7852b3ae2e4ebb794a755b6a90ad486;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 5fa45bcc..89026989 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -11,13 +11,18 @@ ***********************************************************************/ $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 ($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']); +page(_($help_context = "Suppliers"), false, false, "", $js); -//include($path_to_root . "/includes/date_functions.inc"); - -include($path_to_root . "/includes/ui.inc"); +include_once($path_to_root . "/includes/ui.inc"); +include_once($path_to_root . "/includes/ui/contacts_view.inc"); check_db_has_tax_groups(_("There are no tax groups defined in the system. At least one tax group is required before proceeding.")); @@ -25,7 +30,158 @@ if (isset($_GET['supplier_id'])) { $_POST['supplier_id'] = $_GET['supplier_id']; } -$new_supplier = get_post('supplier_id') == ''; + +$supplier_id = get_post('supplier_id'); +//-------------------------------------------------------------------------------------------- +function supplier_settings(&$supplier_id) +{ + global $page_nested; + + start_outer_table(TABLESTYLE2); + + table_section(1); + + if ($supplier_id) + { + //SupplierID exists - either passed when calling the form or from the form itself + $myrow = get_supplier($_POST['supplier_id']); + + $_POST['supp_name'] = $myrow["supp_name"]; + $_POST['supp_ref'] = $myrow["supp_ref"]; + $_POST['address'] = $myrow["address"]; + $_POST['supp_address'] = $myrow["supp_address"]; + + $_POST['gst_no'] = $myrow["gst_no"]; + $_POST['website'] = $myrow["website"]; + $_POST['supp_account_no'] = $myrow["supp_account_no"]; + $_POST['bank_account'] = $myrow["bank_account"]; + $_POST['dimension_id'] = $myrow["dimension_id"]; + $_POST['dimension2_id'] = $myrow["dimension2_id"]; + $_POST['curr_code'] = $myrow["curr_code"]; + $_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['payable_account'] = $myrow["payable_account"]; + $_POST['purchase_account'] = $myrow["purchase_account"]; + $_POST['payment_discount_account'] = $myrow["payment_discount_account"]; + $_POST['notes'] = $myrow["notes"]; + $_POST['inactive'] = $myrow["inactive"]; + } + else + { + $_POST['supp_name'] = $_POST['supp_ref'] = $_POST['address'] = $_POST['supp_address'] = + $_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['sales_type'] = -1; + $_POST['gst_no'] = $_POST['bank_account'] = ''; + $_POST['payment_terms'] = ''; + $_POST['credit_limit'] = price_format(0); + + $company_record = get_company_prefs(); + $_POST['curr_code'] = $company_record["curr_default"]; + $_POST['payable_account'] = $company_record["creditors_act"]; + $_POST['purchase_account'] = ''; // default/item's cogs account + $_POST['payment_discount_account'] = $company_record['pyt_discount_act']; + } + + table_section_title(_("Basic Data")); + + text_row(_("Supplier Name:"), 'supp_name', null, 42, 40); + text_row(_("Supplier Short Name:"), 'supp_ref', null, 30, 30); + + text_row(_("GSTNo:"), 'gst_no', null, 42, 40); + link_row(_("Website:"), 'website', null, 35, 55); + 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']); + } + else + { + currencies_list_row(_("Supplier's Currency:"), 'curr_code', null); + } + tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null); + text_row(_("Our Customer No:"), 'supp_account_no', null, 42, 40); + + 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')); + } + + 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'], + false, false, _("Use Item Inventory/COGS Account")); + 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')); + } + else + table_section(2); + $dim = get_company_pref('use_dimension'); + if ($dim >= 1) + { + table_section_title(_("Dimension")); + dimensions_list_row(_("Dimension")." 1:", 'dimension_id', null, true, " ", false, 1); + if ($dim > 1) + dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', null, true, " ", false, 2); + } + if ($dim < 1) + 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); + textarea_row(_("Physical Address:"), 'supp_address', null, 35, 5); + + table_section_title(_("General")); + 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'); + if (@$_REQUEST['popup']) hidden('popup', 1); + if ($supplier_id) + { + submit_center_first('submit', _("Update Supplier"), + _('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); + } + else + { + submit_center('submit', _("Add New Supplier Details"), true, '', 'default'); + } + div_end(); +} if (isset($_POST['submit'])) { @@ -55,14 +211,15 @@ if (isset($_POST['submit'])) if ($input_error !=1 ) { - if (!$new_supplier) + begin_transaction(); + if ($supplier_id) { update_supplier($_POST['supplier_id'], $_POST['supp_name'], $_POST['supp_ref'], $_POST['address'], - $_POST['supp_address'], $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['gst_no'], - $_POST['email'], $_POST['website'], $_POST['contact'], $_POST['supp_account_no'], $_POST['bank_account'], + $_POST['supp_address'], $_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['rep_lang']); + $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included')); update_record_status($_POST['supplier_id'], $_POST['inactive'], 'suppliers', 'supplier_id'); @@ -72,17 +229,23 @@ if (isset($_POST['submit'])) else { add_supplier($_POST['supp_name'], $_POST['supp_ref'], $_POST['address'], $_POST['supp_address'], - $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['gst_no'], $_POST['email'], - $_POST['website'], $_POST['contact'], $_POST['supp_account_no'], $_POST['bank_account'], + $_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['rep_lang']); + $_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included')); + + $supplier_id = $_POST['supplier_id'] = db_insert_id(); + + add_crm_person($_POST['supp_ref'], $_POST['contact'], '', $_POST['address'], + $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], + $_POST['rep_lang'], ''); + + add_crm_contact('supplier', 'general', $supplier_id, db_insert_id()); - $_POST['supplier_id'] = db_insert_id(); - $new_supplier = false; display_notification(_("A new supplier has been added.")); $Ajax->activate('_page_body'); } + commit_transaction(); } } @@ -114,8 +277,9 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") delete_supplier($_POST['supplier_id']); unset($_SESSION['supplier_id']); - $new_supplier = true; + $supplier_id = ''; $Ajax->activate('_page_body'); + display_notification("#" . $_POST['supplier_id'] . " " . _("Supplier has been deleted.")); } //end if Delete supplier } @@ -123,8 +287,7 @@ start_form(); if (db_has_suppliers()) { - start_table("", 3); -// start_table("class = 'tablestyle_noborder'"); + start_table(false, "", 3); start_row(); supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, _('New supplier'), true, check_value('show_inactive')); @@ -141,146 +304,36 @@ else hidden('supplier_id', get_post('supplier_id')); } -start_outer_table($table_style2, 5); - -table_section(1); - -if (!$new_supplier) -{ - //SupplierID exists - either passed when calling the form or from the form itself - $myrow = get_supplier($_POST['supplier_id']); - - $_POST['supp_name'] = $myrow["supp_name"]; - $_POST['supp_ref'] = $myrow["supp_ref"]; - $_POST['address'] = $myrow["address"]; - $_POST['supp_address'] = $myrow["supp_address"]; - $_POST['phone'] = $myrow["phone"]; - $_POST['phone2'] = $myrow["phone2"]; - $_POST['fax'] = $myrow["fax"]; - $_POST['gst_no'] = $myrow["gst_no"]; - $_POST['email'] = $myrow["email"]; - $_POST['website'] = $myrow["website"]; - $_POST['contact'] = $myrow["contact"]; - $_POST['supp_account_no'] = $myrow["supp_account_no"]; - $_POST['bank_account'] = $myrow["bank_account"]; - $_POST['dimension_id'] = $myrow["dimension_id"]; - $_POST['dimension2_id'] = $myrow["dimension2_id"]; - $_POST['curr_code'] = $myrow["curr_code"]; - $_POST['rep_lang'] = $myrow["rep_lang"]; - $_POST['payment_terms'] = $myrow["payment_terms"]; - $_POST['credit_limit'] = price_format($myrow["credit_limit"]); - $_POST['tax_group_id'] = $myrow["tax_group_id"]; - $_POST['payable_account'] = $myrow["payable_account"]; - $_POST['purchase_account'] = $myrow["purchase_account"]; - $_POST['payment_discount_account'] = $myrow["payment_discount_account"]; - $_POST['notes'] = $myrow["notes"]; - $_POST['inactive'] = $myrow["inactive"]; -} -else -{ - $_POST['supp_name'] = $_POST['supp_ref'] = $_POST['address'] = $_POST['supp_address'] = - $_POST['tax_group_id'] = $_POST['website'] = $_POST['supp_account_no'] = $_POST['notes'] = ''; - $_POST['dimension_id'] = 0; - $_POST['dimension2_id'] = 0; - $_POST['sales_type'] = -1; - $_POST['email'] = $_POST['phone'] = $_POST['phone2'] = $_POST['fax'] = - $_POST['gst_no'] = $_POST['contact'] = $_POST['bank_account'] = ''; - $_POST['payment_terms'] = ''; - $_POST['credit_limit'] = price_format(0); - - $company_record = get_company_prefs(); - $_POST['curr_code'] = $company_record["curr_default"]; - $_POST['rep_lang'] = $dflt_lang; - $_POST['payable_account'] = $company_record["creditors_act"]; - $_POST['purchase_account'] = $company_record["default_cogs_act"]; - $_POST['payment_discount_account'] = $company_record['pyt_discount_act']; - $_POST['inactive'] = 0; -} - -table_section_title(_("Name and Contact")); - -text_row(_("Supplier Name:"), 'supp_name', null, 42, 40); -text_row(_("Supplier Short Name:"), 'supp_ref', null, 30, 30); -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); -link_row(_("Website:"), 'website', null, 35, 55); -text_row(_("Our Customer No:"), 'supp_account_no', null, 42, 40); - -table_section_title(_("Addresses")); -textarea_row(_("Mailing Address:"), 'address', null, 35, 5); -textarea_row(_("Physical Address:"), 'supp_address', null, 35, 5); - -table_section(2); - -table_section_title(_("Purchasing")); -text_row(_("GSTNo:"), 'gst_no', null, 42, 40); -text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40); -amount_row(_("Credit Limit:"), 'credit_limit', null); -if (!$new_supplier) -{ - label_row(_("Supplier's Currency:"), $_POST['curr_code']); - hidden('curr_code', $_POST['curr_code']); -} -else -{ - currencies_list_row(_("Supplier's Currency:"), 'curr_code', null); -} - -languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default')); - -tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null); - -payment_terms_list_row(_("Payment Terms:"), 'payment_terms', null); - -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 Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']); - -$dim = get_company_pref('use_dimension'); -if ($dim >= 1) -{ - table_section_title(_("Dimension")); - - dimensions_list_row(_("Dimension")." 1:", 'dimension_id', null, true, " ", false, 1); - if ($dim > 1) - dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', null, true, " ", false, 2); -} -if ($dim < 1) - hidden('dimension_id', 0); -if ($dim < 2) - hidden('dimension2_id', 0); -table_section_title(_("General")); -textarea_row(_("General Notes:"), 'notes', null, 35, 5); -record_status_list_row(_("Supplier status:"), 'inactive'); - -end_outer_table(1); - -div_start('controls'); -if (!$new_supplier) -{ - submit_center_first('submit', _("Update Supplier"), - _('Update supplier data'), @$_REQUEST['popup'] ? 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); -} -else -{ - submit_center('submit', _("Add New Supplier Details"), true, '', 'default'); -} -div_end(); -hidden('popup', @$_REQUEST['popup']); +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), + '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')) { + default: + case 'settings': + supplier_settings($supplier_id); + break; + case 'contacts': + $contacts = new contacts('contacts', $supplier_id, 'supplier'); + $contacts->show(); + break; + case 'transactions': + $_GET['supplier_id'] = $supplier_id; + include_once($path_to_root."/purchasing/inquiry/supplier_inquiry.php"); + break; + case 'orders': + $_GET['supplier_id'] = $supplier_id; + include_once($path_to_root."/purchasing/inquiry/po_search_completed.php"); + break; + }; +br(); +tabbed_content_end(); end_form(); - end_page(); -?>