diff --git a/Jenkinsfile b/Jenkinsfile
index c1ddc88..17aedfc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=300']) {
+ withEnv(['NEXT_BUILD_NUMBER=301']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'B2BCONDOMINI'
diff --git a/PUB/PAM/Fatture.aspx b/PUB/PAM/Fatture.aspx
new file mode 100644
index 0000000..bceccba
--- /dev/null
+++ b/PUB/PAM/Fatture.aspx
@@ -0,0 +1,11 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/SitePAM.master" AutoEventWireup="true" CodeBehind="Fatture.aspx.cs" Inherits="PUB.PAM.Fatture" %>
+
+<%@ Register Src="~/WebUserContols/mod_dettFattER.ascx" TagPrefix="uc1" TagName="mod_dettFattER" %>
+
+
+
+
+
+
+
+
diff --git a/PUB/PAM/Fatture.aspx.cs b/PUB/PAM/Fatture.aspx.cs
new file mode 100644
index 0000000..4dc2bd1
--- /dev/null
+++ b/PUB/PAM/Fatture.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 PUB.PAM
+{
+ public partial class Fatture : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/PUB/PAM/Fatture.aspx.designer.cs b/PUB/PAM/Fatture.aspx.designer.cs
new file mode 100644
index 0000000..52bacd3
--- /dev/null
+++ b/PUB/PAM/Fatture.aspx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+//
+// Codice generato da uno strumento.
+//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
+//------------------------------------------------------------------------------
+
+namespace PUB.PAM {
+
+
+ public partial class Fatture {
+
+ ///
+ /// Controllo mod_dettFattER.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::PUB.WebUserContols.mod_dettFattER mod_dettFattER;
+ }
+}
diff --git a/PUB/PUB.csproj b/PUB/PUB.csproj
index 6350586..50a01f1 100644
--- a/PUB/PUB.csproj
+++ b/PUB/PUB.csproj
@@ -186,6 +186,7 @@
+
@@ -499,6 +500,13 @@
Fatturati.aspx
+
+ Fatture.aspx
+ ASPXCodeBehind
+
+
+ Fatture.aspx
+
Fornitori.aspx
ASPXCodeBehind
diff --git a/PUB/WebUserContols/mod_ER_grid.ascx b/PUB/WebUserContols/mod_ER_grid.ascx
index 5e7e775..afaa19d 100644
--- a/PUB/WebUserContols/mod_ER_grid.ascx
+++ b/PUB/WebUserContols/mod_ER_grid.ascx
@@ -23,7 +23,10 @@
- Urg: <%# Eval("idxPriorita") %>
+
+
<%# Eval("idxRichiesta") %> |
Urg: <%# Eval("idxPriorita") %>
+
@@ -92,7 +92,7 @@
-
+
diff --git a/PUB/WebUserContols/mod_ER_listFatture.ascx.cs b/PUB/WebUserContols/mod_ER_listFatture.ascx.cs
index da7b0c4..37f1123 100644
--- a/PUB/WebUserContols/mod_ER_listFatture.ascx.cs
+++ b/PUB/WebUserContols/mod_ER_listFatture.ascx.cs
@@ -222,5 +222,11 @@ namespace PUB.WebUserContols
Response.Redirect(Request.RawUrl);
}
}
+
+ protected void odsFatt_Updated(object sender, ObjectDataSourceStatusEventArgs e)
+ {
+ // ricarico...
+ Response.Redirect(Request.RawUrl);
+ }
}
}
\ No newline at end of file
diff --git a/PUB/WebUserContols/mod_dettFattER.ascx.cs b/PUB/WebUserContols/mod_dettFattER.ascx.cs
index dc9bec9..393ec28 100644
--- a/PUB/WebUserContols/mod_dettFattER.ascx.cs
+++ b/PUB/WebUserContols/mod_dettFattER.ascx.cs
@@ -1,9 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
namespace PUB.WebUserContols
{
@@ -11,7 +6,6 @@ namespace PUB.WebUserContols
{
protected void Page_Load(object sender, EventArgs e)
{
-
}
}
}
\ No newline at end of file
diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx.cs b/PUB/WebUserContols/mod_statusRowPAM.ascx.cs
index bfae70e..d212db3 100644
--- a/PUB/WebUserContols/mod_statusRowPAM.ascx.cs
+++ b/PUB/WebUserContols/mod_statusRowPAM.ascx.cs
@@ -21,7 +21,7 @@ namespace PUB.WebUserContols
divFiles.Visible = (idxRichiesta != 0 && titolo != "MyDashboard" && titolo != "Allegati");
divFatture.Visible = (idxRichiesta != 0 && titolo != "MyDashboard" && titolo != "Fatture");
hlDetail.NavigateUrl = string.Format("~/PAM/DettaglioIntervento?idxRichiesta={0}", idxRichiesta);
- hlFatture.NavigateUrl = string.Format("~/PAM/ER_Fatture?idxRichiesta={0}", idxRichiesta);
+ hlFatture.NavigateUrl = string.Format("~/PAM/Fatture?idxRichiesta={0}", idxRichiesta);
hlFiles.NavigateUrl = string.Format("~/PAM/Allegati?idxRichiesta={0}", idxRichiesta);
}