( 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'";
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";