user_list_cells Real name shows empty when not entered in user table. @kvvaradha.

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index eab6f4fa7cf5d58e09528184931a00805ba99f36..8e4da29d0f467e6e59cf4874cc9b8a532661fd91 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -345,7 +345,9 @@ $opts = array(              // default options
                                $img_title = _("Search suppliers");
                                break;
                        case "account":
-                               $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&client_id=" . $id;
+                       case "account2":
+                               $skip = strtolower($type) == "account" ? false : true;
+                               $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
                                $img_title = _("Search GL accounts");
                                break;
                }
@@ -551,10 +553,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, 
@@ -1149,11 +1152,12 @@ function stock_depreciable_fa_list_cells($label, $name, $selected_id=null,
        ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
 
        $year = get_current_fiscalyear();
-       $y = date('Y', strtotime($year['end']));
+       $begin = date2sql(add_months(sql2date($year['begin']), -1));
+       $end = date2sql(add_months(sql2date($year['end']), -1));
 
        // check if current fiscal year
-       $where_opts[] = "depreciation_date < '".$y."-12-01'";
-       $where_opts[] = "depreciation_date >= '".($y-1)."-12-01'";
+       $where_opts[] = "depreciation_date <= '".$end."'";
+       $where_opts[] = "depreciation_date >= '".$begin."'";
 
        $where_opts[] = "material_cost > 0";
        $where_opts[] = "mb_flag='F'";
@@ -1202,7 +1206,7 @@ function tax_types_list_row($label, $name, $selected_id=null, $none_option=false
 function tax_groups_list($name, $selected_id=null,
        $none_option=false, $submit_on_change=false)
 {
-       $sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+       $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
                array(
@@ -1311,25 +1315,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";
 }
 
@@ -1819,7 +1825,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                        FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
                        WHERE chart.account_type=type.id";
        if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
-
+       $account = ($skip_bank_accounts ? "account2" : "account");
        return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
                array(
                        'format' => '_format_account',
@@ -1836,7 +1842,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                        'async' => false,
                        'category' => 2,
                        'show_inactive' => $all
-               ), "account" );
+               ), $account );
 }
 
 function _format_account($row)
@@ -2637,12 +2643,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');
 
@@ -2685,7 +2691,7 @@ function accounts_type_list_row($label, $name, $selected_id=null)
 function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
 {
     $where = false;
-    $sql = " SELECT user_id, real_name FROM ".TB_PREF."users";
+       $sql = " SELECT user_id, IF(real_name = ' ', user_id, real_name) FROM ".TB_PREF."users";
 
     if ($label != null)
         echo "<td>$label</td>\n";