Added optional $submit_on_change parameter to sales_type selectors

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 687c035eedccf87261123b83182df277975f90f9..6932d5aa9a51ec80364a80002acc94b35389a290 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1079,7 +1079,7 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
 function tax_types_list($name, $selected_id,
        $none_option=false, $none_option_name=null, $submit_on_change=false)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."tax_types",
+       simple_codeandname_list("SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types",
                $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
 }
 
@@ -1191,10 +1191,10 @@ function sales_persons_list_cells($label, $name, $selected_id)
        echo "</td>\n";
 }
 
-function sales_persons_list_row($label, $name, $selected_id)
+function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
 {
        echo "<tr>\n";
-       sales_persons_list_cells($label, $name, $selected_id);
+       sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
        echo "</tr>\n";
 }
 
@@ -1296,25 +1296,25 @@ function credit_status_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function sales_types_list($name, $selected_id)
+function sales_types_list($name, $selected_id, $submit_on_change=false)
 {
        simple_codeandname_list("SELECT id, sales_type FROM ".TB_PREF."sales_types",
-               $name, $selected_id);
+               $name, $selected_id, false, null, false, $submit_on_change);
 }
 
-function sales_types_list_cells($label, $name, $selected_id)
+function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       sales_types_list($name, $selected_id);
+       sales_types_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function sales_types_list_row($label, $name, $selected_id)
+function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false)
 {
        echo "<tr>\n";
-       sales_types_list_cells($label, $name, $selected_id);
+       sales_types_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }