Commit 4a7bc754 authored by Frank Bergmann's avatar Frank Bergmann

Beautified document type, using const instead of hard-coded integers

parent 063bb13f
......@@ -244,7 +244,7 @@ from
) r
where
c.cost_id = r.cost_id
and c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706}] ","])
and c.cost_type_id in ([join [im_sub_categories [list [im_cost_type_invoice] [im_cost_type_quote] [im_cost_type_bill] [im_cost_type_po]]] ","])
and c.cost_status_id not in ([join [im_sub_categories [im_cost_status_deleted]] ","])
and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
......@@ -263,18 +263,14 @@ select
im_category_from_id(cust.company_status_id) as customer_status,
prov.company_path as provider_nr,
prov.company_name as provider_name,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_converted END as invoice_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) THEN c.amount_converted END as quote_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) THEN c.amount_converted END as bill_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) THEN c.amount_converted END as po_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency
END as invoice_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency
END as quote_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency
END as bill_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency
END as po_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_invoice]] ","]) THEN c.amount_converted END as invoice_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_quote]] ","]) THEN c.amount_converted END as quote_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_bill]] ","]) THEN c.amount_converted END as bill_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_po]] ","]) THEN c.amount_converted END as po_amount,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_invoice]] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as invoice_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_quote]] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as quote_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_bill]] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as bill_amount_pretty,
CASE WHEN c.cost_type_id in ([join [im_sub_categories [im_cost_type_po]] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as po_amount_pretty,
to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty,
p.project_name,
p.project_nr,
......
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