013 filters added

contract.cfm

@@ -38,7 +38,7 @@
 <!--- decoration --->
 <cfquery name="qDecoration" datasource="#request.DS#">
 	select 
-	__name as contragent
+	__name as contragent, id_klienta as wz
 	from elma.companies k
 	where k.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.company_uid# null=#!isValid('guid',d.company_uid)#/>
 </cfquery>
@@ -85,17 +85,17 @@
 	
 	<div class="tr">
 		<div class="th">Контрагент</div>
-		<div class="td">#qDecoration.contragent# [#d.company_uid#]</div>
+		<div class="td">#qDecoration.contragent# #qDecoration.wz# [#d.company_uid#] </div>
 	</div>
 	
 	<div class="tr">
 		<div class="th">Дата договора</div>
-		<div class="td">#d.date_of_aggrement#</div>
+		<div class="td">#dateFmt(d.date_of_aggrement)#</div>
 	</div>	
 	
 	<div class="tr">
 		<div class="th">Дата окончания договора</div>
-		<div class="td">#d.date_end_aggrement#</div>
+		<div class="td">#dateFmt(d.date_end_aggrement)#</div>
 	</div>
 	
 </div>
@@ -107,14 +107,18 @@
 	 <cfif len(d.__id)>	
 		<cfquery name="qAdditionalAgreement">
 		select 
-		__id::text
-		,__name
+		a.__id::text
+		,a.__name
 		,contract_uid::text
 		,is_actual
 		,last_aa
+		,index
 		,deal_uid::text
 		,base_by::text
+		,d.__name as deal
+		,d.__status_status as status_id
 		from elma.additional_agreements a
+		left outer join elma.deals d on (a.deal_uid=d.__id)
 		where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>
 		order by 1
 		</cfquery>
@@ -129,10 +133,13 @@
 				<tr>
 					<th>__id</th>
 					<th>__name</th>					
+					<th>index</th>					
 					<th>contract_uid</th>
 					<th>is_actual</th>
 					<th>last_aa</th>
 					<th>deal_uid</th>
+					<th>deal</th>
+					<th>status</th>
 					<th>base_by</th>
 				</tr>
 			</thead>
@@ -141,10 +148,13 @@
 
 					<td><a href="additional_agreement.cfm?__id=#__id#&#tr.fwx#">#__id#</a></td> 				
 					<td>#__name#</td> 				
+					<td>#index#</td> 				
 					<td>#contract_uid#</td> 				
 					<td>#is_actual#</td> 				
 					<td>#last_aa#</td> 				
 					<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal_uid#</a></td> 				
+					<td>#deal#</td> 				
+					<td>#status_id#</td>				
 					<td>#base_by#</td> 				
 <!--- 					<td class="c">
 						#dateFormat(dt_contract,'YYYY-MM-DD')#