Do raportow sprzedazy niezbedne relacje

SE/budynki.php

@@ -743,9 +743,12 @@ echo "</table>";
     	 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
+$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
+	 , group_concat(MK_Rewiry.NAZWA_REWI) as NAZWA_REWI
     from IN7_MK_BAZA_DYSTRYBUCJI as t1
     left join IN7_DZIENNIK_KORESP as t2 on t1.ID=t2.ID_PROJECT
+    left join MK_Rewiry as MK_Rewiry on t1.ID = MK_Rewiry.ID_PROJECT
     where t2.A_STATUS!='DELETED'
     and t2.K_DATA_OTRZYMANEJ_KORESP like '".$_GET[DATA_ANALIZY]."'
     	 group by t1.ID  		 "; 
@@ -764,6 +767,7 @@ $ZAP_SQL="select t1.ID, t1.P_ID , t1.M_DIST_DESC,  sum(t2.COST_VALUE) as t2_wart
 		$DATA[$R2->ID]['LOCAL']['ilosc_faktur']+=floatval($R2->ilosc_faktur); //CUMULATED - KWOTA
 		$DATA[$R2->ID]['LOCAL']['I_ZACZETO']=$R2->I_ZACZETO;
 		$DATA[$R2->ID]['LOCAL']['I_ZAKONCZONO']=$R2->I_ZAKONCZONO;
