X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fcustomer_branches.php;h=3dced4dbe5b3ae5bf577542e6e7614b053b3b963;hb=18ccf94f0421e7693bc40e177732a3f937b54d1a;hp=b3f86cfc2e5f9edf406f6b300e19bbbf02217b4d;hpb=8cac19c37c960e50f7c11964510c0d09a530e7b5;p=fa-stable.git
diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index b3f86cfc..3dced4db 100644
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 3;
$path_to_root="../..";
include($path_to_root . "/includes/session.inc");
@@ -35,9 +44,16 @@ if (isset($_GET['SelectedBranch']))
$selected_id = $_GET['SelectedBranch'];
}
+$id = find_submit('Select');
+if ($id != -1)
+{
+ context_return(array('customer_id' => $_POST['customer_id'],
+ 'branch_id' => $id)); // return to sales document
+}
+
//-----------------------------------------------------------------------------------------------
-if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
//initialise no input errors assumed initially before we test
@@ -49,12 +65,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
$input_error = 1;
display_error(_("The Branch name cannot be empty."));
+ set_focus('br_name');
}
if ($input_error != 1)
{
- if ($selected_id != -1)
+ 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*/
@@ -74,6 +91,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
default_location=".db_escape($_POST['default_location']) . ",
br_post_address =".db_escape($_POST['br_post_address']) . ",
disable_trans=".db_escape($_POST['disable_trans']) . ",
+ group_no=".db_escape($_POST['group_no']) . ",
default_ship_via=".db_escape($_POST['default_ship_via']) . "
WHERE branch_code =".db_escape($_POST['branch_code']) . "
AND debtor_no=".db_escape($_POST['customer_id']);
@@ -86,7 +104,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
$sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, br_address,
salesman, phone, fax,
contact_name, area, email, tax_group_id, sales_account, receivables_account, payment_discount_account, sales_discount_account, default_location,
- br_post_address, disable_trans, default_ship_via)
+ br_post_address, disable_trans, group_no, default_ship_via)
VALUES (".db_escape($_POST['customer_id']). ",".db_escape($_POST['br_name']) . ", "
.db_escape($_POST['br_address']) . ", ".db_escape($_POST['salesman']) . ", "
.db_escape($_POST['phone']) . ", ".db_escape($_POST['fax']) . ","
@@ -99,6 +117,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
.db_escape($_POST['default_location']) . ", "
.db_escape($_POST['br_post_address']) . ","
.db_escape($_POST['disable_trans']) . ", "
+ .db_escape($_POST['group_no']) . ", "
.db_escape($_POST['default_ship_via']) . ")";
$note = _('New customer branch has been added');
@@ -140,9 +159,9 @@ elseif ($Mode == '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");
display_notification(_('Selected customer branch has been deleted'));
- $Mode = 'RESET';
}
} //end ifs to test if the branch can be deleted
+ $Mode = 'RESET';
}
if ($Mode == 'RESET' || get_post('_customer_id_update'))
@@ -178,6 +197,7 @@ if ($num_branches)
$th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
_("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
+ if (count($_SESSION['Context'])) $th[] = '';
table_header($th);
while ($myrow = db_fetch($result))
@@ -189,10 +209,12 @@ if ($num_branches)
label_cell($myrow["description"]);
label_cell($myrow["phone"]);
label_cell($myrow["fax"]);
- label_cell("" . $myrow["email"]. "");
+ email_cell($myrow["email"]);
label_cell($myrow["tax_group_name"]);
+ if (count($_SESSION['Context']))
+ edit_button_cell("Select".$myrow["branch_code"], _("Select"));
edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
- edit_button_cell("Delete".$myrow["branch_code"], _("Delete"));
+ delete_button_cell("Delete".$myrow["branch_code"], _("Delete"));
end_row();
}
end_table();
@@ -201,13 +223,11 @@ if ($num_branches)
else
display_note(_("The selected customer does not have any branches. Please create at least one branch."));
-echo "
";
-start_table("$table_style2 width=60%", 5);
-echo "