2018.2 Gold F changes

svn path=/Website/branches/v2018.2/; revision=42304

APPL/API2/model_reportcolumns.inc

@@ -210,7 +210,16 @@ function model_reportcolumns(usrrap_key, params)
             var is_view_name = (oRs("fac_usrrap_functie").Value & 2) == 0;  // niet de procedures
             if (oRs("fac_usrrap_functie").Value == 3) // procedure + gestyled
             {
-                is_view_name = true;
+                var sql_c = "SELECT object_name, object_type"
+                          + "  FROM user_objects"
+                          + " WHERE object_type IN ('VIEW','TABLE')"
+                          + "   AND object_name = UPPER(" + safe.quoted_sql(view_name.toUpperCase()) + ")";
+                var oRs_c = Oracle.Execute(sql_c);
+                if (oRs_c.eof)
+                    is_view_name = false; // Bij styling optie Procedure+gestyled moet ook de view {view_name} aanwezig zijn
+                else
+                    is_view_name = true;
+                oRs_c.Close();
             }
             oRs.Close();
 

APPL/Localscripts/FcltMgr.js

@@ -927,7 +927,7 @@ var FcltMgr =
                 {
                     if ($(helpFrame).hasClass("fcltmodal"))
                     {   // AAEN#20885 jQuery 1.6.1/ ui 1.8.13 gaf problemen als rechtstreeks
-                        setTimeout( function () { parent.FcltMgr._resizeModal(helpFrame) }, 100)
+                        setTimeout( function () { parent.FcltMgr._resizeModal(helpFrame); if (updateTableHeaders) { updateTableHeaders(); } }, 100)
                     }
                     else if ($(helpFrame).hasClass("frametab"))
                     {   // Niets doen als via jumpto een list wordt aangeroepen (bv. prs_phonebook_list.asp).

APPL/Shared/default.csx

@@ -3347,9 +3347,10 @@ tr.unauthorized {
 .mv.r {}
 .mv.l {}
 /* styling for modal (popup) forms */
-body.modal {
+body.modal, body.modal form {
     padding:2px;
 }
+
 /* for modal-like tabs*/
 .likemodal {
    background-color: ==backgroundcolor==;

APPL/Shared/default.inc

@@ -8,7 +8,7 @@
     Context:     Vanuit ELK asp bestand
 */
 
-var FCLTVersion="2018.2d";
+var FCLTVersion="2018.2f";
 var FCLTMinDatabaseSchema="35";
 
 var custpath = rooturl + "/cust/" + customerId;  // path to customer files

CUST/KFSG/custfunctions.wsc

@@ -74,7 +74,7 @@ bes_punch_receive = function (RequestForm, bes_srtdeel_key, item, pResult)
   };
 
   // Alleen voor leverancier Xerox uitvoeren
-  if (bedr_key == 30821)
+  if (bedr_key == 63381)
   {
     // PO
     var po_nr = punchNVL("NEW_ITEM-CUST_FIELD1[#]", item, "Onbekend");

CUST/KFSG/xsl/KFSG.xsl

@@ -4714,21 +4714,21 @@ END:VCALENDAR
 							  <xsl:when test="BROC_FLAG='B'">
 							    <xsl:attribute name="title">Toon variabele bestelopdrachten.</xsl:attribute>
 							    <xsl:attribute name="class">tekst</xsl:attribute>
-							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
 							    <xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=864&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
 							    <u><xsl:value-of select="INKOOPORDERNR"/></u>
 							  </xsl:when>
 							  <xsl:when test="BROC_FLAG='R'">
 							    <xsl:attribute name="title">Toon variabele reserveringen.</xsl:attribute>
 							    <xsl:attribute name="class">tekst</xsl:attribute>
-							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
 							    <xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=863&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
 							    <u><xsl:value-of select="INKOOPORDERNR"/></u>
 							  </xsl:when>
 							  <xsl:when test="BROC_FLAG='O'">
 							    <xsl:attribute name="title">Toon variabele opdrachten.</xsl:attribute>
 							    <xsl:attribute name="class">tekst</xsl:attribute>
-							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
+							    <xsl:attribute name="style">cursor:pointer;</xsl:attribute>
 							    <xsl:attribute name="onclick">FcltMgr.openDetail('appl/fac/fac_usrrap_list.asp?usrrap_key=862&amp;fclt_f_colname1=MAAND&amp;fclt_f_colvalue1=<xsl:value-of select="MAAND"/>&amp;fclt_f_colname2=FCLT_F_LEVERANCIER&amp;fclt_f_colvalue2=<xsl:value-of select="FCLT_F_LEVERANCIER"/>&amp;fclt_f_colname3=FCLT_F_CONTRACTNR&amp;fclt_f_colvalue3=<xsl:value-of select="CONTRACTNR"/>', '<xsl:value-of select="MAAND"/>/<xsl:value-of select="CONTRACTNR"/>');</xsl:attribute>
 							    <u><xsl:value-of select="INKOOPORDERNR"/></u>
 							  </xsl:when>