Merge 2017.3 Gold F

svn path=/Website/trunk/; revision=38446
2018-07-09 18:24:13 +00:00
parent 59c7ea186d e809e5b8e1
commit fe37e384ad
9 changed files with 93 additions and 35 deletions
--- a/CUST/BLCC/export/ADDD/.gitignore
+++ b/CUST/BLCC/export/ADDD/.gitignore
--- a/CUST/BLCC/export/gen_export_ADDD.bat
+++ b/CUST/BLCC/export/gen_export_ADDD.bat
@@ -0,0 +1,27 @@
+REM GEN_EXPORT_FACT
+REM
+REM BLCC
+REM
+REM Exporteert verkoopfacturatie vanuit FACILITOR als CSV tbv. Twinfield.
+REM Het aangemaakte CSV-bestand wordt gemaild naar de afgesproken persoon.
+REM
+REM Context : roep deze file aan indien nodig, of schedule deze
+REM Vereist : de randvoorwaarde voor het gebruik van gen_export
+REM
+REM $Revision$
+REM $Id$
+REM
+REM (c) 2018 Facilitor B.V.
+REM
+
+REM === cleanup
+copy .\ADDD\ADDD*.csv .\ADDD\Backup
+del .\ADDD\ADDD*.csv
+
+REM === create exportfile
+CALL ..\..\..\utils\gen_export\gen_export.bat ADDD
+
+REM === mail
+if not exist ".\ADDD\ADDD*.csv" goto einde
+cscript sendmailAddd.vbs
+:einde
--- a/CUST/BLCC/export/sendmailAddd.vbs
+++ b/CUST/BLCC/export/sendmailAddd.vbs
@@ -0,0 +1,17 @@
+Dim fso, folder, files
+Set fso = CreateObject("Scripting.FileSystemObject")
+
+Set folder = fso.GetFolder("d:\Apps\Facilitor\Fplace5i\CUST\BLCC\export\ADDD")
+Set files = folder.Files
+For each folderIdx In Files
+   If InStrRev(folderIdx.Name, ".csv") > 0 And folderIdx.Size > 0 Then
+      Set objEmail = CreateObject("CDO.Message")
+      objEmail.From = "no_reply@blcc.facilitor.nl"
+      ' objEmail.To = "m.vanderheide@facilitor.nl"
+      objEmail.To = "accounting1@brightlands.com;roger.treur@brightlands.com;leslie.vandewauw@brightlands.com"
+      objEmail.Subject = "Facilitor: Maandelijkse aanlevering ADDD-bestand"
+      objEmail.Textbody = "Automatisch verzonden ADDD-bestand."
+      objEmail.AddAttachment "d:\Apps\Facilitor\Fplace5i\CUST\BLCC\export\ADDD\" + folderIdx.Name
+      objEmail.Send
+   End If
+Next
--- a/CUST/BLCC/xsl/BLCC.xsl
+++ b/CUST/BLCC/xsl/BLCC.xsl
@@ -6,7 +6,7 @@
    <xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
  </xsl:variable>

-  <xsl:variable name="srtnotificatiecode">ORDMAI</xsl:variable>
+  <xsl:variable name="Xsrtnotificatiecode">ORDMAI</xsl:variable>

  <xsl:template name="stylesheet">
    <style>
@@ -2414,27 +2414,27 @@ In het geval van een opdracht buiten contractuele afspraken (workorder) met hoge

            <tr><td colspan="6"><br/><b>SPECIFICATION</b></td></tr>
            <tr>
-              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>ID</b></td>
-              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Issuer</b></td>
-              <td colspan="2" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Description</b></td>
-              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>VAT</b></td>
-              <td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;"><b>Amount excl.<br/>VAT</b></td>
+              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>ID</b></td>
+              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Issuer</b></td>
+              <td colspan="2" style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Description</b></td>
+              <td style="vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>VAT</b></td>
+              <td style="text-align:center;vertical-align:middle;border-bottom:1px solid black;background-color:#AAA;font-size:8pt;"><b>Amount excl.<br/>VAT</b></td>
            </tr>

            <xsl:for-each select="msxml:node-set($sortfilter2)/data_row">
              <tr>
                <td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="REGEL_ID"/></td>
                <td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="AANVRAGER"/></td>
