tests found

contract.cfm

@@ -241,17 +241,7 @@
 		,p.discount as p_discount
 		,p.__id as p_uid
 		,p.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 
-			where p.__id = ANY (siv.params)
-			AND p."__deletedAt" IS NULL
-		) as line_cost			
-		,(select count(*)			
-			from elma.service_parametrs p 
-			where p.__id = ANY (siv.params)
-			AND p."__deletedAt" IS NULL
-		) as param_cnt*/
+
 		,s.probability_pc
 		,d.__index
 		,d.__id as deal_uid
@@ -262,7 +252,8 @@
 		left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
 		where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid('guid',d.__id)#/>
 		and siv.is_actual
-		and a.is_actual
+		--and a.is_actual
+		and s.probability_pc > 0
 		order by siv.version::int
 	</cfquery>
 	
@@ -292,6 +283,7 @@
 				<th width="5%">date_nop</th>
 				<th width="5%">date_end</th>
 				<th>is_easy</th>
+				<th>Вер.%</th>
 				
 				<th width="7%">additional_agreement</th>
 			</tr>
@@ -341,6 +333,7 @@
 				<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
 				<td class="c">#dateFormat(date_end,'YYYY-MM-DD')#</td>
 				<td class="c">#is_easy#</td>
+				<td class="c">#probability_pc#</td>
 	
 				<!--- <td class="c">#additional_agreement_uid#</td> --->
 				<td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>