Removed sparse fields contact_name,disable_trans from cust_branch, added branch bank...

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 3d9babeba4aba21b8046757f4cc6d0f80e55a8d3..689646629c675e069cc0d4c7bd336ddd77302855 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -551,7 +551,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
        if ($editkey)
                set_editor('branch', $name, $editkey);
 
-       $where = $enabled ? array("disable_trans = 0") : array();
+       $where = $enabled ? array("inactive = 0") : array();
        $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref',
        array(
                'where' => $where,

diff --git a/sales/includes/db/branches_db.inc b/sales/includes/db/branches_db.inc
index dcde3c669da3302138463dc83dc3699d491892e5..52c41a786ca8ef51ffd77e07471247897432fe6b 100644 (file)
--- a/sales/includes/db/branches_db.inc
+++ b/sales/includes/db/branches_db.inc
@@ -11,13 +11,13 @@
 ***********************************************************************/
 function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $area, 
        $tax_group_id, $sales_account, $sales_discount_account, $receivables_account, 
-       $payment_discount_account, $default_location, $br_post_address, $disable_trans, $group_no,
+       $payment_discount_account, $default_location, $br_post_address, $group_no,
        $default_ship_via, $notes, $bank_account)
 {
        $sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, branch_ref, br_address,
                salesman, area, tax_group_id, sales_account, receivables_account, payment_discount_account, 
                sales_discount_account, default_location,
-               br_post_address, disable_trans, group_no, default_ship_via, notes, bank_account)
+               br_post_address, group_no, default_ship_via, notes, bank_account)
                VALUES (".db_escape($customer_id). ",".db_escape($br_name) . ", "
                        .db_escape($br_ref) . ", "
                        .db_escape($br_address) . ", ".db_escape($salesman) . ", "
@@ -29,7 +29,6 @@ function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $ar
                        .db_escape($sales_discount_account) . ", "
                        .db_escape($default_location) . ", "
                        .db_escape($br_post_address) . ","
-                       .db_escape($disable_trans) . ", "
                        .db_escape($group_no) . ", "
                        .db_escape($default_ship_via). ", "
                        .db_escape($notes). ", "
@@ -39,7 +38,7 @@ function add_branch($customer_id, $br_name, $br_ref, $br_address, $salesman, $ar
 
 function update_branch($customer_id, $branch_code, $br_name, $br_ref, $br_address,
        $salesman, $area, $tax_group_id, $sales_account, $sales_discount_account, $receivables_account, 
-       $payment_discount_account, $default_location, $br_post_address, $disable_trans, $group_no,
+       $payment_discount_account, $default_location, $br_post_address, $group_no,
        $default_ship_via, $notes, $bank_account)
 {
        $sql = "UPDATE ".TB_PREF."cust_branch SET br_name = " . db_escape($br_name) . ",
@@ -54,7 +53,6 @@ function update_branch($customer_id, $branch_code, $br_name, $br_ref, $br_addres
                payment_discount_account=".db_escape($payment_discount_account) . ",
                default_location=".db_escape($default_location) . ",
                br_post_address =".db_escape($br_post_address) . ",
-               disable_trans=".db_escape($disable_trans) . ",
                group_no=".db_escape($group_no) . ", 
                default_ship_via=".db_escape($default_ship_via) . ",
                notes=".db_escape($notes) . ",

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 73bac5de7206b1768cf7be0d025373db78101047..9a6be322dc560487652f0086d24edf590e0039c1 100644 (file)
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -80,10 +80,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                        update_branch($_POST['customer_id'], $_POST['branch_code'], $_POST['br_name'], $_POST['br_ref'],
                                $_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_location'], $_POST['br_post_address'], $_POST['group_no'],
                                $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']);
-//                     update_record_status($_POST['supplier_id'], $_POST['inactive'],
-//                             'cust_branch', 'branch_code');
 
                        $note =_('Selected customer branch has been updated');
                }
@@ -92,7 +90,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                        add_branch($_POST['customer_id'], $_POST['br_name'], $_POST['br_ref'],
                                $_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_location'], $_POST['br_post_address'], $_POST['group_no'],
                                $_POST['default_ship_via'], $_POST['notes'], $_POST['bank_account']);
                        $selected_id = db_insert_id();
 
@@ -107,7 +105,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                }
                commit_transaction();
                display_notification($note);
-//             $Mode = 'RESET';
+
                if (@$_REQUEST['popup']) {
                        set_focus("Select".($_POST['branch_code'] == -1 ? $selected_id: $_POST['branch_code']));
                }
@@ -116,9 +114,6 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 }
 elseif ($Mode == 'Delete')
 {
-       //the link to delete a selected record was clicked instead of the submit button
-
-       // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
 
        if (branch_in_foreign_table($_POST['customer_id'], $_POST['branch_code'], 'debtor_trans'))
        {
@@ -136,7 +131,7 @@ elseif ($Mode == 'Delete')
                        delete_branch($_POST['customer_id'], $_POST['branch_code']);
                        display_notification(_('Selected customer branch has been deleted'));
                }
-       } //end ifs to test if the branch can be deleted
+       }
        $Mode = 'RESET';
 }
 
