X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomers.php;h=7169596c89deb8485bd69dfe4c84765982164514;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=c66649676dd75e9db09961be893e6857ec5c7989;hpb=f2e8e8b8c9baff6e469f35ae87b2efcefd259597;p=fa-stable.git
diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index c6664967..7169596c 100644
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -12,12 +12,12 @@
$page_security = 'SA_CUSTOMER';
$path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
$js .= get_js_date_picker();
page(_($help_context = "Customers"), @$_REQUEST['popup'], false, "", $js);
@@ -26,6 +26,7 @@ include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/banking.inc");
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");
if (isset($_GET['debtor_no']))
{
@@ -79,7 +80,7 @@ function can_process()
function handle_submit(&$selected_id)
{
- global $path_to_root, $Ajax, $auto_create_branch;
+ global $path_to_root, $Ajax, $SysPrefs;
if (!can_process())
return;
@@ -108,27 +109,28 @@ function handle_submit(&$selected_id)
$selected_id = $_POST['customer_id'] = db_insert_id();
- if (isset($auto_create_branch) && $auto_create_branch == 1)
+ if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
{
add_branch($selected_id, $_POST['CustName'], $_POST['cust_ref'],
$_POST['address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], '',
get_company_pref('default_sales_discount_act'), get_company_pref('debtors_act'), get_company_pref('default_prompt_payment_act'),
- $_POST['location'], $_POST['address'], 0, 0, $_POST['ship_via'], $_POST['notes']);
+ $_POST['location'], $_POST['address'], 0, $_POST['ship_via'], $_POST['notes'], $_POST['bank_account']);
$selected_branch = db_insert_id();
- add_crm_person($_POST['CustName'], $_POST['cust_ref'], '', $_POST['address'],
+ add_crm_person($_POST['cust_ref'], $_POST['CustName'], '', $_POST['address'],
$_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], '', '');
- add_crm_contact('cust_branch', 'general', $selected_branch, db_insert_id());
+ $pers_id = db_insert_id();
+ add_crm_contact('cust_branch', 'general', $selected_branch, $pers_id);
- add_crm_contact('customer', 'general', $selected_id, db_insert_id());
+ add_crm_contact('customer', 'general', $selected_id, $pers_id);
}
commit_transaction();
display_notification(_("A new customer has been added."));
- if (isset($auto_create_branch) && $auto_create_branch == 1)
+ if (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
display_notification(_("A default Branch has been automatically created, please check default Branch values by using link below."));
$Ajax->activate('_page_body');
@@ -186,7 +188,7 @@ if (isset($_POST['delete']))
function customer_settings($selected_id)
{
- global $SysPrefs, $path_to_root, $auto_create_branch;
+ global $SysPrefs, $path_to_root, $page_nested;
if (!$selected_id)
{
@@ -235,7 +237,8 @@ function customer_settings($selected_id)
text_row(_("GSTNo:"), 'tax_id', null, 40, 40);
- if (!$selected_id || is_new_customer($selected_id))
+ if (!$selected_id || is_new_customer($selected_id) || (!key_in_foreign_table($selected_id, 'debtor_trans', 'debtor_no') &&
+ !key_in_foreign_table($selected_id, 'sales_orders', 'debtor_no')))
{
currencies_list_row(_("Customer's Currency:"), 'curr_code', $_POST['curr_code']);
}
@@ -248,13 +251,14 @@ function customer_settings($selected_id)
if($selected_id)
record_status_list_row(_("Customer status:"), 'inactive');
- elseif (isset($auto_create_branch) && $auto_create_branch == 1)
+ elseif (isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
{
table_section_title(_("Branch"));
text_row(_("Phone:"), '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);
+ text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60);
sales_persons_list_row( _("Sales Person:"), 'salesman', null);
}
table_section(2);
@@ -281,13 +285,13 @@ function customer_settings($selected_id)
start_row();
echo '| '._('Customer branches').': | ';
hyperlink_params_td($path_to_root . "/sales/manage/customer_branches.php",
- ''. (@$_REQUEST['popup'] ? _("Select or &Add") : _("&Add or Edit ")).'',
- "debtor_no=".$selected_id.(@$_REQUEST['popup'] ? '&popup=1':''));
+ ''. ($page_nested ? _("Select or &Add") : _("&Add or Edit ")).'',
+ "debtor_no=".$selected_id.($page_nested ? '&popup=1':''));
end_row();
}
textarea_row(_("General Notes:"), 'notes', null, 35, 5);
- if (!$selected_id && isset($auto_create_branch) && $auto_create_branch == 1)
+ if (!$selected_id && isset($SysPrefs->auto_create_branch) && $SysPrefs->auto_create_branch == 1)
{
table_section_title(_("Branch"));
locations_list_row(_("Default Inventory Location:"), 'location');
@@ -298,14 +302,15 @@ function customer_settings($selected_id)
end_outer_table(1);
div_start('controls');
+ if (@$_REQUEST['popup']) hidden('popup', 1);
if (!$selected_id)
{
- submit_center('submit', _("Add New Customer"), true, '', 'default');
+ submit_center('submit', _("Add New Customer"), true, '', false);
}
else
{
submit_center_first('submit', _("Update Customer"),
- _('Update customer data'), @$_REQUEST['popup'] ? true : 'default');
+ _('Update customer data'), $page_nested ? true : false);
submit_return('select', $selected_id, _("Select this customer and return to document entry."));
submit_center_last('delete', _("Delete Customer"),
_('Delete customer data if have been never used'), true);
@@ -317,7 +322,7 @@ function customer_settings($selected_id)
check_db_has_sales_types(_("There are no sales types defined. Please define at least one sales type before adding a customer."));
-start_form();
+start_form(true);
if (db_has_customers())
{
@@ -339,14 +344,16 @@ else
hidden('customer_id');
}
-if (!$selected_id || list_updated('customer_id'))
+//if (!$selected_id || list_updated('customer_id'))
+if (!$selected_id)
unset($_POST['_tabs_sel']); // force settings tab for new customer
tabbed_content_start('tabs', array(
'settings' => array(_('&General settings'), $selected_id),
'contacts' => array(_('&Contacts'), $selected_id),
- 'transactions' => array(_('&Transactions'), $selected_id),
- 'orders' => array(_('Sales &Orders'), $selected_id),
+ 'transactions' => array(_('&Transactions'), (user_check_access('SA_SALESTRANSVIEW') ? $selected_id : null)),
+ 'orders' => array(_('Sales &Orders'), (user_check_access('SA_SALESTRANSVIEW') ? $selected_id : null)),
+ 'attachments' => array(_('Attachments'), (user_check_access('SA_ATTACHDOCUMENT') ? $selected_id : null)),
));
switch (get_post('_tabs_sel')) {
@@ -360,20 +367,21 @@ tabbed_content_start('tabs', array(
break;
case 'transactions':
$_GET['customer_id'] = $selected_id;
- $_GET['popup'] = 1;
include_once($path_to_root."/sales/inquiry/customer_inquiry.php");
break;
case 'orders':
$_GET['customer_id'] = $selected_id;
- $_GET['popup'] = 1;
include_once($path_to_root."/sales/inquiry/sales_orders_view.php");
break;
+ case 'attachments':
+ $_GET['trans_no'] = $selected_id;
+ $_GET['type_no']= ST_CUSTOMER;
+ $attachments = new attachments('attachment', $selected_id, 'customers');
+ $attachments->show();
};
br();
tabbed_content_end();
-hidden('popup', @$_REQUEST['popup']);
end_form();
end_page(@$_REQUEST['popup']);
-?>