Improved quick entries.

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 52475c4eb5d4b0b952059f3f425a6fd51851b0ea..46194019b9bf99e37a40eb6bfda67f66b5dc910a 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1715,49 +1715,6 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate
        return $str;
 }
 
-//------------------------------------------------------------------------------------------------
-
-function quick_entries_list($name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
-       $where = false;
-       $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
-       if ($expense != -1)
-       {
-               $sql .= " WHERE deposit=$expense";
-               $where = true;
-       }       
-       if ($bank_only != -1)
-       {
-               if ($where)
-                       $sql .= " AND bank_only=$bank_only";
-               else    
-                       $sql .= " WHERE bank_only=$bank_only";
-       }
-       combo_input($name, $selected_id, $sql, 'id', 'description',
-               array(
-                       'spec_id' => '',
-                       'order' => 'description',
-                       'select_submit'=> $submit_on_change,
-                       'async' => false
-               ) );
-
-}
-
-function quick_entries_list_cells($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
-       echo "<td>$label</td><td>\n";
-       quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
-       echo "</td>";
-}
-
-function quick_entries_list_row($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
-       echo "<tr>\n";
-       quick_entries_list_cells($label, $name, $selected_id, $expense, $bank_only, $submit_on_change);
-       echo "</tr>\n";
-}
-
-
 //------------------------------------------------------------------------------------------------
 
 function wo_types_list($name, $selected_id=null)
@@ -2040,5 +1997,63 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha
                 ));
 }
 
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false)
+{
+       $where = false;
+       $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+       if ($type != null)
+               $sql .= " WHERE type=$type";
+
+       combo_input($name, $selected_id, $sql, 'id', 'description',
+               array(
+                       'spec_id' => '',
+                       'order' => 'description',
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
+
+}
+
+function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+       echo "<td>$label</td><td>\n";
+       quick_entries_list($name, $selected_id, $type, $submit_on_change);
+       echo "</td>";
+}
+
+function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+       echo "<tr>\n";
+       quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change);
+       echo "</tr>\n";
+}
+
+
+function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $quick_actions;
+       
+       echo "<tr><td>$label</td><td>";
+       array_selector($name, $selected_id, $quick_actions, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
+
+function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $quick_entry_types;
+               
+       echo "<tr><td>$label</td><td>";
+       array_selector($name, $selected_id, $quick_entry_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+                       ) );
+       echo "</td></tr>\n";
+}
+
 
 ?>
\ No newline at end of file