tests found
This commit is contained in:
+6
-4
@@ -177,7 +177,8 @@
|
||||
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
|
||||
AND a.is_actual
|
||||
--AND a.is_actual
|
||||
AND s.probability_pc > 0
|
||||
order by version::int
|
||||
</cfquery>
|
||||
|
||||
@@ -206,7 +207,8 @@
|
||||
<th>__index</th>
|
||||
<th width="5%">date_nop</th>
|
||||
<th width="5%">date_end</th>
|
||||
<th>is_easy</th>
|
||||
<th>is_easy</th>
|
||||
<th width="5%">Вер.%</th>
|
||||
<th width="7%">additional_agreement</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -252,9 +254,9 @@
|
||||
<td class="c">#date_accept#</td>
|
||||
<td class="c">#__index#</td>
|
||||
<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
|
||||
<td class="c<cfif isDate(date_end) AND date_end LT Now()> err</cfif>">#dateFormat(date_end,'YYYY-MM-DD')#</td>
|
||||
<td class="c<cfif isDate(date_end) AND date_end LT Now()> err</cfif>">#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 class="c"><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user