diff --git a/DB/SqlDataCompare_Vocab.dcmp b/DB/SqlDataCompare_Vocab.dcmp
index c615012..00635cd 100644
--- a/DB/SqlDataCompare_Vocab.dcmp
+++ b/DB/SqlDataCompare_Vocab.dcmp
@@ -6,61 +6,8 @@
SQL2016DEV.Sauder_NKC (sa)
- Data Source=WIN2016-SQL\PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False
- WIN2016-SQL\PROD.Sauder_NKC_Prod (sa)
+ Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False
+ SQL2016PROD.Sauder_NKC_Prod (sa)
Default
- [dbo].[AnagDevices]
- [dbo].[AnagItemStatus]
- [dbo].[AnagOpr]
- [dbo].[BatchList]
- [dbo].[BatchReqList_OLD]
- [dbo].[BinList]
- [dbo].[Bins]
- [dbo].[Carts]
- [dbo].[Clients]
- [dbo].[Config]
- [dbo].[ConfSetValues]
- [dbo].[CountAssigned]
- [dbo].[Counters]
- [dbo].[DIRITTI]
- [dbo].[ElencoPostazioni]
- [dbo].[ErrorsLog]
- [dbo].[FinalKit]
- [dbo].[FUNZIONE]
- [dbo].[Import_Log]
- [dbo].[ItemEvents]
- [dbo].[ItemList]
- [dbo].[ItemValidation]
- [dbo].[Kit2OtherItem]
- [dbo].[KitList]
- [dbo].[Lingue]
- [dbo].[Materials]
- [dbo].[MODULO]
- [dbo].[Nesting]
- [dbo].[OfflineOrderList]
- [dbo].[OffOrd2Item]
- [dbo].[Order2FinalKit]
- [dbo].[OrderList]
- [dbo].[OtherItemList]
- [dbo].[Pack2Kit]
- [dbo].[PackList]
- [dbo].[PackListDet]
- [dbo].[PackLog]
- [dbo].[Permessi]
- [dbo].[Permessi2Funzione]
- [dbo].[Places]
- [dbo].[PrintJobQueue]
- [dbo].[Processes]
- [dbo].[Remnants]
- [dbo].[ReplOrders]
- [dbo].[SheetList]
- [dbo].[Stacklist]
- [dbo].[TallyTable]
- [dbo].[UTENTE]
- [dbo].[Utenti]
- [ext].[BatchKitting]
- [ext].[BatchOrder]
- [raw].[ItemList]
- [raw].[OrderList]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index a2cb810..69930dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=343']) {
+ withEnv(['NEXT_BUILD_NUMBER=344']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index 5cac0a3..04fae77 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -93,8 +93,11 @@
+
@@ -425,6 +428,7 @@
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on remote access and securing ELMAH.
-->
+
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx
index 1bec3c4..781aaf6 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx
@@ -11,7 +11,7 @@
<%: traduci("SendToEstim") %>
<%: traduci("StopEstim") %>
-
traduci("SendToNest")
+
<%: traduci("SendToNest") %>
<%: traduci("StopNest") %>
<%: traduci("AcceptNest") %>