Release 1.11

Added option for using alpha numeric chart of accounts.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ffa0b8deffbe0ce04bbf34ad27ab9a8fc81e8716..f24b17fd2f76ff48f4a8abdc7310d664612e9671 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,19 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+-------------------- 1.11 Stable Released ----------------------
+04-jul-2007 Joe Hunt
+ ! Option for using alpha numeric chart of accounts.
+ $ config.php
+   /gl/manage/gl_accounts.php
+   /gl/includes/db/gl_db_accounts.inc
+   /gl/includes/db/gl_db_bank_trans.inc
+   /gl/includes/db/gl_db_trans.inc
+   /gl/inquiry/gl_trial_balance.inc
+   /admin/db/company_db.inc
+   /inventory/includes/db/items_db.inc
+   /sales/manage/customer_branches.inc
+
 04-Jul-2007 Joe Hunt
  # Problems retrieving language texts for poEdit in long javascripts
  $ /includes/ui/ui_view.inc

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index ff04a3f34440f7bde9fad69d11805b06bee50184..ee98b4638f92e836ca3c379487b8ad5fd065c406 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -22,21 +22,21 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
                $default_dim_required)
 {
        $sql = "UPDATE ".TB_PREF."company SET
-               debtors_act=$debtors_act, pyt_discount_act=$pyt_discount_act,
-               creditors_act=$creditors_act, grn_act=$grn_act,
-               exchange_diff_act=$exchange_diff_act,
-               purch_exchange_diff_act=$purch_exchange_diff_act,
-               retained_earnings_act=$retained_earnings_act,
-               freight_act=$freight_act,
-               default_sales_act=$default_sales_act,
-               default_sales_discount_act=$default_sales_discount_act,
-               default_prompt_payment_act=$default_prompt_payment_act,
-               default_inventory_act=$default_inventory_act,
-               default_cogs_act=$default_cogs_act,
-               default_adj_act=$default_adj_act,
-               default_inv_sales_act=$default_inv_sales_act,
-               default_assembly_act=$default_assembly_act,
-               payroll_act=$payroll_act,
+               debtors_act='$debtors_act', pyt_discount_act='$pyt_discount_act',
+               creditors_act='$creditors_act', grn_act='$grn_act',
+               exchange_diff_act='$exchange_diff_act',
+               purch_exchange_diff_act='$purch_exchange_diff_act',
+               retained_earnings_act='$retained_earnings_act',
+               freight_act='$freight_act',
+               default_sales_act='$default_sales_act',
+               default_sales_discount_act='$default_sales_discount_act',
+               default_prompt_payment_act='$default_prompt_payment_act',
+               default_inventory_act='$default_inventory_act',
+               default_cogs_act='$default_cogs_act',
+               default_adj_act='$default_adj_act',
+               default_inv_sales_act='$default_inv_sales_act',
+               default_assembly_act='$default_assembly_act',
+               payroll_act='$payroll_act',
                allow_negative_stock=$allow_negative_stock,
                po_over_receive=$po_over_receive,
                po_over_charge=$po_over_charge,

diff --git a/config.php b/config.php
index dc69f59f24a41880d73fc1ff73521c0047ef7cfa..0b26866e6b44274ec5249f29e8eab3e2eedbab9a 100644 (file)
--- a/config.php
+++ b/config.php
@@ -52,10 +52,10 @@
        // Main Title
        $app_title = "FrontAccounting";
     // application version
-    $version           = "1.1";
+    $version           = "1.11";
 
     // Build for development purposes
-    $build_version     = "21";
+    $build_version     = "23";
 
        // Powered by
        $power_by               = "FrontAccounting";
@@ -72,6 +72,9 @@
 
        /* use Audit Trails in GL */
        $use_audit_trail = 0;
+       
+       /* allow alpha characters in accounts. 0 = numeric, 1 = alpha numeric, 2 = uppercase alpha numeric */
+       $accounts_alpha = 0;
 
        /* default start-up tab (orders/AP/stock/manuf/proj/GL/system) */
        $def_app = "orders";

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 3b5daa9fac9cff06dc61a9615ae1ef0803e68f30..920facba71f574ed6e58cd61621ae8bea719261f 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -16,14 +16,14 @@ function update_gl_account($account_code, $account_name, $account_type, $account
        $account_name = db_escape($account_name);
     $sql = "UPDATE ".TB_PREF."chart_master SET account_name='$account_name',
                account_type=$account_type, account_code2='$account_code2',
-               tax_code=$tax_code WHERE account_code = $account_code";
+               tax_code=$tax_code WHERE account_code = '$account_code'";
 
        db_query($sql, "could not update gl account");
 }
 
 function delete_gl_account($code)
 {
-       $sql = "DELETE FROM ".TB_PREF."chart_master WHERE account_code=$code";
+       $sql = "DELETE FROM ".TB_PREF."chart_master WHERE account_code='$code'";
 
        db_query($sql, "could not delete gl account");
 }
@@ -57,7 +57,7 @@ function get_gl_accounts_all($balance=-1)
 
 function get_gl_account($code)
 {
-       $sql = "SELECT * FROM ".TB_PREF."chart_master WHERE account_code=$code";
+       $sql = "SELECT * FROM ".TB_PREF."chart_master WHERE account_code='$code'";
 
        $result = db_query($sql, "could not get gl account");
        return db_fetch($result);

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index 88cdc5557037a8209e52afec5fa448cad79591e9..804e94ac6ee806c1b28dc8c7a0d5750c03bdef89 100644 (file)
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -28,7 +28,7 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_t
        $sql = "INSERT INTO ".TB_PREF."bank_trans (type, trans_no, bank_act, ref,  
                trans_date, bank_trans_type_id, amount, person_type_id, person_id) ";
        
-       $sql .= "VALUES ($type, $trans_no, $bank_act, '$ref', '$sqlDate', '$bank_trans_type_id', 
+       $sql .= "VALUES ($type, $trans_no, '$bank_act', '$ref', '$sqlDate', '$bank_trans_type_id', 
                $amount_bank, $person_type_id, '$person_id')";
                                                
        if ($err_msg == "")