-                <td colspan="2" style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="REGEL_OMS"/></td>
+                <td colspan="2" style="border-bottom:1px solid black;font-size:8pt;"><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="REGEL_OMS"/></xsl:call-template></td>
                <td style="border-bottom:1px solid black;font-size:8pt;"><xsl:value-of select="FIN_BTWTABELWAARDE_PERC"/> %</td>
                <td style="text-align:right;border-bottom:1px solid black;font-size:8pt;">€ <xsl:value-of select="format-number(MNDNET, '###.###.##0,00', 'european')"/></td>
              </tr>
            </xsl:for-each>

            <tr>
-              <td colspan="3" style="background-color:#AAA;"/>
-              <td colspan="2" style="vertical-align:middle;background-color:#AAA;"><b>Total</b></td>
-              <td style="text-align:right;vertical-align:middle;background-color:#AAA;">€ <xsl:value-of select="format-number(sum(msxml:node-set($sortfilter1)/data_row/MNDNET), '###.###.##0,00', 'european')"/></td>
+              <td colspan="3" style="background-color:#AAA;font-size:8pt;"/>
+              <td colspan="2" style="vertical-align:middle;background-color:#AAA;font-size:8pt;"><b>Total</b></td>
+              <td style="text-align:right;vertical-align:middle;background-color:#AAA;font-size:8pt;">€ <xsl:value-of select="format-number(sum(msxml:node-set($sortfilter1)/data_row/MNDNET), '###.###.##0,00', 'european')"/></td>
            </tr>
              </xsl:otherwise>
            </xsl:choose>
--- a/CUST/DIAN/xsl/exact2dian.xsl
+++ b/CUST/DIAN/xsl/exact2dian.xsl
@@ -5,22 +5,22 @@
 <xsl:variable name="new_line" select="'&#xA;'"/>

 <!--
-CliëntId          => ../OrderedBy/Debtor/@code
-CliëntAchternaam  => ../OrderedBy/Address/Addressee/Name
+CliëntID          => ../OrderedBy/Debtor/@code
+CliëntNaam        => ../OrderedBy/Address/Addressee/Name
 CliëntVoorletters => ../OrderedBy/Address/Addressee/Initials
 CliëntGeslacht    => ../OrderedBy/Address/Addressee/Title/@code *** Als MW.=>Vrouw, anders=>Man.
 CliëntTelefoon    => ../OrderedBy/Address/Phone
 CliëntEmail       => ../OrderedBy/Address/Email
 Artikelnr         => Item/@code
-Omschrijving      => Item/Description
+Omschrijving      => Item/Description<p align="center"></p>
 Prijs             => Item/Costs/Price/Value
 Eenheid           => Unit/@unit *** Dezelfde waarde als Unit/MultiDescriptions/MultiDescription[@number='0']?

-Catalogus Naam    => Hidden: 'Artikellijst <CliëntAchternaam>/<CliëntId>'
+Catalogus Naam    => Hidden: 'Artikellijst <CliëntNaam>/<CliëntID>'
 Leverancier       => Hidden: Altijd Exact
 Cat Datum         => Hidden: Datum toevoegen catalogus of artikel
 Artikelnr         => Item/@code
-Groep             => Hidden: <CliëntId>
+Groep             => Hidden: <CliëntID>
 Omschrijving      => Item/Description
 Prijs             => Item/Costs/Price/Value
 Eenheid           => Unit/@unit
@@ -36,25 +36,35 @@ Annuleerdagen     => Hidden: Altijd leeg
 Opmerking         => Hidden: Altijd leeg
 -->

