***********************************************************************/
$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_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/ui/contacts_view.inc");
//--------------------------------------------------------------------------------------------
function supplier_settings(&$supplier_id)
{
-
+ global $page_nested;
+
start_outer_table(TABLESTYLE2);
table_section(1);
$_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['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'] = '';
$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'];
}
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']);
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'));
}
- 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);
-
- 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']);
-
- table_section(2);
+ else
+ table_section(2);
$dim = get_company_pref('use_dimension');
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(_("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'), @$_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);
$_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'], get_post('tax_included', 0));
update_record_status($_POST['supplier_id'], $_POST['inactive'],
'suppliers', 'supplier_id');
$_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'));
$supplier_id = $_POST['supplier_id'] = db_insert_id();
unset($_SESSION['supplier_id']);
$supplier_id = '';
$Ajax->activate('_page_body');
+ display_notification("#" . $_POST['supplier_id'] . " " . _("Supplier has been deleted."));
} //end if Delete supplier
}
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'));
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'), (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')) {
$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();
-hidden('popup', @$_REQUEST['popup']);
end_form();
-
end_page();
-?>
projects / fa-stable.git / blobdiff