- continued with sending out MIME-mail

www/customers/accounting-contact.tcl

@@ -34,19 +34,22 @@ where c.customer_id = :customer_id
 }]
     
 set sql "
-select
+select distinct
         u.user_id,
         im_name_from_user_id(u.user_id) as name,
         im_email_from_user_id(u.user_id) as email
 from
         users u,
-        acs_rels r,
-        group_member_map m
+        acs_rels r
 where
         r.object_id_one = :customer_id
         and r.object_id_two = u.user_id
-        and m.member_id = u.user_id
-        and m.group_id=[im_customer_group_id]
+        and not exists (
+		select	member_id
+		from	group_member_map m
+		where	m.member_id = u.user_id
+			and m.group_id = [im_employee_group_id]
+	)       
 order by lower(name)
 "
 

www/customers/primary-contact.tcl

@@ -37,19 +37,22 @@ where
 }]
 
 set sql "
-select
-	u.user_id,
-	im_name_from_user_id(u.user_id) as name,
-	im_email_from_user_id(u.user_id) as email
+select distinct
+        u.user_id,
+        im_name_from_user_id(u.user_id) as name,
+        im_email_from_user_id(u.user_id) as email
 from
-	users u,
-	acs_rels r,
-	group_member_map m
+        users u,
+        acs_rels r
 where
-	r.object_id_one = :customer_id
-	and r.object_id_two = u.user_id
-	and m.member_id = u.user_id
-	and m.group_id=[im_customer_group_id]
+        r.object_id_one = :customer_id
+        and r.object_id_two = u.user_id
+        and not exists (
+		select	member_id
+		from	group_member_map m
+		where	m.member_id = u.user_id
+			and m.group_id = [im_employee_group_id]
+	)
 order by lower(name)
 "
 

www/customers/view.tcl

@@ -270,7 +270,7 @@ set company_members [im_group_member_component $customer_id $user_id $admin $ret
 
 set enable_project_estimates 0
 set also_add_to_group [im_customer_group_id]
-set customer_members [im_group_member_component $customer_id $user_id $admin $return_url [im_customer_group_id] [im_employee_group_id] $also_add_to_group]
+set customer_members [im_group_member_component $customer_id $user_id $admin $return_url "" [im_employee_group_id] $also_add_to_group]