fix redmine 440: mostra completa offerta PRIMA che sia davvero fatta (in simulazione)

C2P/WebUserControls/mod_newProduct.ascx.cs

@@ -439,8 +439,6 @@ namespace C2P.WebUserControls
                 { }
                 showEdit = true;
             }
-            // fix visibilità button creazione offerta
-            lbCreateOffer.Visible = okCreate;
             // fix altri button x edit..
             if (!showEdit || editActive)
             {
@@ -476,6 +474,8 @@ namespace C2P.WebUserControls
             { }
             mod_S_Quot1.Visible = quoteOk;
             if (quoteOk) mod_S_Quot1.doUpdate();
+            // fix visibilità button creazione offerta - 2015.06.25 aggiunta condizione quoteOk
+            lbCreateOffer.Visible = okCreate && quoteOk;
         }
         /// <summary>
         /// sistema visibilità buttons x cambio stato

C2P_CronJob/bin/Release/C2P_CronJob.application

@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5jDp7p/YFyMLa9vQdH98t9gtb64=</dsig:DigestValue>
+        <dsig:DigestValue>bxI03TxkMUmsyqt77ro7c/SCD/Q=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest

@@ -84,7 +84,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>PryOAJW97tJRvGzzL48C7flgUXA=</dsig:DigestValue>
+        <dsig:DigestValue>VoRF4oUGkLXkXEC//iA3h3inZIY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -96,7 +96,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>m34cuY2MWUtnkhaDh4sww9nLx9E=</dsig:DigestValue>
+        <dsig:DigestValue>PY0yG0KPjn2Sj44zoAh5QqZJpW0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -252,7 +252,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>OWsKmyQHQHdoYsEdhpd4z5G3dvw=</dsig:DigestValue>
+        <dsig:DigestValue>WCZux0S90xinA+bU2R63Gov7x8U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

C2P_CronJob/bin/Release/NLog.config

@@ -1,15 +1,31 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
+
+
+  <!-- optional, add some variabeles
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
 
   <!-- 
   See https://github.com/nlog/nlog/wiki/Configuration-file 
   for information on customizing logging rules and outputs.
    -->
   <targets>
-    <!-- add your targets here -->
-    
+
+    <!-- 
+    add your targets here 
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+
     <!--
+    Writing events to the a file with the date in the filename. 
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
@@ -17,9 +33,10 @@
 
   <rules>
     <!-- add your logging rules here -->
-    
+
     <!--
-    <logger name="*" minlevel="Trace" writeTo="f" />
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
     -->
   </rules>
 </nlog>

C2P_Data/bin/Release/NLog.config

@@ -1,15 +1,31 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
+
+
+  <!-- optional, add some variabeles
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
 
   <!-- 
   See https://github.com/nlog/nlog/wiki/Configuration-file 
   for information on customizing logging rules and outputs.
    -->
   <targets>
-    <!-- add your targets here -->
-    
+
+    <!-- 
+    add your targets here 
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+
     <!--
+    Writing events to the a file with the date in the filename. 
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
@@ -17,9 +33,10 @@
 
   <rules>
     <!-- add your logging rules here -->
-    
+
     <!--
-    <logger name="*" minlevel="Trace" writeTo="f" />
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
     -->
   </rules>
 </nlog>

C2P_Report/C2P_Report.csproj

@@ -117,12 +117,10 @@
     <Content Include="Reports\IIS02\ReportOffers_S.rdl" />
     <Content Include="Reports\WinLab\ReportOffers_Q.rdl" />
     <Content Include="Reports\WinLab\ReportOffers_S.rdl" />
-    <EmbeddedResource Include="Reports\deploy\OffertDOC.rdlc" />
-    <EmbeddedResource Include="Reports\deploy\ReportOffers_Q.rdlc" />
-    <EmbeddedResource Include="Reports\deploy\ReportOffers_S.rdlc" />
-    <Content Include="Reports\deploy\StdCostList.rdlc">
-      <SubType>Designer</SubType>
-    </Content>
+    <EmbeddedResource Include="Reports\COSTIMATE\OffertDOC.rdlc" />
+    <EmbeddedResource Include="Reports\COSTIMATE\ReportOffers_Q.rdlc" />
+    <EmbeddedResource Include="Reports\COSTIMATE\ReportOffers_S.rdlc" />
+    <EmbeddedResource Include="Reports\COSTIMATE\StdCostList.rdlc" />
     <EmbeddedResource Include="Reports\IIS02\OffertDOC.rdlc" />
     <EmbeddedResource Include="Reports\IIS02\ReportOffers_Q.rdlc" />
     <EmbeddedResource Include="Reports\IIS02\ReportOffers_S.rdlc" />
@@ -135,10 +133,6 @@
     <EmbeddedResource Include="Reports\WinLab\ReportOffers_S.rdlc" />
     <Content Include="Reports\IIS02\StdCostList.rdl" />
     <Content Include="Reports\WinLab\StdCostList.rdl" />
-    <Content Include="Reports\deploy\ReportOffers_Q.rdl" />
-    <Content Include="Reports\deploy\ReportOffers_S.rdl" />
-    <Content Include="Reports\deploy\StdCostList.rdl" />
-    <Content Include="Reports\deploy\OffertDOC.rdl" />
     <Content Include="Reports\IIS02\OffertDOC.rdl" />
     <Content Include="Reports\WinLab\OffertDOC.rdl" />
     <None Include="Web.Debug.config">

C2P_Report/bin/NLog.config

@@ -1,15 +1,31 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
+
+
+  <!-- optional, add some variabeles
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
 
   <!-- 
   See https://github.com/nlog/nlog/wiki/Configuration-file 
   for information on customizing logging rules and outputs.
    -->
   <targets>
-    <!-- add your targets here -->
-    
+
+    <!-- 
+    add your targets here 
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+
     <!--
+    Writing events to the a file with the date in the filename. 
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
@@ -17,9 +33,10 @@
 
   <rules>
     <!-- add your logging rules here -->
-    
+
     <!--
-    <logger name="*" minlevel="Trace" writeTo="f" />
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
     -->
   </rules>
 </nlog>

VersGen/C2P.cs

@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.211.564")]
-[assembly: AssemblyFileVersion("2.3.211.564")]
+[assembly: AssemblyVersion("2.3.212.571")]
+[assembly: AssemblyFileVersion("2.3.212.571")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
 [assembly: AssemblyCompany("Steamware")]

VersGen/C2P.tt

@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.211.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.3.211.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.3.212.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.3.212.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+

packages/NLog.Config.4.0.1/content/NLog.config

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
+
+
+  <!-- optional, add some variabeles
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
+
+  <!-- 
+  See https://github.com/nlog/nlog/wiki/Configuration-file 
+  for information on customizing logging rules and outputs.
+   -->
+  <targets>
+
+    <!-- 
+    add your targets here 
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+
+    <!--
+    Writing events to the a file with the date in the filename. 
+    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
+    -->
+  </targets>
+
+  <rules>
+    <!-- add your logging rules here -->
+
+    <!--
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
+    -->
+  </rules>
+</nlog>

packages/NLog.Config.4.0.1/tools/Install.ps1

@@ -0,0 +1,12 @@
+param($installPath, $toolsPath, $package, $project)
+
+$configItem = $project.ProjectItems.Item("NLog.config")
+
+# set 'Copy To Output Directory' to 'Copy if newer'
+$copyToOutput = $configItem.Properties.Item("CopyToOutputDirectory")
+$copyToOutput.Value = 1
+
+# set 'Build Action' to 'Content'
+$buildAction = $configItem.Properties.Item("BuildAction")
+$buildAction.Value = 2
+