smishchuk/spec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

014 agreement_sum

Browse Source
This commit is contained in:
msyu
2025-06-24 17:20:21 +03:00
parent ef3e2ca0e3
commit 0634f4b6c7
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contract.cfm
+9
View File
@@ -147,12 +147,15 @@
a.contract_id
,a.agreement_version
,a.agreement
,a.probability_perc
,a.dt_agreement
,a.is_actual
,(select count(*) from specification_item_version iv
join specification_item i on (iv.specification_item_uid=i.specification_item_uid AND iv.agreement_version=a.agreement_version)
join specification s on (i.specification_id=s.specification_id AND s.contract_id=a.contract_id)
) as items_changed
,(select sum(quantity*price) from specification_item_version siv join specification_item si on (siv.specification_item_uid=si.specification_item_uid) join specification s on (si.specification_id=s.specification_id) where a.contract_id=s.contract_id AND a.agreement_version=siv.agreement_version) as agreement_sum
,(select sum(quantity*price)*a.probability_perc/100 from specification_item_version siv join specification_item si on (siv.specification_item_uid=si.specification_item_uid) join specification s on (si.specification_id=s.specification_id) where a.contract_id=s.contract_id AND a.agreement_version=siv.agreement_version) as agreement_sum_p
from agreement a
where a.contract_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#d.contract_id#" null=#!isValid('integer', d.contract_id)#/>
order by a.agreement_version
@@ -179,8 +182,11 @@
<th>Номер соглашения (версия)</th>
<th>Название</th>
<th>Дата</th>
<th>Вероятность</th>
<th>Действует</th>
<th>Строк изменено</th>
<th>Сумма измененных</th>
<th>Сумма изм. с в.</th>
<th></th>
</tr>
</thead>
@@ -192,8 +198,11 @@
<td class="r">#agreement_version#</td>
<td>#agreement#</td>
<td>#dateFormat(dt_agreement,'DD.MM.YYYY')#</td>
<td class="r"><cfif probability_perc GT 0>#probability_perc#</cfif></td>
<td class="c"><cfif is_actual GT 0><img src="img/ok.png"/></cfif></td>
<td class="c"><cfif items_changed GT 0>#items_changed#</cfif></td>
<td class="r">#nFmt(agreement_sum)#</td>
<td class="r">#nFmt(agreement_sum_p)#</td>
<td class="c">
<a href="agreement_del.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#"><img src="img/del.gif"/></a>
</td>