- cosine massive update allowing for sub-types of financial documents

www/customers-users-activities.tcl

@@ -9,8 +9,8 @@ select
 	sum(amount) as amount
 from	(
 	select	CASE
-			WHEN c.cost_type_id=3700 THEN 'im_invoice'
-			WHEN c.cost_type_id=3702 THEN 'im_quote'
+			WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN 'im_invoice'
+			WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) THEN 'im_quote'
 		END as type,
 		c.customer_id as customer_id,
 		o.creation_user as user_id,
@@ -20,7 +20,7 @@ from	(
 		acs_objects o
 	where	c.cost_id = o.object_id and
 		c.effective_date > now()::date - 90 and
-		c.cost_type_id in (3700, 3702)
+		c.cost_type_id in ([join [im_sub_categories {3700 3702}] ","])
 UNION
 	select	o.object_type as type,
 		p.company_id as customer_id,

www/finance-costs-monthly.tcl

@@ -143,10 +143,7 @@ set sql "
 		(select * from im_biz_object_urls where url_type = 'view') bou
 	where	c.cost_id = o.object_id and
 		o.object_type = bou.object_type and
-		c.cost_type_id in (
-			[im_cost_type_expense_item],
-			[im_cost_type_bill]
-		)
+		c.cost_type_id in ([join [im_sub_categories [list [im_cost_type_expense_item] [im_cost_type_bill]]] ","])
 	        and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	        and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 	        and c.effective_date::date < to_date(:end_date, 'YYYY-MM-DD')

www/finance-documents-projects.tcl

@@ -246,7 +246,7 @@ from
 	) r
 where
 	c.cost_id = r.cost_id 
-	and c.cost_type_id in (3700, 3702, 3704, 3706)
+	and c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706}] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 	and c.effective_date::date < to_date(:end_date, 'YYYY-MM-DD')
@@ -264,17 +264,17 @@ 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 = 3700 THEN c.amount_converted END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.amount_converted END as quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_converted END as bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.amount_converted END as po_amount,
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3702 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3704 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3706 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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,
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty,
 	p.project_name,

www/finance-income-statement.tcl

@@ -191,7 +191,7 @@ from
 	im_costs c
 	LEFT OUTER JOIN acs_rels r on (c.cost_id = r.object_id_two)
 where
-	c.cost_type_id in (3700, 3704, 3720)
+	c.cost_type_id in ([join [im_sub_categories {3700 3704 3720}] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 	and c.effective_date::date < to_date(:end_date, 'YYYY-MM-DD')
@@ -209,21 +209,21 @@ set sql "
 select
 	c.*,
 	to_char(c.effective_date, :date_format) as effective_date_formatted,
-	CASE WHEN c.cost_type_id = 3700 THEN c.amount_conv END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_conv END as bill_amount,
-	CASE WHEN c.cost_type_id = 3720 THEN c.amount_conv END as expense_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv END as invoice_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) THEN c.amount_conv END as bill_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3720] ","]) THEN c.amount_conv END as expense_amount,
 	cust.company_path as customer_nr,
 	cust.company_name as customer_name,
 	prov.company_path as provider_nr,
 	prov.company_name as provider_name,
 	CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * vat / 100
-		WHEN c.cost_type_id in (3704,3720,3720) THEN -c.amount_conv * vat / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * vat / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories {3704 3720}] ","]) THEN -c.amount_conv * vat / 100
 		ELSE 0
 	END as vat_amount,
 	CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * tax / 100
-		WHEN c.cost_type_id in (3704,3720,3720) THEN -c.amount_conv * tax / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * tax / 100
+		WHEN c.cost_type_id in [join [im_sub_categories {3704 3720}] ","]) THEN -c.amount_conv * tax / 100
 		ELSE 0
 	END as tax_amount,
 	cust.company_id as customer_id,

www/finance-monthly-summary.tcl

@@ -166,7 +166,7 @@ select
 from
 	im_costs c
 where
-	c.cost_type_id in (3700, 3702, 3704, 3706)
+	c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706}] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 	$where_clause
@@ -181,14 +181,14 @@ select
 	cust.company_name as customer_name,
 	prov.company_path as provider_nr,
 	prov.company_name as provider_name,
