diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 7beebe2..b79bd8a 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -298,6 +298,7 @@ + @@ -324,6 +325,7 @@ + @@ -377,6 +379,7 @@ + @@ -583,6 +586,13 @@ NewProductOffer.aspx + + OfferReport.aspx + ASPXCodeBehind + + + OfferReport.aspx + OffersArchive.aspx ASPXCodeBehind @@ -817,6 +827,13 @@ mod_newQuote.ascx + + mod_OfferReport.ascx + ASPXCodeBehind + + + mod_OfferReport.ascx + mod_OffersArchive.ascx ASPXCodeBehind diff --git a/C2P/OfferReport.aspx b/C2P/OfferReport.aspx new file mode 100644 index 0000000..e5f9382 --- /dev/null +++ b/C2P/OfferReport.aspx @@ -0,0 +1,16 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/c2p/FullPage.master" AutoEventWireup="true" CodeBehind="OfferReport.aspx.cs" Inherits="C2P.OfferReport" %> + +<%@ Register Src="~/WebUserControls/mod_OfferReport.ascx" TagPrefix="uc1" TagName="mod_OfferReport" %> + + + + + + + +
+
+ +
+ + diff --git a/C2P/OfferReport.aspx.cs b/C2P/OfferReport.aspx.cs new file mode 100644 index 0000000..efad7ba --- /dev/null +++ b/C2P/OfferReport.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P +{ + public partial class OfferReport : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/OfferReport.aspx.designer.cs b/C2P/OfferReport.aspx.designer.cs new file mode 100644 index 0000000..bff6221 --- /dev/null +++ b/C2P/OfferReport.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P { + + + public partial class OfferReport { + + /// + /// mod_OfferReport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_OfferReport mod_OfferReport; + } +} diff --git a/C2P/Reports/OfferReport.xlsx b/C2P/Reports/OfferReport.xlsx new file mode 100644 index 0000000..04ac810 Binary files /dev/null and b/C2P/Reports/OfferReport.xlsx differ diff --git a/C2P/WebUserControls/mod_OfferReport.ascx b/C2P/WebUserControls/mod_OfferReport.ascx new file mode 100644 index 0000000..36baadb --- /dev/null +++ b/C2P/WebUserControls/mod_OfferReport.ascx @@ -0,0 +1,43 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_OfferReport.ascx.cs" Inherits="C2P.WebUserControls.mod_OfferReport" %> +
+ +
+
+
+
+
+

<%: traduci("HOffRepTitle") %>

+
+ <%: traduci("HOffRepBody") %> +
+
+
+
+
+
+
+
+
+ <%--

<%: traduci("HMaRepStepC") %>

--%> +
+
+

<%--<%: traduci("HMaRepProcData") %>--%> 

+
+
+
+ + + +
+ <%: traduci("OfferReportFile") %> +
+ +
+
+
+
+
+
+
+
+
diff --git a/C2P/WebUserControls/mod_OfferReport.ascx.cs b/C2P/WebUserControls/mod_OfferReport.ascx.cs new file mode 100644 index 0000000..d1504f6 --- /dev/null +++ b/C2P/WebUserControls/mod_OfferReport.ascx.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using C2P_Data; + +namespace C2P.WebUserControls +{ + public partial class mod_OfferReport : SteamWare.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_OfferReport.ascx.designer.cs b/C2P/WebUserControls/mod_OfferReport.ascx.designer.cs new file mode 100644 index 0000000..e18a929 --- /dev/null +++ b/C2P/WebUserControls/mod_OfferReport.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls { + + + public partial class mod_OfferReport { + + /// + /// divHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHelp; + + /// + /// divAnalisys control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAnalisys; + + /// + /// HyperLink2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink HyperLink2; + } +} diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 4b84ecb..f824a7e 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -58,8 +58,7 @@ diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index be0a7b3..56608dd 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index c81a26a..2d4c7ab 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 2277b4d..f0de665 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index c81a26a..2d4c7ab 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 4407948..5ecb664 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 2277b4d..f0de665 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 3fe0612..c9221cb 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.158.452")] -[assembly: AssemblyFileVersion("2.2.158.452")] +[assembly: AssemblyVersion("2.3.162.453")] +[assembly: AssemblyFileVersion("2.3.162.453")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 9a2644d..9cc01f8 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.158.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.158.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.3.162.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.3.162.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+