@@ -73,7 +73,7 @@ function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=
 
 function get_gl_trans_value($account, $type, $trans_no)
 {
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account=$account AND type=$type AND type_no=$trans_no";
+       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account='$account' AND type=$type AND type_no=$trans_no";
        
        $result = db_query($sql, "query for gl trans value");
        

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index fe71fb2d4907110a4435d7dcbbf28f812ff9f1e0..d2e766ad8dc4c59ca0826e36d9897466f87a0e33 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -37,7 +37,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
        $sql .= ") ";
 
        $sql .= "VALUES ($type, $trans_id, '$date',
-               $account, $dimension, $dimension2, '$memo_', $amount_in_home_currency";
+               '$account', $dimension, $dimension2, '$memo_', $amount_in_home_currency";
 
        if ($person_type_id != null)
                $sql .= ", $person_type_id, '$person_id'";
@@ -82,7 +82,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE '%$trans_no'";
 
        if ($account != null)
-               $sql .= " AND ".TB_PREF."gl_trans.account = $account";
+               $sql .= " AND ".TB_PREF."gl_trans.account = '$account'";
 
        if ($dimension > 0)
                $sql .= " AND ".TB_PREF."gl_trans.dimension_id = $dimension";
@@ -118,7 +118,7 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d
        $to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-               WHERE account='" . $account . "'";
+               WHERE account='$account'";
        if ($from_date != "")
                $sql .= "  AND tran_date > '$from'";
        if ($to_date != "")
@@ -142,7 +142,7 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
        $to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-               WHERE account='" . $account . "'";
+               WHERE account='$account'";
        if ($from_date != "")
                $sql .= " AND tran_date >= '$from'";
        if ($to_date != "")

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index d6587c3143365be774e3575a0f921f6a5e54dfcc..5ab5b30b6c1f61a16a6248ce57bc49c604142edc 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -40,7 +40,7 @@ function gl_inquiry_controls()
 function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) {
 
        $sql = "SELECT SUM(amount) As TransactionSum FROM ".TB_PREF."gl_trans
-               WHERE account=$account";
+               WHERE account='$account'";
 
        if ($from) 
        {

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 9ff0fa7a73c906d28f88edbf0e81cf70221c0d6f..1a10f41423395fb8eaff9821279ac4deb84c635d 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -47,14 +47,16 @@ if (isset($_POST['add']) || isset($_POST['update']))
                $input_error = 1;
                display_error( _("The account name cannot be empty."));
        } 
-       elseif (!is_numeric($_POST['account_code'])) 
+       elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
        {
-               $input_error = 1;
-               display_error( _("The account code must be numeric."));
+           $input_error = 1;
+           display_error( _("The account code must be numeric."));
        }
 
        if ($input_error != 1)
        {
+               if ($accounts_alpha == 2)
+                       $_POST['account_code'] = strtoupper($_POST['account_code']);
        if ($selected_account)
                update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);                 
        else
@@ -69,7 +71,7 @@ function can_delete($selected_account)
 {
        if ($selected_account == "")
                return false;
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account=$selected_account";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'";
        $result = db_query($sql,"Couldn't test for existing transactions");
 
        $myrow = db_fetch_row($result);
@@ -79,23 +81,23 @@ function can_delete($selected_account)
                return false;
        }
 
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$selected_account 
-               OR pyt_discount_act=$selected_account 
-               OR creditors_act=$selected_account 
-               OR grn_act=$selected_account 
-               OR exchange_diff_act=$selected_account 
-               OR purch_exchange_diff_act=$selected_account 
-               OR retained_earnings_act=$selected_account
-               OR freight_act=$selected_account
-               OR default_sales_act=$selected_account 
-               OR default_sales_discount_act=$selected_account
-               OR default_prompt_payment_act=$selected_account
-               OR default_inventory_act=$selected_account
-               OR default_cogs_act=$selected_account
-               OR default_adj_act=$selected_account
-               OR default_inv_sales_act=$selected_account
-               OR default_assembly_act=$selected_account
-               OR payroll_act=$selected_account";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' 
+               OR pyt_discount_act='$selected_account' 
+               OR creditors_act='$selected_account' 
+               OR grn_act='$selected_account' 
+               OR exchange_diff_act='$selected_account' 
+               OR purch_exchange_diff_act='$selected_account' 
+               OR retained_earnings_act='$selected_account'
+               OR freight_act='$selected_account'
+               OR default_sales_act='$selected_account' 
+               OR default_sales_discount_act='$selected_account'
+               OR default_prompt_payment_act='$selected_account'
+               OR default_inventory_act='$selected_account'
+               OR default_cogs_act='$selected_account'
+               OR default_adj_act='$selected_account'
+               OR default_inv_sales_act='$selected_account'
+               OR default_assembly_act='$selected_account'
+               OR payroll_act='$selected_account'";
        $result = db_query($sql,"Couldn't test for default company GL codes");
 
        $myrow = db_fetch_row($result);
@@ -105,7 +107,7 @@ function can_delete($selected_account)
                return false;
        }
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code=$selected_account";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code='$selected_account'";
        $result = db_query($sql,"Couldn't test for bank accounts");
 
        $myrow = db_fetch_row($result);