-	CASE WHEN c.cost_type_id = 3700 THEN c.amount_converted END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.amount_converted END as quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_converted END as bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.amount_converted END as po_amount,
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as invoice_amount_pretty,
-	CASE WHEN c.cost_type_id = 3702 THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as quote_amount_pretty,
-	CASE WHEN c.cost_type_id = 3704 THEN to_char(c.amount, :cur_format) || ' ' || c.currency END as bill_amount_pretty,
-	CASE WHEN c.cost_type_id = 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 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,
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty
 from
 	($inner_sql) c

www/finance-payment-balance.tcl

@@ -189,7 +189,7 @@ from
 	LEFT OUTER JOIN im_costs c on (p.cost_id = c.cost_id)
 	LEFT OUTER JOIN acs_rels r on (c.cost_id = r.object_id_two)
 where
-	c.cost_type_id in (3700, 3702, 3704, 3706)
+	c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706}] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 "
@@ -204,18 +204,18 @@ select
 	cust.company_name as customer_name,
 	prov.company_path as provider_nr,
 	prov.company_name as provider_name,
-	CASE WHEN c.cost_type_id = 3700 THEN c.paid_amount_converted END as paid_invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.paid_amount_converted END as paid_quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.paid_amount_converted END as paid_bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.paid_amount_converted END as paid_po_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) c.paid_amount_converted END as paid_invoice_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) c.paid_amount_converted END as paid_quote_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) c.paid_amount_converted END as paid_bill_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) c.paid_amount_converted END as paid_po_amount,
 
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
 	END as paid_invoice_amount_pretty,
-	CASE WHEN c.cost_type_id = 3702 THEN to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
 	END as paid_quote_amount_pretty,
-	CASE WHEN c.cost_type_id = 3704 THEN to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
 	END as paid_bill_amount_pretty,
-	CASE WHEN c.cost_type_id = 3706 THEN to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency 
 	END as paid_po_amount_pretty,
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty,
 	p.project_name,

www/finance-project-hierarchy-documents.tcl

@@ -274,7 +274,7 @@ set inner_sql "
 		c.cost_id = o.object_id
 		and (
 			c.cost_type_id is null 
-			OR c.cost_type_id in (3700, 3702, 3704, 3706, 3718, 3722, 3724, null)
+			OR c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706 3718 3722 3724}] ","])
 		)
 "
 
@@ -297,27 +297,27 @@ select
 	mainp.project_nr as main_project_nr,
 	mainp.project_name as main_project_name,
 
-	CASE WHEN c.cost_type_id = 3700 THEN c.amount_converted END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.amount_converted END as quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_converted END as bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.amount_converted END as po_amount,
-	CASE WHEN c.cost_type_id = 3718 THEN c.amount_converted END as timesheet_amount,
-	CASE WHEN c.cost_type_id = 3722 THEN c.amount_converted END as expense_amount,
-	CASE WHEN c.cost_type_id = 3724 THEN c.amount_converted END as delnote_amount,
+	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 3718] ","]) THEN c.amount_converted END as timesheet_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3722] ","]) THEN c.amount_converted END as expense_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3724] ","]) THEN c.amount_converted END as delnote_amount,
 
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3702 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3704 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3706 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3718 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3718] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as timesheet_amount_pretty,
-	CASE WHEN c.cost_type_id = 3722 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3722] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as expense_amount_pretty,
-	CASE WHEN c.cost_type_id = 3724 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3724] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as delnote_amount_pretty,
 
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty,

www/finance-projects-documents.tcl

@@ -295,7 +295,7 @@ set inner_sql "
 		c.cost_id = o.object_id
 		and (
 			c.cost_type_id is null 
-			OR c.cost_type_id in (3700, 3702, 3704, 3706, 3718, 3722, 3724, null)
+			OR c.cost_type_id in ([join [im_sub_categories {3700 3702 3704 3706 3718 3722 3724}] ","])
 		)
 "
 
@@ -327,27 +327,27 @@ select
 	prov.company_path as provider_nr,
 	prov.company_name as provider_name,
 
