Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prime versione 305 x gestione delibere impedite se UDC in OVAS...

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@313 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-11-10 16:39:50 +00:00
parent 07929f7837
commit fbf7e5e6af
20 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW/Web.config
+1 -1
View File
@@ -62,7 +62,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="300"/>
<add key="minRev" value="305"/>
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW"/>
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="300"/>
<add key="minRev" value="305"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW/obj/Debug/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term/Web.config
+1 -1
View File
@@ -58,7 +58,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="300" />
<add key="minRev" value="305" />
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs
+10 -2
View File
@@ -311,8 +311,16 @@ namespace GMW_Term.WebUserControls
}
catch
{ }
// se NON CONSUMATO e la posizione prevede una delibera mostro il relativo pulsante...
if (!consumato && codTipoDelibera != "")
// controllo NON sia in OVAS
bool isInOvas = false;
try
{
isInOvas = (MagClass.magazzino.taPosUdcCorr.getByUDC(_UDC).Rows.Count > 0);
}
catch
{ }
// se NON CONSUMATO, la posizione prevede una delibera e NON E' in OVAS mostro il relativo pulsante...
if (!consumato && codTipoDelibera != "" && !isInOvas)
{
switch (codTipoDelibera) //!!!OCCHIO HARD CODED!!!
{
GMW/GMW_Term/bin/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term"/>
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="300"/>
<add key="minRev" value="305"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW_Term/obj/Debug/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+3 -3
View File
@@ -330,14 +330,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_Term"
"ProductCode" = "8:{BE3DD215-7264-4D73-A5D0-BF945DA31FC0}"
"PackageCode" = "8:{A0EE4CB7-B344-41B2-A88B-E23FC88143BD}"
"ProductCode" = "8:{E89376FC-9029-41FD-8042-C9B3C96A4EB0}"
"PackageCode" = "8:{043B7D9C-CAB5-4598-B640-611FC4D10335}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.300"
"ProductVersion" = "8:1.0.305"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
GMW/GMW_data/GMW_data.csproj
+1
View File
@@ -160,6 +160,7 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="SqlScripts\GMW_00305.sql" />
<None Include="SqlScripts\GMW_00299.sql" />
<None Include="SqlScripts\GMW_00291.sql" />
<None Include="SqlScripts\GMW_00290.sql" />
GMW/GMW_data/SqlScripts/GMW_00305.sql
+6
View File
@@ -0,0 +1,6 @@
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(305, GETDATE())
GO
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_installer/GMW_installer.vdproj
+5 -5
View File
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{81F0FF2E-60CC-4D19-A9FF-9C45D7C243B0}"
"PackageCode" = "8:{C862786F-9317-44F7-9041-369261413B3F}"
"ProductCode" = "8:{0EE54AA8-8216-4F3E-83FB-27585280D49B}"
"PackageCode" = "8:{8D64D621-0E56-4AA2-925D-3AB7B1523273}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.300"
"ProductVersion" = "8:1.0.305"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -829,7 +829,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583"
{
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
@@ -857,7 +857,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E"
{
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"