a.binder hace 6 años
padre
commit
4e8ed39307

+ 13 - 2
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_DZIENNIK_KORESP.dita

@@ -35,8 +35,19 @@
           <p>Zleceniobiorca:</p><ph/>
           <p xpath="K_OD_KOGO"/><ph/>
           <p xpath="OD_KOGO_ADRES"/><ph/>
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
+         
+          
+          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
+            
+            <p xpath="P_NAME"/><ph/>
+            <p xpath="P_NAME_SECOND"/><ph/>
+            <p>nip: <ph xpath="P_NIP"/><ph> </ph> KRS:<ph xpath="P_KRS_NUMER"/><ph> PESEL</ph><ph xpath="P_PESEL"/><ph> </ph></p>
+            <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_POST_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph> </ph><ph xpath="P_ADDRESS_HOME"/></p>
+            <p>Adres koresp. <ph xpath="P_ADDRESS_KORESP_1282"/><ph> </p>
+            <p><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+            
+            
+          </RelatedFeature>
         </stentry>
       </strow>
     </simpletable>

+ 19 - 8
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa_zleceniobiorca/IN7_DZIENNIK_KORESP.dita

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP"
+<RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
   <!-- Sample template to use with Procesy5 model-driven engine with Concurrent and Parallel processing   -->
@@ -18,11 +18,11 @@
     <ph>z dnia</ph>
     <ph xpath="K_DATA_OTRZYMANEJ_KORESP"/></title>
   <body>
-    <simpletable id="simpletable_uyma_ps1_zy">
+    <simpletable id="simpletable_uym_ps1_zy">
       <strow>
         <stentry>
-          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
-            <p>Zleceniobiorca:</p><ph/>
+          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_OWNER" typeName="p5_default_db:BILLING_OWNER" typeNameRealResource="p5_default_db:BILLING_OWNER"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
+            <p>Zleceniodawca:</p><ph/>
             <p xpath="name1"/><ph/>
             <p xpath="name2"/><ph/>
             <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph> ul.</ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
@@ -32,16 +32,27 @@
             
         </RelatedFeature></stentry>
         <stentry>
-          <p>Zleceniodawca:</p><ph/>
+          <p>Zleceniobiorca:</p><ph/>
           <p xpath="K_OD_KOGO"/><ph/>
           <p xpath="OD_KOGO_ADRES"/><ph/>
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
-          <p xpath="K_NR_OTRZYM_KORESP"/><ph/>
+         
+          
+          <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
+            
+            <p xpath="P_NAME"/><ph/>
+            <p xpath="P_NAME_SECOND"/><ph/>
+            <p>nip: <ph xpath="P_NIP"/><ph> </ph> KRS:<ph xpath="P_KRS_NUMER"/><ph> PESEL</ph><ph xpath="P_PESEL"/><ph> </ph></p>
+            <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_POST_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph> </ph><ph xpath="P_ADDRESS_HOME"/></p>
+            <p>Adres koresp. <ph xpath="P_ADDRESS_KORESP_1282"/><ph> </p>
+            <p><ph>email:</ph><ph xpath="user_mail_contact"/> <ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+            
+            
+          </RelatedFeature>
         </stentry>
       </strow>
     </simpletable>
     
-    <p><b><ph/><ph xpath="K_ZAWARTOS"/></b></p>
+    <p><b>Tytuł umowy: <ph/><ph xpath="K_ZAWARTOS"/></b></p>
   
  
     <p>Tresc: </p>