diff --git a/.vs/SHERPA/v15/Server/sqlite3/storage.ide-shm b/.vs/SHERPA/v15/Server/sqlite3/storage.ide-shm
index b577626..c014e15 100644
Binary files a/.vs/SHERPA/v15/Server/sqlite3/storage.ide-shm and b/.vs/SHERPA/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/SHERPA/v15/Server/sqlite3/storage.ide-wal b/.vs/SHERPA/v15/Server/sqlite3/storage.ide-wal
index b3ef283..053ef72 100644
Binary files a/.vs/SHERPA/v15/Server/sqlite3/storage.ide-wal and b/.vs/SHERPA/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Jenkinsfile b/Jenkinsfile
index a5bd50e..4a9c201 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=81']) {
+ withEnv(['NEXT_BUILD_NUMBER=83']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SHERPA'
diff --git a/SHERPA/Pagamenti.aspx.cs b/SHERPA/Pagamenti.aspx.cs
index 11fa8ae..eca6f94 100644
--- a/SHERPA/Pagamenti.aspx.cs
+++ b/SHERPA/Pagamenti.aspx.cs
@@ -4,130 +4,131 @@ using SteamWare;
namespace SHERPA
{
- public partial class Pagamenti : UserPage
+ public partial class Pagamenti : UserPage
+ {
+ protected void Page_Load(object sender, EventArgs e)
{
- protected void Page_Load(object sender, EventArgs e)
- {
- // imposto i valori di selezione...
- if (!Page.IsPostBack)
- {
- mod_searchParam.tipoDoc = "Fattura";
- mod_searchParam.aperta = 1;
- mod_DocsArchive.tipoDoc = "Fattura";// mod_searchParam.tipoDoc;
- mod_DocsArchive.aperta = mod_searchParam.aperta;
- mod_DocsArchive.doUpdate();
- mod_statusIPS.tipoDoc = mod_searchParam.tipoDoc;
- mod_statusIPS.aperta = mod_searchParam.aperta;
- }
- mod_DocsArchive.eh_ucev += Mod_DocsArchive_eh_ucev;
- mod_searchParam.eh_ucev += Mod_searchParam_eh_ucev;
- mod_registraPagamento.eh_ucev += Mod_registraPagamento_eh_ucev;
- }
-
- private void Mod_registraPagamento_eh_ucev(object sender, EventArgs e)
- {
- // se trovo evento select/reset mostro/nascondo dettagli...
- ucEvent evento = (ucEvent)e;
- switch (evento.tipoEvento)
- {
- case ucEvType.Delete:
- break;
- case ucEvType.Edit:
- break;
- case ucEvType.New:
- mod_DocsArchive.doUpdate();
- //mod_DocsDetail.idxDoc = 0;
- divDetail.Visible = false;
- break;
- case ucEvType.Reset:
- break;
- case ucEvType.ReqUpdateParent:
- mod_searchParam.doUpdate();
- mod_DocsArchive.doUpdate();
- mod_statusIPS.doUpdate();
- break;
- case ucEvType.Selected:
- break;
- default:
- break;
- }
- }
-
- private void Mod_searchParam_eh_ucev(object sender, EventArgs e)
- {
- // se trovo evento select/reset mostro/nascondo dettagli...
- ucEvent evento = (ucEvent)e;
- switch (evento.tipoEvento)
- {
- case ucEvType.Delete:
- break;
- case ucEvType.Edit:
- break;
- case ucEvType.New:
- break;
- case ucEvType.Reset:
- break;
- case ucEvType.ReqUpdateParent:
- // fix selezione elenco documenti
- mod_DocsArchive.searchVal = mod_searchParam.searchVal;
- mod_DocsArchive.tipoDoc = mod_searchParam.tipoDoc;
- mod_DocsArchive.idxCli = mod_searchParam.idxCli;
- mod_DocsArchive.aperta = mod_searchParam.aperta;
- mod_DocsArchive.doReset();
- mod_DocsArchive.doUpdate();
- // fix calcolo conteggi
- mod_statusIPS.searchVal = mod_searchParam.searchVal;
- mod_statusIPS.tipoDoc = mod_searchParam.tipoDoc;
- mod_statusIPS.idxCli = mod_searchParam.idxCli;
- mod_statusIPS.aperta = mod_searchParam.aperta;
- mod_statusIPS.doUpdate();
- // doc aperti!
- mod_registraPagamento.idxCli = mod_searchParam.idxCli;
- mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
- mod_registraPagamento.resetData();
- break;
- case ucEvType.Selected:
- break;
- default:
- break;
- }
- }
-
- ///
- /// Gestione eventi da modulo
- ///
- ///
- ///
- private void Mod_DocsArchive_eh_ucev(object sender, EventArgs e)
- {
- // se trovo evento select/reset mostro/nascondo dettagli...
- ucEvent evento = (ucEvent)e;
- switch (evento.tipoEvento)
- {
- case ucEvType.Delete:
- break;
- case ucEvType.Edit:
- break;
- case ucEvType.New:
- break;
- case ucEvType.Reset:
- mod_registraPagamento.idxDoc = 0;
- break;
- case ucEvType.ReqUpdateParent:
- mod_searchParam.idxCli = mod_DocsArchive.idxCli;
- mod_statusIPS.idxCli = mod_searchParam.idxCli;
- mod_statusIPS.doUpdate();
- mod_registraPagamento.idxCli = mod_DocsArchive.idxCli;
- mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
- mod_registraPagamento.resetData();
- break;
- case ucEvType.Selected:
- mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
- mod_registraPagamento.resetData();
- break;
- default:
- break;
- }
- }
+ // imposto i valori di selezione...
+ if (!Page.IsPostBack)
+ {
+ mod_searchParam.tipoDoc = "Fattura";
+ mod_searchParam.aperta = 1;
+ mod_DocsArchive.tipoDoc = "Fattura";// mod_searchParam.tipoDoc;
+ mod_DocsArchive.aperta = mod_searchParam.aperta;
+ mod_DocsArchive.doUpdate();
+ mod_statusIPS.tipoDoc = mod_searchParam.tipoDoc;
+ mod_statusIPS.aperta = mod_searchParam.aperta;
+ }
+ mod_DocsArchive.eh_ucev += Mod_DocsArchive_eh_ucev;
+ mod_searchParam.eh_ucev += Mod_searchParam_eh_ucev;
+ mod_registraPagamento.eh_ucev += Mod_registraPagamento_eh_ucev;
}
+
+ private void Mod_registraPagamento_eh_ucev(object sender, EventArgs e)
+ {
+ // se trovo evento select/reset mostro/nascondo dettagli...
+ ucEvent evento = (ucEvent)e;
+ switch (evento.tipoEvento)
+ {
+ case ucEvType.Delete:
+ break;
+ case ucEvType.Edit:
+ break;
+ case ucEvType.New:
+ mod_DocsArchive.doUpdate();
+ //mod_DocsDetail.idxDoc = 0;
+ divDetail.Visible = false;
+ break;
+ case ucEvType.Reset:
+ break;
+ case ucEvType.ReqUpdateParent:
+ mod_searchParam.doUpdate();
+ mod_DocsArchive.doUpdate();
+ mod_statusIPS.doUpdate();
+ break;
+ case ucEvType.Selected:
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void Mod_searchParam_eh_ucev(object sender, EventArgs e)
+ {
+ // se trovo evento select/reset mostro/nascondo dettagli...
+ ucEvent evento = (ucEvent)e;
+ switch (evento.tipoEvento)
+ {
+ case ucEvType.Delete:
+ break;
+ case ucEvType.Edit:
+ break;
+ case ucEvType.New:
+ break;
+ case ucEvType.Reset:
+ break;
+ case ucEvType.ReqUpdateParent:
+ // fix selezione elenco documenti
+ mod_DocsArchive.searchVal = mod_searchParam.searchVal;
+ mod_DocsArchive.tipoDoc = mod_searchParam.tipoDoc;
+ mod_DocsArchive.idxCli = mod_searchParam.idxCli;
+ mod_DocsArchive.aperta = mod_searchParam.aperta;
+ mod_DocsArchive.intervalloSel = mod_searchParam.intervalloSel;
+ mod_DocsArchive.doReset();
+ mod_DocsArchive.doUpdate();
+ // fix calcolo conteggi
+ mod_statusIPS.searchVal = mod_searchParam.searchVal;
+ mod_statusIPS.tipoDoc = mod_searchParam.tipoDoc;
+ mod_statusIPS.idxCli = mod_searchParam.idxCli;
+ mod_statusIPS.aperta = mod_searchParam.aperta;
+ mod_statusIPS.doUpdate();
+ // doc aperti!
+ mod_registraPagamento.idxCli = mod_searchParam.idxCli;
+ mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
+ mod_registraPagamento.resetData();
+ break;
+ case ucEvType.Selected:
+ break;
+ default:
+ break;
+ }
+ }
+
+ ///
+ /// Gestione eventi da modulo
+ ///
+ ///
+ ///
+ private void Mod_DocsArchive_eh_ucev(object sender, EventArgs e)
+ {
+ // se trovo evento select/reset mostro/nascondo dettagli...
+ ucEvent evento = (ucEvent)e;
+ switch (evento.tipoEvento)
+ {
+ case ucEvType.Delete:
+ break;
+ case ucEvType.Edit:
+ break;
+ case ucEvType.New:
+ break;
+ case ucEvType.Reset:
+ mod_registraPagamento.idxDoc = 0;
+ break;
+ case ucEvType.ReqUpdateParent:
+ mod_searchParam.idxCli = mod_DocsArchive.idxCli;
+ mod_statusIPS.idxCli = mod_searchParam.idxCli;
+ mod_statusIPS.doUpdate();
+ mod_registraPagamento.idxCli = mod_DocsArchive.idxCli;
+ mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
+ mod_registraPagamento.resetData();
+ break;
+ case ucEvType.Selected:
+ mod_registraPagamento.idxDoc = mod_DocsArchive.idxDoc;
+ mod_registraPagamento.resetData();
+ break;
+ default:
+ break;
+ }
+ }
+ }
}
\ No newline at end of file