003 costs/ number clean
This commit is contained in:
+7
-1
@@ -183,7 +183,11 @@
|
||||
,(select siv.price from specification_item_version siv
|
||||
join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id)
|
||||
where siv.specification_item_uid=i.specification_item_uid AND a.is_actual
|
||||
order by siv.agreement_version desc limit 1) as price
|
||||
order by siv.agreement_version desc limit 1) as price,
|
||||
(select siv.price*siv.quantity from specification_item_version siv
|
||||
join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id)
|
||||
where siv.specification_item_uid=i.specification_item_uid AND a.is_actual
|
||||
order by siv.agreement_version desc limit 1) as cost
|
||||
,(select siv.dt_from from specification_item_version siv
|
||||
join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id)
|
||||
where siv.specification_item_uid=i.specification_item_uid AND a.is_actual
|
||||
@@ -232,6 +236,7 @@
|
||||
<th>Дата по</th>
|
||||
<th>Количество</th>
|
||||
<th>Цена</th>
|
||||
<th>Стоимость</th>
|
||||
<th>Имя для печати</th>
|
||||
<!--- <th>Компонентов</th> --->
|
||||
<th></th>
|
||||
@@ -257,6 +262,7 @@
|
||||
<td class="c">#dateFormat(dt_to,'DD.MM.YYYY')#</td>
|
||||
<td class="r">#quantity#</td>
|
||||
<td class="r">#price#</td>
|
||||
<td class="r">#cost#</td>
|
||||
<td>#specification_item#</td>
|
||||
<td class="c">
|
||||
<c:link_del canWrite=#pageInfo.writePermitted()# entity="specification_item" key="specification_item_uid" id=#specification_item_uid# fwx=#tr.fwx#/>
|
||||
|
||||
Reference in New Issue
Block a user