@@ -167,8 +162,8 @@ function select_link($row) {
        return button("Select".$row["branch_code"], $row["branch_code"], '', ICON_ADD, 'selector');
 }
 
-function branch_settings($selected_id) {
-       global $Mode, $num_branches;
+function branch_settings($selected_id, $num_branches) {
+       global $Mode;
 
        start_outer_table(TABLESTYLE2);
 
@@ -186,16 +181,9 @@ function branch_settings($selected_id) {
                    $_POST['br_ref']  = $myrow["branch_ref"];
                    $_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['rep_lang'] =$myrow["rep_lang"];
-//                 $_POST['phone'] =$myrow["phone"];
-//                 $_POST['phone2'] =$myrow["phone2"];
-//                 $_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"];
@@ -209,9 +197,8 @@ function branch_settings($selected_id) {
                }
        }
        elseif ($Mode != 'ADD_ITEM')
-       { //end of if $SelectedBranch only do the else when a new record is being entered
+       {
                $myrow = get_default_info_for_branch($_POST['customer_id']);
-//             $_POST['rep_lang'] = $myrow['rep_lang'];
                if(!$num_branches) {
                        $_POST['br_name'] = $myrow["name"];
                        $_POST['br_ref'] = $myrow["debtor_ref"];
@@ -247,7 +234,7 @@ function branch_settings($selected_id) {
        tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
 
        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', 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', null, true);
@@ -256,23 +243,20 @@ function branch_settings($selected_id) {
 
        table_section(2);
 
-if($selected_id==-1) {
-       table_section_title(_("General contact data"));
-       text_row(_("Contact Person:"), 'contact_name', null, 35, 40);
-       text_row(_("Phone Number:"), 'phone', null, 32, 30);
-       text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
-       text_row(_("Fax Number:"), 'fax', null, 32, 30);
-       email_row(_("E-mail:"), 'email', null, 35, 55);
-       languages_list_row( _("Document Language:"), 'rep_lang', null, _("Customer default"));
-}
+       if($selected_id==-1) {
+               table_section_title(_("General contact data"));
+               text_row(_("Contact Person:"), 'contact_name', null, 35, 40);
+               text_row(_("Phone Number:"), 'phone', null, 32, 30);
+               text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
+               text_row(_("Fax Number:"), 'fax', null, 32, 30);
+               email_row(_("E-mail:"), 'email', null, 35, 55);
+               languages_list_row( _("Document Language:"), 'rep_lang', null, _("Customer default"));
+       }
        table_section_title(_("Addresses"));
        textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 4);
        textarea_row(_("Billing Address:"), 'br_address', null, 35, 4);
        textarea_row(_("General Notes:"), 'notes', null, 35, 4);
 
-if($selected_id!=-1)
-       yesno_list_row(_("Disable this Branch:"), 'disable_trans', null);
-
        end_outer_table(1);
        submit_add_or_update_center($selected_id == -1, '', 'both');
 }
@@ -302,7 +286,6 @@ $cols = array(
        _("E-mail") => 'email',
        _("Tax Group"),
        _("Inactive") => 'inactive',
-//             array('fun'=>'inactive'),
                ' '=> array('insert'=>true, 'fun'=>'select_link'),
                array('insert'=>true, 'fun'=>'edit_link'),
                array('insert'=>true, 'fun'=>'del_link')
@@ -314,7 +297,6 @@ $cols = array(
 $table =& new_db_pager('branch_tbl', $sql, $cols, 'cust_branch');
 $table->set_inactive_ctrl('cust_branch', 'branch_code');
 
-//$table->width = "85%";
 display_db_pager($table);
 }
 else
@@ -329,7 +311,7 @@ tabbed_content_start('tabs', array(
        switch (get_post('_tabs_sel')) {
                default:
                case 'settings':
-                       branch_settings($selected_id); 
+                       branch_settings($selected_id, $num_branches); 
                        break;
                case 'contacts':
                        $contacts = new contacts('contacts', $selected_id, 'cust_branch');

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 0513a77388a2eced65e8dba51596dc67224d571a..b9f1b67c685d5bf353985ec679035d249a3ee58f 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -113,7 +113,7 @@ function handle_submit(&$selected_id)
                add_branch($selected_id, $_POST['CustName'], $_POST['cust_ref'],
                 $_POST['address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], '',
                 get_company_pref('default_sales_discount_act'), get_company_pref('debtors_act'), get_company_pref('default_prompt_payment_act'),
-                $_POST['location'], $_POST['address'], 0, 0, $_POST['ship_via'], $_POST['notes']);
+                $_POST['location'], $_POST['address'], 0, $_POST['ship_via'], $_POST['notes'], $_POST['bank_account']);
                 
                $selected_branch = db_insert_id();
         
@@ -257,6 +257,7 @@ function customer_settings($selected_id)
                text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
                text_row(_("Fax Number:"), 'fax', null, 32, 30);
                email_row(_("E-mail:"), 'email', null, 35, 55);
+               text_row(_("Bank Account Number:"), 'bank_account', null, 30, 60);
                sales_persons_list_row( _("Sales Person:"), 'salesman', null);
        }
        table_section(2);

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index 481ea817756507284cb1c66328abc1402b61b21f..5f87259ac3586a0a8afed6c5461d4b55f4e1fde5 100644 (file)
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -50,6 +50,20 @@ class fa2_4 {
                if ($result)
                        $result = $this->do_cleanup();
 
+               //remove obsolete and temporary columns.
+               // this have to be done here as db_import rearranges alter query order
+               $dropcol = array(
+                               'cust_branch' => array('contact_name', 'disable_trans'),
+               );
+
+               foreach($dropcol as $table => $columns)
+                       foreach($columns as $col) {
+                               if (db_query("ALTER TABLE `".TB_PREF."{$table}` DROP `$col`")==false) {
+                                       display_error("Cannot drop {$table}.{$col} column:<br>".db_error_msg($db));
+                                       return false;
+                               }
+                       }
+
                return  update_company_prefs(array('version_id'=>$db_version));
        }
        //

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index f067dbe54c9b69cebdc368cf93bd1255fe57a540..c681eea953bfc2c3a944f5f840a10ff3c08d7c52 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -596,7 +596,6 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   `br_address` tinytext NOT NULL,
   `area` int(11) default NULL,
   `salesman` int(11) NOT NULL default '0',
-  `contact_name` varchar(60) NOT NULL default '',
   `default_location` varchar(5) NOT NULL default '',
   `tax_group_id` int(11) default NULL,
   `sales_account` varchar(15) NOT NULL default '',
@@ -604,7 +603,6 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   `receivables_account` varchar(15) NOT NULL default '',
   `payment_discount_account` varchar(15) NOT NULL default '',
   `default_ship_via` int(11) NOT NULL default '1',
-  `disable_trans` tinyint(4) NOT NULL default '0',
   `br_post_address` tinytext NOT NULL,
   `group_no` int(11) NOT NULL default '0',
   `notes` tinytext NOT NULL,
@@ -620,9 +618,9 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
 -- Dumping data for table `0_cust_branch`
 --
 
-INSERT INTO `0_cust_branch` VALUES(1, 1, 'Beefeater Ltd.', 'Beefeater', '', 1, 1, 'Main Branch', 'DEF', 2, '', '4510', '1200', '4500', 1, 0, 'Address 1\nAddress 2\nAddress 3', 0, '', '', 0);
-INSERT INTO `0_cust_branch` VALUES(2, 2, 'Ghostbusters Corp.', 'Ghostbusters', 'Address 1\nAddress 2\nAddress 3', 1, 1, 'Main Branch', 'DEF', 1, '', '4510', '1200', '4500', 1, 0, 'Address 1\nAddress 2\nAddress 3', 0, '','', 0);
-INSERT INTO `0_cust_branch` VALUES(3, 3, 'Brezan', 'Brezan', 'Address 1\nAddress 2\nAddress 3', 1, 1, 'Main Branch', 'DEF', 1, '', '4510', '1200', '4500', 1, 0, 'Address 1\nAddress 2\nAddress 3', 0, '', '', 0);
+INSERT INTO `0_cust_branch` VALUES(1, 1, 'Beefeater Ltd.', 'Beefeater', '', 1, 1, 'DEF', 2, '', '4510', '1200', '4500', 1, 'Address 1\nAddress 2\nAddress 3', 0, '', '', 0);
+INSERT INTO `0_cust_branch` VALUES(2, 2, 'Ghostbusters Corp.', 'Ghostbusters', 'Address 1\nAddress 2\nAddress 3', 1, 1, 'DEF', 1, '', '4510', '1200', '4500', 1, 'Address 1\nAddress 2\nAddress 3', 0, '','', 0);
+INSERT INTO `0_cust_branch` VALUES(3, 3, 'Brezan', 'Brezan', 'Address 1\nAddress 2\nAddress 3', 1, 1, 'DEF', 1, '', '4510', '1200', '4500', 1, 'Address 1\nAddress 2\nAddress 3', 0, '', '', 0);
 
 -- --------------------------------------------------------
 

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index a83dbc2674a8cef4a053e180849689ecb55a7935..0a799658eb45ffb6577a2b4b2b8be0b5f4b145a7 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -561,7 +561,6 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   `br_address` tinytext NOT NULL,
   `area` int(11) default NULL,
   `salesman` int(11) NOT NULL default '0',
-  `contact_name` varchar(60) NOT NULL default '',
   `default_location` varchar(5) NOT NULL default '',
   `tax_group_id` int(11) default NULL,
   `sales_account` varchar(15) NOT NULL default '',
@@ -569,7 +568,6 @@ CREATE TABLE IF NOT EXISTS `0_cust_branch` (
   `receivables_account` varchar(15) NOT NULL default '',
   `payment_discount_account` varchar(15) NOT NULL default '',
   `default_ship_via` int(11) NOT NULL default '1',
-  `disable_trans` tinyint(4) NOT NULL default '0',
   `br_post_address` tinytext NOT NULL,
   `group_no` int(11) NOT NULL default '0',
   `notes` tinytext NOT NULL,