Error line break on supplier_list_cells when label is set to null. Fixed by @notrinos...

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index eab6f4fa7cf5d58e09528184931a00805ba99f36..db706969e68afad534bae17d8ef6cf7adcd5e6fc 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -551,10 +551,11 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false
        $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
-               echo "<td>$label</td><td>\n";
-               echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+               echo "<td>$label</td>\n";
+       echo "<td>";    
+       echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
                $all, $editkey);
-               echo "</td>\n";
+       echo "</td>\n";
 }
 
 function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
@@ -1311,25 +1312,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
 {
        $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
-       return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+       return combo_input($name, $selected_id, $sql, 'area_code', 'description', 
+               array('spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0));
 }
 
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo sales_areas_list($name, $selected_id);
+       echo sales_areas_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       sales_areas_list_cells(null, $name, $selected_id);
+       sales_areas_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 
@@ -2637,12 +2640,12 @@ function subledger_list($name, $account, $selected_id=null)
                FROM "
                .TB_PREF."debtors_master d,"
                .TB_PREF."cust_branch c
-               WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+               WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
        else
                $sql = "SELECT supplier_id as id, supp_ref as name 
                FROM "
                .TB_PREF."suppliers s
-               WHERE s.payable_account=".db_escape($account);
+               WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
 
        $mode = get_company_pref('no_customer_list');