+		$DATA[$R2->ID]['LOCAL']['NAZWA_REWI']=$R2->NAZWA_REWI;
     }
 
 /*  //AD.1)  e1) i jeszcze dodajemy koszty projektow z ID_PROJECT do kosztow glownego projektu -
@@ -1186,13 +1190,13 @@ ZAP_SQL($ZAP_SQL);
      	//OFERTY:
      	echo "<td>";
      	 foreach($DATA_V['CALCULATED_AD3']['OFERS'] as $OFERR=>$OFER_A) {
-		   if($OFER_A['ERROR_NO_OFFER_ID']) echo "<font color=red>(".$OFER_A['ERROR_NO_OFFER_ID'].")</font>,";
-		   else		  echo $OFERR.",";
+		   if($OFER_A['ERROR_NO_OFFER_ID']) echo "<font color=red>(".$OFER_A['ERROR_NO_OFFER_ID'].")</font> ,";
+		   else		  echo $OFERR." , ";
   		 }
   		 //W jakich jest ofertach ?
 		 foreach($OFER as $OFER_IND=>$OFER_ARR) {
 		 	 foreach($OFER_ARR['TOTAL']['ID_PROJECTS'] as $IDP=>$IDP_V) {
-		 	    if($IDP==$DATA_I) echo "[".$OFER_IND."]";
+		 	    if($IDP==$DATA_I) echo "[".$OFER_IND."] ";
 		 	 }
 		 }
 

SE/schema/ant-object/default_db.DEALS_TABLE/DEALS_TABLE/DEALS_TABLE.xsd

@@ -1,45 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:gml="http://www.opengis.net/gml/3.2"
-           xmlns:Types__x3A__default_Default="https://biuro.biall-net.pl/wfs/default_db/Types/Default.xsd"
-           xmlns:default_db__x3A__IN7_DZIENNIK_KORESP="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
-           xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
-           xmlns:default_db__x3A__ADMIN_USERS="https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd"
-           xmlns:default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
-           xmlns:SystemObjects__x3A__AccessGroup="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
-           xmlns:SystemObjects__x3A__AccessOwner="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
-           xmlns:default_db__x3A__DEALS_TABLE="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
-           xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
-           xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-           xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
-           xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
-           xmlns:fix_se_defaultdb_schema="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/fix_se_defaultdb_schema/fix_se_defaultdb_schema.xsd"
-           xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
-           xmlns:default_db__x3A__USERS2_OFFERS_GROUPS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS_GROUPS.xsd"
-           xmlns:default_db__x3A__USERS2_OFFERS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS.xsd"
-           xmlns:default_db__x3A__MK_Rewiry="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
-           xmlns:default_db__x3A__COMPANIES="https://biuro.biall-net.pl/wfs/default_db/table/COMPANIES.xsd"
-           targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
-           vc:minVersion="1.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2"
+   xmlns:Types__x3A__default_Default="https://biuro.biall-net.pl/wfs/default_db/Types/Default.xsd"
+   xmlns:default_db__x3A__IN7_DZIENNIK_KORESP="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
+   xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
+   xmlns:default_db__x3A__ADMIN_USERS="https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd"
+   xmlns:default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
+   xmlns:SystemObjects__x3A__AccessGroup="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
+   xmlns:SystemObjects__x3A__AccessOwner="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
+   xmlns:default_db__x3A__DEALS_TABLE="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
+   xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
+   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+   xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
+   xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+   xmlns:fix_se_defaultdb_schema="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/fix_se_defaultdb_schema/fix_se_defaultdb_schema.xsd"
+   xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
+   xmlns:default_db__x3A__USERS2_OFFERS_GROUPS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS_GROUPS.xsd"
+   xmlns:default_db__x3A__USERS2_OFFERS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS.xsd"
+   xmlns:default_db__x3A__MK_Rewiry="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
+   xmlns:default_db__x3A__COMPANIES="https://biuro.biall-net.pl/wfs/default_db/table/COMPANIES.xsd"
+   targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
+   vc:minVersion="1.1"
+   xmlns:default_db__x3A__SERVICES="https://biuro.biall-net.pl/wfs/default_db/table/SERVICES.xsd">
    <xs:import namespace="http://biuro.biall-net.pl/p5/schema/types"
-              schemaLocation="../../../types.xsd"/>
+      schemaLocation="../../../types.xsd"/>
    <xs:import namespace="http://www.opengis.net/gml/3.2"
-              schemaLocation="http://www.opengis.net/gml/3.2"/>
+      schemaLocation="http://www.opengis.net/gml/3.2"/>
    <!---->
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_DZIENNIK_KORESP.xsd"
-              schemaLocation="../../default_db.IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP.xsd"/>
-   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
-              schemaLocation="../../default_db.IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI.xsd"/>
+      schemaLocation="../../default_db.IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP/IN7_DZIENNIK_KORESP.xsd"/>
+   <xs:import
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
+      schemaLocation="../../default_db.IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd"
-              schemaLocation="../../default_db.ADMIN_USERS/ADMIN_USERS/ADMIN_USERS.xsd"/>
+      schemaLocation="../../default_db.ADMIN_USERS/ADMIN_USERS/ADMIN_USERS.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS_GROUPS.xsd"
-              schemaLocation="../../default_db.USERS2_OFFERS_GROUPS/USERS2_OFFERS_GROUPS/USERS2_OFFERS_GROUPS.xsd"/>
+      schemaLocation="../../default_db.USERS2_OFFERS_GROUPS/USERS2_OFFERS_GROUPS/USERS2_OFFERS_GROUPS.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS.xsd"
-              schemaLocation="../../default_db.USERS2_OFFERS/USERS2_OFFERS/USERS2_OFFERS.xsd"/>
+      schemaLocation="../../default_db.USERS2_OFFERS/USERS2_OFFERS/USERS2_OFFERS.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
-              schemaLocation="../../default_db.MK_Rewiry/MK_Rewiry/MK_Rewiry.xsd"/>
+      schemaLocation="../../default_db.MK_Rewiry/MK_Rewiry/MK_Rewiry.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/COMPANIES.xsd"
-              schemaLocation="../../default_db.COMPANIES/COMPANIES/COMPANIES.xsd"/>
+      schemaLocation="../../default_db.COMPANIES/COMPANIES/COMPANIES.xsd"/>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/SERVICES.xsd"
+      schemaLocation="../../default_db.SERVICES/SERVICES/SERVICES.xsd">
+      <xs:annotation>
+         <xs:documentation>Services potrzebne do raportu sprzedazy</xs:documentation>
+      </xs:annotation>
+   </xs:import>
    <xs:simpleType name="A_STATUS_Type" id="DEALS_TABLE___d4e6183-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -55,49 +62,35 @@
       <xs:annotation>
          <xs:appinfo>
             <system_cache__appinfo:heritage>
-               <system_cache__appinfo:inherit system_cache__appinfo:inherit_ref="default_db:DEALS_TABLE"
-                                              system_cache__appinfo:heritage_acl="true">
+               <system_cache__appinfo:inherit system_cache__appinfo:inherit_ref="default_db:DEALS_TABLE" system_cache__appinfo:heritage_acl="true">
                   <system_cache__appinfo:acl_rule_inherit_to_all_same_name_elements_and_refs/>
                   <acl_rule_inherit_to_all_refs_by_primary/>
                   <acl_rule_inherit_to_all_refs_by_local_element system_cache__appinfo:acl_rule_inherit_local_element_name="A_STATUS"/>
                </system_cache__appinfo:inherit>
-               <system_cache__appinfo:exherit_all system_cache__appinfo:heritage_acl="true"
-                                                  system_cache__appinfo:heritage_sort="true"/>
+               <system_cache__appinfo:exherit_all system_cache__appinfo:heritage_acl="true" system_cache__appinfo:heritage_sort="true"/>
             </system_cache__appinfo:heritage>
          </xs:appinfo>
       </xs:annotation>
       <xs:sequence id="DEALS_TABLE___d4e6193-1">
          <xs:element name="ID" type="xs:integer" id="DEALS_TABLE___d4e6203-1_ID"/>
          <xs:element name="P_ID" type="xs:integer" id="DEALS_TABLE___d4e6204-1_P_ID"/>
-         <xs:element name="the_geom"
-                     type="gml:AbstractFeatureType"
-                     id="DEALS_TABLE___d4e6194-1_the_geom"/>
-         <xs:element name="A_STATUS"
-                     type="default_db__x3A__DEALS_TABLE:A_STATUS_Type"
-                     id="DEALS_TABLE___d4e6195-1_A_STATUS"/>
-         <xs:element name="A_STATUS_INFO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6196-1_A_STATUS_I"/>
-         <xs:element name="L_APPOITMENT_USER"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6197-1_L_APPOITME"/>
+         <xs:element name="the_geom" type="gml:AbstractFeatureType"
+            id="DEALS_TABLE___d4e6194-1_the_geom"/>
+         <xs:element name="A_STATUS" type="default_db__x3A__DEALS_TABLE:A_STATUS_Type"
+            id="DEALS_TABLE___d4e6195-1_A_STATUS"/>
+         <xs:element name="A_STATUS_INFO" type="xs:string" id="DEALS_TABLE___d4e6196-1_A_STATUS_I"/>
+         <xs:element name="L_APPOITMENT_USER" type="xs:string"
+            id="DEALS_TABLE___d4e6197-1_L_APPOITME"/>
          <xs:element ref="default_db__x3A__ADMIN_USERS:L_APPOITMENT_USER"/>
-         <xs:element name="A_CLASSIFIED"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6199-1_A_CLASSIFI"/>
-         <xs:element name="A_ADM_COMPANY"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6201-1_A_ADM_COMP"/>
-         <xs:element name="ID_BILLING_USERS"
-                     type="xs:integer"
-                     id="DEALS_TABLE___d4e6206-1_ID_BILLING"/>
+         <xs:element name="A_CLASSIFIED" type="xs:string" id="DEALS_TABLE___d4e6199-1_A_CLASSIFI"/>
+         <xs:element name="A_ADM_COMPANY" type="xs:string" id="DEALS_TABLE___d4e6201-1_A_ADM_COMP"/>
+         <xs:element name="ID_BILLING_USERS" type="xs:integer"
+            id="DEALS_TABLE___d4e6206-1_ID_BILLING"/>
          <xs:element ref="default_db__x3A__COMPANIES:ID_BILLING_USERS">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
-                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view"
-                                                   system_cache__appinfo:name="ID_BILLING_USERS"
-                                                   system_cache__appinfo:xpath="default_db__x3A__COMPANIES:ID_BILLING_USERS/ID"/>
+                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_BILLING_USERS" system_cache__appinfo:xpath="default_db__x3A__COMPANIES:ID_BILLING_USERS/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <xs:documentation>
@@ -105,146 +98,97 @@
                 </xs:documentation>
             </xs:annotation>
          </xs:element>
-         <xs:element name="P_DEALPREFIX"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6207-1_P_DEALPREF"/>
-         <xs:element name="P_DEALNUMBER"
-                     type="xs:integer"
-                     id="DEALS_TABLE___d4e6208-1_P_DEALNUMB"/>
-         <xs:element name="P_DEALNUMBER_OLD"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6209-1_P_DEALNUMB"/>
-         <xs:element name="P_DEALDATE"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6210-1_P_DEALDATE"/>
-         <xs:element name="TAB_UPDATE_STAT"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6211-1_TAB_UPDATE"/>
-         <xs:element name="TAB_UPDATE_DATE"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6212-1_TAB_UPDATE"/>
-         <xs:element name="TAB_UPDATE_INFO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6213-1_TAB_UPDATE"/>
-         <xs:element name="P_DEALDATE_TERM"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6214-1_P_DEALDATE"/>
-         <xs:element name="ANEX_NEEDED"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6215-1_ANEX_NEEDE"/>
-         <xs:element name="ANEX_CONFIRM_DATE"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6216-1_ANEX_CONFI"/>
-         <xs:element name="DEALDESC"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6218-1_DEALDESC"/>
-         <xs:element name="A_RECORD_CREATE_DATE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6219-1_A_RECORD_C"/>
-         <xs:element name="A_RECORD_CREATE_AUTHOR"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6220-1_A_RECORD_C"/>
-         <xs:element name="A_RECORD_UPDATE_DATE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6221-1_A_RECORD_U"/>
-         <xs:element name="A_RECORD_UPDATE_AUTHOR"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6222-1_A_RECORD_U"/>
-         <xs:element name="L_APPOITMENT_DATE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6223-1_L_APPOITME"/>
-         <xs:element name="L_APPOITMENT_PERIOD"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6224-1_L_APPOITME"/>
-         <xs:element name="L_APPOITMENT_INFO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6225-1_L_APPOITME"/>
-         <xs:element name="L_APPOITMENT_TYPE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6226-1_L_APPOITME"/>
-         <xs:element name="A_PROBLEM"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6227-1_A_PROBLEM"/>
-         <xs:element name="A_PROBLEM_DESC"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6228-1_A_PROBLEM_"/>
-         <xs:element name="A_PROBLEM_DATE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6230-1_A_PROBLEM_"/>
-         <xs:element name="T_WORKPOINTS"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6231-1_T_WORKPOIN"/>
-         <xs:element name="T_WORKPOINTS_VALUE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6232-1_T_WORKPOIN"/>
-         <xs:element name="T_WORKPOINTS_TYPE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6233-1_T_WORKPOIN"/>
-         <xs:element name="T_WORKPOINTS_USER"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6234-1_T_WORKPOIN"/>
-         <xs:element name="T_WORKPOINTS_DATE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6235-1_T_WORKPOIN"/>
-         <xs:element name="P_ACCOUNT"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6236-1_P_ACCOUNT"/>
-         <xs:element name="ID_OFFERS_GROUP"
-                     type="xs:integer"
-                     id="DEALS_TABLE___d4e6237-1_ID_OFFERS_"/>
+         <xs:element name="P_DEALPREFIX" type="xs:string" id="DEALS_TABLE___d4e6207-1_P_DEALPREF"/>
+         <xs:element name="P_DEALNUMBER" type="xs:integer" id="DEALS_TABLE___d4e6208-1_P_DEALNUMB"/>
+         <xs:element name="P_DEALNUMBER_OLD" type="xs:string"
+            id="DEALS_TABLE___d4e6209-1_P_DEALNUMB"/>
+         <xs:element name="P_DEALDATE" type="xs:token" id="DEALS_TABLE___d4e6210-1_P_DEALDATE"/>
+         <xs:element name="TAB_UPDATE_STAT" type="xs:string" id="DEALS_TABLE___d4e6211-1_TAB_UPDATE"/>
+         <xs:element name="TAB_UPDATE_DATE" type="xs:token" id="DEALS_TABLE___d4e6212-1_TAB_UPDATE"/>
+         <xs:element name="TAB_UPDATE_INFO" type="xs:string" id="DEALS_TABLE___d4e6213-1_TAB_UPDATE"/>
+         <xs:element name="P_DEALDATE_TERM" type="xs:token" id="DEALS_TABLE___d4e6214-1_P_DEALDATE"/>
+         <xs:element name="ANEX_NEEDED" type="xs:string" id="DEALS_TABLE___d4e6215-1_ANEX_NEEDE"/>
+         <xs:element name="ANEX_CONFIRM_DATE" type="xs:token"
+            id="DEALS_TABLE___d4e6216-1_ANEX_CONFI"/>
+         <xs:element name="DEALDESC" type="xs:string" id="DEALS_TABLE___d4e6218-1_DEALDESC"/>
+         <xs:element name="A_RECORD_CREATE_DATE" type="xs:string"
+            id="DEALS_TABLE___d4e6219-1_A_RECORD_C"/>
+         <xs:element name="A_RECORD_CREATE_AUTHOR" type="xs:string"
+            id="DEALS_TABLE___d4e6220-1_A_RECORD_C"/>
+         <xs:element name="A_RECORD_UPDATE_DATE" type="xs:string"
+            id="DEALS_TABLE___d4e6221-1_A_RECORD_U"/>
+         <xs:element name="A_RECORD_UPDATE_AUTHOR" type="xs:string"
+            id="DEALS_TABLE___d4e6222-1_A_RECORD_U"/>
+         <xs:element name="L_APPOITMENT_DATE" type="xs:string"
+            id="DEALS_TABLE___d4e6223-1_L_APPOITME"/>
+         <xs:element name="L_APPOITMENT_PERIOD" type="xs:string"
+            id="DEALS_TABLE___d4e6224-1_L_APPOITME"/>
+         <xs:element name="L_APPOITMENT_INFO" type="xs:string"
+            id="DEALS_TABLE___d4e6225-1_L_APPOITME"/>
+         <xs:element name="L_APPOITMENT_TYPE" type="xs:string"
+            id="DEALS_TABLE___d4e6226-1_L_APPOITME"/>
+         <xs:element name="A_PROBLEM" type="xs:string" id="DEALS_TABLE___d4e6227-1_A_PROBLEM"/>
+         <xs:element name="A_PROBLEM_DESC" type="xs:string" id="DEALS_TABLE___d4e6228-1_A_PROBLEM_"/>
+         <xs:element name="A_PROBLEM_DATE" type="xs:string" id="DEALS_TABLE___d4e6230-1_A_PROBLEM_"/>
+         <xs:element name="T_WORKPOINTS" type="xs:string" id="DEALS_TABLE___d4e6231-1_T_WORKPOIN"/>
+         <xs:element name="T_WORKPOINTS_VALUE" type="xs:string"
+            id="DEALS_TABLE___d4e6232-1_T_WORKPOIN"/>
+         <xs:element name="T_WORKPOINTS_TYPE" type="xs:string"
+            id="DEALS_TABLE___d4e6233-1_T_WORKPOIN"/>
+         <xs:element name="T_WORKPOINTS_USER" type="xs:string"
+            id="DEALS_TABLE___d4e6234-1_T_WORKPOIN"/>
+         <xs:element name="T_WORKPOINTS_DATE" type="xs:string"
+            id="DEALS_TABLE___d4e6235-1_T_WORKPOIN"/>
+         <xs:element name="P_ACCOUNT" type="xs:string" id="DEALS_TABLE___d4e6236-1_P_ACCOUNT"/>
+         <xs:element name="ID_OFFERS_GROUP" type="xs:integer"
+            id="DEALS_TABLE___d4e6237-1_ID_OFFERS_"/>
          <xs:element ref="default_db__x3A__USERS2_OFFERS_GROUPS:USERS2_OFFERS_GROUPS"/>
-         <xs:element name="ID_OFFERS_ON"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6238-1_ID_OFFERS_"/>
+         <xs:element name="ID_OFFERS_ON" type="xs:string" id="DEALS_TABLE___d4e6238-1_ID_OFFERS_"/>
          <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_ON"/>
-         <xs:element name="ID_OFFERS_OFF"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6239-1_ID_OFFERS_"/>
+         <xs:element name="ID_OFFERS_OFF" type="xs:string" id="DEALS_TABLE___d4e6239-1_ID_OFFERS_"/>
          <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_OFF"/>
-         <xs:element name="NEW_L2_HANGUP_FROM"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6240-1_NEW_L2_HAN"/>
-         <xs:element name="S_ADDRESS_STREET"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6242-1_S_ADDRESS_"/>
-         <xs:element name="RODZAJ_DZIALANIA_HANDLOWEGO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6243-1_RODZAJ_DZI"/>
-         <xs:element name="L2_HANGUP_FROM"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6244-1_L2_HANGUP_"/>
-         <xs:element name="M_DIST_FILES"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6245-1_M_DIST_FIL"/>
-         <xs:element name="alias_OFFERS_GROUPS__S_ALIAS"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6246-1_alias_OFFE"/>
-         <xs:element name="ROZLICZ_MONTH"
-                     type="xs:token"
-                     id="DEALS_TABLE___d4e6247-1_ROZLICZ_MO"/>
-         <xs:element name="ROZLICZ_ZYSK"
-                     type="xs:double"
-                     id="DEALS_TABLE___d4e6248-1_ROZLICZ_ZY"/>
-         <xs:element name="M_REWIR"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6249-1_M_REWIR"/>
+         <xs:element name="NEW_L2_HANGUP_FROM" type="xs:token"
+            id="DEALS_TABLE___d4e6240-1_NEW_L2_HAN"/>
+         <xs:element name="S_ADDRESS_STREET" type="xs:string"
+            id="DEALS_TABLE___d4e6242-1_S_ADDRESS_"/>
+         <xs:element name="RODZAJ_DZIALANIA_HANDLOWEGO" type="xs:string"
+            id="DEALS_TABLE___d4e6243-1_RODZAJ_DZI"/>
+         <xs:element name="L2_HANGUP_FROM" type="xs:token" id="DEALS_TABLE___d4e6244-1_L2_HANGUP_"/>
+         <xs:element name="M_DIST_FILES" type="xs:string" id="DEALS_TABLE___d4e6245-1_M_DIST_FIL"/>
+         <xs:element name="alias_OFFERS_GROUPS__S_ALIAS" type="xs:string"
+            id="DEALS_TABLE___d4e6246-1_alias_OFFE"/>
+         <xs:element name="ROZLICZ_MONTH" type="xs:token" id="DEALS_TABLE___d4e6247-1_ROZLICZ_MO"/>
+         <xs:element name="ROZLICZ_ZYSK" type="xs:double" id="DEALS_TABLE___d4e6248-1_ROZLICZ_ZY"/>
+         <xs:element name="M_REWIR" type="xs:string" id="DEALS_TABLE___d4e6249-1_M_REWIR"/>
          <xs:element ref="default_db__x3A__MK_Rewiry:MK_Rewiry"/>
-         <xs:element name="P_OSIEDLE"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6250-1_P_OSIEDLE"/>
-         <xs:element name="OFFERS_PRICES_INFO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6251-1_OFFERS_PRI"/>
-         <xs:element name="OFFERS_ZYSK_INFO"
-                     type="xs:string"
-                     id="DEALS_TABLE___d4e6252-1_OFFERS_ZYS"/>
-         <xs:element name="ID_PROJECT"
-                     type="xs:integer"
-                     id="DEALS_TABLE___d4e6254-1_ID_PROJECT"/>
-         <xs:element ref="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT"/>
+         <xs:element name="P_OSIEDLE" type="xs:string" id="DEALS_TABLE___d4e6250-1_P_OSIEDLE"/>
+         <xs:element name="OFFERS_PRICES_INFO" type="xs:string"
+            id="DEALS_TABLE___d4e6251-1_OFFERS_PRI"/>
+         <xs:element name="OFFERS_ZYSK_INFO" type="xs:string"
+            id="DEALS_TABLE___d4e6252-1_OFFERS_ZYS"/>
+         <xs:element name="ID_PROJECT" type="xs:integer" id="DEALS_TABLE___d4e6254-1_ID_PROJECT"/>
+         <xs:element ref="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT">
+            <xs:annotation>
+               <xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache > 
+                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_PROJECT" system_cache__appinfo:xpath="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT/ID"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
+               <xs:documentation>@2018-03 todo mamy podwojne dojscie - przez rewir i przez projekt - lepiej od rewiru analizowac sprzedaz</xs:documentation>
+            </xs:annotation>
+         </xs:element>
+         <xs:element minOccurs="0" ref="default_db__x3A__SERVICES:SERVICES">
+            <xs:annotation>
+                  <xs:appinfo>
+                     <system_cache__appinfo:flat_relation_cache > 
+                        <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID" system_cache__appinfo:xpath="default_db__x3A__SERVICES:SERVICES/ID_DEALS_TABLE"/>
+                     </system_cache__appinfo:flat_relation_cache>
+                  </xs:appinfo>
+               <xs:documentation>Jedna usluga moze miec max jedna umowe raczej. Ta relacja jest potrzebna do raportu sprzedazy. Uwaga podwojne dojscie przez ID_PROJECT jest rowniez! Do tuningu</xs:documentation>
+            </xs:annotation>
+         </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:element name="DEALS_TABLE"
-               type="default_db__x3A__DEALS_TABLE:DEALS_TABLE"
-               id="DEALS_TABLE___d4e6255-1_DEALS_TABL"/>
+   <xs:element name="DEALS_TABLE" type="default_db__x3A__DEALS_TABLE:DEALS_TABLE"
+      id="DEALS_TABLE___d4e6255-1_DEALS_TABL"/>
 </xs:schema>

SE/schema/ant-object/default_db.IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI.xsd

@@ -30,7 +30,8 @@
    xmlns:default_db__x3A__PROBLEMS="https://biuro.biall-net.pl/wfs/default_db/table/PROBLEMS.xsd"
    elementFormDefault="qualified"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
-   vc:minVersion="1.1" attributeFormDefault="qualified">
+   vc:minVersion="1.1" attributeFormDefault="qualified"
+   xmlns:default_db__x3A__MK_Rewiry="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd">
    <xs:import namespace="http://www.opengis.net/gml/3.2"
       schemaLocation="http://www.opengis.net/gml/3.2"/>
    <xs:import namespace="http://biuro.biall-net.pl/p5/schema/types"
@@ -84,6 +85,12 @@
       schemaLocation="../../default_db.USERS2_MARKETING/USERS2_MARKETING/USERS2_MARKETING.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/PROBLEMS.xsd"
       schemaLocation="../../default_db.PROBLEMS/PROBLEMS/PROBLEMS.xsd"/>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
+      schemaLocation="../../default_db.MK_Rewiry/MK_Rewiry/MK_Rewiry.xsd">
+      <xs:annotation>
+         <xs:documentation>relacja do rewirow bedzie potrzebna do raportu sprzedazy , bo za rewirem kryja sie umowy, z ktorych wynika sprzedaz na fakturach</xs:documentation>
+      </xs:annotation>
+   </xs:import>
    <xs:simpleType name="M_DIST_TYPE">
       <xs:restriction base="xs:string"/>
    </xs:simpleType>
@@ -613,7 +620,25 @@
             ref="default_db__x3A__BADANIA_W_TERENIE:BADANIA_W_TERENIE"/>
          <xs:element ref="default_db__x3A__USERS2_MARKETING:USERS2_MARKETING" maxOccurs="unbounded"
             minOccurs="0"/>
-         <xs:element maxOccurs="unbounded" minOccurs="0" ref="default_db__x3A__PROBLEMS:PROBLEMS"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0" ref="default_db__x3A__PROBLEMS:PROBLEMS">
+            <xs:annotation>
+               <xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache>
+                     <system_cache__appinfo:source system_cache__appinfo:name="ID" system_cache__appinfo:ref_engine="view" system_cache__appinfo:xpath="default_db__x3A__PROBLEMS:PROBLEMS/ID_PROJECT"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
+            </xs:annotation>
+         </xs:element>
+         <xs:element ref="default_db__x3A__MK_Rewiry:MK_Rewiry" maxOccurs="unbounded" minOccurs="0">
+            <xs:annotation>
+               <xs:appinfo>
+                     <system_cache__appinfo:flat_relation_cache>
+                        <system_cache__appinfo:source system_cache__appinfo:name="ID" system_cache__appinfo:ref_engine="view" system_cache__appinfo:xpath="default_db__x3A__MK_Rewiry:MK_Rewiry/ID_PROJECT"/>
+                     </system_cache__appinfo:flat_relation_cache>
+                  </xs:appinfo>
+               <xs:documentation>Rewiry sa potrzebne dla potrzeby zrobienia raportu sprzedazy - idziemy do umowy i serwisu i faktur</xs:documentation>
+            </xs:annotation>
+         </xs:element>
       </xs:sequence>
    </xs:complexType>
    <xs:element name="IN7_MK_BAZA_DYSTRYBUCJI"
@@ -672,7 +697,6 @@
                <xs:element ref="default_db__x3A__COMPANIES:ID_BILLING_USERS"/>
                <xs:element maxOccurs="unbounded" minOccurs="0"
                   ref="default_db__x3A__SALES_PLAN:SALES_PLAN"/>
-               
                <!--<xs:element maxOccurs="unbounded" minOccurs="0"
             ref="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:INWESTYCJA_BUDOWA_SIECI"/>-->
                <xs:element ref="default_db__x3A__CRM_LISTA_ZASOBOW_OFFERS:CRM_LISTA_ZASOBOW_OFFERS"
@@ -1138,6 +1162,17 @@
                   maxOccurs="unbounded" minOccurs="0"/>
                <xs:element maxOccurs="unbounded" minOccurs="0"
                   ref="default_db__x3A__PROBLEMS:PROBLEMS"/>
+               <xs:element ref="default_db__x3A__MK_Rewiry:MK_Rewiry" maxOccurs="unbounded"
+                  minOccurs="0">
+                  <xs:annotation>
+                     <xs:appinfo>
+                     <system_cache__appinfo:flat_relation_cache>
+                        <system_cache__appinfo:source system_cache__appinfo:name="ID" system_cache__appinfo:ref_engine="view" system_cache__appinfo:xpath="default_db__x3A__MK_Rewiry:MK_Rewiry/ID_PROJECT"/>
+                     </system_cache__appinfo:flat_relation_cache>
+                  </xs:appinfo>
+                     <xs:documentation>Rewiry sa potrzebne dla potrzeby zrobienia raportu sprzedazy - idziemy do umowy i serwisu i faktur</xs:documentation>
+                  </xs:annotation>
+               </xs:element>
             </xs:sequence>
          </xs:restriction>
       </xs:complexContent>

SE/schema/ant-object/default_db.MK_Rewiry/MK_Rewiry/MK_Rewiry.xsd

@@ -18,7 +18,8 @@
    xmlns:default_db__x3A__CRM_LISTA_ZASOBOW="https://biuro.biall-net.pl/wfs/default_db/table/CRM_LISTA_ZASOBOW.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
    vc:minVersion="1.1"
-   xmlns:default_db__x3A__SALES_PLAN="https://biuro.biall-net.pl/wfs/default_db/table/SALES_PLAN.xsd">
+   xmlns:default_db__x3A__SALES_PLAN="https://biuro.biall-net.pl/wfs/default_db/table/SALES_PLAN.xsd"
+   xmlns:default_db__x3A__DEALS_TABLE="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd">
    <xs:import namespace="http://biuro.biall-net.pl/p5/schema/types"
       schemaLocation="../../../types.xsd"/>
    <xs:import namespace="http://www.opengis.net/gml/3.2"
@@ -36,6 +37,12 @@
       schemaLocation="../../default_db.CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW/CRM_LISTA_ZASOBOW.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/SALES_PLAN.xsd"
       schemaLocation="../../default_db.SALES_PLAN/SALES_PLAN/SALES_PLAN.xsd"/>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
+      schemaLocation="../../default_db.DEALS_TABLE/DEALS_TABLE/DEALS_TABLE.xsd">
+      <xs:annotation>
+         <xs:documentation>Ta relacja bedzie potrzebna do raportów sprzedazy</xs:documentation>
+      </xs:annotation>
+   </xs:import>
    <xs:simpleType name="A_STATUS_Type" id="__MK_Rewiry___d5e78387-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -339,6 +346,19 @@
                </xs:appinfo>
             </xs:annotation>
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__DEALS_TABLE:DEALS_TABLE">
+            <xs:annotation>
+               <xs:documentation>
+                  Potrzebne do raportu sprzedazy - idziemy do faktur
+               </xs:documentation>
+               <xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache>
+                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="NAZWA_REWI" system_cache__appinfo:xpath="default_db__x3A__DEALS_TABLE:DEALS_TABLE/M_REWIR"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
+            </xs:annotation>
+         </xs:element>
       </xs:sequence>
    </xs:complexType>
    <xs:element name="MK_Rewiry" type="default_db__x3A__MK_Rewiry:MK_Rewiry"

SE/schema/ant-object/default_db.SERVICES/SERVICES/SERVICES.xsd

@@ -115,7 +115,7 @@
          <xs:element ref="default_db__x3A__DEALS_TABLE:DEALS_TABLE">
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache>
+                  <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true"> <!-- to jest dodatkowa relacja, podstawowa powinna byc od umow  -->
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_DEALS_TABLE" system_cache__appinfo:xpath="default_db__x3A__DEALS_TABLE:DEALS_TABLE/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>