diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 33b554c0..b79886f5 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,6 +44,27 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + + + + + + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -58,55 +79,55 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index dfe51783..0ed4df6b 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,8 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2860FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.6.0FactuGESFactuGES2.8.6.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2870FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.7.0FactuGESFactuGES2.8.7.0 + File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 37498c8f..a118fe42 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,8,6,0 -PRODUCTVERSION 2,8,6,0 +FILEVERSION 2,8,7,0 +PRODUCTVERSION 2,8,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.8.6.0\0" + VALUE "FileVersion", "2.8.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.8.6.0\0" + VALUE "ProductVersion", "2.8.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 337bbce8..e35d6fc1 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm index 402ec03d..a62dd4ea 100644 --- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.dfm @@ -371,7 +371,6 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente Name = 'ID_TIENDA' DataType = datInteger DisplayLabel = 'RecibosCliente_ID_TIENDA' - ServerAutoRefresh = True DictionaryEntry = 'RecibosCliente_ID_TIENDA' end item @@ -379,22 +378,20 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente DataType = datString Size = 255 DisplayLabel = 'RecibosCliente_TIENDA' - ServerAutoRefresh = True DictionaryEntry = 'RecibosCliente_TIENDA' end item Name = 'LISTA_NOMBRES' DataType = datString Size = 255 - DisplayLabel = 'Otros nombres' - ServerAutoRefresh = True + DictionaryEntry = 'RecibosCliente_LISTA_NOMBRES' end item Name = 'CUENTA_CONTABLE' DataType = datString Size = 255 DisplayLabel = 'Cuenta contable' - ServerAutoRefresh = True + DictionaryEntry = 'RecibosCliente_CUENTA_CONTABLE' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas index 594aad71..dff5aafd 100644 --- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas +++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas @@ -9,10 +9,10 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosRecibos = '{AE89E2C7-E725-49D7-923C-C31DB52289BC}'; - RID_RecibosCliente = '{EA2A5415-CD57-4A6D-B0ED-02C852CDF365}'; - RID_PagosCliente = '{91E0EB25-0D8D-49CC-BEE9-DDB4DC953232}'; - RID_RecibosCompensadosCli = '{8418F37E-CDF2-49D4-8EA6-458D5619E4D4}'; + RID_ListaAnosRecibos = '{6F080A07-7F79-49DA-8223-2A765568A41D}'; + RID_RecibosCliente = '{FF13E325-433D-4B3F-ACBD-95CB1636F3EE}'; + RID_PagosCliente = '{1E77A59F-B566-4264-8DB5-E93D18972BB8}'; + RID_RecibosCompensadosCli = '{98D8A267-FB74-476C-A8E5-F8CD6C1E4CD5}'; { Data table names } nme_ListaAnosRecibos = 'ListaAnosRecibos'; @@ -225,7 +225,7 @@ const type { IListaAnosRecibos } IListaAnosRecibos = interface(IDAStronglyTypedDataTable) - ['{FAC8D465-4E19-43A8-B172-67E80A7D2D39}'] + ['{56AA9455-4989-40E3-B732-0FE6B0E52E03}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -260,7 +260,7 @@ type { IRecibosCliente } IRecibosCliente = interface(IDAStronglyTypedDataTable) - ['{68685DBB-DED5-49DD-8E6F-844F238408B8}'] + ['{5072D408-2297-4727-B0A0-EB3FCB2C231C}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -739,7 +739,7 @@ type { IPagosCliente } IPagosCliente = interface(IDAStronglyTypedDataTable) - ['{CFF8F00A-377F-4D2C-A75E-4B5E8B17F6F5}'] + ['{CFAC341F-7138-4FBB-AC89-E63550865FCC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -978,7 +978,7 @@ type { IRecibosCompensadosCli } IRecibosCompensadosCli = interface(IDAStronglyTypedDataTable) - ['{241530CF-F60C-48CC-838B-F3F34C69347C}'] + ['{C1ABC344-B387-4169-A394-4F93FD736B79}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas index 0ca66e96..57c9827f 100644 --- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas +++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteServer_Intf.pas @@ -9,15 +9,15 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosRecibosDelta = '{B3DE24BA-E4C3-4E3F-B165-880E87414EB2}'; - RID_RecibosClienteDelta = '{7241C382-E1CC-4FC6-A769-0EBA50663E8D}'; - RID_PagosClienteDelta = '{553625F5-33E4-4FB0-9C0D-EE9012E08F8E}'; - RID_RecibosCompensadosCliDelta = '{5AFBB5EF-8AA2-4DFA-805D-D09B444DE070}'; + RID_ListaAnosRecibosDelta = '{070BCFBB-6E14-46D6-BBB2-A01C1BAD1371}'; + RID_RecibosClienteDelta = '{46CE98E3-16F4-43A1-8219-F238C0D52079}'; + RID_PagosClienteDelta = '{8E5F9BD5-BBDE-4A07-A44D-5E2E2E6A11AA}'; + RID_RecibosCompensadosCliDelta = '{6B9D813E-0FF0-49C2-A1C3-DCC7F50EF7B5}'; type { IListaAnosRecibosDelta } IListaAnosRecibosDelta = interface(IListaAnosRecibos) - ['{B3DE24BA-E4C3-4E3F-B165-880E87414EB2}'] + ['{070BCFBB-6E14-46D6-BBB2-A01C1BAD1371}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IRecibosClienteDelta } IRecibosClienteDelta = interface(IRecibosCliente) - ['{7241C382-E1CC-4FC6-A769-0EBA50663E8D}'] + ['{46CE98E3-16F4-43A1-8219-F238C0D52079}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; @@ -529,7 +529,7 @@ type { IPagosClienteDelta } IPagosClienteDelta = interface(IPagosCliente) - ['{553625F5-33E4-4FB0-9C0D-EE9012E08F8E}'] + ['{8E5F9BD5-BBDE-4A07-A44D-5E2E2E6A11AA}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBOValue : Integer; @@ -767,7 +767,7 @@ type { IRecibosCompensadosCliDelta } IRecibosCompensadosCliDelta = interface(IRecibosCompensadosCli) - ['{5AFBB5EF-8AA2-4DFA-805D-D09B444DE070}'] + ['{6B9D813E-0FF0-49C2-A1C3-DCC7F50EF7B5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm index f6a16894..ea8a0adc 100644 --- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm +++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.dfm @@ -1035,6 +1035,8 @@ object srvRecibosCliente: TsrvRecibosCliente end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item @@ -1449,20 +1451,6 @@ object srvRecibosCliente: TsrvRecibosCliente RelationshipType = rtForeignKey end> UpdateRules = < - item - Name = 'Delete PagosCliente' - DoUpdate = False - DoInsert = False - DatasetName = 'PagosCliente' - FailureBehavior = fbRaiseException - end - item - Name = 'Delete RecibosCliente' - DoUpdate = False - DoInsert = False - DatasetName = 'RecibosCliente' - FailureBehavior = fbRaiseException - end item Name = 'Insert RecibosCliente' DoUpdate = False @@ -1490,6 +1478,20 @@ object srvRecibosCliente: TsrvRecibosCliente DoDelete = False DatasetName = 'PagosCliente' FailureBehavior = fbRaiseException + end + item + Name = 'Delete PagosCliente' + DoUpdate = False + DoInsert = False + DatasetName = 'PagosCliente' + FailureBehavior = fbRaiseException + end + item + Name = 'Delete RecibosCliente' + DoUpdate = False + DoInsert = False + DatasetName = 'RecibosCliente' + FailureBehavior = fbRaiseException end> Version = 0 Left = 48 diff --git a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm index 78824e18..7ef68fb2 100644 --- a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor Top = 84 end object rda_RecibosProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 51 Top = 151 end @@ -138,8 +138,6 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor MasterSource = ds_RecibosProveedor MasterFields = 'ID' DetailFields = 'ID_RECIBO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PagosProveedor' IndexDefs = <> Left = 288 @@ -338,8 +336,6 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor MasterSource = ds_RecibosProveedor MasterFields = 'ID' DetailFields = 'ID_RECIBO_COMPENSADO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'RecibosCompensadosProv' IndexDefs = <> Left = 424 @@ -582,8 +578,6 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_RecibosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'RecibosProveedor' IndexDefs = <> Left = 176 @@ -606,8 +600,6 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_RecibosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosRecibos' IndexDefs = <> Left = 176 diff --git a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas index cb4a2a04..6c70f989 100644 --- a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas +++ b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas @@ -3,16 +3,16 @@ unit schRecibosProveedorClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosRecibos = '{9B2BA80B-D6E7-4970-B1CC-20990D8D11E7}'; - RID_RecibosCompensadosProv = '{E0ECB451-A8BC-4B37-82A9-7F86E2FFE256}'; - RID_RecibosProveedor = '{77ED4397-26CE-4EA3-ACF1-8CFDCE5DDF9C}'; - RID_PagosProveedor = '{249FF85D-110C-447F-8164-61DF9530E7F9}'; + RID_ListaAnosRecibos = '{C4D58B52-1C42-49F5-B6C4-00013B86DF71}'; + RID_RecibosCompensadosProv = '{BD0A05F9-B690-4A5D-95AD-57688D408E31}'; + RID_RecibosProveedor = '{989AACFA-CB2C-4B5C-ACB8-696687E57527}'; + RID_PagosProveedor = '{A527D368-D732-4E18-B125-72560F107BAA}'; { Data table names } nme_ListaAnosRecibos = 'ListaAnosRecibos'; @@ -229,7 +229,7 @@ const type { IListaAnosRecibos } IListaAnosRecibos = interface(IDAStronglyTypedDataTable) - ['{4CC0A39B-177C-4530-BDA1-74655040BD1D}'] + ['{75833044-28F9-487D-ADF7-CDC95EB7B769}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -264,7 +264,7 @@ type { IRecibosCompensadosProv } IRecibosCompensadosProv = interface(IDAStronglyTypedDataTable) - ['{4CEC51B6-36BE-40B5-9CC9-7942E4916321}'] + ['{7E4FA871-AD89-406F-B163-6E5154F44888}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -743,7 +743,7 @@ type { IRecibosProveedor } IRecibosProveedor = interface(IDAStronglyTypedDataTable) - ['{2909B622-C1B0-4738-B8EE-87F279FE7CA3}'] + ['{724C736D-D277-4EBF-914B-78870C1310FA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1222,7 +1222,7 @@ type { IPagosProveedor } IPagosProveedor = interface(IDAStronglyTypedDataTable) - ['{D614A1E7-19B0-47A4-A975-E61D0DA5EE19}'] + ['{322743CC-25F4-4021-95E4-7E633FF70694}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas index 869c0d74..31eaad90 100644 --- a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas +++ b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas @@ -9,15 +9,15 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosRecibosDelta = '{6C4A7ACE-8C97-469A-A496-493F1A280405}'; - RID_RecibosCompensadosProvDelta = '{07E70EBB-5912-4A27-BB68-34D15E499C1E}'; - RID_RecibosProveedorDelta = '{79959841-F924-4E80-B1C0-26D60A1CA5E4}'; - RID_PagosProveedorDelta = '{C9839E83-8D1F-4F5D-8A06-704C5BE7E7D8}'; + RID_ListaAnosRecibosDelta = '{67B9BDDE-4773-4079-8B6D-307FBB93CC35}'; + RID_RecibosCompensadosProvDelta = '{EFA871F9-3800-4DD1-9EF8-691841D06186}'; + RID_RecibosProveedorDelta = '{CA420FFF-13D3-416B-A682-A273FA866808}'; + RID_PagosProveedorDelta = '{FE2AD486-4B08-424D-AA09-1F387625E6C3}'; type { IListaAnosRecibosDelta } IListaAnosRecibosDelta = interface(IListaAnosRecibos) - ['{6C4A7ACE-8C97-469A-A496-493F1A280405}'] + ['{67B9BDDE-4773-4079-8B6D-307FBB93CC35}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IRecibosCompensadosProvDelta } IRecibosCompensadosProvDelta = interface(IRecibosCompensadosProv) - ['{07E70EBB-5912-4A27-BB68-34D15E499C1E}'] + ['{EFA871F9-3800-4DD1-9EF8-691841D06186}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; @@ -529,7 +529,7 @@ type { IRecibosProveedorDelta } IRecibosProveedorDelta = interface(IRecibosProveedor) - ['{79959841-F924-4E80-B1C0-26D60A1CA5E4}'] + ['{CA420FFF-13D3-416B-A682-A273FA866808}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; @@ -1007,7 +1007,7 @@ type { IPagosProveedorDelta } IPagosProveedorDelta = interface(IPagosProveedor) - ['{C9839E83-8D1F-4F5D-8A06-704C5BE7E7D8}'] + ['{FE2AD486-4B08-424D-AA09-1F387625E6C3}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBOValue : Integer; diff --git a/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas index 564ec606..0deafef7 100644 --- a/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas @@ -168,9 +168,10 @@ begin FProveedor.DataTable.Active := True; ID_PROVEEDOR := FProveedor.ID; + NOMBRE_PROVEEDOR := FProveedor.NOMBRE; //El proveedor puede tener un nombre por el ce se le conoce y luego un nombre_comercial //caso de elegir la dirección principal del proveedor para el recibo, se cogerá el nombre_comercial para los datos fiscales - NOMBRE := FProveedor.NOMBRE_COMERCIAL; + NOMBRE := FProveedor.NOMBRE; NIF_CIF := FProveedor.NIF_CIF; CALLE := FProveedor.CALLE; CODIGO_POSTAL := FProveedor.CODIGO_POSTAL; diff --git a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm index e4ac5cc7..decae93d 100644 --- a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm +++ b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm @@ -1439,20 +1439,6 @@ object srvRecibosProveedor: TsrvRecibosProveedor RelationshipType = rtForeignKey end> UpdateRules = < - item - Name = 'Delete PagosProveedor' - DoUpdate = False - DoInsert = False - DatasetName = 'PagosProveedor' - FailureBehavior = fbRaiseException - end - item - Name = 'Delete RecibosProveedor' - DoUpdate = False - DoInsert = False - DatasetName = 'RecibosProveedor' - FailureBehavior = fbRaiseException - end item Name = 'Insert RecibosProveedor' DoUpdate = False @@ -1480,6 +1466,20 @@ object srvRecibosProveedor: TsrvRecibosProveedor DoDelete = False DatasetName = 'PagosProveedor' FailureBehavior = fbRaiseException + end + item + Name = 'Delete PagosProveedor' + DoUpdate = False + DoInsert = False + DatasetName = 'PagosProveedor' + FailureBehavior = fbRaiseException + end + item + Name = 'Delete RecibosProveedor' + DoUpdate = False + DoInsert = False + DatasetName = 'RecibosProveedor' + FailureBehavior = fbRaiseException end> Version = 0 Left = 48 diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 6243add6..4feb426a 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -106,8 +106,6 @@ uses schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas', schContabilidadClient_Intf in '..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas', schContabilidadServer_Intf in '..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas', - schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', srvContratosCliente_Impl in '..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas' {srvContratosCliente: TDataAbstractService}, uBizContratosClienteServer in '..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas', uRptContratosCliente_Server in '..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas' {RptContratosCliente}, @@ -135,10 +133,12 @@ uses schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', + schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', + schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', - schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', - schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas'; + schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index f6fd59a1..b91c81fa 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2860FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.6.0FactuGES (Servidor)2.8.6.0martes, 03 de octubre de 2017 12:45 + FalseTrueFalseTrueFalse2870FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.7.0FactuGES (Servidor)2.8.7.0miércoles, 25 de octubre de 2017 16:15 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 70ec2208..115c51f4 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,8,6,0 -PRODUCTVERSION 2,8,6,0 +FILEVERSION 2,8,7,0 +PRODUCTVERSION 2,8,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.8.6.0\0" + VALUE "FileVersion", "2.8.7.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "2.8.6.0\0" - VALUE "CompileDate", "miércoles, 25 de octubre de 2017 16:15\0" + VALUE "ProductVersion", "2.8.7.0\0" + VALUE "CompileDate", "jueves, 31 de mayo de 2018 13:22\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index b0cae6be..5bf2d3f7 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