X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;h=3be5bc5f6a9367545a859934f6bb5a11c67f698c;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=3ac981fec411176331a9ca63434ff2a3d0a7c234;hpb=5b8ee3cb748382ab5a2665a620183f08c8ba204b;p=fa-stable.git diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 3ac981fe..3be5bc5f 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -1,14 +1,30 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIER'; +$path_to_root = "../.."; +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'], false, "", $js); + +include_once($path_to_root . "/includes/ui.inc"); +include_once($path_to_root . "/includes/ui/contacts_view.inc"); +include_once($path_to_root . "/includes/ui/attachment.inc"); check_db_has_tax_groups(_("There are no tax groups defined in the system. At least one tax group is required before proceeding.")); @@ -16,14 +32,11 @@ if (isset($_GET['supplier_id'])) { $_POST['supplier_id'] = $_GET['supplier_id']; } -$new_supplier = get_post('supplier_id') == ''; - -if (isset($_POST['submit'])) -{ - //initialise no input errors assumed initially before we test - $input_error = 0; +$supplier_id = get_post('supplier_id', ''); +function can_process() +{ /* actions to take once the user has clicked the submit button ie the page has called itself with some user input */ @@ -31,61 +44,69 @@ if (isset($_POST['submit'])) if (strlen($_POST['supp_name']) == 0 || $_POST['supp_name'] == "") { - $input_error = 1; display_error(_("The supplier name must be entered.")); set_focus('supp_name'); + return false; + } + + if (strlen($_POST['supp_ref']) == 0 || $_POST['supp_ref'] == "") + { + display_error(_("The supplier short name must be entered.")); + set_focus('supp_ref'); + return false; } + return true; +} - if ($input_error !=1 ) +function handle_submit(&$supplier_id) +{ + global $path_to_root, $Ajax, $SysPrefs; + + if (!can_process()) + return; + begin_transaction(); + if ($supplier_id) + { + update_supplier($_POST['supplier_id'], $_POST['supp_name'], $_POST['supp_ref'], $_POST['address'], + $_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'], check_value('tax_included')); + update_record_status($_POST['supplier_id'], $_POST['inactive'], + 'suppliers', 'supplier_id'); + + $Ajax->activate('supplier_id'); // in case of status change + display_notification(_("Supplier has been updated.")); + } + else { + add_supplier($_POST['supp_name'], $_POST['supp_ref'], $_POST['address'], $_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'], check_value('tax_included')); - if (!$new_supplier) - { + $supplier_id = $_POST['supplier_id'] = db_insert_id(); - $sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($_POST['supp_name']) . ", - address=".db_escape($_POST['address']) . ", - email=".db_escape($_POST['email']) . ", - bank_account=".db_escape($_POST['bank_account']) . ", - dimension_id=".db_escape($_POST['dimension_id']) . ", - dimension2_id=".db_escape($_POST['dimension2_id']) . ", - curr_code=".db_escape($_POST['curr_code']).", - payment_terms=".db_escape($_POST['payment_terms']) . ", - payable_account=".db_escape($_POST['payable_account']) . ", - purchase_account=".db_escape($_POST['purchase_account']) . ", - payment_discount_account=".db_escape($_POST['payment_discount_account']) . ", - tax_group_id=".db_escape($_POST['tax_group_id']) . " WHERE supplier_id = '" . $_POST['supplier_id'] . "'"; - - db_query($sql,"The supplier could not be updated"); - display_notification(_("Supplier has been updated.")); - } - else - { + add_crm_person($_POST['supp_ref'], $_POST['contact'], '', $_POST['address'], + $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], + $_POST['rep_lang'], ''); - $sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, address, email, bank_account, dimension_id, dimension2_id, curr_code, - payment_terms, payable_account, purchase_account, payment_discount_account, tax_group_id) - VALUES (".db_escape($_POST['supp_name']). ", " - .db_escape($_POST['address']) . ", " - .db_escape($_POST['email']). ", " - .db_escape($_POST['bank_account']). ", " - .db_escape($_POST['dimension_id']). ", " - .db_escape($_POST['dimension2_id']). ", " - .db_escape($_POST['curr_code']). ", " - .db_escape($_POST['payment_terms']). ", " - .db_escape($_POST['payable_account']). ", " - .db_escape($_POST['purchase_account']). ", " - .db_escape($_POST['payment_discount_account']). ", " - .db_escape($_POST['tax_group_id']). ")"; - - db_query($sql,"The supplier could not be added"); - $_POST['supplier_id'] = db_insert_id(); - $new_supplier = false; - display_notification(_("A new supplier has been added.")); - $Ajax->activate('_page_body'); - } + add_crm_contact('supplier', 'general', $supplier_id, db_insert_id()); + + display_notification(_("A new supplier has been added.")); + $Ajax->activate('_page_body'); } + commit_transaction(); +} -} -elseif (isset($_POST['delete']) && $_POST['delete'] != "") +if (isset($_POST['submit'])) +{ + handle_submit($supplier_id); +} + +if (isset($_POST['delete']) && $_POST['delete'] != "") { //the link to delete a selected record was clicked instead of the submit button @@ -93,10 +114,7 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") // PREVENT DELETES IF DEPENDENT RECORDS IN 'supp_trans' , purch_orders - $sql= "SELECT COUNT(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" . $_POST['supplier_id'] . "'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($_POST['supplier_id'], 'supp_trans', 'supplier_id')) { $cancel_delete = 1; display_error(_("Cannot delete this supplier because there are transactions that refer to this supplier.")); @@ -104,10 +122,7 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") } else { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."purch_orders WHERE supplier_id='" . $_POST['supplier_id'] . "'"; - $result = db_query($sql,"check failed"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($_POST['supplier_id'], 'purch_orders', 'supplier_id')) { $cancel_delete = 1; display_error(_("Cannot delete the supplier record because purchase orders have been created against this supplier.")); @@ -116,134 +131,225 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") } if ($cancel_delete == 0) { - $sql="DELETE FROM ".TB_PREF."suppliers WHERE supplier_id='" . $_POST['supplier_id']. "'"; - db_query($sql,"check failed"); + 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 } -elseif (isset($_POST['select'])) + +//-------------------------------------------------------------------------------------------- +function supplier_settings(&$supplier_id) { - context_return(array('supplier_id' => $_POST['supplier_id'])); -} + global $page_nested; + + start_outer_table(TABLESTYLE2); -start_form(); + table_section(1); -if (db_has_suppliers()) -{ - start_table("", 3); -// start_table("class = 'tablestyle_noborder'"); - supplier_list_row(_("Select a supplier: "), 'supplier_id', null, - _('New supplier'), true); - end_table(); -} -else -{ - hidden('supplier_id', get_post('supplier_id')); -} + 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 + { + if (list_updated('supplier_id') || !isset($_POST['supp_name'])) { + $_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']; + } + } -//start_table("class='tablestyle2'", 0, 3); -start_table("class='tablestyle'", 3); + table_section_title(_("Basic Data")); -table_section_title(_("Supplier")); + text_row(_("Supplier Name:"), 'supp_name', null, 42, 60); + text_row(_("Supplier Short Name:"), 'supp_ref', null, 30, 30); -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['address'] = $myrow["address"]; - $_POST['email'] = $myrow["email"]; - $_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['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"]; + 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')); + } -} -else -{ - $_POST['supp_name'] = $_POST['address'] = $_POST['tax_group_id'] = ''; - $_POST['dimension_id'] = 0; - $_POST['dimension2_id'] = 0; - $_POST['sales_type'] = -1; - $_POST['email'] = $_POST['bank_account'] = ''; - $_POST['payment_terms'] = ''; - $_POST['credit_limit'] = price_format(sys_prefs::default_credit_limit()); - - $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['payment_discount_account'] = $company_record['pyt_discount_act']; + 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 : false); + 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, '', false); + } + div_end(); } -text_row(_("Supplier Name:"), 'supp_name', null, 42, 40); -textarea_row(_("Address:"), 'address', null, 35, 5); -text_row(_("Email:"), 'email', null, 42, 40); -text_row(_("Bank Account:"), 'bank_account', null, 42, 40); +start_form(true); -// Sherifoz 23.09.03 currency can't be changed if editing -if (!$new_supplier) +if (db_has_suppliers()) { - label_row(_("Supplier's Currency:"), $_POST['curr_code']); - hidden('curr_code', $_POST['curr_code']); + start_table(false, "", 3); + start_row(); + supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, + _('New supplier'), true, check_value('show_inactive')); + check_cells(_("Show inactive:"), 'show_inactive', null, true); + end_row(); + end_table(); + if (get_post('_show_inactive_update')) { + $Ajax->activate('supplier_id'); + set_focus('supplier_id'); + } } else { - currencies_list_row(_("Supplier's Currency:"), 'curr_code', null); + hidden('supplier_id', get_post('supplier_id')); } -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); - -end_table(1); -div_start('controls'); -if (!$new_supplier) -{ - submit_center_first('submit', _("Update Supplier"), - _('Update supplier data'), true); - submit_return('select', _("Return"), _("Select this supplier and return to document entry."), true); - submit_center_last('delete', _("Delete Supplier"), - _('Delete supplier data if have been never used'), true); -} -else -{ - submit_center('submit', _("Add New Supplier Details"), true, '', true); -} -div_end(); +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)), + 'attachments' => array(_('Attachments'), (user_check_access('SA_ATTACHDOCUMENT') ? $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; + case 'attachments': + $_GET['trans_no'] = $supplier_id; + $_GET['type_no']= ST_SUPPLIER; + $attachments = new attachments('attachment', $supplier_id, 'suppliers'); + $attachments->show(); + }; +br(); +tabbed_content_end(); end_form(); +end_page(@$_REQUEST['popup']); -end_page(); - -?>