pricing model

specification.cfm

@@ -153,8 +153,9 @@
 		,svc.code
 		,s.specification_id
 		,s.contract_id
-		<!--- ,i.price*i.quantity as cost --->
-		<!--- ,(select count(*) from svc_param sp where sp.svc_id=i.svc_id) as svc_param_count --->
+		,i.pricing_model_id
+		,p.pricing_model_short
+
 		,(select siv.agreement_version 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 
@@ -193,6 +194,7 @@
 		 order by siv.agreement_version desc limit 1) as dt_to
 		,(select count(*) from specification_item_version siv where siv.specification_item_uid=i.specification_item_uid) as  item_version_count
 		from specification_item i
+		join pricing_model p on (i.pricing_model_id=p.pricing_model_id)
 		join specification s on (i.specification_id=s.specification_id)
 		--left outer join ()
 		left outer join svc on (i.svc_id=svc.svc_id)
@@ -220,6 +222,7 @@
 				<th></th>
 				<th>Ключ строки</th>
 				<th>Услуга</th>				
+				<th>Модель</th>				
 				<th>Код услуги</th>
 				<th>Версий</th>
 				<th>&nbsp;</th>
@@ -241,6 +244,7 @@
 				</td> 
 				<td>#specification_item_uid#</td> 	
 				<td>#svc#</td> 				 		
+				<td class="c">#pricing_model_short#</td> 				 		
 				<td>#code#</td> 		
  				<td class="c">#item_version_count#</td>
  				<td class="c"></td>