From 3a1ee6b50bfc2f4ef33f616a808d3729e82b9367 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Tue, 26 Sep 2017 15:18:23 +0000 Subject: [PATCH] Merge 2017.1 Gold F patches svn path=/Website/trunk/; revision=35454 --- APPL/API2/api2.inc | 9 ++++--- CUST/AKZA/custfunctions.wsc | 4 +-- CUST/BLCC/export/gen_export_PWRBI.bat | 4 ++- CUST/KFSG/xsl/KFSG.xsl | 35 +++++++++++++++++++++++--- CUST/LOGC/apple-touch-icon.png | Bin 17766 -> 0 bytes 5 files changed, 43 insertions(+), 9 deletions(-) delete mode 100644 CUST/LOGC/apple-touch-icon.png diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc index 368745c151..78f9114942 100644 --- a/APPL/API2/api2.inc +++ b/APPL/API2/api2.inc @@ -891,11 +891,14 @@ api2 = { existing_includes[inckey].found = true; } } - for (oldi in existing_includes) + if (!incmodel.keyfield) // niet voor custom_fields { - if (!existing_includes[oldi].found) + for (oldi in existing_includes) { - incmodel.REST_DELETE(params, oldi); + if (!existing_includes[oldi].found) + { + incmodel.REST_DELETE(params, oldi); + } } } } diff --git a/CUST/AKZA/custfunctions.wsc b/CUST/AKZA/custfunctions.wsc index 2d62d1c2c4..9bc6ac9e7c 100644 --- a/CUST/AKZA/custfunctions.wsc +++ b/CUST/AKZA/custfunctions.wsc @@ -153,9 +153,9 @@ mld_postsave = function (mld_melding, pResult) // Eerst controleren of de drive, folder en het bestand aanwezig zijn. Anders niet kopieeren. // Als het kopie al aanwezig is dan, dan niet opnieuw kopieeren - if (fso.DriveExists("d:") && fso.FolderExists("e:\\ptw") && fso.FileExists("e:\\ptw\\TEST.xlsm") && !fso.FileExists("e:\\ptw\\ptw-" + mld_melding + ".xlsm")) + if (fso.DriveExists("d:") && fso.FolderExists("d:\\ptw") && fso.FileExists("d:\\ptw\\PTW Master 20170701 (Dutch).xlsm") && !fso.FileExists("d:\\ptw\\ptw-" + mld_melding + ".xlsm")) { - fso.CopyFile("e:\\ptw\\PTW Master 20170701 (Dutch).xlsm", "e:\\ptw\\ptw-" + mld_melding + ".xlsm"); + fso.CopyFile("d:\\ptw\\PTW Master 20170701 (Dutch).xlsm", "d:\\ptw\\ptw-" + mld_melding + ".xlsm"); // TODO: Kenmerkwaarde werkvergunning (km961) vullen met locatie nieuwe bestand. // Controleren of er al een kenmerkmelding record aanwezig is voor kenmerk 961. diff --git a/CUST/BLCC/export/gen_export_PWRBI.bat b/CUST/BLCC/export/gen_export_PWRBI.bat index a714a53351..423159f719 100644 --- a/CUST/BLCC/export/gen_export_PWRBI.bat +++ b/CUST/BLCC/export/gen_export_PWRBI.bat @@ -2,7 +2,7 @@ REM GEN_EXPORT_PWRBI.BAT REM REM BLCC REM -REM Exporteert 5-tal PowerBI-bestanden als CSV (BLCC#41180). +REM Exporteert 6-tal PowerBI-bestanden als CSV (BLCC#41180 en BLCC#42928). REM REM Context : roep deze file aan indien nodig, of schedule deze REM Vereist : de randvoorwaarde voor het gebruik van gen_export @@ -28,5 +28,7 @@ CALL ..\..\..\utils\gen_export\gen_export.bat PWRBI_ORDTRK CALL ..\..\..\utils\gen_export\gen_export.bat PWRBI_MLD +CALL ..\..\..\utils\gen_export\gen_export.bat PWRBI_KOSTEN + REM ================================================== transfer file to BLCC ftp ftp.exe -ni -s:ftp_blcc2pwrbi.scr diff --git a/CUST/KFSG/xsl/KFSG.xsl b/CUST/KFSG/xsl/KFSG.xsl index 2bed0fa7bb..3168fe4c7a 100644 --- a/CUST/KFSG/xsl/KFSG.xsl +++ b/CUST/KFSG/xsl/KFSG.xsl @@ -2685,8 +2685,8 @@ Wij verzoeken u de met de uitvoeringsdatum en de werkzaamheden gespecificeerde f
 
