Moving tax_included to sales_types,changed coinstraint for tax type name,

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 3c7fd1e59ee23bc73e5f09a2fa4abf32f2bd760a..e2c79201209ea54fc622c45e2936dd2a98e67ffe 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);
 }
 
@@ -2079,6 +2079,7 @@ function cust_allocations_list_cells($label, $name, $selected)
        echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
        echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
        echo "<option " . ($selected == '4'?" selected ":"") . " value='4'>" . _("Credit Notes"). "</option>\n";
+       echo "<option " . ($selected == '5'?" selected ":"") . " value='5'>" . _("Delivery Notes"). "</option>\n";
        echo "</select></td>\n";
 }