Skip to content

I
intranet-reporting-finance
Commit a621200e authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- fixed issue if translation fields are not available

parent 5d9a233a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
www/finance-project-hierarchy-documents.tcl
View file @ a621200e
...@@ -340,9 +340,7 @@ select ...@@ -340,9 +340,7 @@ select
to_char(p.end_date, :date_format) as end_date_formatted, to_char(p.end_date, :date_format) as end_date_formatted,
to_char(p.start_date, :date_format) as start_date_formatted, to_char(p.start_date, :date_format) as start_date_formatted,
'<a href=/intranet/users/view?user_id=' || p.company_contact_id || '>' || '<a href=/intranet/users/view?user_id=' || p.company_contact_id || '>' ||
im_name_from_user_id(p.company_contact_id) || '</a>' as company_contact_link, im_name_from_user_id(p.company_contact_id) || '</a>' as company_contact_link
im_category_from_id(p.source_language_id) as source_language,
im_category_from_id(p.subject_area_id) as subject_area
from from
($inner_sql) c ($inner_sql) c
LEFT OUTER JOIN im_projects p on (c.project_project_id = p.project_id) LEFT OUTER JOIN im_projects p on (c.project_project_id = p.project_id)
...@@ -633,8 +631,6 @@ set field_options [concat $field_options { ...@@ -633,8 +631,6 @@ set field_options [concat $field_options {
start_date_formatted "Project - End Date" start_date_formatted "Project - End Date"
company_contact_link "Project - Customer Contact" company_contact_link "Project - Customer Contact"
company_project_nr "Project - Customer's Project Nr" company_project_nr "Project - Customer's Project Nr"
source_language "Project - Source Language"
subject_area "Project - Subject Area"
final_company "Project - Final Company" final_company "Project - Final Company"
reported_hours_cache "Project - Reported Hours" reported_hours_cache "Project - Reported Hours"
cost_quotes_cache "Project - Quotes" cost_quotes_cache "Project - Quotes"
......
www/finance-subprojects-documents.tcl
View file @ a621200e
...@@ -255,9 +255,7 @@ set inner_sql " ...@@ -255,9 +255,7 @@ set inner_sql "
to_char(child.end_date, :date_format) as end_date_formatted, to_char(child.end_date, :date_format) as end_date_formatted,
to_char(child.start_date, :date_format) as start_date_formatted, to_char(child.start_date, :date_format) as start_date_formatted,
'<a href=/intranet/users/view?user_id=' || child.company_contact_id || '>' || '<a href=/intranet/users/view?user_id=' || child.company_contact_id || '>' ||
im_name_from_user_id(child.company_contact_id) || '</a>' as company_contact_link, im_name_from_user_id(child.company_contact_id) || '</a>' as company_contact_link
im_category_from_id(child.source_language_id) as source_language,
im_category_from_id(child.subject_area_id) as subject_area,
-- Cost fields -- Cost fields
c.*, c.*,
...@@ -594,8 +592,6 @@ set field_options [concat $field_options { ...@@ -594,8 +592,6 @@ set field_options [concat $field_options {
start_date_formatted "Project - End Date" start_date_formatted "Project - End Date"
company_contact_link "Project - Customer Contact" company_contact_link "Project - Customer Contact"
company_project_nr "Project - Customer's Project Nr" company_project_nr "Project - Customer's Project Nr"
source_language "Project - Source Language"
subject_area "Project - Subject Area"
final_company "Project - Final Company" final_company "Project - Final Company"
reported_hours_cache "Project - Reported Hours" reported_hours_cache "Project - Reported Hours"
cost_quotes_cache "Project - Quotes" cost_quotes_cache "Project - Quotes"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment