diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index fba25ef..12dcefd 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -196,6 +196,22 @@ + + + + + + + + + + + + + + + + diff --git a/C2P/Drawings/1AN00001.png b/C2P/Drawings/1AN00001.png new file mode 100644 index 0000000..cdbf41a Binary files /dev/null and b/C2P/Drawings/1AN00001.png differ diff --git a/C2P/Drawings/1AN00002.png b/C2P/Drawings/1AN00002.png new file mode 100644 index 0000000..6c1cbae Binary files /dev/null and b/C2P/Drawings/1AN00002.png differ diff --git a/C2P/Drawings/1AN00003.png b/C2P/Drawings/1AN00003.png new file mode 100644 index 0000000..9dc834f Binary files /dev/null and b/C2P/Drawings/1AN00003.png differ diff --git a/C2P/Drawings/1AN00004.png b/C2P/Drawings/1AN00004.png new file mode 100644 index 0000000..eb9e6f1 Binary files /dev/null and b/C2P/Drawings/1AN00004.png differ diff --git a/C2P/Drawings/1AN00005.png b/C2P/Drawings/1AN00005.png new file mode 100644 index 0000000..8de0c82 Binary files /dev/null and b/C2P/Drawings/1AN00005.png differ diff --git a/C2P/Drawings/Itm0001.png b/C2P/Drawings/Itm0001.png new file mode 100644 index 0000000..9dc834f Binary files /dev/null and b/C2P/Drawings/Itm0001.png differ diff --git a/C2P/Drawings/Itm0002.png b/C2P/Drawings/Itm0002.png new file mode 100644 index 0000000..6c1cbae Binary files /dev/null and b/C2P/Drawings/Itm0002.png differ diff --git a/C2P/Drawings/Itm0003.png b/C2P/Drawings/Itm0003.png new file mode 100644 index 0000000..cdbf41a Binary files /dev/null and b/C2P/Drawings/Itm0003.png differ diff --git a/C2P/Drawings/Itm0004.png b/C2P/Drawings/Itm0004.png new file mode 100644 index 0000000..eb9e6f1 Binary files /dev/null and b/C2P/Drawings/Itm0004.png differ diff --git a/C2P/Drawings/Itm0005.png b/C2P/Drawings/Itm0005.png new file mode 100644 index 0000000..8de0c82 Binary files /dev/null and b/C2P/Drawings/Itm0005.png differ diff --git a/C2P/Drawings/MissingImage.png b/C2P/Drawings/MissingImage.png new file mode 100644 index 0000000..cdbf41a Binary files /dev/null and b/C2P/Drawings/MissingImage.png differ diff --git a/C2P/Drawings/Profilo_01.png b/C2P/Drawings/Profilo_01.png new file mode 100644 index 0000000..47e1a4c Binary files /dev/null and b/C2P/Drawings/Profilo_01.png differ diff --git a/C2P/Drawings/Profilo_02.png b/C2P/Drawings/Profilo_02.png new file mode 100644 index 0000000..3ab9ba2 Binary files /dev/null and b/C2P/Drawings/Profilo_02.png differ diff --git a/C2P/Drawings/Profilo_03.png b/C2P/Drawings/Profilo_03.png new file mode 100644 index 0000000..6c1cbae Binary files /dev/null and b/C2P/Drawings/Profilo_03.png differ diff --git a/C2P/Drawings/Profilo_04.png b/C2P/Drawings/Profilo_04.png new file mode 100644 index 0000000..eb9e6f1 Binary files /dev/null and b/C2P/Drawings/Profilo_04.png differ diff --git a/C2P/Drawings/Profilo_05.png b/C2P/Drawings/Profilo_05.png new file mode 100644 index 0000000..8de0c82 Binary files /dev/null and b/C2P/Drawings/Profilo_05.png differ diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 3b0c344..949630d 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -14,48 +14,52 @@
-
- - - - <%-- +
+
+ + + + <%-- --%> - - -
-
-
- -
- - -
- - -
- <%: traduci("RawMat") %> - -
- -
-
- <%: traduci("ExistingProduct")%> - <%: traduci("NewProduct")%> -
-
-
-
-
- - - - - -
-
+ + +
+
+ + +
+ + +
+ <%: traduci("RawMat") %> + +
+ +
+
+ <%: traduci("ExistingProduct")%> + <%: traduci("NewProduct")%> +
+
+
+
+
+ + + + + +
+
+
+
+
+
+ <%--
+
--%> +
- diff --git a/C2P/ExistingProductOffer.aspx.designer.cs b/C2P/ExistingProductOffer.aspx.designer.cs index 92a40b9..18b0425 100644 --- a/C2P/ExistingProductOffer.aspx.designer.cs +++ b/C2P/ExistingProductOffer.aspx.designer.cs @@ -56,5 +56,14 @@ namespace C2P { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// Image1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image1; } } diff --git a/C2P/Reports/MarginReport.xlsx b/C2P/Reports/MarginReport.xlsx index 53792cd..3678a8c 100644 Binary files a/C2P/Reports/MarginReport.xlsx and b/C2P/Reports/MarginReport.xlsx differ diff --git a/C2P/Reports/SiepiLogoHead_160_800.png b/C2P/Reports/SiepiLogoHead_160_800.png new file mode 100644 index 0000000..90a9b15 Binary files /dev/null and b/C2P/Reports/SiepiLogoHead_160_800.png differ diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index 7fc0ffa..bbc3372 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -73,7 +73,7 @@ --%> -
+
@@ -96,7 +96,7 @@ <%:traduci("Open") %>
- <%:traduci("Delete") %> + <%:traduci("Delete") %>
<%:traduci("Duplicate") %> @@ -118,6 +118,14 @@ + + + <%----%> + + + <%----%> + + diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx b/C2P/WebUserControls/mod_Q_Costs.ascx index 90719f8..665b012 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx +++ b/C2P/WebUserControls/mod_Q_Costs.ascx @@ -90,14 +90,14 @@
- +
- +
diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx.cs b/C2P/WebUserControls/mod_Q_Costs.ascx.cs index 1f02e6d..8586b09 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Costs.ascx.cs @@ -89,5 +89,16 @@ namespace C2P.WebUserControls eh_update(this, new EventArgs()); } } + /// + /// verifica se utente sia admin altrimenti non vede dati... + /// + public bool userIsAdmin + { + get + { + bool answ = SteamWare.user_std.UtSn.userHasRight("SuperUser"); + return answ; + } + } } } \ No newline at end of file diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 6246a52..eb15210 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 dbc5b71..30502b6 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index dbc5b71..30502b6 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index dbc5b71..30502b6 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 688db80..c87c699 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 60d5c5c..5ce8f08 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.116.267")] -[assembly: AssemblyFileVersion("0.9.116.267")] +[assembly: AssemblyVersion("0.9.117.271")] +[assembly: AssemblyFileVersion("0.9.117.271")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 0853017..0a1c304 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.116.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.9.116.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.9.117.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.9.117.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+