diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index aaee386..9b63b41 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -14,8 +14,8 @@ - 00:00:13 - 12/12/2013 10:39:51 - False + 00:00:01 + 14/01/2014 15:34:24 + True diff --git a/Build/Build.fbz6 b/Build/Build.fbz6 index 9d01cdf..21f48b0 100644 Binary files a/Build/Build.fbz6 and b/Build/Build.fbz6 differ diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf index 7b7175e..f298238 100644 --- a/Build/Installer.fbpInf +++ b/Build/Installer.fbpInf @@ -14,8 +14,8 @@ - 00:00:00 - 30/12/1899 - True + 00:02:38 + 13/12/2013 16:54:53 + False diff --git a/Build/Installer.fbz6 b/Build/Installer.fbz6 index d503aad..0131f58 100644 Binary files a/Build/Installer.fbz6 and b/Build/Installer.fbz6 differ diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index a987570..e54686d 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -511,7 +511,8 @@ CREATE TABLE CLIENTES_DATOS ( VENCIMIENTO_FACTURAS_3 SMALLINT, FELICITACION TIPO_BOOLEANO, TIPO_CLIENTE VARCHAR(255) COLLATE ES_ES, - SEPA TIPO_BOOLEANO DEFAULT 0 NOT NULL + SEPA TIPO_BOOLEANO DEFAULT 0 NOT NULL, + ID_CENTRAL TIPO_ID ); CREATE TABLE CLIENTES_DTOS_PROVEEDORES ( @@ -1999,7 +2000,8 @@ CREATE VIEW V_CLIENTES( DESCUENTO, FELICITACION, TIPO_CLIENTE, - SEPA) + SEPA, + ID_CENTRAL) AS SELECT V_CONTACTOS.ID, @@ -2045,15 +2047,16 @@ SELECT CLIENTES_DATOS.DESCUENTO, CLIENTES_DATOS.FELICITACION, CLIENTES_DATOS.TIPO_CLIENTE, - CLIENTES_DATOS.SEPA + CLIENTES_DATOS.SEPA, + CLIENTES_DATOS.ID_CENTRAL FROM V_CONTACTOS LEFT OUTER JOIN CLIENTES_DATOS ON (V_CONTACTOS.ID = CLIENTES_DATOS.ID_CLIENTE) LEFT OUTER JOIN CONTACTOS ON (CLIENTES_DATOS.ID_AGENTE = CONTACTOS.ID) WHERE - V_CONTACTOS.ID_CATEGORIA = 1 -; + V_CONTACTOS.ID_CATEGORIA = 1; + CREATE VIEW V_AGENTES( ID, ID_CATEGORIA, diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 5ab31c7..ce679d9 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -55,10 +55,10 @@ MainSource - - - - + + + + diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 970fa2b..b868ce6 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -45,14 +45,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - - Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components Base.dpk diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 09df5dc..2786300 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4340FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.4.0FactuGESFactuGES4.3.4.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4350FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.5.0FactuGESFactuGES4.3.5.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a40a741..0e82a34 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,3,4,0 -PRODUCTVERSION 4,3,4,0 +FILEVERSION 4,3,5,0 +PRODUCTVERSION 4,3,5,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "4.3.4.0\0" + VALUE "FileVersion", "4.3.5.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.3.4.0\0" + VALUE "ProductVersion", "4.3.5.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 573f40f..35ba4c7 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 39f4304..06b415a 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,30 +59,30 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj index 384662e..c80dfaf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj @@ -43,10 +43,6 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found @@ -58,27 +54,29 @@ MainSource - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + -
fruDialogListaAlbaranesClienteEnvioEMail
+
frDialogListaAlbaranesClienteEnvioEMail
T
@@ -145,8 +143,6 @@
frViewElegirArticulosAlbaranesCliente
TFrame
- -