diff --git a/Application.cfc b/Application.cfc index 9e27455..2891b05 100644 --- a/Application.cfc +++ b/Application.cfc @@ -99,7 +99,7 @@ - + diff --git a/additional_agreement_ls.cfm b/additional_agreement_ls.cfm index 0e3c384..d7ab93a 100644 --- a/additional_agreement_ls.cfm +++ b/additional_agreement_ls.cfm @@ -26,6 +26,7 @@ a.__name a.index d.__name as deal + d.__id as deal_uid g.__name as contract g.company_uid k.__name as contragent @@ -87,6 +88,9 @@ select count(*) as cnt from elma.aggrements d where 1=1 + + + @@ -94,6 +98,10 @@ select count(*) as cnt from elma.aggrements d where 1=1 + + + #deal# + @@ -108,7 +116,7 @@ select count(*) as cnt from elma.aggrements d where 1=1 - + diff --git a/deal.cfm b/deal.cfm index 566b714..beb0f9e 100644 --- a/deal.cfm +++ b/deal.cfm @@ -257,14 +257,13 @@ __index - user_description + user_description Кол-во Скидка% Сумма - abstractive_service_code - modifier_code - is_actual - type + Код + type + is_actual hash version name_version @@ -274,9 +273,7 @@ date_end is_easy Компонентов - - - additional_agreement + additional_agreement @@ -284,14 +281,19 @@ #__index# - #user_description# + #user_description# #cnt# #discount# #nFmt(line_cost)# - #abstractive_service_code# - #modifier_code# - #is_actual# - #type# + + #abstractive_service_code#.#modifier_code# + + #type# + #is_actual# #hash# #version# #name_version# diff --git a/deal_ls.cfm b/deal_ls.cfm index 68df423..8ff6c90 100644 --- a/deal_ls.cfm +++ b/deal_ls.cfm @@ -32,13 +32,16 @@ d._companies d."__createdAt" as __createdAt k.__name as contragent + k.__id as contragent_uid k.id_klienta as wz d.__status_status s.status s.probability_pc c.__name as owner a.__name as additional_agreement + a.__id as additional_agreement_uid g.__name as contract + g.__id as contract_uid g.date_of_aggrement as dt_contract from elma.deals d @@ -95,12 +98,33 @@ select count(*) as cnt from elma.deals d where 1=1 + + + + + + + + + + + + + #additional_agreement# + + + + #contract# + + + + #contragent# @@ -114,15 +138,15 @@ select count(*) as cnt from elma.deals d where 1=1 - + - - + +