Merged latest changes from stable branch.

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

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 91973cc6c1b7c9411818ccc3b4093f02c2a29d76..374d2f57d74fc1512645f382fd976d5b2658b1b9 100644 (file)
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -81,7 +81,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                                $_POST['br_address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], $_POST['sales_account'],
                                $_POST['sales_discount_account'], $_POST['receivables_account'], $_POST['payment_discount_account'],
                                $_POST['default_location'], $_POST['br_post_address'], $_POST['disable_trans'], $_POST['group_no'],
-                               $_POST['default_ship_via'], $_POST['notes']);
+                               $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']);
 //                     update_record_status($_POST['supplier_id'], $_POST['inactive'],
 //                             'cust_branch', 'branch_code');
 
@@ -93,7 +93,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                                $_POST['br_address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], $_POST['sales_account'],
                                $_POST['sales_discount_account'], $_POST['receivables_account'], $_POST['payment_discount_account'],
                                $_POST['default_location'], $_POST['br_post_address'], 0, $_POST['group_no'],
-                               $_POST['default_ship_via'], $_POST['notes']);
+                               $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']);
                        $selected_id = db_insert_id();
 
                        add_crm_person($_POST['contact_name'], $_POST['contact_name'], '', $_POST['br_post_address'], 
@@ -177,8 +177,7 @@ function branch_settings($selected_id) {
        $_POST['email'] = "";
        if ($selected_id != -1)
        {
-               if ($Mode == 'Edit') {
-
+               if ($Mode == 'Edit' || !isset($_POST['br_name'])) {
                        //editing an existing branch
                        $myrow = get_cust_branch($_POST['customer_id'], $_POST['branch_code']);
                        set_focus('br_name');
@@ -205,6 +204,7 @@ function branch_settings($selected_id) {
                    $_POST['payment_discount_account'] = $myrow['payment_discount_account'];
                        $_POST['group_no']  = $myrow["group_no"];
                        $_POST['notes']  = $myrow["notes"];
+                       $_POST['bank_account']  = $myrow["bank_account"];
 
                }
        }
@@ -217,7 +217,6 @@ function branch_settings($selected_id) {
                        $_POST['br_ref'] = $myrow["debtor_ref"];
                        $_POST['contact_name'] = _('Main Branch');
                        $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"];
-                       $_POST['email'] = $myrow['email'];
                }
                $_POST['branch_code'] = "";
                if (!isset($_POST['sales_account']) || !isset($_POST['sales_discount_account']))
@@ -226,7 +225,7 @@ function branch_settings($selected_id) {
 
                        // We use the Item Sales Account as default!
                    // $_POST['sales_account'] = $company_record["default_sales_act"];
-                   $_POST['sales_account'] = $_POST['notes']  = '';
+                   $_POST['sales_account'] = $_POST['notes']  = $_POST['bank_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'];
@@ -251,8 +250,9 @@ function branch_settings($selected_id) {
        // 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', null, false, false, true);
        gl_all_accounts_list_row(_("Sales Discount Account:"), 'sales_discount_account');
-       gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account');
+       gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'receivables_account', null, true);
        gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discount_account');
+       text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60);
 
        table_section(2);
 
@@ -316,10 +316,13 @@ $table->set_inactive_ctrl('cust_branch', 'branch_code');
 
 //$table->width = "85%";
 display_db_pager($table);
+}
+else
+       display_note(_("The selected customer does not have any branches. Please create at least one branch."));
 
 tabbed_content_start('tabs', array(
-               'settings' => array('&General settings', $selected_id!=-1),
-               'contacts' => array('&Contacts', $selected_id!=-1),
+               'settings' => array(_('&General settings'), $selected_id!=-1),
+               'contacts' => array(_('&Contacts'), $selected_id!=-1),
 //             'orders' => array('S&ales orders', $selected_id!=-1) // not implemented
        ));
        
@@ -338,13 +341,10 @@ tabbed_content_start('tabs', array(
        hidden('selected_id', $selected_id);
 br();
 tabbed_content_end();
-}
-else
-       display_note(_("The selected customer does not have any branches. Please create at least one branch."));
 
 
 end_form();
 
-end_page();
+end_page(@$_REQUEST['popup']);
 
 ?>