-  
-
+ --
+ -
-
@@ -3070,6 +3070,35 @@ Wij verzoeken u de met de uitvoeringsdatum en de werkzaamheden gespecificeerde f + +BEGIN:VCALENDAR +VERSION:2.0 +METHOD:REQUEST +BEGIN:VEVENT +UID:FCLTRES +DTSTAMP:TZ +DTSTART:TZ +DTEND:TZ +SUMMARY;ENCODING=QUOTED-PRINTABLE:: - +DESCRIPTION;ENCODING=QUOTED-PRINTABLE: +LOCATION;ENCODING=QUOTED-PRINTABLE: +ORGANIZER;CN=:MAILTO:reservering-noreply@facilitor.nl + +ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;CN= + ():MAILTO: + +SEQUENCE: + + + + + +PRIORITY:5 +END:VEVENT +END:VCALENDAR + + + @@ -3944,4 +3973,4 @@ Wij verzoeken u de met de uitvoeringsdatum en de werkzaamheden gespecificeerde f - \ No newline at end of file + \ No newline at end of file diff --git a/CUST/LOGC/apple-touch-icon.png b/CUST/LOGC/apple-touch-icon.png deleted file mode 100644 index 42e8b92aa06a04fcb1bd6d111ed46e472fc51bb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17766 zcmeI4cT`i^y1+A|SWpKGBRKaWF*a}vDUbw05;PQH1VrhbLvnyf3MN5<1soIbqvOk&a-op zI$2rLIU<1$z!iCeIx;~3WR1ZvjAQ`-#~+kpy+L1|kcoSJJs*eVahW(riWSi+z!>!7 znQsw;wp*<2I9vQV23(vGOPL{~LjeS!6u`;^e4&IcW8xHX>Cm&hnSjG8Or-uy+-iA3 ztdo@u)>tG4u@oIDoo&nJtAF?j2-&mSjx~7 zL(KJ|Z!j?%N(V_yoS#%0KqnA_f`W8{bag~xUjoU%z<@v`6UbydWPz6i3#EVzFO)1E z3^E+Y1e9>ZyZ|XrB*e<&0^XuPDHDg2CmQ(-jY|+Pl1L~SVh2$q$bbL>Nry=If|HdM zvYS9Kp{GP@x*6)p(8wlCD6tC;00|pFi6~Ia0Zli9Lh0g(IuYO}l8PjLqA&D+ME%84 za5*C#2?!MP6@a-M0>}piP)-TtN1AX9Ql8J~iTJZh}5v7)N5T2=suCzPYmW)R>`qcc7l4>SR!AWL46c%lKG zOtB-8>3S48iSi?nOeYe@1R1o1#jt{^p9@HVuZc3w79K~$<@p4ERg_W7@iDBd=oUhW z6cBPi3lkPJb{!s%OZTCWseq3+6;GnkeDHc?T^ioo8(J|wR2tWS1aQ3dL9$|yw(am8F&-Pcp3*Jf*dM9(bort zQ%n%%vsC6h2~5H{R#d`E>{e59igP{~wUk)M>`ACBR zF}T_ns*tZ+n}c!3JHit%2=e`!&-)Kdg#_6A|C@-fTUY-j6ERxJ96vzl3vyY6;UXSx z_`10poYC>CYk0+ez8V>$yNewtlUf47pja}#7!<3O4fu|4mG^hBbpCg%bu^zMmo*>& zS$vT%2dZi@$RJFlhL2mG8fGW&J3<(R8Xjii(jROcKisk1nvl|%?ih>sBC(Z-3$k>_ zx{WrEc7ws?(0xQ=0U%}Z1b{C{2oU-*2&0W-EaeA19olapN`PXYBQXe{wZZM3y|)I#vyLbw+j_tA@LddfE$lQWkXbDLM*k9^)myjnEZ*Y@v%Y$f8mx zx)cTh-VFD!;mJV0lL-$xF(vYypG1LDDV*S%2|b;^=s89+0#RUU`ETXuO`M|U&E*KDG5ygef2c|`F!GIu( zC@y3^FfED;1_W6|aUt`8X;EA-Ajl$$3z-j0i{gR-K^75lDUZGo3kspPV1uC7UDd#Y z7SOA*SdRGyD-34KQVeFtP7J1N0QzmkU;>F4%u6o}h7P@pt0p?=S!@Qqg?q}vWVM~F z?$u#WOV=8Wl6?IgnFZ=9?D@YP^>RMg9Bq1T$Feo6%OfpIjaU7hX1~Xd@hkN}#nJ;d zX?`pDwib!+!ji0ys#ZV$`P_ny*?gRPxXYQjW_EU_1 ze)BQs=~ls9UGwff#?QH|&LdB|9=|ti@r@w`v^DR>at~Z2P2LqYN7-ze(qh$pHbl0T zda4)Hz%EcU%vLtjQeUJ{6iibnV3v@F+)@!@VoOB`$aNyi36jAq|Bu}Yn|M_3WL%wR z-UEJAy3y^L5Rt5v#YopA?p?wR3y+<7MB|Eo{=g0D&N)jg4?qJtWq$d=KSR^advdSg z_PopZM%k=lcgVnX(Dsn_L1<9Pk5yYW@7`(#rY8(6)oF9RQ5yEr_wtd*f?o_=41;r3 z8tP}8wLYKyxZU}&`lY72j;^h*9+SY@>hkZWMr78JH1@dp*_K)s%+BbBx+`B$;z zR^;N$$7 z(y!BxyEwP{Q=#_JB~^Kps=I%6RXDv;ek{T4n5PlWcH2+2=J8yt5??a!tN5m#t^srV zoTLT!X6Y;C%IBxFt+J4Em=aXwu8H2keK}-P^SJ&$`S{sIj%{pu7CqHs zgDNF%Z|jOvqOzv_%b40P9a()cGa;osyNoB0ggMe}`jCs2xSWwtysxuhN|n7*K- zxqI8jBj0hSEqDL1f2*Nkv-&Cfi@)MRvKn)JGoo|ehSubJ;x#d=F8NYhZ#rh^<(oZq z=!!5eZAy$SwqH_f_Hf1gwUI@@$_pWJ`-~2_%$bSj^ULze>6DlozZ78qE?&1iwIi{r z@nrz-Hjo?Z@q_qKUZ}gp5{JXx&p+VG661N7J0vDvx>Q_!THBuqXv^lu;hKbQ z!ZT;#URs9Aa<>#^Vdu)9erZ|S^TO7*g83+Bm#A!;TmOR?4&5=@Fz3qic(tH=(+v7e z)&T4hXg`2TFif?(^DH>2?^$wtOnI&SujLNwGS~hXbf}?Tb*^<{eyGv?H%lIbE+VA9 zaCOy~?T~-(!nZ}cPiCcKGO3w`aiNCu?UnoVH)!j)u5Xwz?Q~J~N1X8;s7F9ef0ef8 zxAU{VbI7CY_`!334!|(jcNG>hx<8 zqO5km#v}IaJCWXehV2>8Hh;Y3ndK*AG!vNRrP!9;Sr-Qq7OHOb*;JVlY1Df!|5#3S z?5_2m8PnR_{gYDCy~-m(XFkeipLdzzTEYGi^UpfNpU)AUz-L1&RgKK>ZA znfGZL3hVFvR3=+Eb-*vjLA17}uc>84)zy_}y?%*0{_x_7w+q@jyEiKJbneT-WLr8_ ze_xvH;aIWwUG6uVjGoocetv$##b<8NIR%|JZ#KSPVf?3RaYV95!kbx>paE;fDe0$| z?Ew>URfMkMghf!j3yeh{YHJVge$AXSP}(8zc8*WUZ%U^0M(ncJ4ij%uawS3s?EUVe z>;gg_!^ZaPvCSKLrmI0GCdV{@(k_3>8qBjC%%x_5F>UdE+Z4& iXNGP*CM5$?FrJlNo$nnr=gR*RiiN4Q$pyAo*#7`%9y&Y#