007 interface improvements

specification_item.cfm

@@ -17,6 +17,8 @@
 
 <m:prepare_detail entity="specification_item" key="specification_item_uid" pageInfoOut="pageInfo"/>
 
+<cfparam name="agreement_version" default=""/>
+
 <d:bean readonly=#!pageInfo.writePermitted()# table="#pageInfo.entity#" datasource="#request.DS#" output="d" status="status">
 	<d:param field="specification_item_uid" type="guid" key autoincrement/>
 	<d:param field="specification_id" type="integer" required/>
@@ -90,6 +92,7 @@
 <cfoutput>
 <input type="hidden" name="specification_item_uid" value="#d.specification_item_uid#"/>
 <input type="hidden" name="specification_id" value="#d.specification_id#"/>
+<input type="hidden" name="agreement_version" value="#agreement_version#"/><!--- невидимый параметр контекста *** пересекается по имени с полем запроса в фактурной части --->
 <input type="hidden" name="track" value="#tr.self#"/>
 <input type="hidden" name="pass" value=""/><!--- pass marker to prevent save on submit --->
 
@@ -142,7 +145,7 @@
 			<cfquery name="qList" datasource="#request.DS#">
 				select s.pricing_model_id, s.pricing_model, s.pricing_model_short		 
 				from pricing_model s 
-				order by 2
+				order by 1
 			</cfquery>
 			<c:combo
 				query=#qList#
@@ -151,7 +154,6 @@
 				key="pricing_model_id" 
 				selected="#d.pricing_model_id#"
 				displayf="##pricing_model_short## [##pricing_model_id##] ##pricing_model##"
-				empty=""
 				class=""
 			/> 
 			<!--- <cfif d.svc_id GT 0>
@@ -207,7 +209,7 @@
 			Версии строки (#qSpecificationItemVersion.recordCount#) (история инстанса)
 			<cfif pageInfo.writePermitted()>
 				<cfoutput>
-					<cfset addUrl="specification_item_version.cfm?agreement_version=&specification_item_uid=#d.specification_item_uid#&#tr.fwx#"/>
+					<cfset addUrl="specification_item_version.cfm?agreement_version=#agreement_version#&specification_item_uid=#d.specification_item_uid#&#tr.fwx#"/>
 					<button type="button" class="maincontrol" onclick="document.location.href='#addUrl#'">
 						<a href="#addUrl#">Создать</a>
 					</button>