Chenaged api for inserted columns

[fa-stable.git] / includes / ui / ui_lists.inc

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index acfe058cb56a1584d996e446f1003505c61c56e3..3a0ec674006721ad622286ae2348a4f765bcf6a1 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -887,26 +887,26 @@ function tax_groups_list($name, $selected_id=null,
        array(
                'order' => 'id',
                'spec_option' => $none_option,
-               'spec_id' => 0,
+               'spec_id' => reserved_words::get_all_numeric(),
                'select_submit'=> $submit_on_change,
                'async' => false,
        ) );
 }
 
-function tax_groups_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = tax_groups_list($name, $selected_id, false, $submit_on_change);
+       $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
        echo "</td>\n";
        return $str;
 }
 
-function tax_groups_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = tax_groups_list_cells($label, $name, $selected_id, false, $submit_on_change);
+       $str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
@@ -1137,7 +1137,7 @@ function movement_types_list_row($label, $name, $selected_id=null)
 }
 
 //-----------------------------------------------------------------------------------------------
-
+/*
 function bank_trans_types_list($name, $selected_id=null)
 {
        $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
@@ -1159,7 +1159,7 @@ function bank_trans_types_list_row($label, $name, $selected_id=null)
        bank_trans_types_list_cells($label, $name, $selected_id);
        echo "</tr>\n";
 }
-
+*/
 //-----------------------------------------------------------------------------------------------
 
 function workcenter_list($name, $selected_id=null, $all_option=false)
@@ -1196,11 +1196,12 @@ 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.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";
+       $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";
 
-       return combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+       return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
@@ -1225,7 +1226,60 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
        echo "</tr>\n";
        return $str;
 }
+//-----------------------------------------------------------------------------------------------
+
+function cash_accounts_list_row($label, $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
+               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, 'id', 'bank_account_name',
+       array(
+               'format' => '_format_add_curr',
+               'select_submit'=> $submit_on_change,
+               'async' => true
+       ) );
+       echo "</td></tr>\n";
+       return $str;
+}
+//-----------------------------------------------------------------------------------------------
+
+function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+{
+       $sql = "SELECT id, pos_name FROM ".TB_PREF."sales_pos";
+
+       default_focus($name);
+       echo '<tr>';
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+
+       $str = combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+       array(
+               'select_submit'=> $submit_on_change,
+               'async' => true,
+               'spec_option' =>$spec_option,
+               'spec_id' => -1,
+       ) );
+       echo "</td></tr>\n";
+
+       return $str;    
+}
+//-----------------------------------------------------------------------------------------------
 
+function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+       echo "</td>\n";
+       return $str;
+}
 //-----------------------------------------------------------------------------------------------
 
 function class_list($name, $selected_id=null, $submit_on_change=false)
@@ -1327,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
@@ -1506,6 +1560,37 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate
        return $str;
 }
 
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
+{
+       $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+       if ($expense)
+               $sql .= " WHERE deposit=0";
+       else
+               $sql .= " WHERE deposit=1";
+       if ($bank_only)
+               $sql .= " AND bank_only=1";
+       else
+               $sql .= " AND bank_only=0";
+       combo_input($name, $selected_id, $sql, 'id', 'description',
+               array(
+                       'spec_id' => '',
+                       'order' => 'description',
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
+
+}
+
+function quick_entries_list_row($label, $name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
+{
+       echo "<tr><td>$label</td><td>\n";
+       quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
+       echo "</td></tr>\n";
+}
+
+
 //------------------------------------------------------------------------------------------------
 
 function wo_types_list($name, $selected_id=null)