smishchuk/spec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

looks like semi-working

Browse Source
This commit is contained in:
msyu
2025-08-22 17:33:59 +03:00
parent 3d2a6a3552
commit e7628f9100
12 changed files with 604 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
income_daily_rpt.cfm
+2 -2
View File
@@ -157,7 +157,7 @@ from (
join agreement ia on (isp.contract_id=ia.contract_id AND iiv.agreement_version=ia.agreement_version)
where iiv.specification_item_uid=siv.specification_item_uid
AND (dayscale.dt >= iiv.dt_from /*AND (iiv.dt_to > dayscale.dt OR iiv.dt_to IS NULL)*/)))
/*AND ia.is_actual*/ /*свежее соглашение не обязано быть действующим*/
/*AND ia.is_actual*/ /*рабочее соглашение не обязано быть действующим*/
join specification_item si on (siv.specification_item_uid=si.specification_item_uid AND si.pricing_model_id in (2,3))
join specification s on (si.specification_id=s.specification_id)
join agreement a on (s.contract_id=a.contract_id AND a.agreement_version=siv.agreement_version)
@@ -175,7 +175,7 @@ from (
join agreement ia on (isp.contract_id=ia.contract_id AND iiv.agreement_version=ia.agreement_version)
where iiv.specification_item_uid=si.specification_item_uid
AND ia.agreement_version < siv.agreement_version
AND ia.is_actual /*именно действующее соглашение, принимаемое за факт*/
AND ia.is_actual /*именно действующее (базовое) соглашение, принимаемое за факт*/
/*а почему тут дату не проверяем ВПР*/
)
)