Преглед на файлове

die('TODO change to IN7_DZIENNIK_KORESP @2018-03');

a.binder преди 8 години
родител
ревизия
d66ee114cf
променени са 1 файла, в които са добавени 37 реда и са изтрити 5 реда
  1. 37 5
      SE/budynki.php

+ 37 - 5
SE/budynki.php

@@ -735,12 +735,20 @@ echo "</table>";
 
 
  // echo " //AD.1) szukamy kosztow projektow i ich wzajemnych powiazan- moze i tez ich mieszkan";
-   $ZAP_SQL="select t1.ID, t1.P_ID , t1.M_DIST_DESC,  sum(t2.wartosc) as t2_wartosc , count(t2.ID) as ilosc_faktur  ,    min(t2.DATA_DOK) as I_ZACZETO , max(t2.DATA_DOK) as I_ZAKONCZONO
+  /* przed 2018-03- $ZAP_SQL="select t1.ID, t1.P_ID , t1.M_DIST_DESC,  sum(t2.wartosc) as t2_wartosc , count(t2.ID) as ilosc_faktur  ,    min(t2.DATA_DOK) as I_ZACZETO , max(t2.DATA_DOK) as I_ZAKONCZONO
     from IN7_MK_BAZA_DYSTRYBUCJI as t1
     left join KSIEG_DOKUMENTY as t2 on t1.ID=t2.ID_PROJECT
     where t2.A_STATUS!='DELETED'
     and t2.DATA_DOK like '".$_GET[DATA_ANALIZY]."'
     	 group by t1.ID  		 "; //and ( t1.ID=138 or t1.ID=168 or t1.ID=446 )
+*/
+//@2018-03 - zastapienie danych rekordami z IN7_DZIENNIK_KORESP
+$ZAP_SQL="select t1.ID, t1.P_ID , t1.M_DIST_DESC,  sum(t2.COST_VALUE) as t2_wartosc , count(t2.ID) as ilosc_faktur  ,    min(t2.K_DATA_OTRZYMANEJ_KORESP) as I_ZACZETO , max(t2.K_DATA_OTRZYMANEJ_KORESP) as I_ZAKONCZONO
+    from IN7_MK_BAZA_DYSTRYBUCJI as t1
+    left join IN7_DZIENNIK_KORESP as t2 on t1.ID=t2.ID_PROJECT
+    where t2.A_STATUS!='DELETED'
+    and t2.K_DATA_OTRZYMANEJ_KORESP like '".$_GET[DATA_ANALIZY]."'
+    	 group by t1.ID  		 "; 
 
 	echo "\n".$ZAP_SQL."\n"; //koszty wyliczone 1 raz dla calosci to :
 	//446=3 152,07+ 0,00 (3 152,07) = 3 152,07 ; zgadza sie przy wyzwoleniach perLATA
@@ -1347,7 +1355,16 @@ echo "<table border=1><tr><td>";
 echo "Podaj kryteria</td><td>  <input type=text name=DATA_DOK size=3 value=$_GET[DATA_DOK]></td></tr>";
 echo "<tr><td colspan=1><input type=submit name=ADD value=SZUKAJ></td><td>MIESIAC</td><td>TYP_DOK</td><td>BUDZET</td><td>FIRMA</td><td>ILOSC</td><td>CENA</td><td>ILOSC</td><td>WARTOS</td><td>ZRODLO</td><td>BILANS</td><td>BILANS_CALK</td></tr>";
 
