diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 180f2fa..1e5dfbf 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index e912ad5..c094037 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -375,13 +375,6 @@ var AEmpresas: IBizEmpresa; AEmpresasController: IEmpresasController; begin - //PARCHE - if (AppFactuGES.UsuarioActivo.ID = 2) then - begin - CambiarEmpresa(1); - exit; - end; - JsDialog := TJSDialog.Create(nil); try JsDialog.Content.Add('Selección de empresa'); diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index f6cfde3..097187b 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -45,6 +45,8 @@ 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 @@ -62,59 +64,59 @@
DataModuleRegistroCorreos
TDataModule + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 97f3e0c..c468556 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\TrueFalse4070FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.7.0FactuGESFactuGES4.0.7.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4080FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.8.0FactuGESFactuGES4.0.8.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 5539b8b..afb3be8 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,0,7,0 -PRODUCTVERSION 4,0,7,0 +FILEVERSION 4,0,8,0 +PRODUCTVERSION 4,0,8,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.0.7.0\0" + VALUE "FileVersion", "4.0.8.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.0.7.0\0" + VALUE "ProductVersion", "4.0.8.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 1d6deb6..ec0d5bf 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 44da7ac..d9d2837 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -56,6 +56,11 @@ begin LoadModule('Comisiones_plugin.bpl'); LoadModule('BancaElectronica_plugin.bpl'); LoadModule('TiendaWeb_plugin.bpl'); + + LoadModule('Informes_plugin.bpl'); +// LoadModule('InfVentasArticulo_plugin.bpl'); +// LoadModule('InfMargenArticulo_plugin.bpl'); + end; end; diff --git a/Source/Cliente/uNavPaneController.pas b/Source/Cliente/uNavPaneController.pas index 06c233c..b624303 100644 --- a/Source/Cliente/uNavPaneController.pas +++ b/Source/Cliente/uNavPaneController.pas @@ -131,46 +131,6 @@ begin try AEmpresas.DataTable.Active := True; - - //PARCHE - if (AppFactuGES.UsuarioActivo.ID = 2) then - begin - // Buscar la página si existe - AIndex := EncontrarPagina(FNavigationPane, AEmpresas.NOMBRE); - if AIndex > -1 then - ASeccionPadre := EncontrarSeccionPadre(FNavigationPane.NavPages[AIndex]) - else begin - // Crear la página de la empresa - AIndex := CrearPagina(FNavigationPane, AEmpresas.NOMBRE, nil, -1); - - ASeccionPadre := CrearSeccion(FNavigationPane.NavPages[AIndex]); - ASeccionPadre.Align := alClient; - ASeccionPadre.AutoScroll := True; - end; - FNavigationPane.NavPages[AIndex].Tag := AEmpresas.ID; - - - // Crear secciones - for ASeccionCount := 0 to AListaSecciones.Count - 1 do - begin - ASeccion := CrearSeccion(ASeccionPadre); - with ASeccion do - begin - Top := 100 * AEmpresasCount; - Align := alTop; - AutoScroll := False; - end; - - ADivisor := CrearDivisor(ASeccion, AListaSecciones[ASeccionCount]); - - PopulateNavPagePane(ASeccion, TMenuItem(AListaSecciones.Objects[ASeccionCount]), - FLargeImages, dmBase.StyleManager); - ASeccion.Height := ASeccion.Height + ADivisor.Height; - end; - end - else - //FIN PARCHE - {$IFDEF MULTIEMPRESA} while not AEmpresas.DataTable.EOF do begin diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index bac03bb..e03cdd1 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -318,7 +318,6 @@ object fPantallaPrincipal: TfPantallaPrincipal Category = 'Empresa' Caption = 'A'#241'adir empresa' OnExecute = actAnadirEmpresaExecute - OnUpdate = actAnadirEmpresaUpdate end end object ModulesSmallImageList: TPngImageList diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 515e3a3..474ac26 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -121,7 +121,6 @@ type procedure Listadeempresas1_OLDClick(Sender: TObject); procedure actInformacionEmpresaExecute(Sender: TObject); procedure actAnadirEmpresaExecute(Sender: TObject); - procedure actAnadirEmpresaUpdate(Sender: TObject); private FContenido : TCustomEditor; procedure ShowEmbedded(AEditor : ICustomEditor); @@ -542,12 +541,6 @@ begin ShowMessage('Empresa dada de alta, cierre la aplicación y vuelva a abrirla, para poder acceder a ella'); end; -procedure TfPantallaPrincipal.actAnadirEmpresaUpdate(Sender: TObject); -begin - //PARCHE - (Sender as TAction).Enabled := (AppFactuGES.UsuarioActivo.ID <> 2) -end; - procedure TfPantallaPrincipal.actCambiarPassExecute(Sender: TObject); begin AppFactuGES.UsuariosController._ShowChangePassword; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm index 05a03b2..a77bea6 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm @@ -1,19 +1,49 @@ inherited frViewElegirArticulosAlbaranesCliente: TfrViewElegirArticulosAlbaranesCliente + inherited cxGrid: TcxGrid + inherited cxGridView: TcxGridDBTableView + inherited cxGridViewPRECIO_NETO: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end + inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end + end + end inherited frViewFiltroBase1: TfrViewFiltroBase inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 225 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 225 ExplicitWidth = 121 Width = 121 end inherited eLista: TcxComboBox Left = 383 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 383 ExplicitWidth = 322 Width = 322 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas index 489bc42..e9bb88c 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas @@ -12,7 +12,7 @@ uses uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, - uDAInterfaces; + uDAInterfaces, uCustomView, uViewBase; type IViewElegirArticulosAlbaranesCliente = interface(IViewArticulos) diff --git a/Source/Modulos/Contactos/Views/Contactos_view.identcache b/Source/Modulos/Contactos/Views/Contactos_view.identcache index bf92858..2ab5c5d 100644 Binary files a/Source/Modulos/Contactos/Views/Contactos_view.identcache and b/Source/Modulos/Contactos/Views/Contactos_view.identcache differ diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 7d09787..15fd858 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -260,6 +260,10 @@ inherited fEditorClientes: TfEditorClientes Enabled = True Visible = True end + inherited actExportarExcel: TAction + Enabled = True + Visible = True + end object actDocumentosPresupuestos: TAction Category = 'Acciones' Caption = 'Presupuestos' diff --git a/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas index 759ded8..db485ef 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas @@ -158,11 +158,10 @@ end; procedure TDetallesFacturaClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); begin -//En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP -// if Assigned(AArticulos) then -// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO -// else -// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; + if Assigned(AArticulos) then + ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO + else + ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; end; procedure TDetallesFacturaClienteController.ValidarCampos(DataTable: TDADataTable); @@ -178,7 +177,7 @@ begin if ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).IsNull then if Assigned(AArticulos) then // ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP_TOTAL - ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_NETO + ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE else ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null; end; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm index b6e48e1..099fad1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm @@ -9,9 +9,13 @@ inherited frViewElegirArticulosFacturasCliente: TfrViewElegirArticulosFacturasCl end inherited cxGridViewPRECIO_NETO: TcxGridDBColumn Caption = 'Precio neto' + Visible = False + VisibleForCustomization = False end inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn Caption = 'Precio porte' + Visible = False + VisibleForCustomization = False end end end diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc index c3a8fa5..28fc4dc 100644 --- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc +++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */ -/* c:\temp\dtf1AB.tmp */ +/* c:\temp\dtf5F3.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc index 302bbce..e487c3c 100644 --- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc +++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */ -/* c:\temp\dtf1A9.tmp */ +/* c:\temp\dtf5F1.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc index ad633f2..b0fa6bf 100644 --- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc +++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */ -/* c:\temp\dtf1A7.tmp */ +/* c:\temp\dtf5EF.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc index a1e7afc..1b0d54b 100644 --- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc +++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */ -/* c:\temp\dtf20F.tmp */ +/* c:\temp\dtf657.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc index 7eb2c2a..f4a13fd 100644 --- a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc +++ b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc @@ -26,4 +26,4 @@ END /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */ /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */ -/* c:\temp\dtf20D.tmp */ +/* c:\temp\dtf655.tmp */ diff --git a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc index a456be7..81b951c 100644 --- a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc +++ b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */ /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */ -/* c:\temp\dtf1C1.tmp */ +/* c:\temp\dtf609.tmp */ diff --git a/Source/Modulos/Tienda web/Test/Contactos_data.drc b/Source/Modulos/Tienda web/Test/Contactos_data.drc deleted file mode 100644 index 686f858..0000000 --- a/Source/Modulos/Tienda web/Test/Contactos_data.drc +++ /dev/null @@ -1,10 +0,0 @@ -/* VER180 - Generated by the Borland Delphi Pascal Compiler - because -GD or --drc was supplied to the compiler. - - This file contains compiler-generated resources that - were bound to the executable. - If this file is empty, then no compiler-generated - resources were bound to the produced executable. -*/ - diff --git a/Source/Modulos/Tienda web/Test/TiendaWeb_Tests.drc b/Source/Modulos/Tienda web/Test/TiendaWeb_Tests.drc deleted file mode 100644 index 7642ac9..0000000 --- a/Source/Modulos/Tienda web/Test/TiendaWeb_Tests.drc +++ /dev/null @@ -1,14 +0,0 @@ -/* VER180 - Generated by the Borland Delphi Pascal Compiler - because -GD or --drc was supplied to the compiler. - - This file contains compiler-generated resources that - were bound to the executable. - If this file is empty, then no compiler-generated - resources were bound to the produced executable. -*/ - -STRINGTABLE -BEGIN -END - diff --git a/Source/Modulos/Tienda web/Test/cxIntlPrintSys3D10.drc b/Source/Modulos/Tienda web/Test/cxIntlPrintSys3D10.drc deleted file mode 100644 index 686f858..0000000 --- a/Source/Modulos/Tienda web/Test/cxIntlPrintSys3D10.drc +++ /dev/null @@ -1,10 +0,0 @@ -/* VER180 - Generated by the Borland Delphi Pascal Compiler - because -GD or --drc was supplied to the compiler. - - This file contains compiler-generated resources that - were bound to the executable. - If this file is empty, then no compiler-generated - resources were bound to the produced executable. -*/ - diff --git a/Source/Modulos/Tienda web/Test/vclie.drc b/Source/Modulos/Tienda web/Test/vclie.drc deleted file mode 100644 index 686f858..0000000 --- a/Source/Modulos/Tienda web/Test/vclie.drc +++ /dev/null @@ -1,10 +0,0 @@ -/* VER180 - Generated by the Borland Delphi Pascal Compiler - because -GD or --drc was supplied to the compiler. - - This file contains compiler-generated resources that - were bound to the executable. - If this file is empty, then no compiler-generated - resources were bound to the produced executable. -*/ - diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL index 59312a0..6d4f45b 100644 --- a/Source/Servicios/FactuGES.RODL +++ b/Source/Servicios/FactuGES.RODL @@ -1036,6 +1036,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas index 60f0638..264a1c2 100644 --- a/Source/Servicios/FactuGES_Intf.pas +++ b/Source/Servicios/FactuGES_Intf.pas @@ -57,6 +57,8 @@ const IsrvImpresiones_IID : TGUID = '{CC4477C1-AA2C-464D-B485-AB0C31E282A7}'; IsrvRegistroCorreos_IID : TGUID = '{E912B281-0A69-49F5-ABA7-8A66FF17DD98}'; IsrvTiendaWeb_IID : TGUID = '{A0C6D311-18C5-4851-AA96-02B3CA95BE75}'; + IsrvInformes_IID : TGUID = '{2FC3D21B-4919-4357-A5B5-10EF4AF72185}'; + IsrvInfVentasArticulo_IID : TGUID = '{669DBB17-90F9-4346-AD92-B2A85D2A6200}'; { Event ID's } @@ -96,6 +98,8 @@ type IsrvImpresiones = interface; IsrvRegistroCorreos = interface; IsrvTiendaWeb = interface; + IsrvInformes = interface; + IsrvInfVentasArticulo = interface; TRdxEmpresasArray = class; TIntegerArray = class; @@ -946,6 +950,44 @@ type function HayConexionConTienda: Boolean; end; + { IsrvInformes } + IsrvInformes = interface(IDataAbstractService) + ['{2FC3D21B-4919-4357-A5B5-10EF4AF72185}'] + end; + + { CosrvInformes } + CosrvInformes = class + class function Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvInformes; + end; + + { TsrvInformes_Proxy } + TsrvInformes_Proxy = class(TDataAbstractService_Proxy, IsrvInformes) + protected + function __GetInterfaceName:string; override; + + end; + + { IsrvInfVentasArticulo } + IsrvInfVentasArticulo = interface(IDataAbstractService) + ['{669DBB17-90F9-4346-AD92-B2A85D2A6200}'] + function GetData2(const DatasetName: AnsiString; const MaxRecords: Integer; const Columns: AnsiString; const Params: DataParameterArray): Binary; + function GetSchema2(const DatasetName: AnsiString; const Columns: AnsiString): Binary; + end; + + { CosrvInfVentasArticulo } + CosrvInfVentasArticulo = class + class function Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvInfVentasArticulo; + end; + + { TsrvInfVentasArticulo_Proxy } + TsrvInfVentasArticulo_Proxy = class(TDataAbstractService_Proxy, IsrvInfVentasArticulo) + protected + function __GetInterfaceName:string; override; + + function GetData2(const DatasetName: AnsiString; const MaxRecords: Integer; const Columns: AnsiString; const Params: DataParameterArray): Binary; + function GetSchema2(const DatasetName: AnsiString; const Columns: AnsiString): Binary; + end; + implementation uses @@ -2999,6 +3041,70 @@ begin end end; +{ CosrvInformes } + +class function CosrvInformes.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvInformes; +begin + result := TsrvInformes_Proxy.Create(aMessage, aTransportChannel); +end; + +function TsrvInformes_Proxy.__GetInterfaceName:string; +begin + result := 'srvInformes'; +end; + +{ CosrvInfVentasArticulo } + +class function CosrvInfVentasArticulo.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvInfVentasArticulo; +begin + result := TsrvInfVentasArticulo_Proxy.Create(aMessage, aTransportChannel); +end; + +{ TsrvInfVentasArticulo_Proxy } + +function TsrvInfVentasArticulo_Proxy.__GetInterfaceName:string; +begin + result := 'srvInfVentasArticulo'; +end; + +function TsrvInfVentasArticulo_Proxy.GetData2(const DatasetName: AnsiString; const MaxRecords: Integer; const Columns: AnsiString; const Params: DataParameterArray): Binary; +begin + try + result := nil; + __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GetData2'); + __Message.Write('DatasetName', TypeInfo(AnsiString), DatasetName, []); + __Message.Write('MaxRecords', TypeInfo(Integer), MaxRecords, []); + __Message.Write('Columns', TypeInfo(AnsiString), Columns, []); + __Message.Write('Params', TypeInfo(DataAbstract4_Intf.DataParameterArray), Params, []); + __Message.Finalize; + + __TransportChannel.Dispatch(__Message); + + __Message.Read('Result', TypeInfo(Binary), result, []); + finally + __Message.UnsetAttributes(__TransportChannel); + __Message.FreeStream; + end +end; + +function TsrvInfVentasArticulo_Proxy.GetSchema2(const DatasetName: AnsiString; const Columns: AnsiString): Binary; +begin + try + result := nil; + __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GetSchema2'); + __Message.Write('DatasetName', TypeInfo(AnsiString), DatasetName, []); + __Message.Write('Columns', TypeInfo(AnsiString), Columns, []); + __Message.Finalize; + + __TransportChannel.Dispatch(__Message); + + __Message.Read('Result', TypeInfo(Binary), result, []); + finally + __Message.UnsetAttributes(__TransportChannel); + __Message.FreeStream; + end +end; + initialization RegisterROClass(TRdxLoginInfo); RegisterROClass(TRdxEmpresasArray); @@ -3037,6 +3143,8 @@ initialization RegisterProxyClass(IsrvImpresiones_IID, TsrvImpresiones_Proxy); RegisterProxyClass(IsrvRegistroCorreos_IID, TsrvRegistroCorreos_Proxy); RegisterProxyClass(IsrvTiendaWeb_IID, TsrvTiendaWeb_Proxy); + RegisterProxyClass(IsrvInformes_IID, TsrvInformes_Proxy); + RegisterProxyClass(IsrvInfVentasArticulo_IID, TsrvInfVentasArticulo_Proxy); finalization @@ -3077,5 +3185,7 @@ finalization UnregisterProxyClass(IsrvImpresiones_IID); UnregisterProxyClass(IsrvRegistroCorreos_IID); UnregisterProxyClass(IsrvTiendaWeb_IID); + UnregisterProxyClass(IsrvInformes_IID); + UnregisterProxyClass(IsrvInfVentasArticulo_IID); end. diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas index cda6d77..c589d1e 100644 --- a/Source/Servicios/FactuGES_Invk.pas +++ b/Source/Servicios/FactuGES_Invk.pas @@ -355,6 +355,24 @@ type procedure Invoke_HayConexionConTienda(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); end; + TsrvInformes_Invoker = class(TDataAbstractService_Invoker) + private + protected + public + constructor Create; override; + published + end; + + TsrvInfVentasArticulo_Invoker = class(TDataAbstractService_Invoker) + private + protected + public + constructor Create; override; + published + procedure Invoke_GetData2(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); + procedure Invoke_GetSchema2(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); + end; + implementation uses @@ -2617,5 +2635,87 @@ begin end; end; +{ TsrvInformes_Invoker } + +constructor TsrvInformes_Invoker.Create; +begin + inherited Create; + FAbstract := False; +end; + +{ TsrvInfVentasArticulo_Invoker } + +constructor TsrvInfVentasArticulo_Invoker.Create; +begin + inherited Create; + FAbstract := False; +end; + +procedure TsrvInfVentasArticulo_Invoker.Invoke_GetData2(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); +{ function GetData2(const DatasetName: AnsiString; const MaxRecords: Integer; const Columns: AnsiString; const Params: DataParameterArray): Binary; } +var + DatasetName: AnsiString; + MaxRecords: Integer; + Columns: AnsiString; + Params: DataAbstract4_Intf.DataParameterArray; + lResult: Binary; + __lObjectDisposer: TROObjectDisposer; +begin + Params := nil; + lResult := nil; + try + __Message.Read('DatasetName', TypeInfo(AnsiString), DatasetName, []); + __Message.Read('MaxRecords', TypeInfo(Integer), MaxRecords, []); + __Message.Read('Columns', TypeInfo(AnsiString), Columns, []); + __Message.Read('Params', TypeInfo(DataAbstract4_Intf.DataParameterArray), Params, []); + + lResult := (__Instance as IsrvInfVentasArticulo).GetData2(DatasetName, MaxRecords, Columns, Params); + + __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvInfVentasArticulo', 'GetData2Response'); + __Message.Write('Result', TypeInfo(Binary), lResult, []); + __Message.Finalize; + __Message.UnsetAttributes(__Transport); + + finally + __lObjectDisposer := TROObjectDisposer.Create(__Instance); + try + __lObjectDisposer.Add(Params); + __lObjectDisposer.Add(lResult); + finally + __lObjectDisposer.Free(); + end; + end; +end; + +procedure TsrvInfVentasArticulo_Invoker.Invoke_GetSchema2(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); +{ function GetSchema2(const DatasetName: AnsiString; const Columns: AnsiString): Binary; } +var + DatasetName: AnsiString; + Columns: AnsiString; + lResult: Binary; + __lObjectDisposer: TROObjectDisposer; +begin + lResult := nil; + try + __Message.Read('DatasetName', TypeInfo(AnsiString), DatasetName, []); + __Message.Read('Columns', TypeInfo(AnsiString), Columns, []); + + lResult := (__Instance as IsrvInfVentasArticulo).GetSchema2(DatasetName, Columns); + + __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvInfVentasArticulo', 'GetSchema2Response'); + __Message.Write('Result', TypeInfo(Binary), lResult, []); + __Message.Finalize; + __Message.UnsetAttributes(__Transport); + + finally + __lObjectDisposer := TROObjectDisposer.Create(__Instance); + try + __lObjectDisposer.Add(lResult); + finally + __lObjectDisposer.Free(); + end; + end; +end; + initialization end. diff --git a/Source/Servicios/RODLFile.res b/Source/Servicios/RODLFile.res index 660fe2c..ae9a0be 100644 Binary files a/Source/Servicios/RODLFile.res and b/Source/Servicios/RODLFile.res differ diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 9acc124..961a06e 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 035800c..2ff01ca 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -163,7 +163,11 @@ uses schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas', - schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas'; + schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas', + srvInformes_Impl in '..\Modulos\Informes base\Servidor\srvInformes_Impl.pas' {srvInformes: TDataAbstractService}, + schInformesClient_Intf in '..\Modulos\Informes base\Model\schInformesClient_Intf.pas', + schInformesServer_Intf in '..\Modulos\Informes base\Model\schInformesServer_Intf.pas', + srvInfVentasArticulo_Impl in '..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas' {srvInfVentasArticulo: TDataAbstractService}; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 11af204..eef50c3 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse4070FalseFalseFalseFalseFalse308212524.0.7.04.0.7.0martes, 02 de noviembre de 2010 18:27 + FalseTrueFalse/standaloneTrueFalse4080FalseFalseFalseFalseFalse308212524.0.8.04.0.8.0miércoles, 03 de noviembre de 2010 16:17 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr @@ -201,6 +201,16 @@
srvImpresiones
TDARemoteService + +
srvInfVentasArticulo
+ TDataAbstractService + + + + +
srvInformes
+ TDataAbstractService + diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index bf1a4ec..d080142 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 4,0,7,0 -PRODUCTVERSION 4,0,7,0 +FILEVERSION 4,0,8,0 +PRODUCTVERSION 4,0,8,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "4.0.7.0\0" - VALUE "ProductVersion", "4.0.7.0\0" - VALUE "CompileDate", "martes, 02 de noviembre de 2010 18:52\0" + VALUE "FileVersion", "4.0.8.0\0" + VALUE "ProductVersion", "4.0.8.0\0" + VALUE "CompileDate", "viernes, 05 de noviembre de 2010 19:11\0" END END BLOCK "VarFileInfo"