@@ -116,10 +118,10 @@ function can_delete($selected_account)
        }       
 
        $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
-               inventory_account=$selected_account 
-               OR cogs_account=$selected_account
-               OR adjustment_account=$selected_account 
-               OR sales_account=$selected_account";
+               inventory_account='$selected_account' 
+               OR cogs_account='$selected_account'
+               OR adjustment_account='$selected_account' 
+               OR sales_account='$selected_account'";
        $result = db_query($sql,"Couldn't test for existing stock GL codes");
 
        $myrow = db_fetch_row($result);
@@ -129,7 +131,7 @@ function can_delete($selected_account)
                return false;
        }       
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$selected_account OR purchasing_gl_code=$selected_account";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code='$selected_account' OR purchasing_gl_code='$selected_account'";
        $result = db_query($sql,"Couldn't test for existing tax GL codes");
 
        $myrow = db_fetch_row($result);
@@ -140,10 +142,10 @@ function can_delete($selected_account)
        }       
        
        $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
-               sales_account=$selected_account 
-               OR sales_discount_account=$selected_account
-               OR receivables_account=$selected_account
-               OR payment_discount_account=$selected_account";
+               sales_account='$selected_account' 
+               OR sales_discount_account='$selected_account'
+               OR receivables_account='$selected_account'
+               OR payment_discount_account='$selected_account'";
        $result = db_query($sql,"Couldn't test for existing cust branch GL codes");
 
        $myrow = db_fetch_row($result);
@@ -154,9 +156,9 @@ function can_delete($selected_account)
        }               
        
        $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
