$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
{
$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*/
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']);
$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']) . ","
.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');
$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))
label_cell($myrow["fax"]);
label_cell("<a href=mailto:" . $myrow["email"]. ">" . $myrow["email"]. "</a>");
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"));
end_row();
$_POST['sales_discount_account'] = $myrow['sales_discount_account'];
$_POST['receivables_account'] = $myrow['receivables_account'];
$_POST['payment_discount_account'] = $myrow['payment_discount_account'];
+ $_POST['group_no'] = $myrow["group_no"];
}
}
elseif ($Mode != 'ADD_ITEM')
{
$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'];
shippers_list_row(_("Default Shipping Company:"), 'default_ship_via', null);
-tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null, 31, 30);
+tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
yesno_list_row(_("Disable this Branch:"), 'disable_trans', null);
+sales_groups_list_row(_("Sales Group:"), 'group_no', null, true);
+
echo "</table>";
echo "</td><td class='tableseparator'>"; // outer table