-	CASE WHEN c.cost_type_id = 3700 THEN c.amount_converted END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.amount_converted END as quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_converted END as bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.amount_converted END as po_amount,
-	CASE WHEN c.cost_type_id = 3718 THEN c.amount_converted END as timesheet_amount,
-	CASE WHEN c.cost_type_id = 3722 THEN c.amount_converted END as expense_amount,
-	CASE WHEN c.cost_type_id = 3724 THEN c.amount_converted END as delnote_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) c.amount_converted END as invoice_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) c.amount_converted END as quote_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) c.amount_converted END as bill_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) c.amount_converted END as po_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3718] ","]) c.amount_converted END as timesheet_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3722] ","]) c.amount_converted END as expense_amount,
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3724] ","]) c.amount_converted END as delnote_amount,
 
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as invoice_amount_pretty,
-	CASE WHEN c.cost_type_id = 3702 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3702] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as quote_amount_pretty,
-	CASE WHEN c.cost_type_id = 3704 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3704] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as bill_amount_pretty,
-	CASE WHEN c.cost_type_id = 3706 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3706] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as po_amount_pretty,
-	CASE WHEN c.cost_type_id = 3718 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3718] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as timesheet_amount_pretty,
-	CASE WHEN c.cost_type_id = 3722 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3722] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as expense_amount_pretty,
-	CASE WHEN c.cost_type_id = 3724 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in ([join [im_sub_categories 3724] ","]) to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as delnote_amount_pretty,
 
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty,

www/finance-subprojects-documents.tcl

@@ -296,34 +296,34 @@ set inner_sql "
 		parent.end_date::date < to_date(:end_date, 'YYYY-MM-DD') and
 		child.tree_sortkey between parent.tree_sortkey and tree_right(parent.tree_sortkey) and
 		child.project_status_id not in ([im_project_status_deleted]) and
