X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=6932d5aa9a51ec80364a80002acc94b35389a290;hb=e8707dc974e7153ec0ac304144fcbd246ee5db13;hp=3c7fd1e59ee23bc73e5f09a2fa4abf32f2bd760a;hpb=217f175953339fd10cd5aee5942cc263a4092323;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 3c7fd1e5..6932d5aa 100644
--- 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 "\n";
}
-function sales_persons_list_row($label, $name, $selected_id)
+function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "
\n";
- sales_persons_list_cells($label, $name, $selected_id);
+ sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
echo "
\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 "$label | \n";
echo "";
- sales_types_list($name, $selected_id);
+ sales_types_list($name, $selected_id, $submit_on_change);
echo " | \n";
}
-function sales_types_list_row($label, $name, $selected_id)
+function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "\n";
- sales_types_list_cells($label, $name, $selected_id);
+ sales_types_list_cells($label, $name, $selected_id, $submit_on_change);
echo "
\n";
}
@@ -2079,6 +2079,7 @@ function cust_allocations_list_cells($label, $name, $selected)
echo "\n";
echo "\n";
echo "\n";
+ echo "\n";
echo "\n";
}