Merge branch 'master' of bn.git:plabudda/se

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl

@@ -277,7 +277,7 @@
             </FAKTURY_vs_UMOWY>
         </xsl:variable>
         
-        <topic id="topic_ghxxxf_ruaam_aos_{ generate-id()}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        <topic id="topic_ghxxxf_fxu_uaam_aos_{ generate-id()}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
             <xsl:variable name="polarize_osoba_string" select="'Hirsz' "/>
             <title>Analiza FAKTUR vs UMOWY - kwoty (FXU). </title>
@@ -287,7 +287,7 @@
                 <xsl:choose>
                     <xsl:when test="$rok//Data_zawarcia.rok">
                         <xsl:variable name="simpletable">
-                            <simpletable frame="all"  id="simpgletaakbslesss_inaaz_fwf_{generate-id()}" system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true"> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
+                            <simpletable frame="all"  id="simpglefxu_taakbslesss_inaaz_fwf_{generate-id()}" system_cache__dita:width_cols="auto"  system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true"> <!-- system_cache__dita:width_cols="10" system_cache__dita:bypass_rows_with_zero="true" system_cache__dita:bypass_rows_empty="true" -->
                                 
                                 <sthead>
                                     <stentry>Rejestr</stentry>
@@ -1880,7 +1880,13 @@
                 </topic>
             </xsl:variable>
             
-            
+            <xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY">
+                <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY" select=".">
+                    <xsl:with-param name="group_name" select="$group_name"/>
+                    <xsl:with-param name="resulset"  select="$resulset"/>
+                </xsl:apply-templates>
+                <!--</xsl:result-document>-->
+            </xsl:variable>
             
             
             
@@ -1952,6 +1958,10 @@
                         <xsl:with-param name="path_rel" select="'../'"/>
                         <xsl:with-param name="xref" select="'topic'"/>
                     </xsl:apply-templates>
+                    <xsl:apply-templates mode="ditamap_root.embedded_map" select="$BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY">
+                        <xsl:with-param name="path_rel" select="'../'"/>
+                        <xsl:with-param name="xref" select="'topic'"/>
+                    </xsl:apply-templates>
                 </topic>
             </xsl:result-document>
             
@@ -1966,16 +1976,10 @@
             <xsl:apply-templates mode="ditamap_root.embedded_map.topic_child_to_ditamap" select="$topic.faktury">
                 <xsl:with-param name="path_rel" select="''"/>
             </xsl:apply-templates>
-            <topicref href="{$group_name}/{$refpos}_FXU.dita">
-                <xsl:result-document href="{$temp}/{$uuid}/{$group_name}/{$refpos}_FXU.dita">
-                    <!--<xsl:variable name="BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY">-->
-                    <xsl:apply-templates mode="BI_audit_ENERGA_RUM_KONTRAHENCI.BI_audit_ENERGA_FAKTURY_vs_BI_audit_ENERGA_RUM_UMOWY" select=".">
-                        <xsl:with-param name="group_name" select="$group_name"/>
-                        <xsl:with-param name="resulset"  select="$resulset"/>
-                    </xsl:apply-templates>
-                </xsl:result-document>
-                <!--</xsl:variable>-->
-            </topicref>
+            <!--<topicref href="{$group_name}/{$refpos}_FXU.dita">
+                <!-\-<xsl:result-document href="{$temp}/{$uuid}/{$group_name}/{$refpos}_FXU.dita">-\->
+                    
+            </topicref>-->
         </topicref>
         
         

SE/se-lib/Route/UrlAction/JPK.php

@@ -349,7 +349,7 @@ format: 'YYYY-MM'
 <div class="container" style="margin-top:20px">
   <form class="form-horizontal" method="post" target="_blank">
     <legend>
-      Podgląd deklaracjii JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH'] . " (" . ((($this->JPK_VAT_Wariant == 2 && $this->JPK['PURPOSE'] == 1) || ($this->JPK_VAT_Wariant == 3 && $this->JPK['PURPOSE'] === 0)) ? "pierwsze złożenie" : "korekta") . ")"?>
+      Podgląd deklaracjii JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH'] . " (" . ((($this->JPK_VAT_Wariant == 2 && $this->JPK['PURPOSE'] == 1) || ($this->JPK_VAT_Wariant == 3 && $this->JPK['PURPOSE'] == 0)) ? "pierwsze złożenie" : "korekta") . ")"?>
       <span class="pull-right">
         <?=$this->BO['name1']?>
       </span>
@@ -381,7 +381,7 @@ format: 'YYYY-MM'
 <div class="container" style="margin-top:20px">
   <form class="form-horizontal" method="post" enctype="multipart/form-data">
     <legend>
-      Edycja deklaracji JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH']." (".((($this->JPK_VAT_Wariant == 2 && $this->JPK['PURPOSE'] == 1) || ($this->JPK_VAT_Wariant == 3 && $this->JPK['PURPOSE'] === 0)) ? "pierwsze złożenie" : "korekta").")"?>
+      Edycja deklaracji JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH']." (".((($this->JPK_VAT_Wariant == 2 && $this->JPK['PURPOSE'] == 1) || ($this->JPK_VAT_Wariant == 3 && $this->JPK['PURPOSE'] == 0)) ? "pierwsze złożenie" : "korekta").")"?>
       <span class="pull-right">
         <?=$this->BO['name1']?>
       </span>