067 end customer

payg.cfm

@@ -50,12 +50,16 @@
 	,siv.date_nop as dt_from, siv.date_end as dt_to, siv.discount as service_discount, siv.cnt as service_quantity
 	/*,p.__name as line_key*/, p.ed_izm, p.name as component, p.type, aa.__name as additional_agreement, aa.__id::text as additional_agreement_uid
 	--, aa.is_actual
+	,siv.end_customer as end_customer_uid
+	,z.id_klienta as end_customer_wz
+	,z.__name as end_customer_name
 	from elma.deals d
 	join elma.deals_services siv on (d.__id=ANY(siv.deal)) 
 	join elma.service_parametrs p on (p.__id = ANY(siv.params))
 	join elma.companies k on (d._companies=k.__id)
 	join elma.additional_agreements aa on (aa.__id = ANY(siv.additional_agreement))
 	join elma.aggrements a on (aa.contract_uid = a.__id)
+	left outer join elma.companies z on (siv.end_customer=z.__id)
 	where p.type IN (2,3) AND aa.is_actual
 	AND siv.date_nop < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dt_finish#/> 
 	AND (siv.date_end > <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dt_start#/> OR siv.date_end IS NULL)/*****/
@@ -349,6 +353,7 @@ order by wz, code
 SELECT 
 <d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
 	<d:field title="WZ">coalesce(coalesce(c.wz, m.wz), s.wz) as wz</d:field>
+	<d:field title="WZE">s.end_customer_wz as wze</d:field>
 	<d:field title="Артикул">coalesce(m.code, s.code) as code</d:field>
 	<d:field title="Артикул фикс">f.code as f_code</d:field>
 	<d:field title="Кол-во к оплате" cfSqlType="CF_SQL_NUMERIC">ceiling(m.chargeable_metric) as chargeable_metric</d:field>
@@ -475,6 +480,7 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 		<td width="5%">Договор</td>
 		<td width="10%">Допник</td>
 		<td width="10%">Сделка</td>
+		<td width="3%">Конечник</td>
 	
 	</thead>
 		
@@ -519,13 +525,14 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 			<td><a href="contract.cfm?__id=#contract_uid#&#tr.fwx#">#contract#</a></td>
 			<td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
 			<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal#</a></td>		
+			<td>#WZE#</a></td>		
 		</tr>
 		</cfoutput>
 		<tr>
 			<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
 			<td bgcolor="##eee" colspan="4" class="r" style="border-bottom:2px solid gray;"><b>Итого</b> <a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#:</td>
 			<td bgcolor="##eee" colspan="1" class="r b nw" style="border-bottom:2px solid gray;">#NumFmt(acc,2)#</td>
-			<td colspan="14" style="border-bottom:2px solid gray;"></td>
+			<td colspan="99" style="border-bottom:2px solid gray;"></td>
 		</tr >
 	</cfoutput>