-if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select YEAR(DATA_DOK) as ROK, MONTH(DATA_DOK) as MIESIAC,ID_KONTO_KSIEG,TYP_DOKUMENTU,ID_BUDZET,A_ADM_COMPANY,count(ID) ILOSC ,max(CENA_JEDN_NETTO) as CENA_JEDN_NETTO , sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC,
+if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else // before 2018-03 ZAP_SQL("select YEAR(DATA_DOK) as ROK, MONTH(DATA_DOK) as MIESIAC,ID_KONTO_KSIEG,TYP_DOKUMENTU,ID_BUDZET,A_ADM_COMPANY,count(ID) ILOSC ,max(CENA_JEDN_NETTO) as CENA_JEDN_NETTO , sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC,
+//if(ID_KONTO_KSIEG like '5__-01%' or ID_KONTO_KSIEG like '5__-02%','AMORTYZACJA',if(ID_KONTO_KSIEG like '201-%','PRZYCHOD',if(ID_KONTO_KSIEG like '080-%','INWESTYCJE',if(ID_BUDZET like 'WYNAGRODZENIA' or ID_BUDZET like 'ZAKUP-LACZY','STALE','KOSZTY/INNE')))) as TYP
+//from
+//KSIEG_DOKUMENTY where A_STATUS='NORMAL' and ID_KONTO_KSIEG not like '5%-01%' and DATA_DOK like '".$_GET[DATA_DOK]."'
+//group by YEAR(DATA_DOK),month(DATA_DOK),TYP_DOKUMENTU,ID_BUDZET,TYP
+//order by DATA_DOK;
+//");
+die('TODO KSIEG_DOKUMENTY to IN7_DZIENNIK_KORESP');
+
+ZAP_SQL("select YEAR(K_DATA_OTRZYMANEJ_KORESP) as ROK, MONTH(K_DATA_OTRZYMANEJ_KORESP) as MIESIAC,ID_KONTO_KSIEG,TYP_DOKUMENTU,ID_BUDZET,A_ADM_COMPANY,count(ID) ILOSC ,max(CENA_JEDN_NETTO) as CENA_JEDN_NETTO , sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC,
 if(ID_KONTO_KSIEG like '5__-01%' or ID_KONTO_KSIEG like '5__-02%','AMORTYZACJA',if(ID_KONTO_KSIEG like '201-%','PRZYCHOD',if(ID_KONTO_KSIEG like '080-%','INWESTYCJE',if(ID_BUDZET like 'WYNAGRODZENIA' or ID_BUDZET like 'ZAKUP-LACZY','STALE','KOSZTY/INNE')))) as TYP
 from
 KSIEG_DOKUMENTY where A_STATUS='NORMAL' and ID_KONTO_KSIEG not like '5%-01%' and DATA_DOK like '".$_GET[DATA_DOK]."'
@@ -1356,6 +1373,7 @@ order by DATA_DOK;
 ");
 
 
+
 $KOSZTA_INNE=0;
 $KOSZTA_INNE_CALK=0;
 
@@ -1513,6 +1531,7 @@ echo "<td>Podaj konta ksiegowe w % </td><td>  <input type=text name=ID_KONTO_KSI
 echo "</tr>";
 echo "<tr><td colspan=1><input type=submit name=ADD value=SZUKAJ></td><td>KONTO</td><td>ROK</td><td>MIESIAC</td><td>ILOSC</td><td>WARTOS</td></tr>";
 
+die('todo change to IN7_DZIENNIK_KORESP @2018-03');
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
 	from  KSIEG_DOKUMENTY where A_STATUS='NORMAL' and TYP_DOKUMENTU='DOKUMENT' and ID_KONTO_KSIEG like '".$_GET[ID_KONTO_KSIEG]."' and
 	 COALESCE(unix_timestamp(DATA_DOK), 0) < COALESCE(unix_timestamp('".$_GET[DATA_DOK_MAX]."'), 0)
@@ -1542,7 +1561,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 80<table border=2>";
-
+die('todo change to IN7_DZIENNIK_KORESP @2018-03');
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
   where A_STATUS='NORMAL'
@@ -1579,7 +1598,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 139<table border=2>";
-
+die('todo change to IN7_DZIENNIK_KORESP @2018-03');
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
   where A_STATUS='NORMAL'
@@ -1616,7 +1635,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 221<table border=2>";
-
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from KSIEG_DOKUMENTY
   where A_STATUS='NORMAL'
@@ -1656,6 +1675,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>ROCZNIE ZESPOLY/SYNTETYCZNIE<br><table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -1694,6 +1714,7 @@ echo "</table>";
 
 unset($DATA);
 echo "</table><hr>ROCZNIE_ZESPOLY<br><table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -1730,6 +1751,7 @@ echo "</table>";
 
 
 unset($DATA);
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 $ZAP_SQL="select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -1772,6 +1794,7 @@ echo "</table>";
 
 
 unset($DATA);
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 $ZAP_SQL="select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC , ID_BUDZET
   from  KSIEG_DOKUMENTY
@@ -1896,6 +1919,7 @@ echo "<td>Podaj kryteria data MAX do ktorej nalezy liczyc</td><td>  <input type=
 echo "<td>Podaj konta ksiegowe w % </td><td>  <input type=text name=ID_KONTO_KSIEG size=3 value=".$_GET[ID_KONTO_KSIEG]."></td>";
 echo "</tr>";
 echo "<tr><td colspan=1><input type=submit name=ADD value=SZUKAJ></td><td>KONTO</td><td>ROK</td><td>MIESIAC</td><td>ILOSC</td><td>WARTOS</td></tr>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -1956,6 +1980,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 80<table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -1993,6 +2018,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 139<table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -2030,6 +2056,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>MIESIECZNIE SYNTETYCZNIE zespol 221<table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-',month(DATA_DOK)) as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -2070,6 +2097,7 @@ while ($DWA=mysql_fetch_array($result)) {
 
 unset($DATA);
 echo "</table><hr>ROCZNIE ZESPOLY/SYNTETYCZNIE<br><table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -2134,6 +2162,7 @@ echo "</table>";
 
 unset($DATA);
 echo "</table><hr>ROCZNIE_ZESPOLY<br><table border=2>";
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 if(!$_SESSION['ADM_ADMIN_LEVEL']=="0") echo "BRAK UPRAWNIEN <BR>"; else ZAP_SQL("select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -2170,6 +2199,7 @@ echo "</table>";
 
 
 unset($DATA);
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 $ZAP_SQL="select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC
   from  KSIEG_DOKUMENTY
@@ -2244,6 +2274,7 @@ echo "</table>";
 
 
 unset($DATA);
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 $ZAP_SQL="select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC , ID_BUDZET
   from  KSIEG_DOKUMENTY
@@ -2374,6 +2405,7 @@ echo "</tr>";
 echo "<tr><td colspan=1><input type=submit name=ADD value=SZUKAJ></td><td>KONTO</td><td>ROK</td><td>MIESIAC</td><td>ILOSC</td><td>WARTOS</td></tr>";
 
 unset($DATA);
+die('TODO change to IN7_DZIENNIK_KORESP @2018-03');
 
 $ZAP_SQL="select ID_KONTO_KSIEG, concat(YEAR(DATA_DOK),'-') as DATA ,sum(ILOSC*CENA_JEDN_NETTO) as WARTOSC , ID_BUDZET , TYP_DOKUMENTU
   from  KSIEG_DOKUMENTY