-		(c.cost_type_id is null OR c.cost_type_id in (3700, 3702, 3704, 3706, 3718, 3722, 3724))
+		(c.cost_type_id is null OR c.cost_type_id in ([join [im_sub_categories {3700, 3702, 3704, 3706, 3718, 3722, 3724}] ","])
 		$where_clause
 "
 
 
 set sql "
 select	c.*,
-	CASE WHEN c.cost_type_id = 3700 THEN c.amount_converted END as invoice_amount,
-	CASE WHEN c.cost_type_id = 3702 THEN c.amount_converted END as quote_amount,
-	CASE WHEN c.cost_type_id = 3704 THEN c.amount_converted END as bill_amount,
-	CASE WHEN c.cost_type_id = 3706 THEN c.amount_converted END as po_amount,
-	CASE WHEN c.cost_type_id = 3718 THEN c.amount_converted END as timesheet_amount,
-	CASE WHEN c.cost_type_id = 3722 THEN c.amount_converted END as expense_amount,
-	CASE WHEN c.cost_type_id = 3724 THEN c.amount_converted END as delnote_amount,
-
-	CASE WHEN c.cost_type_id = 3700 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 3718] ","]) THEN c.amount_converted END as timesheet_amount,
+	CASE WHEN c.cost_type_id in([join [im_sub_categories 3722] ","]) THEN c.amount_converted END as expense_amount,
+	CASE WHEN c.cost_type_id in([join [im_sub_categories 3724] ","]) THEN c.amount_converted END as delnote_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 = 3702 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3704 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3706 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	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 = 3718 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in([join [im_sub_categories 3718] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as timesheet_amount_pretty,
-	CASE WHEN c.cost_type_id = 3722 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in([join [im_sub_categories 3722] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as expense_amount_pretty,
-	CASE WHEN c.cost_type_id = 3724 THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
+	CASE WHEN c.cost_type_id in([join [im_sub_categories 3724] ","]) THEN to_char(c.amount, :cur_format) || ' ' || c.currency 
 	END as delnote_amount_pretty,
 	to_char(c.paid_amount, :cur_format) || ' ' || c.paid_currency as paid_amount_pretty
 from

www/finance-vat-advanced.tcl

@@ -195,7 +195,7 @@ from
 	im_costs c
 	LEFT OUTER JOIN acs_rels r on (c.cost_id = r.object_id_two)
 where
-	c.cost_type_id in (3700)
+	c.cost_type_id in ([join [im_sub_categories 3700] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 "
@@ -217,11 +217,11 @@ select
 		ascii(vat_type)::numeric 
 	as quarter_cost_type_vat_type,
 	round(CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * vat / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * vat / 100
 		ELSE 0
 	END,2) as vat_amount,
 	round(CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * tax / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * tax / 100
 		ELSE 0
 	END,2) as tax_amount,
 	cust.company_id as customer_id,
@@ -426,10 +426,8 @@ db_foreach sql $sql {
 	set quarter_cost_type_vat_type $cost_id
     }
 
-    set invoice_or_quote_p [expr $cost_type_id == [im_cost_type_invoice] || $cost_type_id == [im_cost_type_quote] || $cost_type_id == [im_cost_type_delivery_note] || $cost_type_id == [im_cost_type_interco_quote] || $cost_type_id == [im_cost_type_interco_invoice]]
-
+    set invoice_or_quote_p [im_cost_type_is_invoice_or_quote_p $cost_type_id]
     set vat_number $customer_vat_number
-
     set cost_item_amount_pretty [im_report_format_number $cost_item_amount $output_format $number_locale]
     set vat_amount_pretty [im_report_format_number $vat_amount $output_format $number_locale]
     set tax_amount_pretty [im_report_format_number $tax_amount $output_format $number_locale]

www/finance-vat.tcl

@@ -205,7 +205,7 @@ from
 	im_costs c
 	LEFT OUTER JOIN acs_rels r on (c.cost_id = r.object_id_two)
 where
-	c.cost_type_id in (3700,3704,3720,3730,3732)
+	c.cost_type_id in ([join [im_sub_categories [list 3700 3704 3720 3730 3732]] ","])
 	and c.effective_date >= to_date(:start_date, 'YYYY-MM-DD')
 	and c.effective_date < to_date(:end_date, 'YYYY-MM-DD')
 "
@@ -236,13 +236,13 @@ select
 		ascii(vat_type)::numeric 
 	as quarter_cost_type_vat_type,
 	round(CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * vat / 100
-		WHEN c.cost_type_id in (3704,3720,3720) THEN -c.amount_conv * vat / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * vat / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories {3704 3720}] ","]) THEN -c.amount_conv * vat / 100
 		ELSE 0
 	END,2) as vat_amount,
 	round(CASE
-		WHEN c.cost_type_id in (3700) THEN c.amount_conv * tax / 100
-		WHEN c.cost_type_id in (3704,3720,3720) THEN -c.amount_conv * tax / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories 3700] ","]) THEN c.amount_conv * tax / 100
+		WHEN c.cost_type_id in ([join [im_sub_categories {3704 3720}] ","]) THEN -c.amount_conv * tax / 100
 		ELSE 0
 	END,2) as tax_amount,
 	cust.company_id as customer_id,
@@ -595,7 +595,7 @@ db_foreach sql $sql {
 	set quarter_cost_type_vat_type $cost_id
     }
 
-    set invoice_or_quote_p [expr $cost_type_id == [im_cost_type_invoice] || $cost_type_id == [im_cost_type_quote] || $cost_type_id == [im_cost_type_delivery_note] || $cost_type_id == [im_cost_type_interco_quote] || $cost_type_id == [im_cost_type_interco_invoice]]
+    set invoice_or_quote_p [im_cost_type_is_invoice_or_quote_p $cost_type_id]
     if {$invoice_or_quote_p} {
 	set vat_number $customer_vat_number
     } else {
@@ -617,7 +617,7 @@ db_foreach sql $sql {
     if {$customer_id == [im_company_internal]} {
 	set company_html "<a href=$company_url$provider_id>$provider_name</a>"
     }
-    if {$cost_type_id == [im_cost_type_expense_item]} {
+    if {$cost_type_id in [im_sub_categories [im_cost_type_expense_item]]} {
 	set company_html $external_company_name
     }