From 4bc9d1e1c5df7cc13aa4e72d0ee8095dfbf4a3a8 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 22 May 2014 13:07:34 +0200 Subject: [PATCH] testati casi vari: - creazione nuova Q/S - clonazione Q - clonazione Q -> S - conversione Q->S ...tutto ok, metto in prod ... --- C2P/WebUserControls/mod_QuoteDet.ascx.cs | 16 ++++++++-------- C2P/WebUserControls/mod_S_Header.ascx | 2 +- C2P/bin/C2P.dll | Bin 362496 -> 363008 bytes C2P/bin/C2P_Data.dll | Bin 521216 -> 521216 bytes C2P/bin/SteamWare.dll | Bin 501248 -> 501248 bytes C2P_Report/bin/C2P_Data.dll | Bin 521216 -> 521216 bytes C2P_Report/bin/C2P_Report.dll | Bin 6656 -> 6656 bytes C2P_Report/bin/SteamWare.dll | Bin 501248 -> 501248 bytes VersGen/C2P.cs | 4 ++-- VersGen/C2P.tt | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index 1a3829e..478aa60 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -246,10 +246,12 @@ namespace C2P.WebUserControls mod_Q_ExtrPar1.Visible = false; mod_Q_Header1.Visible = true; mod_Q_PackPar1.Visible = false; + lbConvQ2S.Visible = false; } else // altrimenti gestione ordinaria di editing { + lbConvQ2S.Visible = true; switch (req) { case "Costs": @@ -397,14 +399,12 @@ namespace C2P.WebUserControls protected void lbConvQ2S_Click(object sender, EventArgs e) { // update da Q ad S del tipo offerta - - // redirect a simulazione -#if false - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1); - // aggiorno! - updateBaseData(); -#endif + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + if (tab.Rows.Count > 0) + { + // seleziona l'offerta duplicata! + Response.Redirect(string.Format("Quote?QuoteType={0}&CodQuote={1}&QuoteRev={2}", tab[0].QuoteType, tab[0].CodQuote, tab[0].QuoteRev)); + } } diff --git a/C2P/WebUserControls/mod_S_Header.ascx b/C2P/WebUserControls/mod_S_Header.ascx index 4d9416e..3a0b1f0 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx +++ b/C2P/WebUserControls/mod_S_Header.ascx @@ -185,7 +185,7 @@ - + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 96c96fa45343c2099f76df4f1813b7d3dfea2178..3e2ae56deb95ca167f3c0caa170e145654fbe62e 100644 GIT binary patch delta 6724 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 NrD#Cg^)1Q|_&*f&s-FM= diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 54b6092fe41bea153186c18ad7e2e043a562e41b..2b134c1a2146d80f6bf160908e29d31c1dbf5c3f 100644 GIT binary patch delta 75 zcmZp8A>Z&qenJP+)0>T5tzC?*T}-WA%&lE4tzE3GU2I#s*bnU&@ZQq-{&pao delta 75 zcmZp8A>Z&qenJNm$C1Xa)-J}@E~eHl=GHEj)-Kl8F1D>*?1%OXbgX)HJa1pSbHg8o f4EA3S3bw}_U{}!sYMI{jid~D*ef!#1?7^G>=*b{= diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 909a3124bbdb026cc1f379055b029ec47d2d5ffd..7920b2dcea71da5baade91a3e7d9501c72d01f27 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbApslbelQtzC?*T}-WA%&lE4tzE3GU2I#s*rQSfHXn8pDDhNu?_9p1 e$+D^{b@`W6b_<}6>EGtEYcYmzSDeRwpB(_GMjs#m delta 74 zcmZoTBiC?7ZbAnW`;o@3)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#oRjl@A6M0PUDd;p e`>-?j_wp~P>=r;B)4$DS*J2FWt~ihVK05$*bRJ3o diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 54b6092fe41bea153186c18ad7e2e043a562e41b..2b134c1a2146d80f6bf160908e29d31c1dbf5c3f 100644 GIT binary patch delta 75 zcmZp8A>Z&qenJP+)0>T5tzC?*T}-WA%&lE4tzE3GU2I#s*bnU&@ZQq-{&pao delta 75 zcmZp8A>Z&qenJNm$C1Xa)-J}@E~eHl=GHEj)-Kl8F1D>*?1%OXbgX)HJa1pSbHg8o f4EA3S3bw}_U{}!sYMI{jid~D*ef!#1?7^G>=*b{= diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 94d0be66ff6a8b9e8afa4f84f466eb08ce5ca138..b0f42d67749a1abcc3d1715c2dff71e959e56c06 100644 GIT binary patch delta 49 zcmZoLX)u}4!Sv$h#x5ZNf%UWAs2`eP>c0A)$=%wb*9x202&`cQN=}Xv(qf#wxmBo| F9RNMu76$+T delta 49 zcmZoLX)u}4!NhfBW0#PCKz* diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 909a3124bbdb026cc1f379055b029ec47d2d5ffd..7920b2dcea71da5baade91a3e7d9501c72d01f27 100644 GIT binary patch delta 74 zcmZoTBiC?7ZbApslbelQtzC?*T}-WA%&lE4tzE3GU2I#s*rQSfHXn8pDDhNu?_9p1 e$+D^{b@`W6b_<}6>EGtEYcYmzSDeRwpB(_GMjs#m delta 74 zcmZoTBiC?7ZbAnW`;o@3)-J}@E~eHl=GHEj)-Kl8F1D>*>`|!#oRjl@A6M0PUDd;p e`>-?j_wp~P>=r;B)4$DS*J2FWt~ihVK05$*bRJ3o diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 2c57a4a..5fe50b7 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.78.172")] -[assembly: AssemblyFileVersion("0.7.78.172")] +[assembly: AssemblyVersion("0.7.79.172")] +[assembly: AssemblyFileVersion("0.7.79.172")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index d59e88c..6396222 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.78.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.7.78.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.79.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.79.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+