Changes in POS extension related to bank accounts structure changes.

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 0d38d72203d202131b40c275f4f6afffaa4d0b8d..3a0ec674006721ad622286ae2348a4f765bcf6a1 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1197,8 +1197,9 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false
 function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
        $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
-               FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
+               FROM ".TB_PREF."bank_accounts";
+//             , ".TB_PREF."chart_master
+//             WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
 
        return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
@@ -1229,15 +1230,14 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       $sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
-               FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code"
-               . " AND ".TB_PREF."bank_accounts.account_type=3";
+       $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+               FROM ".TB_PREF."bank_accounts
+               WHERE ".TB_PREF."bank_accounts.account_type=3";
 
        if ($label != null)
                echo "<tr><td>$label</td>\n";
        echo "<td>";
-       $str = combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+       $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
@@ -1381,7 +1381,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                        FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
                        ."LEFT JOIN ".TB_PREF."bank_accounts acc "
                        ."ON chart.account_code=acc.account_code
-                               WHERE acc.account_code IS NULL
+                               WHERE acc.account_code  IS NULL
                        AND chart.account_type=type.id";
        else
                $sql = "SELECT chart.account_code, chart.account_name, type.name

diff --git a/sales/includes/db/sales_points_db.inc b/sales/includes/db/sales_points_db.inc
index d444ea7676a9d749af86396ce8fd7e8bd1f00735..d095c71191ca73c143dc6ef917079cba206b9929 100644 (file)
--- a/sales/includes/db/sales_points_db.inc
+++ b/sales/includes/db/sales_points_db.inc
@@ -27,7 +27,7 @@ function get_all_sales_points()
                .TB_PREF."sales_pos as pos,"
                .TB_PREF."locations as loc,"
                .TB_PREF."bank_accounts as acc"
-               ." WHERE pos.pos_location=loc.loc_code AND pos.pos_account=acc.account_code";
+               ." WHERE pos.pos_location=loc.loc_code AND pos.pos_account=acc.id";
        
        return db_query($sql, "could not get all POS definitions");
 } 
@@ -38,7 +38,7 @@ function get_sales_point($id)
                .TB_PREF."sales_pos as pos,"
                .TB_PREF."locations as loc,"
                .TB_PREF."bank_accounts as acc"
-               ." WHERE pos.id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.account_code";
+               ." WHERE pos.id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.id";
        
        $result = db_query($sql, "could not get POS definition");
        

diff --git a/sales/manage/sales_points.php b/sales/manage/sales_points.php
index fabb2fea96b1a4aaba5e59206af444ae2f87316a..dbee5c8225a8997901206cf7867c032f658f8a3a 100644 (file)
--- a/sales/manage/sales_points.php
+++ b/sales/manage/sales_points.php
@@ -108,15 +108,15 @@ if ($selected_id != -1)
                $_POST['name']  = $myrow["pos_name"];
                $_POST['location']  = $myrow["pos_location"];
                $_POST['account']  = $myrow["pos_account"];
-               $_POST['credit_sale']  = $myrow["credit_sale"];
-               $_POST['cash_sale']  = $myrow["cash_sale"];
+               if ($myrow["credit_sale"]) $_POST['credit_sale']  = 1;
+               if ($myrow["cash_sale"]) $_POST['cash_sale'] = 1;
        }
        hidden('selected_id', $selected_id);
 } 
 
 text_row_ex(_("Point of Sale Name").':', 'name', 20, 30);
-check_row(_('Allowed credit sale'), 'credit', null);
-check_row(_('Allowed cash sale'), 'cash', null);
+check_row(_('Allowed credit sale'), 'credit', check_value('credit_sale'));
+check_row(_('Allowed cash sale'), 'cash',  check_value('cash_sale'));
 locations_list_row(_("POS location").':', 'location');
 cash_accounts_list_row(_("Default cash account").':', 'account');
 

diff --git a/sql/alter2.1.sql b/sql/alter2.1.sql
index cdcdd73e14149c68def30770fea62eb05ed3847c..e6057e4d5ef74488dafae4cff1647ca992dfc1b5 100644 (file)
--- a/sql/alter2.1.sql
+++ b/sql/alter2.1.sql
@@ -24,8 +24,7 @@ CREATE TABLE `0_sales_pos` (
   UNIQUE KEY(`pos_name`)
 ) ENGINE=MyISAM AUTO_INCREMENT=3;
 
-INSERT INTO `0_sales_pos` VALUES ('1', 'Default', '1', '1', 'DEF', '1705');
-INSERT INTO `0_sales_pos` VALUES ('2', 'Cash sale', '1', '0', 'CWA', '1705');
+INSERT INTO `0_sales_pos` VALUES ('1', 'Default', '1', '1', 'DEF', '1');
 
 ALTER TABLE `0_users` ADD `pos` SMALLINT(6) DEFAULT '1';