Added dimension entries in delivery and invoice forms

[fa-stable.git] / sales / manage / customer_branches.php

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index b3f86cfc2e5f9edf406f6b300e19bbbf02217b4d..69ecd9e4059e9845755d1ab6cc0165f9ccb79337 100644 (file)
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -35,9 +35,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 +56,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*/
 
@@ -140,9 +148,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 +186,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))
@@ -191,6 +200,8 @@ if ($num_branches)
                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();
@@ -256,7 +267,9 @@ 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'];
@@ -287,7 +300,7 @@ locations_list_row(_("Default Inventory Location:"), 'default_location', null);
 
 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);