diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index fe00a830..f4910a29 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -45,12 +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/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas index fe5293de..2e103a11 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas @@ -49,7 +49,7 @@ begin // Update_Asiento_Factura(aChange); end; ctDelete: begin - Delete_Asiento_Factura(aChange); +// Delete_Asiento_Factura(aChange); end; end; diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas index 75b7f4c7..56f16c46 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas @@ -997,7 +997,7 @@ var i: Integer; ADiaVencimiento: Integer; ADiasMas: Integer; - BSemaforo: Boolean; + BSemaforo: Boolean; begin diff --git a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj index 6a7fd52b..351e67c3 100644 --- a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj +++ b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj @@ -20,6 +20,9 @@ + + + @@ -271,14 +274,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedorServer.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedorServer.pas index 60cb04b3..5f4726f9 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedorServer.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedorServer.pas @@ -52,7 +52,7 @@ begin // Update_Asiento_Factura(aChange); end; ctDelete: begin - Delete_Asiento_Factura(aChange); +// Delete_Asiento_Factura(aChange); end; end; diff --git a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas index 0aa6167e..2ebbb7e3 100644 --- a/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Model/uBizRecibosCliente.pas @@ -149,10 +149,6 @@ procedure TBizRecibosCliente.SetRecibosCompensados(const Value: IBizRecibosCompe begin FRecibosCompensados := Value; EnlazarMaestroDetalle(FRecibosCompensadosLink, FRecibosCompensados); - - if Assigned(FRecibosCompensados) then - if not FRecibosCompensados.DataTable.Active then - FRecibosCompensados.DataTable.Active := True; end; function TBizRecibosCliente._GetCliente: IBizCliente; diff --git a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm index 30507cd2..2ec5a4b7 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 @@ -114,8 +114,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 = 280 @@ -265,8 +263,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 = 416 @@ -451,8 +447,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 = 160 @@ -475,8 +469,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 = 160 diff --git a/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas index 2bb0df14..eadb88a1 100644 --- a/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Model/uBizRecibosProveedor.pas @@ -143,10 +143,6 @@ procedure TBizRecibosProveedor.SetRecibosCompensados(const Value: IBizRecibosCom begin FRecibosCompensados := Value; EnlazarMaestroDetalle(FRecibosCompensadosLink, FRecibosCompensados); - - if Assigned(FRecibosCompensados) then - if not FRecibosCompensados.DataTable.Active then - FRecibosCompensados.DataTable.Active := True; end; function TBizRecibosProveedor._GetProveedor: IBizProveedor; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 9f805f17..b135d68a 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index e86016b5..03d3d93b 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.8.3.0\0" VALUE "ProductVersion", "1.8.3.0\0" - VALUE "CompileDate", "lunes, 12 de julio de 2010 20:06\0" + VALUE "CompileDate", "lunes, 19 de julio de 2010 18:17\0" END END BLOCK "VarFileInfo"