Repaso general e incremento de versión (2.1.7)

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@193 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
David Arranz 2008-04-09 16:10:41 +00:00
parent 167979c6a2
commit 287e082cb5
9 changed files with 33 additions and 28 deletions

View File

@ -1021,7 +1021,7 @@ updateclient_path
<Property name="ValidateOnParse" type="Boolean">True</Property>
<Property name="XMLDocSource" type="TXMLDocSource">sxText</Property>
<Property MultiValue="0" name="XMLDocumentName" type="string">UpdateConfig.xml</Property>
<Property name="XMLObject" type="IFBXMLObject" XMLID="{C1C3BE59-A0BA-4D8C-A8AD-286F2FFAB400}"/>
<Property name="XMLObject" type="IFBXMLObject" XMLID="{89075332-E126-49E9-9792-8CF73D1235D1}"/>
<Property MultiValue="0" name="XMLSourceFile" type="string"></Property>
<Property MultiValue="1" name="XMLText" type="string"><![CDATA[&lt;UpdatePlus&gt;
&lt;FileList&gt;
@ -1033,7 +1033,7 @@ updateclient_path
&lt;/FileList&gt;
&lt;Execute&gt;
&lt;RunAt Name="OnUpdateProcessComplete"&gt;
&lt;Execute Name="&amp;lt;ApplicationDir&amp;gt;\updates\FactuGES2setup.exe" WaitForProcess="True" /&gt;
&lt;Execute Name="&amp;lt;ApplicationDir&amp;gt;\updates\factuges2setup.exe" WaitForProcess="True" /&gt;
&lt;/RunAt&gt;
&lt;/Execute&gt;
&lt;ShellExec purpose="Backwards compatibility only"&gt;
@ -1046,7 +1046,7 @@ updateclient_path
&lt;UpdateVersion&gt;%factuges_version%&lt;/UpdateVersion&gt;
&lt;/UpdatePlus&gt;]]>
</Property>
<Object Class="TFBXMLObject" XMLID="{C1C3BE59-A0BA-4D8C-A8AD-286F2FFAB400}"><Property MultiValue="0" name="Name" type="string">UpdateConfig.xml</Property>
<Object Class="TFBXMLObject" XMLID="{89075332-E126-49E9-9792-8CF73D1235D1}"><Property MultiValue="0" name="Name" type="string">UpdateConfig.xml</Property>
</Object>
</Object>
<Object Class="TFBXMLSaveDocumentAction" XMLID="{B2A961A8-7252-4E9A-B0EE-4B491FC59DDB}"><Property MultiValue="0" name="ActionComment" type="string"></Property>

View File

@ -6,13 +6,15 @@
</PropertyGroup>
<PropertyGroup>
<DBServer Condition=" '$(SqlCmdRunner)' == '' ">localhost</DBServer>
<DeploymentBuild Condition=" '$(DeploymentBuild)' == '' ">false</DeploymentBuild>
<SqlScriptsFolder Condition=" '$(SqlScriptsFolder)' == '' ">$(MSBuildProjectDirectory)\Scripts</SqlScriptsFolder>
<ToolsFolder Condition=" '$(ToolsFolder)' == '' ">$(MSBuildProjectDirectory)\..\Tools</ToolsFolder>
<CodeOutputFolder Condition=" '$(CodeOutputFolder)' == '' ">$(MSBuildProjectDirectory)\..\Output</CodeOutputFolder>
<SqlCmdRunner Condition=" '$(SqlCmdRunner)' == '' ">$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DBUser Condition=" '$(DBUser)' == '' ">sysdba</DBUser>
<DBPassword Condition=" '$(DBPassword)' == '' ">masterkey</DBPassword>
<DBServer Condition=" '$(SqlCmdRunner)' == '' ">localhost</DBServer>
<DeploymentBuild Condition=" '$(DeploymentBuild)' == '' ">false</DeploymentBuild>
<SqlScriptsFolder Condition=" '$(SqlScriptsFolder)' == '' ">$(MSBuildProjectDirectory)\Scripts</SqlScriptsFolder>
<ToolsFolder Condition=" '$(ToolsFolder)' == '' ">$(MSBuildProjectDirectory)\..\Tools</ToolsFolder>
<CodeOutputFolder Condition=" '$(CodeOutputFolder)' == '' ">$(MSBuildProjectDirectory)\..\Output</CodeOutputFolder>
<SqlCmdRunner Condition=" '$(SqlCmdRunner)' == '' ">$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</PropertyGroup>
<PropertyGroup Condition=" '|$(Configuration)|' == '|Debug|' ">
@ -38,13 +40,19 @@
<MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')"/>
</Target>
<Target Name="Build"
<Target Name="Build"
DependsOnTargets="CreateDatabase;InsertSysData"/>
<Target Name="CreateDatabase"
Inputs="@(Sql)"
Outputs="@(SqlOutput)">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="InsertSysData">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
@ -53,7 +61,6 @@
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata_plan_general_contable_acana.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="BuildReplicador"

View File

@ -732,6 +732,7 @@ CREATE TABLE CONTACTOS_DATOS_BANCO (
CREATE TABLE CONTACTOS_DIRECCIONES (
ID TIPO_ID NOT NULL,
ID_CONTACTO TIPO_ID NOT NULL,
NIF_CIF VARCHAR(15),
CALLE VARCHAR(255),
POBLACION VARCHAR(255),
PROVINCIA VARCHAR(255),
@ -751,6 +752,7 @@ CREATE TABLE CONTACTOS_DIRECCIONES (
CREATE TABLE EMPLEADOS_DATOS (
ID_EMPLEADO TIPO_ID NOT NULL,
FECHA_NACIMIENTO DATE,
COMISION TIPO_PORCENTAJE,
CATEGORIA VARCHAR(255),
FECHA_ALTA_EMPRESA DATE,
FORMACION_BASE TIPO_NOTAS,

View File

@ -53,11 +53,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
FILEVERSION 2,1,6,0
PRODUCTVERSION 2,1,6,0
FILEVERSION 2,1,7,0
PRODUCTVERSION 2,1,7,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.1.6.0\0"
VALUE "FileVersion", "2.1.7.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "2.1.6\0"
VALUE "ProductVersion", "2.1.7.0\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

Binary file not shown.

View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 25 de marzo de 2008 19:25</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 09 de abril de 2008 14:17</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 1,1,0,0
PRODUCTVERSION 1,1,0,0
FILEVERSION 2,1,7,0
PRODUCTVERSION 2,1,7,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -12,9 +12,9 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "FileVersion", "1.1.0.0\0"
VALUE "ProductVersion", "1.1.0.0\0"
VALUE "CompileDate", "miércoles, 09 de abril de 2008 13:55\0"
VALUE "FileVersion", "2.1.7.0\0"
VALUE "ProductVersion", "2.1.7.0\0"
VALUE "CompileDate", "miércoles, 09 de abril de 2008 18:02\0"
END
END
BLOCK "VarFileInfo"