067 end customer

contragent.cfm

@@ -170,10 +170,14 @@
 			,s.probability_pc
 			,d.__index
 			,d.__id as deal_uid
+			,siv.end_customer as end_customer_uid
+			,z.id_klienta as end_customer_wz
+			,z.__name as end_customer_name
 			from elma.deals_services siv
 			join elma.deals d on d.__id=ANY(siv.deal)
 			join status s on (d.__status_status=s.status_id)
 			join elma.service_parametrs p ON (p.__id = ANY (siv.params) AND p."__deletedAt" IS NULL)
+			left outer join elma.companies z on (siv.end_customer=z.__id)
 			left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
 			where d._companies=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid("guid",d.__id)#/>
 			AND siv.is_actual
@@ -192,24 +196,25 @@
 				<tr>
 					<th>__index</th>
 					<!--- <th>__name</th> --->
-					<th width="20%">user_description</th>
+					<th width="20%">user description</th>
 					<th width="25%">Компоненты</th>
 					<th>Кол-во</th>
 					<th>Скидка%</th>
 					<th width="5%">Сумма</th>
 					<th>Код</th>
 					<th>type</th>									
-					<th>is_actual</th>					
+					<th>is actual</th>					
 					<th>hash</th>
 					<th>version</th>
-					<th>name_version</th>
-					<th>date_accept</th>
+					<th>name version</th>
+					<th>date accept</th>
 					<th>__index</th>
-					<th width="5%">date_nop</th>
-					<th width="5%">date_end</th>
-					<th>is_easy</th>		
-					<th width="5%">Вер.%</th>						
-					<th width="7%">additional_agreement</th>
+					<th width="5%">date nop</th>
+					<th width="5%">date end</th>
+					<th>is easy</th>		
+					<th width="2%">Вер.%</th>						
+					<th width="10%">Дополнительное соглашение</th>
+					<th width="5%">Конечник</th>
 				</tr>
 			</thead>
 			
@@ -259,6 +264,7 @@
 					<td class="c">#probability_pc#</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#" title="#replace(end_customer_name,'"','&quot;','ALL')#">#end_customer_wz#</a></td><!--- *** надо эскейпить кавычки в имени --->
 				</tr>
 			</cfoutput>		
 		</table>