-               purchase_account=$selected_account 
-               OR payment_discount_account=$selected_account 
-               OR payable_account=$selected_account";
+               purchase_account='$selected_account' 
+               OR payment_discount_account='$selected_account' 
+               OR payable_account='$selected_account'";
        $result = db_query($sql,"Couldn't test for existing suppliers GL codes");
 
        $myrow = db_fetch_row($result);

diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc
index 988d1d1801cdcc1fa73ed12c66b5f1acf086e612..a46455841b7a889baaa0cb114030d8c1986ce746 100644 (file)
--- a/inventory/includes/db/items_db.inc
+++ b/inventory/includes/db/items_db.inc
@@ -7,11 +7,11 @@ function update_item($stock_id, $description, $long_description, $category_id, $
        $sql = "UPDATE ".TB_PREF."stock_master SET long_description='$long_description',
                description='$description',
                category_id='$category_id',
-               sales_account=$sales_account,
-               inventory_account=$inventory_account,
-               cogs_account=$cogs_account,
-               adjustment_account=$adjustment_account,
-               assembly_account=$assembly_account,
+               sales_account='$sales_account',
+               inventory_account='$inventory_account',
+               cogs_account='$cogs_account',
+               adjustment_account='$adjustment_account',
+               assembly_account='$assembly_account',
                dimension_id=$dimension_id,
                dimension2_id=$dimension2_id,
                tax_type_id=$tax_type_id
@@ -29,8 +29,8 @@ function add_item($stock_id, $description, $long_description, $category_id, $tax
                adjustment_account, assembly_account, dimension_id, dimension2_id)
                VALUES ('$stock_id', '$description', '$long_description',
                '$category_id', $tax_type_id, '$units', '$mb_flag',
-               $sales_account, $inventory_account, $cogs_account,
-               $adjustment_account, $assembly_account, $dimension_id, $dimension2_id)";
+               '$sales_account', '$inventory_account', '$cogs_account',
+               '$adjustment_account', '$assembly_account', $dimension_id, $dimension2_id)";
 
        db_query($sql, "The item could not be added");
 

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 51c0aa6fa536a3047f3e55ddd1ef216f3f078a7c..8d7a17a6a8a21d16129ecab33a523986d6d82a99 100644 (file)
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -73,10 +73,10 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                area='" . $_POST['area'] . "',
                email='" . $_POST['email'] . "',
                tax_group_id=" . $_POST['tax_group_id'] . ",
-                               sales_account=" . $_POST['sales_account'] . ",
-                               sales_discount_account=" . $_POST['sales_discount_account'] . ",
-                               receivables_account=" . $_POST['receivables_account'] . ",
-                               payment_discount_account=" . $_POST['payment_discount_account'] . ",
+                               sales_account='" . $_POST['sales_account'] . "',
+                               sales_discount_account='" . $_POST['sales_discount_account'] . "',
+                               receivables_account='" . $_POST['receivables_account'] . "',
+                               payment_discount_account='" . $_POST['payment_discount_account'] . "',
                default_location='" . $_POST['default_location'] . "',
                br_post_address = '" . $_POST['br_post_address'] . "',
                disable_trans=" . $_POST['disable_trans'] . ",
@@ -96,11 +96,11 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                                        $_POST['br_address'] . "', '" . $_POST['salesman'] . "', '" .
                                        $_POST['phone'] . "', '" . $_POST['fax'] . "','" .
                                        $_POST['contact_name'] . "', '" . $_POST['area'] . "','" .
-                                       $_POST['email'] . "', " . $_POST['tax_group_id'] . ", " .
-                                       $_POST['sales_account'] . ", " .
-                                       $_POST['receivables_account'] . ", " .
-                                       $_POST['payment_discount_account'] . ", " .
-                                       $_POST['sales_discount_account'] . ", '" .
+                                       $_POST['email'] . "', " . $_POST['tax_group_id'] . ", '" .
+                                       $_POST['sales_account'] . "', '" .
+                                       $_POST['receivables_account'] . "', '" .
+                                       $_POST['payment_discount_account'] . "', '" .
+                                       $_POST['sales_discount_account'] . "', '" .
                                        $_POST['default_location'] . "', '" . $_POST['br_post_address'] . "'," . $_POST['disable_trans'] . ", " . $_POST['default_ship_via'] . ")";
                }