-<xsl:template match="/">ClientId;ClientAchternaam;ClientVoorletters;ClientGeslacht;ClientTelefoon;ClientEmail;Artikelnr;Omschrijving;Prijs;Eenheid
-<xsl:for-each select="//Orders/Order/OrderLine">
-<xsl:variable name="ClientId"><xsl:value-of select="../OrderedBy/Debtor/@code"/></xsl:variable>
-<xsl:variable name="ClientAchternaam"><xsl:value-of select="../OrderedBy/Address/Addressee/Name"/></xsl:variable>
-<xsl:variable name="ClientVoorletters"><xsl:value-of select="../OrderedBy/Address/Addressee/Initials"/></xsl:variable>
+<xsl:template match="/">ClientID;ClientNaam;ClientVoorletters;ClientGeslacht;ClientTelefoon;ClientEmail;Artnr;ArtikelOmschrijving;ArtikelPrijs;ArtikelEenheid;AantalCE
+<xsl:for-each select="//ClientArtikellijst/Artikel">
+<xsl:sort select="regel" data-type="number"/>
+<xsl:variable name="ClientID"><xsl:value-of select="../ClientID"/></xsl:variable>
+<xsl:variable name="ClientNaam"><xsl:value-of select="../ClientNaam"/></xsl:variable>
+<xsl:variable name="ClientVoorletters"><xsl:value-of select="../ClientVoorletters"/></xsl:variable>
 <xsl:variable name="ClientGeslacht">
    <xsl:choose>
-        <xsl:when test="substring(../OrderedBy/Address/Addressee/Title/@code,1,1)='H'">M</xsl:when>
-        <xsl:when test="substring(../OrderedBy/Address/Addressee/Title/@code,1,1)='M'">V</xsl:when>
+        <xsl:when test="substring(../ClientGeslacht,1,1)='H'">M</xsl:when>
+        <xsl:when test="substring(../ClientGeslacht,1,1)='M'">V</xsl:when>
        <xsl:otherwise></xsl:otherwise>
    </xsl:choose>
 </xsl:variable>
-<xsl:variable name="ClientTelefoon"><xsl:value-of select="../OrderedBy/Address/Phone"/></xsl:variable>
-<xsl:variable name="ClientEmail"><xsl:value-of select="../OrderedBy/Address/Email"/></xsl:variable>
-<xsl:variable name="Artikelnr"><xsl:value-of select="Item/@code"/></xsl:variable>
-<xsl:variable name="Omschrijving"><xsl:value-of select="Item/Description"/></xsl:variable>
-<xsl:variable name="Prijs"><xsl:value-of select="Item/Costs/Price/Value"/></xsl:variable>
-<xsl:variable name="Eenheid"><xsl:value-of select="Unit/@unit"/></xsl:variable>
-<xsl:value-of select="$ClientId"/>;<xsl:value-of select="$ClientAchternaam"/>;<xsl:value-of select="$ClientVoorletters"/>;<xsl:value-of select="$ClientGeslacht"/>;<xsl:value-of select="$ClientTelefoon"/>;<xsl:value-of select="$ClientEmail"/>;<xsl:value-of select="$Artikelnr"/>;<xsl:value-of select="$Omschrijving"/>;<xsl:value-of select="$Prijs"/>;<xsl:value-of select="$Eenheid"/><xsl:value-of select="$new_line"/>
+<xsl:variable name="ClientTelefoon"><xsl:value-of select="../ClientTelefoon"/></xsl:variable>
+<xsl:variable name="ClientEmail"><xsl:value-of select="../ClientEmail"/></xsl:variable>
+<xsl:variable name="Artikelnr"><xsl:value-of select="translate(Artnr, ' ', '')"/></xsl:variable>
+<xsl:variable name="Omschrijving"><xsl:value-of select="translate(ArtikelOmschrijving, ' ', '')"/></xsl:variable>
+<xsl:variable name="Prijs"><xsl:value-of select="translate(ArtikelPrijs, ' ', '')"/></xsl:variable>
+<!--xsl:variable name="Eenheid">
+    <xsl:choose>
+        <xsl:when test="translate(ArtikelEenheid, 'STUKS ', 'stuks')='stuks' and aantal_ce!='1'">per <xsl:value-of select="translate(aantal_ce, ' ', '')"/> stuks</xsl:when>
+        <xsl:when test="translate(ArtikelEenheid, 'STUKS ', 'stuks')='stuks' and aantal_ce='1'"><xsl:value-of select="translate(ArtikelEenheid, 'STUKS ', 'stuks')"/></xsl:when>
+        <xsl:when test="translate(aantal_ce, ' ', '')!=''"><xsl:value-of select="translate(aantal_ce, ' ', '')"/> per <xsl:value-of select="translate(ArtikelEenheid, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ ', 'abcdefghijklmnopqrstuvwxyz')"/></xsl:when>
+        <xsl:otherwise><xsl:value-of select="translate(ArtikelEenheid, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ ', 'abcdefghijklmnopqrstuvwxyz')"/></xsl:otherwise>
+    </xsl:choose>
+</xsl:variable-->
+<xsl:variable name="Eenheid"><xsl:value-of select="translate(ArtikelEenheid, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ ', 'abcdefghijklmnopqrstuvwxyz')"/></xsl:variable>
+<xsl:variable name="AantalCE"><xsl:value-of select="translate(aantal_ce, ' ', '')"/></xsl:variable>
+<xsl:value-of select="$ClientID"/>;<xsl:value-of select="$ClientNaam"/>;<xsl:value-of select="$ClientVoorletters"/>;<xsl:value-of select="$ClientGeslacht"/>;<xsl:value-of select="$ClientTelefoon"/>;<xsl:value-of select="$ClientEmail"/>;<xsl:value-of select="$Artikelnr"/>;<xsl:value-of select="$Omschrijving"/>;<xsl:value-of select="$Prijs"/>;<xsl:value-of select="$Eenheid"/>;<xsl:value-of select="$AantalCE"/><xsl:value-of select="$new_line"/>
 </xsl:for-each>
 </xsl:template>
 </xsl:stylesheet>
