X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=c4460d69e713b64569191e0a7daf8d67476117d1;hb=4c16d92ae1e1032f23e029d7d2f901a65a4223bc;hp=1478e63b94419aacd7289b1352d618cd1fb4c5c1;hpb=c73e1bd3cfe2231278d5749f87657bcae429ddf0;p=fa-stable.git
diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 1478e63b..c4460d69 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -20,28 +20,31 @@ check_db_has_shippers(_("There are no shipping companies defined in the system.
check_db_has_tax_groups(_("There are no tax groups defined in the system. At least one tax group is required before proceeding."));
+simple_page_mode(true);
//-----------------------------------------------------------------------------------------------
if (isset($_GET['debtor_no']))
{
$_POST['customer_id'] = strtoupper($_GET['debtor_no']);
- $_POST['New'] = "1";
}
+$_POST['branch_code'] = $selected_id;
if (isset($_GET['SelectedBranch']))
{
$_POST['branch_code'] = strtoupper($_GET['SelectedBranch']);
- unset($_POST['New']);
+ $selected_id = $_GET['SelectedBranch'];
}
-if (!isset($_GET['SelectedBranch']) && !isset($_POST['AddUpdate']))
+$id = find_submit('Select');
+if ($id != -1)
{
- $_POST['New'] = "1";
+ context_return(array('customer_id' => $_POST['customer_id'],
+ 'branch_id' => $id)); // return to sales document
}
//-----------------------------------------------------------------------------------------------
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
//initialise no input errors assumed initially before we test
@@ -53,13 +56,13 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
{
$input_error = 1;
display_error(_("The Branch name cannot be empty."));
+ set_focus('br_name');
}
if ($input_error != 1)
{
- //if (!isset($_POST['New']))
- if (isset($_POST['UPDATE_ITEM']))
+ if ($selected_id != -1)
{
/*SelectedBranch could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -83,6 +86,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
WHERE branch_code =".db_escape($_POST['branch_code']) . "
AND debtor_no=".db_escape($_POST['customer_id']);
+ $note =_('Selected customer branch has been updated');
}
else
{
@@ -104,16 +108,18 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
.db_escape($_POST['br_post_address']) . ","
.db_escape($_POST['disable_trans']) . ", "
.db_escape($_POST['default_ship_via']) . ")";
+
+ $note = _('New customer branch has been added');
}
//run the sql from either of the above possibilites
db_query($sql,"The branch record could not be inserted or updated");
-
- meta_forward($_SERVER['PHP_SELF'], "debtor_no=" . $_POST['customer_id']);
+ display_notification($note);
+ $Mode = 'RESET';
}
}
-elseif (isset($_GET['delete']))
+elseif ($Mode == 'Delete')
{
//the link to delete a selected record was clicked instead of the submit button
@@ -141,11 +147,20 @@ elseif (isset($_GET['delete']))
{
$sql="DELETE FROM ".TB_PREF."cust_branch WHERE branch_code='" . $_POST['branch_code']. "' AND debtor_no='" . $_POST['customer_id']. "'";
db_query($sql,"could not delete branch");
- meta_forward($_SERVER['PHP_SELF'], "debtor_no=" . $_POST['customer_id']);
+ display_notification(_('Selected customer branch has been deleted'));
}
} //end ifs to test if the branch can be deleted
+ $Mode = 'RESET';
}
+if ($Mode == 'RESET' || get_post('_customer_id_update'))
+{
+ $selected_id = -1;
+ $cust_id = $_POST['customer_id'];
+ unset($_POST);
+ $_POST['customer_id'] = $cust_id;
+ $Ajax->activate('_page_body');
+}
start_form();
echo "
"; // outer table
echo "";
-if (!isset($_POST['New']) && $num_branches)
+if ($selected_id != -1)
{
-
- //editing an existing branch
- $sql = "SELECT * FROM ".TB_PREF."cust_branch
- WHERE branch_code='" . $_POST['branch_code'] . "'
- AND debtor_no='" . $_POST['customer_id'] . "'";
-
- $result = db_query($sql,"check failed");
- $myrow = db_fetch($result);
-
- $_POST['branch_code'] = $myrow["branch_code"];
- $_POST['br_name'] = $myrow["br_name"];
- $_POST['br_address'] = $myrow["br_address"];
- $_POST['br_post_address'] = $myrow["br_post_address"];
- $_POST['contact_name'] = $myrow["contact_name"];
- $_POST['salesman'] =$myrow["salesman"];
- $_POST['area'] =$myrow["area"];
- $_POST['phone'] =$myrow["phone"];
- $_POST['fax'] =$myrow["fax"];
- $_POST['email'] =$myrow["email"];
- $_POST['tax_group_id'] = $myrow["tax_group_id"];
- $_POST['disable_trans'] = $myrow['disable_trans'];
- $_POST['default_location'] = $myrow["default_location"];
- $_POST['default_ship_via'] = $myrow['default_ship_via'];
- $_POST['sales_account'] = $myrow["sales_account"];
- $_POST['sales_discount_account'] = $myrow['sales_discount_account'];
- $_POST['receivables_account'] = $myrow['receivables_account'];
- $_POST['payment_discount_account'] = $myrow['payment_discount_account'];
-
+ if ($Mode == 'Edit') {
+
+ //editing an existing branch
+ $sql = "SELECT * FROM ".TB_PREF."cust_branch
+ WHERE branch_code='" . $_POST['branch_code'] . "'
+ AND debtor_no='" . $_POST['customer_id'] . "'";
+ $result = db_query($sql,"check failed");
+ $myrow = db_fetch($result);
+ set_focus('br_name');
+ $_POST['branch_code'] = $myrow["branch_code"];
+ $_POST['br_name'] = $myrow["br_name"];
+ $_POST['br_address'] = $myrow["br_address"];
+ $_POST['br_post_address'] = $myrow["br_post_address"];
+ $_POST['contact_name'] = $myrow["contact_name"];
+ $_POST['salesman'] =$myrow["salesman"];
+ $_POST['area'] =$myrow["area"];
+ $_POST['phone'] =$myrow["phone"];
+ $_POST['fax'] =$myrow["fax"];
+ $_POST['email'] =$myrow["email"];
+ $_POST['tax_group_id'] = $myrow["tax_group_id"];
+ $_POST['disable_trans'] = $myrow['disable_trans'];
+ $_POST['default_location'] = $myrow["default_location"];
+ $_POST['default_ship_via'] = $myrow['default_ship_via'];
+ $_POST['sales_account'] = $myrow["sales_account"];
+ $_POST['sales_discount_account'] = $myrow['sales_discount_account'];
+ $_POST['receivables_account'] = $myrow['receivables_account'];
+ $_POST['payment_discount_account'] = $myrow['payment_discount_account'];
+ }
}
-else
+elseif ($Mode != 'ADD_ITEM')
{ //end of if $SelectedBranch only do the else when a new record is being entered
-
- $sql = "SELECT name, address, email
- FROM ".TB_PREF."debtors_master WHERE debtor_no = '" . $_POST['customer_id']. "'";
- $result = db_query($sql,"check failed");
- $myrow = db_fetch($result);
- $_POST['br_name'] = $myrow["name"];
- $_POST['contact_name'] = _("Main Branch");
- $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"];
+ if(!$num_branches) {
+ $sql = "SELECT name, address, email
+ FROM ".TB_PREF."debtors_master WHERE debtor_no = '" . $_POST['customer_id']. "'";
+ $result = db_query($sql,"check failed");
+ $myrow = db_fetch($result);
+ $_POST['br_name'] = $myrow["name"];
+ $_POST['contact_name'] = _('Main Branch');
+ $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"];
+ $_POST['email'] = $myrow['email'];
+ }
$_POST['branch_code'] = "";
- $_POST['email'] = $myrow['email'];
if (!isset($_POST['sales_account']) || !isset($_POST['sales_discount_account']))
{
$company_record = get_company_prefs();
- $_POST['sales_account'] = $company_record["default_sales_act"];
+ // We use the Item Sales Account as default!
+ // $_POST['sales_account'] = $company_record["default_sales_act"];
+ $_POST['sales_account'] = "";
$_POST['sales_discount_account'] = $company_record['default_sales_discount_act'];
$_POST['receivables_account'] = $company_record['debtors_act'];
$_POST['payment_discount_account'] = $company_record['default_prompt_payment_act'];
}
- hidden('New', 'Yes');
}
-hidden('branch_code', $_POST['branch_code']);
+hidden('selected_id', $selected_id);
+hidden('branch_code');
table_section_title(_("Name and Contact"));
-text_row(_("Branch Name:"), 'br_name', $_POST['br_name'], 35, 40);
-text_row(_("Contact Person:"), 'contact_name', $_POST['contact_name'], 35, 40);
+text_row(_("Branch Name:"), 'br_name', null, 35, 40);
+text_row(_("Contact Person:"), 'contact_name', null, 35, 40);
text_row(_("Phone Number:"), 'phone', null, 20, 20);
text_row(_("Fax Number:"), 'fax', null, 20, 20);
-text_row("" . _("E-mail:") . "", 'email', $_POST['email'], 35, 55);
+text_row("" . _("E-mail:") . "", 'email', null, 35, 55);
table_section_title(_("Sales"));
@@ -299,26 +313,25 @@ echo"";
table_section_title(_("GL Accounts"));
// 2006-06-14. Changed gl_al_accounts_list to have an optional all_option 'Use Item Sales Accounts'
-gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account'], false,
- false, false, true);
+gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', null, false, false, false, true);
-gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account', $_POST['sales_discount_account']);
+gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account');
-gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account', $_POST['receivables_account']);
+gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account');
-gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']);
+gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discount_account');
table_section_title(_("Addresses"));
-textarea_row(_("Mailing Address:"), 'br_post_address',$_POST['br_post_address'], 35, 5);
+textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 5);
-textarea_row(_("Billing Address:"), 'br_address', $_POST['br_address'], 35, 5);
+textarea_row(_("Billing Address:"), 'br_address', null, 35, 5);
end_table();
end_table(1); // outer table
-submit_add_or_update_center(isset($_POST['New']));
+submit_add_or_update_center($selected_id == -1, '', true);
end_form();
|