067 end customer

deal.cfm

@@ -231,6 +231,9 @@
 			,siv.params::text
 			,a.__id::text as additional_agreement_uid
 			,a.__name as additional_agreement
+			,siv.end_customer as end_customer_uid
+			,z.id_klienta as end_customer_wz
+			,z.__name as end_customer_name
 			,(select 
 				sum(siv.cnt*(100-COALESCE(siv.discount,0))/100*p.price*p.cnt*(100-COALESCE(p.discount,0))/100) 			
 				from elma.service_parametrs p 
@@ -242,6 +245,7 @@
 			) as param_cnt
 			from elma.deals_services siv
 			left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
+			left outer join elma.companies z on (siv.end_customer=z.__id)
 			where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid("guid",d.__id)#/>=ANY(siv.deal) 
 			and siv.is_actual
 			order by version::int
@@ -273,6 +277,7 @@
 					<th>is_easy</th>
 					<th>Компонентов</th>
 					<th width="12%">additional_agreement</th>
+					<th>Конечный клиент</th>
 				</tr>
 			</thead>
 			
@@ -308,8 +313,9 @@
 					<td class="c"><cfif is_easy GT 0>Простая<cfelseif is_easy EQ 0>Композитная<cfelse>is_easy=#is_easy#</cfif></td>
 					<td class="c">#param_cnt#</td>
 					
-					<!--- <td class="c">#additional_agreement_uid#</td> --->
+					<!--- <td class="c">#additional_agreement_uid#</td> --->					
 					<td class="c"><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
+					<td class="c"><a href="contragent.cfm?__id=#end_customer_uid#&#tr.fwx#">#end_customer_wz# #end_customer_name#</a></td>
 				</tr>
 			</cfoutput>		
 		</table>