--- a/CUST/STCH/export/SAP/Backup/.gitignore
+++ b/CUST/STCH/export/SAP/Backup/.gitignore
--- a/CUST/STCH/export/gen_export_sap.bat
+++ b/CUST/STCH/export/gen_export_sap.bat
@@ -1,6 +1,6 @@
 REM GEN_EXPORT_SAP.BAT
 REM
-REM BLCC
+REM STCH
 REM
 REM Exporteert opdrachten en kosten t.b.v. SAP
 REM
@@ -14,11 +14,12 @@ REM (c) 2016 Facilitor B.V.
 REM

 REM ================================================== cleanup
-copy .\SAP\*.csv .\SAP\BACKUP
-del .\SAP\*.csv
+copy .\SAP\*.xml .\SAP\BACKUP
+del .\SAP\*.xml

 REM ================================================== create exportfile(s)
-CALL ..\..\..\utils\gen_export\gen_export.bat SAP
+CALL ..\..\..\utils\gen_export\gen_export.bat SAP_XML

-REM ================================================== transfer file to STCH ftp
-ftp.exe -ni -s:ftp_stch2sap.scr
+REM ================================================== transfer file to STCH sftp
+REM ftp.exe -ni -s:ftp_ord2sap.scr
+..\..\..\utils\sftp\psftp -l facilitor -pw F@cilt0r2018! 31.11.57.222 -b sftp_ord2sap.scr
--- a/CUST/STCH/export/sftp_ord2sap.scr
+++ b/CUST/STCH/export/sftp_ord2sap.scr
@@ -0,0 +1,2 @@
+mput SAP\*.xml
+bye
--- a/CUST/UWVA/Plugins/dirinfo
+++ b/CUST/UWVA/Plugins/dirinfo
@@ -2,3 +2,4 @@ flexwhere.wsc       pluging voor objects.json api
 proxyflexware.aspx  Staat bij UWV op de BIS-server (BISIDSERVER) geinstalleerd als
                        C:\Sites\Default Web Site\FACILITORPROXY\proxyflexwhere.aspx
                    Aan te roepen via http://172.20.1.30/facilitorproxy/proxyflexwhere.aspx
+tcs.wsc             plugin voor het omzettten van binnenkomende buitenmeldingen van bezoekers (insliklezer TCS)