diff --git a/Build/BuildRoberto.fbl5 b/Build/BuildRoberto.fbl5 index fa44938f..ae31418b 100644 Binary files a/Build/BuildRoberto.fbl5 and b/Build/BuildRoberto.fbl5 differ diff --git a/Build/buildlog.html b/Build/buildlog.html index fd1d833a..c30b0e37 100644 --- a/Build/buildlog.html +++ b/Build/buildlog.html @@ -65,19 +65,19 @@ function domCollapseAll(show){ Date : -01/08/2007 +02/08/2007 Start Time : -19:23:22 +19:52:29 End Time : -19:26:52 +19:54:00 Run Time : -00:03:30 +00:01:31
@@ -94,5687 +94,22 @@ function domCollapseAll(show){ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5901,7 +144,7 @@ uGenerarFacturasProvPedProvUtils.pas(153) Hint: H2077 Value assigned to 'Generar uGenerarFacturasProvPedProvUtils.pas(166) Hint: H2164 Variable 'ARespuesta' is declared but never used in 'GenerarFacturaProv' uGenerarFacturasProvPedProvUtils.pas(226) Warning: W1035 Return value of function 'GenerarFacturaProv' might be undefined uGenerarFacturasProvPedProvUtils.pas(210) Hint: H2164 Variable 'APedidos' is declared but never used in 'GenerarFacturaProv' -280 lines, 1.62 seconds, 13412 bytes code, 84 bytes data. +280 lines, 1.59 seconds, 13412 bytes code, 84 bytes data. @@ -5909,16 +152,16 @@ uGenerarFacturasProvPedProvUtils.pas(210) Hint: H2164 Variable 'APedidos' is dec - - + + - - + + @@ -5934,7 +177,7 @@ Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation uEditorPedidosCliente.pas(34) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorGridBase' uEditorPedidoCliente.pas(162) Hint: H2077 Value assigned to 'bEsNuevo' never used -1740 lines, 2.41 seconds, 45284 bytes code, 120 bytes data. +1740 lines, 2.38 seconds, 45284 bytes code, 120 bytes data. @@ -5942,8 +185,8 @@ uEditorPedidoCliente.pas(162) Hint: H2077 Value assigned to 'bEsNuevo' never use - - + + @@ -5957,7 +200,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -121 lines, 2.70 seconds, 14252 bytes code, 68 bytes data. +121 lines, 2.62 seconds, 14252 bytes code, 68 bytes data. @@ -5965,8 +208,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -5988,7 +231,7 @@ uEditorAlbaranesCliente.pas(194) Hint: H2164 Variable 'AAlbaran' is declared but uEditorAlbaranesCliente.pas(409) Hint: H2164 Variable 'AAlbaran' is declared but never used in 'TfEditorAlbaranesCliente.NuevoInterno' uEditorAlbaranCliente.pas(135) Hint: H2164 Variable 'i' is declared but never used in 'TfEditorAlbaranCliente.FormShow' uEditorAlbaranCliente.pas(193) Hint: H2077 Value assigned to 'bEsNuevo' never used -2319 lines, 3.28 seconds, 57032 bytes code, 140 bytes data. +2319 lines, 3.23 seconds, 57032 bytes code, 140 bytes data. @@ -5996,8 +239,8 @@ uEditorAlbaranCliente.pas(193) Hint: H2077 Value assigned to 'bEsNuevo' never us - - + + @@ -6011,7 +254,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -134 lines, 3.56 seconds, 14756 bytes code, 68 bytes data. +134 lines, 3.55 seconds, 14756 bytes code, 68 bytes data. @@ -6019,8 +262,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6036,7 +279,7 @@ Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation uEditorFacturasCliente.pas(34) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorGridBase' uEditorFacturaCliente.pas(26) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' -1574 lines, 2.25 seconds, 41908 bytes code, 116 bytes data. +1574 lines, 2.16 seconds, 41908 bytes code, 116 bytes data. @@ -6044,8 +287,8 @@ uEditorFacturaCliente.pas(26) Warning: W1010 Method 'FormShow' hides virtual met - - + + @@ -6059,7 +302,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -122 lines, 2.78 seconds, 14032 bytes code, 68 bytes data. +122 lines, 2.81 seconds, 14032 bytes code, 68 bytes data. @@ -6067,8 +310,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6095,7 +338,7 @@ uEditorDetalleReservas.pas(91) Hint: H2164 Variable 'Respuesta' is declared but uEditorDetalleReservas.pas(166) Hint: H2164 Variable 'AAlmacenes' is declared but never used in 'TfEditorDetalleReservas.SeleccionarAlmacen' uEditorDetalleReservas.pas(167) Hint: H2164 Variable 'Respuesta' is declared but never used in 'TfEditorDetalleReservas.SeleccionarAlmacen' uEditorDetalleReservas.pas(28) Hint: H2219 Private symbol 'DarIDAlmacenSeleccionado' declared but never used -1688 lines, 2.25 seconds, 40624 bytes code, 112 bytes data. +1688 lines, 2.09 seconds, 40628 bytes code, 112 bytes data. @@ -6103,8 +346,8 @@ uEditorDetalleReservas.pas(28) Hint: H2219 Private symbol 'DarIDAlmacenSeleccion - - + + @@ -6126,8 +369,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6153,8 +396,8 @@ uEditorDireccionEntregaPedidoProveedor.pas(43) Hint: H2219 Private symbol 'Pedid - - + + @@ -6168,7 +411,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -121 lines, 3.47 seconds, 14016 bytes code, 68 bytes data. +121 lines, 3.50 seconds, 14016 bytes code, 68 bytes data. @@ -6176,8 +419,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6201,7 +444,7 @@ uEditorAlbaranProveedor.pas(221) Hint: H2164 Variable 'ADireccion' is declared b uEditorElegirArticulosAlbaranProveedor.pas(16) Warning: W1010 Method 'FormCloseQuery' hides virtual method of base type 'TfEditorDBBase' uEditorDireccionEntregaAlbaranProveedor.pas(43) Hint: H2219 Private symbol 'Albaran' declared but never used uEditorAlbaranDevProveedor.pas(67) Hint: H2077 Value assigned to 'bEsNuevo' never used -2228 lines, 3.89 seconds, 55136 bytes code, 140 bytes data. +2228 lines, 3.80 seconds, 55136 bytes code, 140 bytes data. @@ -6209,8 +452,8 @@ uEditorAlbaranDevProveedor.pas(67) Hint: H2077 Value assigned to 'bEsNuevo' neve - - + + @@ -6224,7 +467,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -134 lines, 4.55 seconds, 14764 bytes code, 68 bytes data. +134 lines, 4.58 seconds, 14764 bytes code, 68 bytes data. @@ -6232,8 +475,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6247,7 +490,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Banca electronica\Plugin\BancaElectronica_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -107 lines, 0.97 seconds, 12324 bytes code, 68 bytes data. +107 lines, 1.02 seconds, 12324 bytes code, 68 bytes data. @@ -6255,8 +498,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6275,7 +518,7 @@ uEditorComisiones.pas(23) Warning: W1010 Method 'FormShow' hides virtual method uViewComision.pas(73) Warning: W1020 Constructing instance of 'TAgentesController' containing abstract method 'TContactosController.ElegirContacto' uEditorComision.pas(31) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' uEditorComision.pas(111) Hint: H2077 Value assigned to 'bEsNuevo' never used -1119 lines, 1.31 seconds, 29620 bytes code, 104 bytes data. +1119 lines, 1.28 seconds, 29620 bytes code, 104 bytes data. @@ -6283,8 +526,8 @@ uEditorComision.pas(111) Hint: H2077 Value assigned to 'bEsNuevo' never used - - + + @@ -6306,9 +549,9 @@ Copyright (c) 1983,2005 Borland Software Corporation - - - + + + @@ -6331,7 +574,7 @@ uEditorAlbaranProveedor.pas(221) Hint: H2164 Variable 'ADireccion' is declared b uEditorElegirArticulosAlbaranProveedor.pas(16) Warning: W1010 Method 'FormCloseQuery' hides virtual method of base type 'TfEditorDBBase' uEditorDireccionEntregaAlbaranProveedor.pas(43) Hint: H2219 Private symbol 'Albaran' declared but never used uEditorAlbaranDevProveedor.pas(67) Hint: H2077 Value assigned to 'bEsNuevo' never used -2228 lines, 3.70 seconds, 55136 bytes code, 140 bytes data. +2228 lines, 3.78 seconds, 55136 bytes code, 140 bytes data. @@ -6339,8 +582,8 @@ uEditorAlbaranDevProveedor.pas(67) Hint: H2077 Value assigned to 'bEsNuevo' neve - - + + @@ -6354,7 +597,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -134 lines, 4.50 seconds, 14764 bytes code, 68 bytes data. +134 lines, 4.59 seconds, 14764 bytes code, 68 bytes data. @@ -6362,8 +605,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6380,7 +623,7 @@ Copyright (c) 1983,2005 Borland Software Corporation uEditorFacturasProveedor.pas(34) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorGridBase' uEditorFacturaProveedor.pas(24) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' uEditorElegirArticulosFacturaProveedor.pas(16) Warning: W1010 Method 'FormCloseQuery' hides virtual method of base type 'TfEditorDBBase' -1527 lines, 3.64 seconds, 40348 bytes code, 112 bytes data. +1527 lines, 3.66 seconds, 40352 bytes code, 112 bytes data. @@ -6388,8 +631,8 @@ uEditorElegirArticulosFacturaProveedor.pas(16) Warning: W1010 Method 'FormCloseQ - - + + @@ -6403,7 +646,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -122 lines, 3.98 seconds, 14088 bytes code, 68 bytes data. +122 lines, 4.00 seconds, 14088 bytes code, 68 bytes data. @@ -6411,8 +654,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6432,7 +675,7 @@ uEditorHistoricoMovimientos.pas(91) Hint: H2164 Variable 'AAlmacenes' is declare uEditorHistoricoMovimientos.pas(92) Hint: H2164 Variable 'AAlmacenesController' is declared but never used in 'TfEditorHistoricoMovimientos.DarIDAlmacenSeleccionado' uEditorHistoricoMovimientos.pas(93) Hint: H2164 Variable 'Respuesta' is declared but never used in 'TfEditorHistoricoMovimientos.DarIDAlmacenSeleccionado' uEditorHistoricoMovimientos.pas(34) Hint: H2219 Private symbol 'DarIDAlmacenSeleccionado' declared but never used -544 lines, 1.69 seconds, 20752 bytes code, 84 bytes data. +544 lines, 1.67 seconds, 20760 bytes code, 84 bytes data. @@ -6440,8 +683,8 @@ uEditorHistoricoMovimientos.pas(34) Hint: H2219 Private symbol 'DarIDAlmacenSele - - + + @@ -6455,7 +698,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Historico de movimientos\Plugin\HistoricoMovimientos_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -120 lines, 1.91 seconds, 13436 bytes code, 68 bytes data. +120 lines, 1.94 seconds, 13436 bytes code, 68 bytes data. @@ -6463,16 +706,16 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + - - + + @@ -6486,7 +729,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Tienda web\Model\TiendaWeb_model.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -5561 lines, 0.58 seconds, 95536 bytes code, 112 bytes data. +5561 lines, 0.47 seconds, 95536 bytes code, 112 bytes data. @@ -6494,8 +737,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6509,7 +752,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Tienda web\Data\TiendaWeb_data.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -437 lines, 0.44 seconds, 12072 bytes code, 72 bytes data. +437 lines, 0.41 seconds, 12072 bytes code, 72 bytes data. @@ -6517,8 +760,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6579,7 +822,7 @@ uTiendaWebController.pas(335) Hint: H2077 Value assigned to 'ADlg' never used uTiendaWebController.pas(282) Hint: H2164 Variable 'Respuesta' is declared but never used in 'TTiendaWebController.DescargarPedidos' uTiendaWebController.pas(379) Hint: H2077 Value assigned to 'TTiendaWebController.ValidarTiendaWeb' never used uTiendaWebController.pas(416) Hint: H2077 Value assigned to 'TTiendaWebController.Eliminar' never used -4748 lines, 0.89 seconds, 50236 bytes code, 120 bytes data. +4748 lines, 0.94 seconds, 50236 bytes code, 120 bytes data. @@ -6587,8 +830,8 @@ uTiendaWebController.pas(416) Hint: H2077 Value assigned to 'TTiendaWebControlle - - + + @@ -6610,8 +853,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6625,7 +868,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Tienda web\Plugin\TiendaWeb_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -149 lines, 1.24 seconds, 13296 bytes code, 72 bytes data. +149 lines, 1.17 seconds, 13296 bytes code, 72 bytes data. @@ -6633,16 +876,16 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + - - + + @@ -6656,7 +899,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Remesas de proveedor\Model\RemesasProveedor_model.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -1954 lines, 0.44 seconds, 38876 bytes code, 88 bytes data. +1954 lines, 0.47 seconds, 38876 bytes code, 88 bytes data. @@ -6664,8 +907,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6679,7 +922,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Remesas de proveedor\Data\RemesasProveedor_data.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -176 lines, 0.61 seconds, 9836 bytes code, 72 bytes data. +176 lines, 0.44 seconds, 9836 bytes code, 72 bytes data. @@ -6687,8 +930,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6714,8 +957,8 @@ uRemesasProveedorController.pas(596) Warning: W1036 Variable 'ID_Remesas' might - - + + @@ -6733,7 +976,7 @@ uEditorRemesasProveedor.pas(28) Warning: W1010 Method 'FormShow' hides virtual m uEditorRemesasProveedor.pas(222) Hint: H2164 Variable 'ACadena' is declared but never used in 'TfEditorRemesasProveedor.EliminarInterno' uEditorRemesaProveedor.pas(32) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' uEditorRemesaProveedor.pas(116) Hint: H2077 Value assigned to 'bEsNuevo' never used -1170 lines, 0.91 seconds, 30568 bytes code, 104 bytes data. +1170 lines, 0.81 seconds, 30568 bytes code, 104 bytes data. @@ -6741,8 +984,8 @@ uEditorRemesaProveedor.pas(116) Hint: H2077 Value assigned to 'bEsNuevo' never u - - + + @@ -6756,7 +999,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Remesas de proveedor\Plugin\RemesasProveedor_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -120 lines, 0.98 seconds, 12776 bytes code, 68 bytes data. +120 lines, 0.97 seconds, 12776 bytes code, 68 bytes data. @@ -6764,16 +1007,16 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + - - + + @@ -6795,8 +1038,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6818,8 +1061,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6843,8 +1086,8 @@ uReferenciasController.pas(147) Hint: H2164 Variable 'NuevoID' is declared but n - - + + @@ -6858,7 +1101,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Referencias\Views\Referencias_view.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -244 lines, 0.41 seconds, 9928 bytes code, 76 bytes data. +244 lines, 0.39 seconds, 9928 bytes code, 76 bytes data. @@ -6866,8 +1109,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6881,7 +1124,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Referencias\Plugin\Referencias_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -120 lines, 0.39 seconds, 8056 bytes code, 68 bytes data. +120 lines, 0.41 seconds, 8056 bytes code, 68 bytes data. @@ -6889,16 +1132,16 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + - - + + @@ -6920,8 +1163,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6935,7 +1178,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informes base\Data\Informes_data.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -160 lines, 0.36 seconds, 7268 bytes code, 76 bytes data. +160 lines, 0.34 seconds, 7268 bytes code, 76 bytes data. @@ -6943,8 +1186,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -6960,7 +1203,7 @@ Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation uInformesController.pas(119) Hint: H2077 Value assigned to 'TInformesController.Eliminar' never used uInformesController.pas(179) Hint: H2077 Value assigned to 'TInformesController.ValidarInforme' never used -458 lines, 0.66 seconds, 9984 bytes code, 80 bytes data. +458 lines, 0.47 seconds, 9984 bytes code, 80 bytes data. @@ -6968,8 +1211,8 @@ uInformesController.pas(179) Hint: H2077 Value assigned to 'TInformesController. - - + + @@ -6983,7 +1226,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informes base\Controller\InformesBase_controller.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -70 lines, 0.14 seconds, 2440 bytes code, 68 bytes data. +70 lines, 0.12 seconds, 2440 bytes code, 68 bytes data. @@ -6991,8 +1234,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -7018,8 +1261,8 @@ uEditorInformes.pas(30) Warning: W1010 Method 'FormShow' hides virtual method of - - + + @@ -7045,7 +1288,7 @@ uViewFiltros.pas(69) Hint: H2164 Variable 'ACaption' is declared but never used uViewFiltros.pas(136) Hint: H2164 Variable 'ARow' is declared but never used in 'TfrViewFiltros.vgFiltrosEditorRow1EditPropertiesEditValueChanged' uViewFiltros.pas(137) Hint: H2164 Variable 'AColumn' is declared but never used in 'TfrViewFiltros.vgFiltrosEditorRow1EditPropertiesEditValueChanged' uViewFiltros.pas(138) Hint: H2164 Variable 'AItemIndex' is declared but never used in 'TfrViewFiltros.vgFiltrosEditorRow1EditPropertiesEditValueChanged' -2168 lines, 0.58 seconds, 37888 bytes code, 132 bytes data. +2194 lines, 0.61 seconds, 39352 bytes code, 132 bytes data. @@ -7053,8 +1296,8 @@ uViewFiltros.pas(138) Hint: H2164 Variable 'AItemIndex' is declared but never us - - + + @@ -7068,7 +1311,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informes Base\Plugin\Informes_plugin.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -120 lines, 0.48 seconds, 8888 bytes code, 68 bytes data. +120 lines, 0.52 seconds, 8888 bytes code, 68 bytes data. @@ -7076,16 +1319,16 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + - - + + @@ -7099,7 +1342,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -1886 lines, 0.09 seconds, 32052 bytes code, 80 bytes data. +1926 lines, 0.11 seconds, 32852 bytes code, 80 bytes data. @@ -7107,8 +1350,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -7122,7 +1365,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -152 lines, 0.61 seconds, 7696 bytes code, 76 bytes data. +152 lines, 0.34 seconds, 7696 bytes code, 76 bytes data. @@ -7130,8 +1373,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -7145,7 +1388,7 @@ Running Delphi compiler.... Using Command Line : /B "E:\Codigo (Luis León)\Source\Modulos\Informe ventas por articulo\Controller\InfVentasArticulo_controller.dpk" /Q Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation -336 lines, 0.58 seconds, 11052 bytes code, 88 bytes data. +336 lines, 0.62 seconds, 11252 bytes code, 88 bytes data. @@ -7153,8 +1396,8 @@ Copyright (c) 1983,2005 Borland Software Corporation - - + + @@ -7172,9 +1415,9 @@ uViewInfVentasArticuloGrid.pas(153) Hint: H2164 Variable 'AColumn' is declared b uViewInfVentasArticuloGrid.pas(154) Hint: H2164 Variable 'AFecha' is declared but never used in 'TfrViewInfVentasArticuloGrid.cxGridViewStylesGetContentStyle' uViewInfVentasArticuloGrid.pas(374) Hint: H2164 Variable 'AValue1' is declared but never used in 'TfrViewInfVentasArticuloGrid.cxGridViewDataControllerCompare' uViewInfVentasArticuloGrid.pas(375) Hint: H2164 Variable 'AValue2' is declared but never used in 'TfrViewInfVentasArticuloGrid.cxGridViewDataControllerCompare' -uEditorInfVentasArticulo.pas(37) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' -uEditorInfVentasArticulo.pas(198) Hint: H2164 Variable 'Fichero' is declared but never used in 'TfEditorInfVentasArticulo.GuardarConfiguracion' -1021 lines, 0.66 seconds, 22112 bytes code, 84 bytes data. +uEditorInfVentasArticulo.pas(38) Warning: W1010 Method 'FormShow' hides virtual method of base type 'TfEditorBase' +uEditorInfVentasArticulo.pas(199) Hint: H2164 Variable 'Fichero' is declared but never used in 'TfEditorInfVentasArticulo.GuardarConfiguracion' +1039 lines, 0.66 seconds, 23164 bytes code, 84 bytes data. @@ -7182,8 +1425,8 @@ uEditorInfVentasArticulo.pas(198) Hint: H2164 Variable 'Fichero' is declared but - - + + @@ -7199,7 +1442,7 @@ Borland Delphi for Win32 compiler version 18.0 Copyright (c) 1983,2005 Borland Software Corporation uPluginInfVentasArticulo.pas(48) Hint: H2164 Variable 'AInfVentasArticuloController' is declared but never used in 'TPluginInfVentasArticulo.actVentasArticuloExecute' uPluginInfVentasArticulo.pas(49) Hint: H2164 Variable 'AInfVentasArticulo' is declared but never used in 'TPluginInfVentasArticulo.actVentasArticuloExecute' -124 lines, 0.66 seconds, 10604 bytes code, 68 bytes data. +124 lines, 0.69 seconds, 10604 bytes code, 68 bytes data. @@ -7207,16 +1450,16 @@ uPluginInfVentasArticulo.pas(49) Hint: H2164 Variable 'AInfVentasArticulo' is de - - + + - - + + @@ -7239,7 +1482,7 @@ uNavPaneController.pas(132) Hint: H2077 Value assigned to 'ASeccionPadre' never uNavPaneController.pas(156) Warning: W1036 Variable 'AEmpresasCount' might not have been initialized uPantallaPrincipal.pas(552) Warning: W1035 Return value of function 'TfPantallaPrincipal.IsShortCut' might be undefined uPantallaPrincipal.pas(112) Hint: H2219 Private symbol 'ExecuteActionMenu' declared but never used -25290 lines, 0.66 seconds, 238376 bytes code, 11744 bytes data. +25290 lines, 0.62 seconds, 238376 bytes code, 11744 bytes data. @@ -7247,16 +1490,16 @@ uPantallaPrincipal.pas(112) Hint: H2219 Private symbol 'ExecuteActionMenu' decla - - + + - - + + @@ -7272,8 +1515,8 @@ Success - - + + @@ -7289,8 +1532,8 @@ Success - - + +
- Action List Action List: Main19:23:2219:26:5200:03:30
CompletedLog Variable ValuesLog Variable Values19:23:2219:23:2200:00:00View
-
-
CompletedAction GroupBorrar ficheros temporales19:23:2219:23:2200:00:00
CompletedMSBuild ProjectMSBuild Project [ E:\Codigo (Luis León)\Source\ClearFiles.msbuild ]19:23:2219:23:4100:00:18View
-
-
CompletedRead Registry ValueLeer la ruta de búsqueda de Delphi desde el registro19:23:4119:23:4100:00:00View
-
-
CompletedAction GroupServidor19:23:4119:23:4100:00:0019:52:2919:54:0000:01:31
Completed Compile Delphi Win32 ProjectCompile Servidor\FactuGES_Server.dpr19:23:4119:23:4800:00:07View
-
-
CompletedAction GroupBase19:23:4819:23:4800:00:00
CompletedCompile Delphi Win32 ProjectCompile DataAbstract_D10\DataAbstract_D10.dpk19:23:4819:23:5000:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Base\Base.dpk19:23:5019:23:5100:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Base\ControllerBase\ControllerBase.dpk19:23:5119:23:5200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Base\GUIBase\GUIBase.dpk19:23:5219:23:54Compile Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dpk19:52:2919:52:31 00:00:02ViewView
-
-
CompletedAction GroupMódulos19:23:5419:23:5400:00:00
CompletedAction GroupGeneral19:23:5419:23:5400:00:00
CompletedAction GroupEmpresas19:23:5419:23:5400:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Empresas\Model\Empresas_model.dpk19:23:5419:23:5600:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Empresas\Data\Empresas_data.dpk19:23:5619:23:5700:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Empresas\Controller\Empresas_controller.dpk19:23:5719:23:5800:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Base\Usuarios\Usuarios.dpk19:23:5819:23:5900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Empresas\Views\Empresas_view.dpk19:23:5919:24:0000:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Empresas\Plugin\Empresas_plugin.dpk19:24:0019:24:0000:00:00View
-
-
CompletedAction GroupFormas de pago19:24:0019:24:0000:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Formas de pago\Model\FormasPago_model.dpk19:24:0019:24:0100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Formas de pago\Data\FormasPago_data.dpk19:24:0119:24:0200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Formas de pago\Controller\FormasPago_controller.dpk19:24:0219:24:0200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Formas de pago\Views\FormasPago_view.dpk19:24:0219:24:0300:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Formas de pago\Plugin\FormasPago_plugin.dpk19:24:0319:24:0400:00:00View
-
-
CompletedAction GroupTipos de IVA19:24:0419:24:0400:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Tipos de IVA\Model\TiposIVA_model.dpk19:24:0419:24:0400:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Tipos de IVA\Data\TiposIVA_data.dpk19:24:0419:24:0500:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Tipos de IVA\Controller\TiposIVA_controller.dpk19:24:0519:24:0600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Tipos de IVA\Views\TiposIVA_view.dpk19:24:0619:24:0600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Tipos de IVA\Plugin\TiposIVA_plugin.dpk19:24:0619:24:0700:00:00View
-
-
CompletedAction GroupContactos19:24:0719:24:0700:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Contactos\Model\Contactos_model.dpk19:24:0719:24:0800:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Contactos\Data\Contactos_data.dpk19:24:0819:24:0900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Contactos\Controller\Contactos_controller.dpk19:24:0919:24:0900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Contactos\Views\Contactos_view.dpk19:24:0919:24:1100:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Contactos\Plugin\Contactos_plugin.dpk19:24:1119:24:1200:00:01View
-
-
CompletedAction GroupFamilias19:24:1219:24:1200:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Familias\Model\Familias_model.dpk19:24:1219:24:1200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Familias\Data\Familias_data.dpk19:24:1219:24:1300:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Familias\Controller\Familias_controller.dpk19:24:1319:24:1300:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Familias\Views\Familias_view.dpk19:24:1319:24:1400:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Familias\Plugin\Familias_plugin.dpk19:24:1419:24:1500:00:00View
-
-
CompletedAction GroupAlmacenes MDC19:24:1519:24:1500:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Almacenes\Model\Almacenes_model.dpk19:24:1519:24:1600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Almacenes\Data\Almacenes_data.dpk19:24:1619:24:1600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Almacenes\Controller\Almacenes_controller.dpk19:24:1619:24:1700:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Almacenes\Views\Almacenes_view.dpk19:24:1719:24:1800:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Almacenes\Plugin\Almacenes_plugin.dpk19:24:1819:24:1900:00:00View
-
-
CompletedAction GroupArtículos MDC19:24:1919:24:1900:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Articulos\Model\Articulos_model.dpk19:24:1919:24:2000:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Articulos\Data\Articulos_data.dpk19:24:2019:24:2100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Articulos\Controller\Articulos_controller.dpk19:24:2119:24:2100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Articulos\Views\Articulos_view.dpk19:24:2119:24:2300:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Articulos\Plugin\Articulos_plugin.dpk19:24:2319:24:2400:00:01View
-
-
CompletedAction GroupVentas19:24:2419:24:2400:00:00
CompletedAction GroupRecibos de cliente MDC19:24:2419:24:2400:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de cliente\Model\RecibosCliente_model.dpk19:24:2419:24:2400:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de cliente\Data\RecibosCliente_data.dpk19:24:2419:24:2500:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de cliente\Controller\RecibosCliente_controller.dpk19:24:2519:24:2600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de cliente\Views\RecibosCliente_view.dpk19:24:2619:24:2700:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.dpk19:24:2719:24:2800:00:01View
-
-
CompletedAction GroupRemesas de cliente MDC19:24:2819:24:2800:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Remesas de cliente\Model\RemesasCliente_model.dpk19:24:2819:24:2900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Remesas de cliente\Data\RemesasCliente_data.dpk19:24:2919:24:3000:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Remesas de cliente\Controller\RemesasCliente_controller.dpk19:24:3019:24:3100:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Banca electronica\Controller\BancaElectronica_controller.dpk19:24:3119:24:3200:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Banca electronica\Views\BancaElectronica_view.dpk19:24:3219:24:3300:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Remesas de cliente\Views\RemesasCliente_view.dpk19:24:3319:24:3400:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Remesas de cliente\Plugin\RemesasCliente_plugin.dpk19:24:3419:24:3500:00:01View
-
-
CompletedAction GroupPedidos de cliente MDC19:24:3519:24:3500:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos de cliente\Model\PedidosCliente_model.dpk19:24:3519:24:3600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos de cliente\Data\PedidosCliente_data.dpk19:24:3619:24:3700:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.dpk19:24:3719:24:3800:00:01View
-
-
CompletedAction GroupAlbaranes de cliente MDC19:24:3819:24:3800:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.dpk19:24:3819:24:3900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.dpk19:24:3919:24:3900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.dpk19:24:3919:24:4000:00:01View
-
-
CompletedAction GroupFacturas de cliente MDC19:24:4019:24:4000:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de cliente\Model\FacturasCliente_model.dpk19:24:4019:24:4100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de cliente\Data\FacturasCliente_data.dpk19:24:4119:24:4200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de cliente\Controller\FacturasCliente_controller.dpk19:24:4219:24:4300:00:01View
-
-
CompletedAction GroupComisiones MDC19:24:4319:24:4300:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Comisiones\Model\Comisiones_model.dpk19:24:4319:24:4400:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Comisiones\Data\Comisiones_data.dpk19:24:4419:24:4500:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Comisiones\Controller\Comisiones_controller.dpk19:24:4519:24:4600:00:01View
-
-
CompletedAction GroupCompras19:24:4619:24:4600:00:00
CompletedAction GroupPedidos de proveedor MDC19:24:4619:24:4600:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos a proveedor\Model\PedidosProveedor_model.dpk19:24:4619:24:4700:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos a proveedor\Data\PedidosProveedor_data.dpk19:24:4719:24:4800:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.dpk19:24:4819:24:4900:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.dpk19:24:4919:24:5000:00:00View
-
-
CompletedAction GroupRecibos de proveedor19:24:5019:24:5000:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de proveedor\Model\RecibosProveedor_model.dpk19:24:5019:24:5100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de proveedor\Data\RecibosProveedor_data.dpk19:24:5119:24:5200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de proveedor\Controller\RecibosProveedor_controller.dpk19:24:5219:24:5300:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de proveedor\Views\RecibosProveedor_view.dpk19:24:5319:24:5400:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Recibos de proveedor\Plugin\RecibosProveedor_plugin.dpk19:24:5419:24:5500:00:01View
-
-
CompletedAction GroupLogística19:24:5519:24:5500:00:00
CompletedAction GroupInventario MDC19:24:5519:24:5500:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Inventario\Model\Inventario_model.dpk19:24:5519:24:5600:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Inventario\Data\Inventario_data.dpk19:24:5619:24:5700:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Inventario\Controller\Inventario_controller.dpk19:24:5719:24:5800:00:01View
-
-
CompletedAction GroupHistorico Movimientos MDC19:24:5819:24:5800:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Historico de movimientos\Model\HistoricoMovimientos_model.dpk19:24:5819:24:5800:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Historico de movimientos\Data\HistoricoMovimientos_data.dpk19:24:5819:24:5900:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Historico de movimientos\Controller\HistoricoMovimientos_controller.dpk19:24:5919:25:0000:00:00View
-
-
CompletedAction GroupAlbaranes de proveedor MDC19:25:0019:25:0000:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de proveedor\Model\AlbaranesProveedor_model.dpk19:25:0019:25:0100:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de proveedor\Data\AlbaranesProveedor_data.dpk19:25:0119:25:0200:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dpk19:25:0219:25:0300:00:01View
-
-
CompletedAction GroupFacturas de proveedor MDC19:25:0319:25:0300:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de proveedor\Model\FacturasProveedor_model.dpk19:25:0319:25:0400:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de proveedor\Data\FacturasProveedor_data.dpk19:25:0419:25:0500:00:00View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Facturas de proveedor\Controller\FacturasProveedor_controller.dpk19:25:0519:25:0600:00:01View
-
-
CompletedAction GroupRelaciones19:25:0619:25:0600:00:00
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dpk19:25:0619:25:0800:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dpk19:25:0819:25:0900:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dpk ]19:25:0919:25:1100:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dpk ]19:25:1119:25:1300:00:02View
-
Completed Compile Delphi Win32 ProjectCompile Modulos\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dpk ]19:25:1319:25:1500:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Pedidos de cliente - Albaranes de cliente\PedCli_AlbCli_relation.dpk ]19:25:1519:25:1600:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Pedidos de cliente - Pedidos a proveedor\PedCli_PedProv_relation.dpk19:25:1619:25:1700:00:01View
-
-
CompletedCompile Delphi Win32 ProjectCompile Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\AlbProv_FacProv_relation.dpk19:25:1719:25:2000:00:02View
-
-
CompletedCompile Delphi Win32 Project Compile Modulos\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dpk19:25:2019:25:2119:52:3119:52:33 00:00:01 View
Completed Action Group Vistas - Plugin19:25:2119:25:2119:52:3319:52:33 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Pedidos de cliente\Views\PedidosCliente_view.dpk19:25:2119:25:2419:52:3319:52:35 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.dpk19:25:2419:25:2719:52:3519:52:38 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.dpk19:25:2719:25:3119:52:3819:52:42 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.dpk19:25:3119:25:3419:52:4219:52:46 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Facturas de cliente\Views\FacturasCliente_view.dpk19:25:3419:25:3719:52:4619:52:48 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.dpk19:25:3719:25:4019:52:4819:52:51 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Inventario\Views\Inventario_view.dpk19:25:4019:25:4319:52:5119:52:53 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Inventario\Plugin\Inventario_plugin.dpk19:25:4319:25:4519:52:5319:52:56 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Pedidos a proveedor\Views\PedidosProveedor_view.dpk19:25:4519:25:4919:52:5619:53:00 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.dpk19:25:4919:25:5219:53:0019:53:03 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.dpk19:25:5219:25:5719:53:0319:53:07 00:00:04 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.dpk19:25:5719:26:0119:53:0719:53:12 00:00:04 View
Completed Compile Delphi Win32 Project Compile Modulos\Banca electronica\Plugin\BancaElectronica_plugin.dpk19:26:0119:26:0319:53:1219:53:13 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Comisiones\Views\Comisiones_view.dpk19:26:0319:26:0419:53:1319:53:15 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Comisiones\Plugin\Comisiones_plugin.dpk19:26:0419:26:0619:53:1519:53:17 00:00:02 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.dpk19:26:0619:26:1000:00:0319:53:1719:53:2100:00:04 View
Completed Compile Delphi Win32 Project Compile Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.dpk19:26:1019:26:1519:53:2119:53:26 00:00:04 View
Completed Compile Delphi Win32 Project Compile Modulos\Facturas de proveedor\Views\FacturasProveedor_view.dpk19:26:1519:26:1919:53:2619:53:30 00:00:03 View
Completed Compile Delphi Win32 Project Compile Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.dpk19:26:1919:26:2319:53:3019:53:34 00:00:04 View
Completed Compile Delphi Win32 Project Compile Modulos\Historico de movimientos\Views\HistoricoMovimientos_view.dpk19:26:2319:26:2519:53:3419:53:36 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Historico de movimientos\Plugin\HistoricoMovimientos_plugin.dpk19:26:2519:26:2719:53:3619:53:38 00:00:02 View
Completed Action Group Tienda Web19:26:2719:26:2719:53:3819:53:38 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Tienda web\Model\TiendaWeb_model.dpk19:26:2719:26:2819:53:3819:53:39 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Tienda web\Data\TiendaWeb_data.dpk19:26:2819:26:2919:53:3919:53:40 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Tienda web\Controller\TiendaWeb_controller.dpk19:26:2919:26:3019:53:4019:53:41 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Tienda web\Views\TiendaWeb_view.dpk19:26:3019:26:3219:53:4119:53:42 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Tienda web\Plugin\TiendaWeb_plugin.dpk19:26:3219:26:3319:53:4219:53:43 00:00:01 View
Completed Action Group Remesas de proveedor19:26:3319:26:3319:53:4319:53:43 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Remesas de proveedor\Model\RemesasProveedor_model.dpk19:26:3319:26:3419:53:4319:53:44 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Remesas de proveedor\Data\RemesasProveedor_data.dpk19:26:3419:26:3519:53:4419:53:45 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Remesas de proveedor\Controller\RemesasProveedor_controller.dpk19:26:3519:26:3619:53:4519:53:46 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Remesas de proveedor\Views\RemesasProveedor_view.dpk19:26:3619:26:3719:53:4619:53:47 00:00:01 View
Completed Compile Delphi Win32 Project Compile Modulos\Remesas de proveedor\Plugin\RemesasProveedor_plugin.dpk19:26:3719:26:3819:53:4719:53:48 00:00:01 View
Completed Action Group Referencias19:26:3819:26:3819:53:4819:53:48 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Referencias\Model\Referencias_model.dpk19:26:3819:26:3819:53:4819:53:48 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Referencias\Data\Referencias_data.dpk19:26:3819:26:3919:53:4819:53:49 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Referencias\Controller\Referencias_controller.dpk19:26:3919:26:4019:53:4919:53:50 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Referencias\Views\Referencias_view.dpk19:26:4019:26:4119:53:5019:53:50 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Referencias\Plugin\Referencias_plugin.dpk19:26:4119:26:4219:53:5019:53:51 00:00:00 View
Completed Action Group Informes base19:26:4219:26:4219:53:5119:53:51 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Model\Informes_model.dpk19:26:4219:26:4219:53:5119:53:51 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Data\Informes_data.dpk19:26:4219:26:4219:53:5119:53:52 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Controller\Informes_controller.dpk19:26:4219:26:4319:53:5219:53:53 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Controller\InformesBase_controller.dpk19:26:4319:26:4419:53:5319:53:53 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Views\Informes_view.dpk19:26:4419:26:4519:53:5319:53:54 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Views\InformesBase_view.dpk19:26:4519:26:4519:53:5419:53:54 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informes base\Plugin\Informes_plugin.dpk19:26:4519:26:4619:53:5419:53:55 00:00:00 View
Completed Action Group Informes ventas por articulo19:26:4619:26:4619:53:5519:53:55 00:00:00
Completed Compile Delphi Win32 Project Compile Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.dpk19:26:4619:26:4619:53:5519:53:56 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.dpk19:26:4619:26:4719:53:5619:53:56 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informe ventas por articulo\Controller\InfVentasArticulo_controller.dpk19:26:4719:26:4819:53:5619:53:57 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.dpk19:26:4819:26:4919:53:5719:53:58 00:00:00 View
Completed Compile Delphi Win32 Project Compile Modulos\Informe ventas por articulo\Plugin\InfVentasArticulo_plugin.dpk19:26:4919:26:5019:53:5819:53:59 00:00:00 View
Completed Action Group Cliente19:26:5019:26:5019:53:5919:53:59 00:00:00
Completed Compile Delphi Win32 Project Compile Cliente\FactuGES.dpr19:26:5019:26:5119:53:5919:54:00 00:00:00 View
Completed Action Group Comprimir ejecutables19:26:5119:26:5119:54:0019:54:00 00:00:00
Completed ASPack Compress Executable Comprimir servidor19:26:5119:26:5219:54:0019:54:00 00:00:00 View
Completed ASPack Compress Executable Comprimir cliente19:26:5219:26:5219:54:0019:54:00 00:00:00 View
Completed Export Log Export Log19:26:5219:26:5219:54:0019:54:00 00:00:00


diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 3695c175..3620f727 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Database/VISTAS.SQL b/Database/VISTAS.SQL index 727867f5..d97355df 100644 --- a/Database/VISTAS.SQL +++ b/Database/VISTAS.SQL @@ -2,10 +2,18 @@ DROP VIEW V_VENTAS_ARTICULOS; DROP VIEW V_INF_VENTAS_ARTICULOS; + DROP VIEW V_INF_MARGEN_VENTAS_ARTICULOS; -DROP VIEW V_INF_ULTIMA_COMPRA; + +DROP VIEW V_INF_MARGEN_ARTICULOS; +DROP VIEW V_INF_MARGEN_COMPRAS; +DROP VIEW V_INF_MARGEN_VENTAS; DROP VIEW V_INF_PROMEDIO_COMPRA; +DROP VIEW V_INF_PROMEDIO_VENTA; +DROP VIEW V_INF_ULTIMA_COMPRA; +DROP VIEW V_INF_ULTIMA_VENTA; DROP VIEW V_INF_FEC_ULTIMA_COMPRA; +DROP VIEW V_INF_FEC_ULTIMA_VENTA; DROP VIEW V_INV_DETALLE_RESERVAS; @@ -2273,34 +2281,33 @@ and (facturas_proveedor_detalles.cantidad > 0) group by facturas_proveedor.ID_EMPRESA, -facturas_proveedor_detalles.ID_ARTICULO -; +facturas_proveedor_detalles.ID_ARTICULO; -CREATE VIEW V_INF_PROMEDIO_COMPRA( +CREATE VIEW V_INF_FEC_ULTIMA_VENTA( ID_EMPRESA, + ID_CLIENTE, ID_ARTICULO, - IMPORTE_UNIDAD_COMPRA, - IMPORTE_NETO_COMPRA, - IMPORTE_PORTE_COMPRA) + FECHA) AS select -facturas_proveedor.id_empresa, -facturas_proveedor_detalles.ID_ARTICULO, +facturas_cliente.ID_EMPRESA, +facturas_cliente.ID_CLIENTE, +facturas_cliente_detalles.ID_ARTICULO, +max(facturas_cliente.FECHA_FACTURA) -avg(facturas_proveedor_detalles.IMPORTE_UNIDAD) as IMPORTE_UNIDAD_COMPRA, -avg(facturas_proveedor_detalles.IMPORTE_UNIDAD - (facturas_proveedor_detalles.IMPORTE_UNIDAD * (facturas_proveedor_detalles.DESCUENTO / 100))) AS IMPORTE_NETO_COMPRA, -avg(facturas_proveedor_detalles.IMPORTE_PORTE) as IMPORTE_PORTE_COMPRA +from facturas_cliente_detalles +left join facturas_cliente +on (facturas_cliente.id = facturas_cliente_detalles.id_factura) +WHERE (ID_ARTICULO IS NOT NULL) +AND (ID_ARTICULO > 0) +and (facturas_cliente_detalles.cantidad > 0) -from facturas_proveedor_detalles +group by +facturas_cliente.ID_EMPRESA, +facturas_cliente.ID_CLIENTE, +facturas_cliente_detalles.ID_ARTICULO; -left outer join facturas_proveedor -on (facturas_proveedor.id = facturas_proveedor_detalles.id_factura) - -WHERE (facturas_proveedor_detalles.ID_ARTICULO IS NOT NULL) AND (facturas_proveedor_detalles.ID_ARTICULO > 0) /*Quitamos conceptos libres*/ -and (facturas_proveedor_detalles.cantidad > 0) /*Quitamos los abonos*/ - -group by 1, 2; CREATE VIEW V_INF_ULTIMA_COMPRA( ID_EMPRESA, @@ -2334,71 +2341,208 @@ and (facturas_proveedor.FECHA_FACTURA = v_inf_fec_ultima_compra.fecha) /*nos que group by 1, 2; -CREATE VIEW V_INF_MARGEN_VENTAS_ARTICULOS( - ID_FACTURA, +CREATE VIEW V_INF_ULTIMA_VENTA( ID_EMPRESA, - REFERENCIA_FACTURA, - FECHA_FACTURA, - IMPORTE_TOTAL_FACTURA, - ID_COMISION_FACTURA, + ID_CLIENTE, ID_ARTICULO, + IMPORTE_UNIDAD_VENTA, + IMPORTE_NETO_VENTA, + IMPORTE_PORTE_VENTA) +AS +select +facturas_cliente.id_empresa, +facturas_cliente.id_cliente, +facturas_cliente_detalles.ID_ARTICULO, + +avg(facturas_cliente_detalles.IMPORTE_UNIDAD) as IMPORTE_UNIDAD_VENTA, +avg(facturas_cliente_detalles.IMPORTE_UNIDAD - (facturas_cliente_detalles.IMPORTE_UNIDAD * (facturas_cliente_detalles.DESCUENTO / 100))) AS IMPORTE_NETO_VENTA, +avg(facturas_cliente_detalles.IMPORTE_PORTE) as IMPORTE_PORTE_VENTA + +from facturas_cliente_detalles + +left outer join facturas_cliente +on (facturas_cliente.id = facturas_cliente_detalles.id_factura) + +left outer join v_inf_fec_ultima_venta +on (v_inf_fec_ultima_venta.id_empresa = facturas_cliente.id_empresa) +and (v_inf_fec_ultima_venta.id_cliente = facturas_cliente.id_cliente) +and (v_inf_fec_ultima_venta.id_articulo = facturas_cliente_detalles.id_articulo) + +WHERE (facturas_cliente_detalles.ID_ARTICULO IS NOT NULL) AND (facturas_cliente_detalles.ID_ARTICULO > 0) /*Quitamos conceptos libres*/ +and (facturas_cliente_detalles.cantidad > 0) /*Quitamos los abonos*/ +and (facturas_cliente.FECHA_FACTURA = v_inf_fec_ultima_venta.fecha) /*nos quedamos con las ultimas compras*/ + +group by 1, 2, 3; + + +CREATE VIEW V_INF_PROMEDIO_COMPRA( + ID_EMPRESA, + ID_ARTICULO, + IMPORTE_UNIDAD_COMPRA, + IMPORTE_NETO_COMPRA, + IMPORTE_PORTE_COMPRA) +AS +select +facturas_proveedor.id_empresa, +facturas_proveedor_detalles.ID_ARTICULO, + +avg(facturas_proveedor_detalles.IMPORTE_UNIDAD) as IMPORTE_UNIDAD_COMPRA, +avg(facturas_proveedor_detalles.IMPORTE_UNIDAD - (facturas_proveedor_detalles.IMPORTE_UNIDAD * (facturas_proveedor_detalles.DESCUENTO / 100))) AS IMPORTE_NETO_COMPRA, +avg(facturas_proveedor_detalles.IMPORTE_PORTE) as IMPORTE_PORTE_COMPRA + +from facturas_proveedor_detalles + +left outer join facturas_proveedor +on (facturas_proveedor.id = facturas_proveedor_detalles.id_factura) + +WHERE (facturas_proveedor_detalles.ID_ARTICULO IS NOT NULL) AND (facturas_proveedor_detalles.ID_ARTICULO > 0) /*Quitamos conceptos libres*/ +and (facturas_proveedor_detalles.cantidad > 0) /*Quitamos los abonos*/ + +group by 1, 2; + + +CREATE VIEW V_INF_PROMEDIO_VENTA( + ID_EMPRESA, + ID_CLIENTE, + ID_ARTICULO, + IMPORTE_UNIDAD_VENTA, + IMPORTE_NETO_VENTA, + IMPORTE_PORTE_VENTA) +AS +select +facturas_cliente.id_empresa, +facturas_cliente.id_cliente, +facturas_cliente_detalles.ID_ARTICULO, + +avg(facturas_cliente_detalles.IMPORTE_UNIDAD) as IMPORTE_UNIDAD_VENTA, +avg(facturas_cliente_detalles.IMPORTE_UNIDAD - (facturas_cliente_detalles.IMPORTE_UNIDAD * (facturas_cliente_detalles.DESCUENTO / 100))) AS IMPORTE_NETO_VENTA, +avg(facturas_cliente_detalles.IMPORTE_PORTE) as IMPORTE_PORTE_VENTA + +from facturas_cliente_detalles + +left outer join facturas_cliente +on (facturas_cliente.id = facturas_cliente_detalles.id_factura) + +WHERE (facturas_cliente_detalles.ID_ARTICULO IS NOT NULL) AND (facturas_cliente_detalles.ID_ARTICULO > 0) /*Quitamos conceptos libres*/ +and (facturas_cliente_detalles.cantidad > 0) /*Quitamos los abonos*/ + +group by 1, 2, 3; + + +CREATE VIEW V_INF_MARGEN_COMPRAS( + ID_EMPRESA, + ID_ARTICULO, + IMPORTE_UNIDAD_ULT_COMP, + IMPORTE_NETO_ULT_COMP, + IMPORTE_PORTE_ULT_COMP, + IMPORTE_UNIDAD_PRO_COMP, + IMPORTE_NETO_PRO_COMP, + IMPORTE_PORTE_PRO_COMP) +AS +select ID_EMPRESA, ID_ARTICULO, COALESCE(SUM(IMPORTE_UNIDAD_ULT_COMP),0), COALESCE(SUM(IMPORTE_NETO_ULT_COMP),0), COALESCE(SUM(IMPORTE_PORTE_ULT_COMP),0), + COALESCE(SUM(IMPORTE_UNIDAD_PRO_COMP),0), COALESCE(SUM(IMPORTE_NETO_PRO_COMP),0), COALESCE(SUM(IMPORTE_PORTE_PRO_COMP),0) + +from +(select ID_EMPRESA, ID_ARTICULO, +IMPORTE_UNIDAD_COMPRA as IMPORTE_UNIDAD_ULT_COMP, IMPORTE_NETO_COMPRA as IMPORTE_NETO_ULT_COMP, IMPORTE_PORTE_COMPRA as IMPORTE_PORTE_ULT_COMP, +null as IMPORTE_UNIDAD_PRO_COMP, null as IMPORTE_NETO_PRO_COMP, null as IMPORTE_PORTE_PRO_COMP +from v_inf_ultima_compra + +union all + +select ID_EMPRESA, ID_ARTICULO, +null, null, null, +IMPORTE_UNIDAD_COMPRA as IMPORTE_UNIDAD_PRO_COMP, IMPORTE_NETO_COMPRA as IMPORTE_NETO_PRO_COMP, IMPORTE_PORTE_COMPRA as IMPORTE_PORTE_PRO_COMP +from v_inf_promedio_compra) + +GROUP BY 1, 2; + + +CREATE VIEW V_INF_MARGEN_VENTAS( + ID_EMPRESA, + ID_CLIENTE, + ID_ARTICULO, + IMPORTE_UNIDAD_ULT_VENT, + IMPORTE_NETO_ULT_VENT, + IMPORTE_PORTE_ULT_VENT, + IMPORTE_UNIDAD_PRO_VENT, + IMPORTE_NETO_PRO_VENT, + IMPORTE_PORTE_PRO_VENT) +AS +select ID_EMPRESA, ID_CLIENTE, ID_ARTICULO, COALESCE(SUM(IMPORTE_UNIDAD_ULT_VENT),0), COALESCE(SUM(IMPORTE_NETO_ULT_VENT),0), COALESCE(SUM(IMPORTE_PORTE_ULT_VENT),0), COALESCE(SUM(IMPORTE_UNIDAD_PRO_VENT),0), + COALESCE(SUM(IMPORTE_NETO_PRO_VENT),0), COALESCE(SUM(IMPORTE_PORTE_PRO_VENT),0) + +from + +(select ID_EMPRESA, ID_CLIENTE, ID_ARTICULO, +IMPORTE_UNIDAD_VENTA as IMPORTE_UNIDAD_ULT_VENT, IMPORTE_NETO_VENTA as IMPORTE_NETO_ULT_VENT, IMPORTE_PORTE_VENTA as IMPORTE_PORTE_ULT_VENT, +null as IMPORTE_UNIDAD_PRO_VENT, null as IMPORTE_NETO_PRO_VENT, null as IMPORTE_PORTE_PRO_VENT +from v_inf_ultima_venta + +union all + +select ID_EMPRESA, ID_CLIENTE, ID_ARTICULO, +null, null, null, +IMPORTE_UNIDAD_VENTA as IMPORTE_UNIDAD_PRO_VENT, IMPORTE_NETO_VENTA as IMPORTE_NETO_PRO_VENT, IMPORTE_PORTE_VENTA as IMPORTE_PORTE_PRO_VENT +from v_inf_promedio_venta) + +GROUP BY 1, 2, 3; + + +CREATE VIEW V_INF_MARGEN_ARTICULOS( + ID_EMPRESA, + ID_CLIENTE, + ID_ARTICULO, + NIF_CIF_CLIENTE, + NOMBRE_CLIENTE, + NOMBRE_COMERCIAL_CLIENTE, + NIF_CIF_AGENTE, + NOMBRE_AGENTE, FAMILIA, REFERENCIA, REFERENCIA_PROV, DESCRIPCION, COMISIONABLE, INVENTARIABLE, - IMPORTE_UNIDAD_COSTE, - DESCUENTO_PROVEEDOR_COSTE, - IMPORTE_NETO_COSTE, - IMPORTE_PORTE_COSTE, - IMPORTE_UNIDAD_ULTIMA_COMPRA, - IMPORTE_NETO_ULTIMA_COMPRA, - IMPORTE_PORTE_ULTIMA_COMPRA, - IMPORTE_UNIDAD_PROMEDIO_COMPRA, - IMPORTE_NETO_PROMEDIO_COMPRA, - IMPORTE_PORTE_PROMEDIO_COMPRA, - CANTIDAD, - IMPORTE_UNIDAD_VENTA, - DESCUENTO_CLIENTE_VENTA, - IMPORTE_NETO_VENTA, - IMPORTE_PORTE_VENTA, - IMPORTE_TOTAL_VENTA, - IMPORTE_MARGEN_COSTE, - PORCENTAJE_MARGEN_COSTE, - IMPORTE_MARGEN_ULT_COMPRA, - PORCENTAJE_MARGEN_ULT_COMPRA, - IMPORTE_MARGEN_PROM_COMPRA, - PORCENTAJE_MARGEN_PROM_COMPRA, - NIF_CIF_PROVEEDOR, - NOMBRE_PROVEEDOR, - CALLE_PROVEEDOR, - POBLACION_PROVEEDOR, - PROVINCIA_PROVEEDOR, - NIF_CIF_CLIENTE, - NOMBRE_CLIENTE, - NOMBRE_COMERCIAL_CLIENTE, - CALLE_CLIENTE, - POBLACION_CLIENTE, - PROVINCIA_CLIENTE, - NIF_CIF_AGENTE, - NOMBRE_AGENTE, - CALLE_AGENTE, - POBLACION_AGENTE, - PROVINCIA_AGENTE, - COMISION_AGENTE, - IMPORTE_COMISION_AGENTE) + IMP_UNIDAD_ULT_VENT, + IMP_NETO_ULT_VENT, + IMP_PORTE_ULT_VENT, + IMP_UNIDAD_PRO_VENT, + IMP_NETO_PRO_VENT, + IMP_PORTE_PRO_VENT, + IMP_UNIDAD_COMPRA, + IMP_NETO_COMPRA, + IMP_PORTE_COMPRA, + IMP_UNIDAD_ULT_COMP, + IMP_NETO_ULT_COMP, + IMP_PORTE_ULT_COMP, + IMP_UNIDAD_PRO_COMP, + IMP_NETO_PRO_COMP, + IMP_PORTE_PRO_COMP, + IMP_MARGEN_ULT_VENT_COMPRA, + POR_MARGEN_ULT_VENT_COMPRA, + IMP_MARGEN_ULT_VENT_ULT_COMP, + POR_MARGEN_ULT_VENT_ULT_COMP, + IMP_MARGEN_ULT_VENT_PRO_COMP, + POR_MARGEN_ULT_VENT_PRO_COMP, + IMP_MARGEN_PRO_VENT_COMPRA, + POR_MARGEN_PRO_VENT_COMPRA, + IMP_MARGEN_PRO_VENT_ULT_COMP, + POR_MARGEN_PRO_VENT_ULT_COMP, + IMP_MARGEN_PRO_VENT_PRO_COMP, + POR_MARGEN_PRO_VENT_PRO_COMP) AS - select -FACTURAS_CLIENTE.ID, -FACTURAS_CLIENTE.ID_EMPRESA, -FACTURAS_CLIENTE.REFERENCIA, -FACTURAS_CLIENTE.FECHA_FACTURA, -FACTURAS_CLIENTE.IMPORTE_TOTAL, -FACTURAS_CLIENTE.ID_COMISION_LIQUIDADA, +V_INF_MARGEN_VENTAS.id_empresa, +V_INF_MARGEN_VENTAS.id_cliente, +V_INF_MARGEN_VENTAS.id_articulo, -FACTURAS_CLIENTE_DETALLES.ID_ARTICULO, +CLIENTES.NIF_CIF, +CLIENTES.NOMBRE, +CLIENTES_DATOS.NOMBRE_COMERCIAL, + +AGENTES.NIF_CIF, +AGENTES.NOMBRE, ARTICULOS.FAMILIA, ARTICULOS.REFERENCIA, @@ -2407,95 +2551,101 @@ ARTICULOS.DESCRIPCION, ARTICULOS.COMISIONABLE, ARTICULOS.INVENTARIABLE, -ARTICULOS.PRECIO_COSTE, -ARTICULOS.DESCUENTO, -ARTICULOS.PRECIO_NETO, -ARTICULOS.PRECIO_PORTE, +COALESCE(V_INF_MARGEN_VENTAS.importe_unidad_ult_vent, 0), +COALESCE(V_INF_MARGEN_VENTAS.importe_neto_ult_vent, 0), +COALESCE(V_INF_MARGEN_VENTAS.importe_porte_ult_vent, 0), -V_INF_ULTIMA_COMPRA.importe_unidad_compra, -V_INF_ULTIMA_COMPRA.importe_neto_compra, -V_INF_ULTIMA_COMPRA.importe_porte_compra, +COALESCE(V_INF_MARGEN_VENTAS.importe_unidad_pro_vent, 0), +COALESCE(V_INF_MARGEN_VENTAS.importe_neto_pro_vent, 0), +COALESCE(V_INF_MARGEN_VENTAS.importe_porte_pro_vent, 0), -V_INF_PROMEDIO_COMPRA.importe_unidad_compra, -V_INF_PROMEDIO_COMPRA.importe_neto_compra, -V_INF_PROMEDIO_COMPRA.importe_porte_compra, +COALESCE(ARTICULOS.PRECIO_COSTE, 0), +COALESCE(ARTICULOS.PRECIO_NETO, 0), +COALESCE(ARTICULOS.PRECIO_PORTE, 0), -FACTURAS_CLIENTE_DETALLES.CANTIDAD, -FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD as importe_unidad_venta, -FACTURAS_CLIENTE_DETALLES.DESCUENTO, -FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100)) as importe_neto_venta, -FACTURAS_CLIENTE_DETALLES.IMPORTE_PORTE as importe_porte_venta, -FACTURAS_CLIENTE_DETALLES.IMPORTE_TOTAL, +COALESCE(V_INF_MARGEN_COMPRAS.importe_unidad_ult_comp, 0), +COALESCE(V_INF_MARGEN_COMPRAS.importe_neto_ult_comp, 0), +COALESCE(V_INF_MARGEN_COMPRAS.importe_porte_ult_comp, 0), -(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - ARTICULOS.PRECIO_NETO as importe_margen_compra, -CASE WHEN (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - ARTICULOS.PRECIO_NETO > 0 -THEN -(ARTICULOS.PRECIO_NETO * 100) / (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) -else -0 +COALESCE(V_INF_MARGEN_COMPRAS.importe_unidad_pro_comp, 0), +COALESCE(V_INF_MARGEN_COMPRAS.importe_neto_pro_comp, 0), +COALESCE(V_INF_MARGEN_COMPRAS.importe_porte_pro_comp, 0), + + +/*MARGEN CON ULTIMA VENTA*/ + +V_INF_MARGEN_VENTAS.importe_neto_ult_vent - ARTICULOS.PRECIO_NETO as imp_margen_ult_vent_compra, +CASE +WHEN ARTICULOS.PRECIO_NETO = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_ult_vent - ARTICULOS.PRECIO_NETO) > 0 THEN + (ARTICULOS.PRECIO_NETO * 100) / V_INF_MARGEN_VENTAS.importe_neto_ult_vent +ELSE 0 END -as porcentaje_margen_compra, +as por_margen_ult_vent_compra, -(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - V_INF_ULTIMA_COMPRA.importe_neto_compra as importe_margen_ultima_compra, -CASE WHEN (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - V_INF_ULTIMA_COMPRA.importe_neto_compra > 0 -THEN -(V_INF_ULTIMA_COMPRA.importe_neto_compra * 100) /(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) -ELSE -0 +V_INF_MARGEN_VENTAS.importe_neto_ult_vent - V_INF_MARGEN_COMPRAS.importe_neto_ult_comp as imp_margen_ult_vent_ult_comp, +CASE +WHEN V_INF_MARGEN_COMPRAS.importe_neto_ult_comp = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_ult_vent - V_INF_MARGEN_COMPRAS.importe_neto_ult_comp) > 0 THEN + (V_INF_MARGEN_COMPRAS.importe_neto_ult_comp * 100) / V_INF_MARGEN_VENTAS.importe_neto_ult_vent +ELSE 0 END -as porcentaje_margen_ultima_compra, +as por_margen_ult_vent_ult_comp, -(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - V_INF_PROMEDIO_COMPRA.importe_neto_compra as importe_margen_promedio_compra, -CASE WHEN (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) - V_INF_PROMEDIO_COMPRA.importe_neto_compra > 0 -THEN -(V_INF_PROMEDIO_COMPRA.importe_neto_compra * 100) /(FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD - (FACTURAS_CLIENTE_DETALLES.IMPORTE_UNIDAD * (FACTURAS_CLIENTE_DETALLES.DESCUENTO/100))) -ELSE -0 +V_INF_MARGEN_VENTAS.importe_neto_ult_vent - V_INF_MARGEN_COMPRAS.importe_neto_pro_comp as imp_margen_ult_vent_pro_comp, +CASE +WHEN V_INF_MARGEN_COMPRAS.importe_neto_pro_comp = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_ult_vent - V_INF_MARGEN_COMPRAS.importe_neto_pro_comp) > 0 THEN + (V_INF_MARGEN_COMPRAS.importe_neto_pro_comp * 100) / V_INF_MARGEN_VENTAS.importe_neto_ult_vent +ELSE 0 END -as porcentaje_promedio_compra, - -PROVEEDORES.NIF_CIF, -PROVEEDORES.NOMBRE, -PROVEEDORES.CALLE, -PROVEEDORES.POBLACION, -PROVEEDORES.PROVINCIA, - -CLIENTES.NIF_CIF, -CLIENTES.NOMBRE, -CLIENTES_DATOS.NOMBRE_COMERCIAL, -CLIENTES.CALLE, -CLIENTES.POBLACION, -CLIENTES.PROVINCIA, - -AGENTES.NIF_CIF, -AGENTES.NOMBRE, -AGENTES.CALLE, -AGENTES.POBLACION, -AGENTES.PROVINCIA, - -COALESCE(AGENTES_COMISIONES.COMISION, 0) AS COMISION, - -(CASE COALESCE(AGENTES_COMISIONES.COMISION, 0) WHEN 0 THEN 0 - ELSE ((FACTURAS_CLIENTE_DETALLES.IMPORTE_TOTAL * AGENTES_COMISIONES.COMISION)/100) END) as IMPORTE_COMISION +as por_margen_ult_vent_pro_comp, -from FACTURAS_CLIENTE_DETALLES -left join V_INF_ULTIMA_COMPRA on (V_INF_ULTIMA_COMPRA.ID_ARTICULO = FACTURAS_CLIENTE_DETALLES.ID_ARTICULO) -left join V_INF_PROMEDIO_COMPRA on (V_INF_PROMEDIO_COMPRA.ID_ARTICULO = FACTURAS_CLIENTE_DETALLES.ID_ARTICULO) -left join ARTICULOS on (ARTICULOS.ID = FACTURAS_CLIENTE_DETALLES.ID_ARTICULO) -left join CONTACTOS PROVEEDORES on (PROVEEDORES.ID = ARTICULOS.ID_PROVEEDOR) -left join FACTURAS_CLIENTE on (FACTURAS_CLIENTE.ID = FACTURAS_CLIENTE_DETALLES.ID_FACTURA) -left join CONTACTOS CLIENTES on (CLIENTES.ID = FACTURAS_CLIENTE.ID_CLIENTE) +/*MARGEN CON VENTAS PROMEDIO*/ + +V_INF_MARGEN_VENTAS.importe_neto_pro_vent - ARTICULOS.PRECIO_NETO as imp_margen_pro_vent_compra, +CASE +WHEN ARTICULOS.PRECIO_NETO = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_pro_vent - ARTICULOS.PRECIO_NETO) > 0 THEN + (ARTICULOS.PRECIO_NETO * 100) / V_INF_MARGEN_VENTAS.importe_neto_pro_vent +ELSE 0 +END +as por_margen_pro_vent_compra, + +V_INF_MARGEN_VENTAS.importe_neto_pro_vent - V_INF_MARGEN_COMPRAS.importe_neto_ult_comp as imp_margen_pro_vent_ult_comp, +CASE +WHEN V_INF_MARGEN_COMPRAS.importe_neto_ult_comp = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_pro_vent - V_INF_MARGEN_COMPRAS.importe_neto_ult_comp) > 0 THEN + (V_INF_MARGEN_COMPRAS.importe_neto_ult_comp * 100) / V_INF_MARGEN_VENTAS.importe_neto_pro_vent +ELSE 0 +END +as por_margen_pro_vent_ult_comp, + +V_INF_MARGEN_VENTAS.importe_neto_pro_vent - V_INF_MARGEN_COMPRAS.importe_neto_pro_comp as imp_margen_pro_vent_pro_comp, +CASE +WHEN V_INF_MARGEN_COMPRAS.importe_neto_pro_comp = 0 THEN 100 +WHEN (V_INF_MARGEN_VENTAS.importe_neto_pro_vent - V_INF_MARGEN_COMPRAS.importe_neto_pro_comp) > 0 THEN + (V_INF_MARGEN_COMPRAS.importe_neto_pro_comp * 100) / V_INF_MARGEN_VENTAS.importe_neto_pro_vent +ELSE 0 +END +as por_margen_pro_vent_pro_comp + + +from V_INF_MARGEN_VENTAS + +left join v_inf_margen_compras +on (v_inf_margen_compras.id_empresa = v_INF_MARGEN_ventas.id_empresa) +and (v_inf_margen_compras.id_articulo = v_INF_MARGEN_ventas.id_articulo) + +left join ARTICULOS +on (ARTICULOS.ID = v_INF_MARGEN_ventas.id_articulo) + +left join CONTACTOS CLIENTES on (CLIENTES.ID = V_INF_MARGEN_VENTAS.ID_CLIENTE) left join CLIENTES_DATOS on (CLIENTES_DATOS.ID_CLIENTE = CLIENTES.ID) left join CONTACTOS AGENTES on (AGENTES.ID = CLIENTES_DATOS.ID_AGENTE) -left join AGENTES_COMISIONES -on ((AGENTES_COMISIONES.ID_AGENTE = AGENTES.ID) and (AGENTES_COMISIONES.ID_PROVEEDOR = PROVEEDORES.ID)) - -where (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO is not null) and (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO > 0) /*Quitamos conceptos libres*/ -and (FACTURAS_CLIENTE_DETALLES.cantidad > 0) /*Quitamos los abonos*/ -and (ARTICULOS.INVENTARIABLE = 1); /*Solo nos quedamos con los inventariables*/ - +where (ARTICULOS.INVENTARIABLE = 1); /* Al igual que en Varela tendremos esta vista para hacer todos los informes que queramos de ventas, ya que estará desglosado por artículo */ diff --git a/Output/Debug/Cliente/AlbCli_FacCli_relation.bpl b/Output/Debug/Cliente/AlbCli_FacCli_relation.bpl index 9fa6a04a..05d77d76 100644 Binary files a/Output/Debug/Cliente/AlbCli_FacCli_relation.bpl and b/Output/Debug/Cliente/AlbCli_FacCli_relation.bpl differ diff --git a/Output/Debug/Cliente/AlbProv_FacProv_relation.bpl b/Output/Debug/Cliente/AlbProv_FacProv_relation.bpl index e60c04ed..15bb70a3 100644 Binary files a/Output/Debug/Cliente/AlbProv_FacProv_relation.bpl and b/Output/Debug/Cliente/AlbProv_FacProv_relation.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesCliente_controller.bpl b/Output/Debug/Cliente/AlbaranesCliente_controller.bpl index 040412e5..f6927121 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_controller.bpl and b/Output/Debug/Cliente/AlbaranesCliente_controller.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesCliente_data.bpl b/Output/Debug/Cliente/AlbaranesCliente_data.bpl index dfa7f4b3..6e67bf17 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_data.bpl and b/Output/Debug/Cliente/AlbaranesCliente_data.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesCliente_model.bpl b/Output/Debug/Cliente/AlbaranesCliente_model.bpl index 4ed26eeb..fb6a6a02 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_model.bpl and b/Output/Debug/Cliente/AlbaranesCliente_model.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesCliente_plugin.bpl b/Output/Debug/Cliente/AlbaranesCliente_plugin.bpl index 7a5d922d..d74ea2c4 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_plugin.bpl and b/Output/Debug/Cliente/AlbaranesCliente_plugin.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesCliente_view.bpl b/Output/Debug/Cliente/AlbaranesCliente_view.bpl index 1fdcc1b4..b0628f78 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_view.bpl and b/Output/Debug/Cliente/AlbaranesCliente_view.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_controller.bpl b/Output/Debug/Cliente/AlbaranesProveedor_controller.bpl index 3dc9b875..777e96fb 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_controller.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_controller.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_data.bpl b/Output/Debug/Cliente/AlbaranesProveedor_data.bpl index 4e5712a3..f3f385c6 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_data.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_data.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_model.bpl b/Output/Debug/Cliente/AlbaranesProveedor_model.bpl index 6a5c6b19..b5789650 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_model.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_model.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_plugin.bpl b/Output/Debug/Cliente/AlbaranesProveedor_plugin.bpl index 11ca4323..ef2fb826 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_plugin.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_plugin.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl index 241b446d..c8398534 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/Almacenes_controller.bpl b/Output/Debug/Cliente/Almacenes_controller.bpl index fe8a9c0e..a0f2aeeb 100644 Binary files a/Output/Debug/Cliente/Almacenes_controller.bpl and b/Output/Debug/Cliente/Almacenes_controller.bpl differ diff --git a/Output/Debug/Cliente/Almacenes_data.bpl b/Output/Debug/Cliente/Almacenes_data.bpl index dc64096f..a273f8d7 100644 Binary files a/Output/Debug/Cliente/Almacenes_data.bpl and b/Output/Debug/Cliente/Almacenes_data.bpl differ diff --git a/Output/Debug/Cliente/Almacenes_model.bpl b/Output/Debug/Cliente/Almacenes_model.bpl index 6d0ad6eb..dd4a7242 100644 Binary files a/Output/Debug/Cliente/Almacenes_model.bpl and b/Output/Debug/Cliente/Almacenes_model.bpl differ diff --git a/Output/Debug/Cliente/Almacenes_plugin.bpl b/Output/Debug/Cliente/Almacenes_plugin.bpl index 9dede077..e3fb6971 100644 Binary files a/Output/Debug/Cliente/Almacenes_plugin.bpl and b/Output/Debug/Cliente/Almacenes_plugin.bpl differ diff --git a/Output/Debug/Cliente/Almacenes_view.bpl b/Output/Debug/Cliente/Almacenes_view.bpl index 59b6f768..52bc4fd7 100644 Binary files a/Output/Debug/Cliente/Almacenes_view.bpl and b/Output/Debug/Cliente/Almacenes_view.bpl differ diff --git a/Output/Debug/Cliente/Articulos_controller.bpl b/Output/Debug/Cliente/Articulos_controller.bpl index 7060e1af..982294c3 100644 Binary files a/Output/Debug/Cliente/Articulos_controller.bpl and b/Output/Debug/Cliente/Articulos_controller.bpl differ diff --git a/Output/Debug/Cliente/Articulos_data.bpl b/Output/Debug/Cliente/Articulos_data.bpl index 5625e4f3..7c9ffd1e 100644 Binary files a/Output/Debug/Cliente/Articulos_data.bpl and b/Output/Debug/Cliente/Articulos_data.bpl differ diff --git a/Output/Debug/Cliente/Articulos_model.bpl b/Output/Debug/Cliente/Articulos_model.bpl index f34ff90b..ece9b45a 100644 Binary files a/Output/Debug/Cliente/Articulos_model.bpl and b/Output/Debug/Cliente/Articulos_model.bpl differ diff --git a/Output/Debug/Cliente/Articulos_plugin.bpl b/Output/Debug/Cliente/Articulos_plugin.bpl index 85bae4a8..b706dc9f 100644 Binary files a/Output/Debug/Cliente/Articulos_plugin.bpl and b/Output/Debug/Cliente/Articulos_plugin.bpl differ diff --git a/Output/Debug/Cliente/Articulos_view.bpl b/Output/Debug/Cliente/Articulos_view.bpl index 75da7ca2..8366958f 100644 Binary files a/Output/Debug/Cliente/Articulos_view.bpl and b/Output/Debug/Cliente/Articulos_view.bpl differ diff --git a/Output/Debug/Cliente/BancaElectronica_controller.bpl b/Output/Debug/Cliente/BancaElectronica_controller.bpl index 3057d903..d026056a 100644 Binary files a/Output/Debug/Cliente/BancaElectronica_controller.bpl and b/Output/Debug/Cliente/BancaElectronica_controller.bpl differ diff --git a/Output/Debug/Cliente/BancaElectronica_plugin.bpl b/Output/Debug/Cliente/BancaElectronica_plugin.bpl index b4a89b0c..168afaa8 100644 Binary files a/Output/Debug/Cliente/BancaElectronica_plugin.bpl and b/Output/Debug/Cliente/BancaElectronica_plugin.bpl differ diff --git a/Output/Debug/Cliente/BancaElectronica_view.bpl b/Output/Debug/Cliente/BancaElectronica_view.bpl index ca96f712..a188e238 100644 Binary files a/Output/Debug/Cliente/BancaElectronica_view.bpl and b/Output/Debug/Cliente/BancaElectronica_view.bpl differ diff --git a/Output/Debug/Cliente/Base.bpl b/Output/Debug/Cliente/Base.bpl index 8be9e639..725becfa 100644 Binary files a/Output/Debug/Cliente/Base.bpl and b/Output/Debug/Cliente/Base.bpl differ diff --git a/Output/Debug/Cliente/Comisiones_controller.bpl b/Output/Debug/Cliente/Comisiones_controller.bpl index 64a5610e..2eb559f0 100644 Binary files a/Output/Debug/Cliente/Comisiones_controller.bpl and b/Output/Debug/Cliente/Comisiones_controller.bpl differ diff --git a/Output/Debug/Cliente/Comisiones_data.bpl b/Output/Debug/Cliente/Comisiones_data.bpl index 0c5f7213..77c558d6 100644 Binary files a/Output/Debug/Cliente/Comisiones_data.bpl and b/Output/Debug/Cliente/Comisiones_data.bpl differ diff --git a/Output/Debug/Cliente/Comisiones_model.bpl b/Output/Debug/Cliente/Comisiones_model.bpl index 18ab2937..000bebe6 100644 Binary files a/Output/Debug/Cliente/Comisiones_model.bpl and b/Output/Debug/Cliente/Comisiones_model.bpl differ diff --git a/Output/Debug/Cliente/Comisiones_plugin.bpl b/Output/Debug/Cliente/Comisiones_plugin.bpl index 05b89326..746ab8d7 100644 Binary files a/Output/Debug/Cliente/Comisiones_plugin.bpl and b/Output/Debug/Cliente/Comisiones_plugin.bpl differ diff --git a/Output/Debug/Cliente/Comisiones_view.bpl b/Output/Debug/Cliente/Comisiones_view.bpl index 9cf9404a..d54fdcee 100644 Binary files a/Output/Debug/Cliente/Comisiones_view.bpl and b/Output/Debug/Cliente/Comisiones_view.bpl differ diff --git a/Output/Debug/Cliente/Contactos_controller.bpl b/Output/Debug/Cliente/Contactos_controller.bpl index 820bc3e0..5590900d 100644 Binary files a/Output/Debug/Cliente/Contactos_controller.bpl and b/Output/Debug/Cliente/Contactos_controller.bpl differ diff --git a/Output/Debug/Cliente/Contactos_data.bpl b/Output/Debug/Cliente/Contactos_data.bpl index 01e2650d..49f96ac2 100644 Binary files a/Output/Debug/Cliente/Contactos_data.bpl and b/Output/Debug/Cliente/Contactos_data.bpl differ diff --git a/Output/Debug/Cliente/Contactos_model.bpl b/Output/Debug/Cliente/Contactos_model.bpl index 72aa14f4..b46dc980 100644 Binary files a/Output/Debug/Cliente/Contactos_model.bpl and b/Output/Debug/Cliente/Contactos_model.bpl differ diff --git a/Output/Debug/Cliente/Contactos_plugin.bpl b/Output/Debug/Cliente/Contactos_plugin.bpl index 4f143660..1b731465 100644 Binary files a/Output/Debug/Cliente/Contactos_plugin.bpl and b/Output/Debug/Cliente/Contactos_plugin.bpl differ diff --git a/Output/Debug/Cliente/Contactos_view.bpl b/Output/Debug/Cliente/Contactos_view.bpl index e88e0929..2275935a 100644 Binary files a/Output/Debug/Cliente/Contactos_view.bpl and b/Output/Debug/Cliente/Contactos_view.bpl differ diff --git a/Output/Debug/Cliente/ControllerBase.bpl b/Output/Debug/Cliente/ControllerBase.bpl index d9392d62..d7a35741 100644 Binary files a/Output/Debug/Cliente/ControllerBase.bpl and b/Output/Debug/Cliente/ControllerBase.bpl differ diff --git a/Output/Debug/Cliente/DataAbstract_D10.bpl b/Output/Debug/Cliente/DataAbstract_D10.bpl index 39c1bd7d..f0fbf6e0 100644 Binary files a/Output/Debug/Cliente/DataAbstract_D10.bpl and b/Output/Debug/Cliente/DataAbstract_D10.bpl differ diff --git a/Output/Debug/Cliente/Empresas_controller.bpl b/Output/Debug/Cliente/Empresas_controller.bpl index 4fb59960..8e87bc67 100644 Binary files a/Output/Debug/Cliente/Empresas_controller.bpl and b/Output/Debug/Cliente/Empresas_controller.bpl differ diff --git a/Output/Debug/Cliente/Empresas_data.bpl b/Output/Debug/Cliente/Empresas_data.bpl index f76f8baf..4db80cbf 100644 Binary files a/Output/Debug/Cliente/Empresas_data.bpl and b/Output/Debug/Cliente/Empresas_data.bpl differ diff --git a/Output/Debug/Cliente/Empresas_model.bpl b/Output/Debug/Cliente/Empresas_model.bpl index 4b640774..aecf4ae0 100644 Binary files a/Output/Debug/Cliente/Empresas_model.bpl and b/Output/Debug/Cliente/Empresas_model.bpl differ diff --git a/Output/Debug/Cliente/Empresas_plugin.bpl b/Output/Debug/Cliente/Empresas_plugin.bpl index c1ab312b..47bfcc47 100644 Binary files a/Output/Debug/Cliente/Empresas_plugin.bpl and b/Output/Debug/Cliente/Empresas_plugin.bpl differ diff --git a/Output/Debug/Cliente/Empresas_view.bpl b/Output/Debug/Cliente/Empresas_view.bpl index 54215b7a..abf9e6f3 100644 Binary files a/Output/Debug/Cliente/Empresas_view.bpl and b/Output/Debug/Cliente/Empresas_view.bpl differ diff --git a/Output/Debug/Cliente/FactuGES.exe b/Output/Debug/Cliente/FactuGES.exe index f4f229aa..5a929c7a 100644 Binary files a/Output/Debug/Cliente/FactuGES.exe and b/Output/Debug/Cliente/FactuGES.exe differ diff --git a/Output/Debug/Cliente/FacturasCliente_controller.bpl b/Output/Debug/Cliente/FacturasCliente_controller.bpl index 42341687..4d88ea93 100644 Binary files a/Output/Debug/Cliente/FacturasCliente_controller.bpl and b/Output/Debug/Cliente/FacturasCliente_controller.bpl differ diff --git a/Output/Debug/Cliente/FacturasCliente_data.bpl b/Output/Debug/Cliente/FacturasCliente_data.bpl index 340a8fa0..6ce34eee 100644 Binary files a/Output/Debug/Cliente/FacturasCliente_data.bpl and b/Output/Debug/Cliente/FacturasCliente_data.bpl differ diff --git a/Output/Debug/Cliente/FacturasCliente_model.bpl b/Output/Debug/Cliente/FacturasCliente_model.bpl index e212bd46..13b251c4 100644 Binary files a/Output/Debug/Cliente/FacturasCliente_model.bpl and b/Output/Debug/Cliente/FacturasCliente_model.bpl differ diff --git a/Output/Debug/Cliente/FacturasCliente_plugin.bpl b/Output/Debug/Cliente/FacturasCliente_plugin.bpl index d6403b7a..6b75557e 100644 Binary files a/Output/Debug/Cliente/FacturasCliente_plugin.bpl and b/Output/Debug/Cliente/FacturasCliente_plugin.bpl differ diff --git a/Output/Debug/Cliente/FacturasCliente_view.bpl b/Output/Debug/Cliente/FacturasCliente_view.bpl index e6f0ff34..e7627eb6 100644 Binary files a/Output/Debug/Cliente/FacturasCliente_view.bpl and b/Output/Debug/Cliente/FacturasCliente_view.bpl differ diff --git a/Output/Debug/Cliente/FacturasProveedor_controller.bpl b/Output/Debug/Cliente/FacturasProveedor_controller.bpl index d0cc63a3..d9947a54 100644 Binary files a/Output/Debug/Cliente/FacturasProveedor_controller.bpl and b/Output/Debug/Cliente/FacturasProveedor_controller.bpl differ diff --git a/Output/Debug/Cliente/FacturasProveedor_data.bpl b/Output/Debug/Cliente/FacturasProveedor_data.bpl index ec92e6d9..38859123 100644 Binary files a/Output/Debug/Cliente/FacturasProveedor_data.bpl and b/Output/Debug/Cliente/FacturasProveedor_data.bpl differ diff --git a/Output/Debug/Cliente/FacturasProveedor_model.bpl b/Output/Debug/Cliente/FacturasProveedor_model.bpl index a39100b6..d2e9eed1 100644 Binary files a/Output/Debug/Cliente/FacturasProveedor_model.bpl and b/Output/Debug/Cliente/FacturasProveedor_model.bpl differ diff --git a/Output/Debug/Cliente/FacturasProveedor_plugin.bpl b/Output/Debug/Cliente/FacturasProveedor_plugin.bpl index 4985eafa..a40d2175 100644 Binary files a/Output/Debug/Cliente/FacturasProveedor_plugin.bpl and b/Output/Debug/Cliente/FacturasProveedor_plugin.bpl differ diff --git a/Output/Debug/Cliente/FacturasProveedor_view.bpl b/Output/Debug/Cliente/FacturasProveedor_view.bpl index 36847603..8f928ec3 100644 Binary files a/Output/Debug/Cliente/FacturasProveedor_view.bpl and b/Output/Debug/Cliente/FacturasProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/Familias_controller.bpl b/Output/Debug/Cliente/Familias_controller.bpl index ad24c08a..fc6a9076 100644 Binary files a/Output/Debug/Cliente/Familias_controller.bpl and b/Output/Debug/Cliente/Familias_controller.bpl differ diff --git a/Output/Debug/Cliente/Familias_data.bpl b/Output/Debug/Cliente/Familias_data.bpl index 01ace8f6..5dae83f5 100644 Binary files a/Output/Debug/Cliente/Familias_data.bpl and b/Output/Debug/Cliente/Familias_data.bpl differ diff --git a/Output/Debug/Cliente/Familias_model.bpl b/Output/Debug/Cliente/Familias_model.bpl index dc7df17d..15869866 100644 Binary files a/Output/Debug/Cliente/Familias_model.bpl and b/Output/Debug/Cliente/Familias_model.bpl differ diff --git a/Output/Debug/Cliente/Familias_plugin.bpl b/Output/Debug/Cliente/Familias_plugin.bpl index 8375a3b6..fa6c42fe 100644 Binary files a/Output/Debug/Cliente/Familias_plugin.bpl and b/Output/Debug/Cliente/Familias_plugin.bpl differ diff --git a/Output/Debug/Cliente/Familias_view.bpl b/Output/Debug/Cliente/Familias_view.bpl index edd10789..5b2debe8 100644 Binary files a/Output/Debug/Cliente/Familias_view.bpl and b/Output/Debug/Cliente/Familias_view.bpl differ diff --git a/Output/Debug/Cliente/FormasPago_controller.bpl b/Output/Debug/Cliente/FormasPago_controller.bpl index 21ce5d13..1d4d08d5 100644 Binary files a/Output/Debug/Cliente/FormasPago_controller.bpl and b/Output/Debug/Cliente/FormasPago_controller.bpl differ diff --git a/Output/Debug/Cliente/FormasPago_data.bpl b/Output/Debug/Cliente/FormasPago_data.bpl index 56c31f02..6531c3a7 100644 Binary files a/Output/Debug/Cliente/FormasPago_data.bpl and b/Output/Debug/Cliente/FormasPago_data.bpl differ diff --git a/Output/Debug/Cliente/FormasPago_model.bpl b/Output/Debug/Cliente/FormasPago_model.bpl index 2a815752..e0041051 100644 Binary files a/Output/Debug/Cliente/FormasPago_model.bpl and b/Output/Debug/Cliente/FormasPago_model.bpl differ diff --git a/Output/Debug/Cliente/FormasPago_plugin.bpl b/Output/Debug/Cliente/FormasPago_plugin.bpl index 50c079e5..f4c5bc81 100644 Binary files a/Output/Debug/Cliente/FormasPago_plugin.bpl and b/Output/Debug/Cliente/FormasPago_plugin.bpl differ diff --git a/Output/Debug/Cliente/FormasPago_view.bpl b/Output/Debug/Cliente/FormasPago_view.bpl index 0bf20a36..da554ad2 100644 Binary files a/Output/Debug/Cliente/FormasPago_view.bpl and b/Output/Debug/Cliente/FormasPago_view.bpl differ diff --git a/Output/Debug/Cliente/GUIBase.bpl b/Output/Debug/Cliente/GUIBase.bpl index 96401929..f9bcf84c 100644 Binary files a/Output/Debug/Cliente/GUIBase.bpl and b/Output/Debug/Cliente/GUIBase.bpl differ diff --git a/Output/Debug/Cliente/HistoricoMovimientos_controller.bpl b/Output/Debug/Cliente/HistoricoMovimientos_controller.bpl index 326b226c..4f9900e9 100644 Binary files a/Output/Debug/Cliente/HistoricoMovimientos_controller.bpl and b/Output/Debug/Cliente/HistoricoMovimientos_controller.bpl differ diff --git a/Output/Debug/Cliente/HistoricoMovimientos_data.bpl b/Output/Debug/Cliente/HistoricoMovimientos_data.bpl index e628edc2..45c92645 100644 Binary files a/Output/Debug/Cliente/HistoricoMovimientos_data.bpl and b/Output/Debug/Cliente/HistoricoMovimientos_data.bpl differ diff --git a/Output/Debug/Cliente/HistoricoMovimientos_model.bpl b/Output/Debug/Cliente/HistoricoMovimientos_model.bpl index a6115304..0ca47bc2 100644 Binary files a/Output/Debug/Cliente/HistoricoMovimientos_model.bpl and b/Output/Debug/Cliente/HistoricoMovimientos_model.bpl differ diff --git a/Output/Debug/Cliente/HistoricoMovimientos_plugin.bpl b/Output/Debug/Cliente/HistoricoMovimientos_plugin.bpl index 4e7003fb..2309d44b 100644 Binary files a/Output/Debug/Cliente/HistoricoMovimientos_plugin.bpl and b/Output/Debug/Cliente/HistoricoMovimientos_plugin.bpl differ diff --git a/Output/Debug/Cliente/HistoricoMovimientos_view.bpl b/Output/Debug/Cliente/HistoricoMovimientos_view.bpl index 08df4ef2..48c8770e 100644 Binary files a/Output/Debug/Cliente/HistoricoMovimientos_view.bpl and b/Output/Debug/Cliente/HistoricoMovimientos_view.bpl differ diff --git a/Output/Debug/Cliente/InfVentasArticulo_controller.bpl b/Output/Debug/Cliente/InfVentasArticulo_controller.bpl index f7973eeb..0278d1cd 100644 Binary files a/Output/Debug/Cliente/InfVentasArticulo_controller.bpl and b/Output/Debug/Cliente/InfVentasArticulo_controller.bpl differ diff --git a/Output/Debug/Cliente/InfVentasArticulo_data.bpl b/Output/Debug/Cliente/InfVentasArticulo_data.bpl index edf940ff..d15f4f11 100644 Binary files a/Output/Debug/Cliente/InfVentasArticulo_data.bpl and b/Output/Debug/Cliente/InfVentasArticulo_data.bpl differ diff --git a/Output/Debug/Cliente/InfVentasArticulo_model.bpl b/Output/Debug/Cliente/InfVentasArticulo_model.bpl index 1d20e29e..945d9189 100644 Binary files a/Output/Debug/Cliente/InfVentasArticulo_model.bpl and b/Output/Debug/Cliente/InfVentasArticulo_model.bpl differ diff --git a/Output/Debug/Cliente/InfVentasArticulo_plugin.bpl b/Output/Debug/Cliente/InfVentasArticulo_plugin.bpl index 77a6f009..a3906fcd 100644 Binary files a/Output/Debug/Cliente/InfVentasArticulo_plugin.bpl and b/Output/Debug/Cliente/InfVentasArticulo_plugin.bpl differ diff --git a/Output/Debug/Cliente/InfVentasArticulo_view.bpl b/Output/Debug/Cliente/InfVentasArticulo_view.bpl index d5608568..c81f70a5 100644 Binary files a/Output/Debug/Cliente/InfVentasArticulo_view.bpl and b/Output/Debug/Cliente/InfVentasArticulo_view.bpl differ diff --git a/Output/Debug/Cliente/InformesBase_controller.bpl b/Output/Debug/Cliente/InformesBase_controller.bpl index d337dfc2..46f3e494 100644 Binary files a/Output/Debug/Cliente/InformesBase_controller.bpl and b/Output/Debug/Cliente/InformesBase_controller.bpl differ diff --git a/Output/Debug/Cliente/InformesBase_view.bpl b/Output/Debug/Cliente/InformesBase_view.bpl index 176585bb..41ecd790 100644 Binary files a/Output/Debug/Cliente/InformesBase_view.bpl and b/Output/Debug/Cliente/InformesBase_view.bpl differ diff --git a/Output/Debug/Cliente/Informes_controller.bpl b/Output/Debug/Cliente/Informes_controller.bpl index 820bc453..c161156e 100644 Binary files a/Output/Debug/Cliente/Informes_controller.bpl and b/Output/Debug/Cliente/Informes_controller.bpl differ diff --git a/Output/Debug/Cliente/Informes_data.bpl b/Output/Debug/Cliente/Informes_data.bpl index 41712b42..f85ad2d5 100644 Binary files a/Output/Debug/Cliente/Informes_data.bpl and b/Output/Debug/Cliente/Informes_data.bpl differ diff --git a/Output/Debug/Cliente/Informes_model.bpl b/Output/Debug/Cliente/Informes_model.bpl index c84e76be..000aa5dd 100644 Binary files a/Output/Debug/Cliente/Informes_model.bpl and b/Output/Debug/Cliente/Informes_model.bpl differ diff --git a/Output/Debug/Cliente/Informes_plugin.bpl b/Output/Debug/Cliente/Informes_plugin.bpl index 52f1146f..7bac9446 100644 Binary files a/Output/Debug/Cliente/Informes_plugin.bpl and b/Output/Debug/Cliente/Informes_plugin.bpl differ diff --git a/Output/Debug/Cliente/Informes_view.bpl b/Output/Debug/Cliente/Informes_view.bpl index 5638d5f6..4d7a247c 100644 Binary files a/Output/Debug/Cliente/Informes_view.bpl and b/Output/Debug/Cliente/Informes_view.bpl differ diff --git a/Output/Debug/Cliente/Inventario_controller.bpl b/Output/Debug/Cliente/Inventario_controller.bpl index 6d5bf7e0..f8c05f15 100644 Binary files a/Output/Debug/Cliente/Inventario_controller.bpl and b/Output/Debug/Cliente/Inventario_controller.bpl differ diff --git a/Output/Debug/Cliente/Inventario_data.bpl b/Output/Debug/Cliente/Inventario_data.bpl index c834ee9c..8f0dd241 100644 Binary files a/Output/Debug/Cliente/Inventario_data.bpl and b/Output/Debug/Cliente/Inventario_data.bpl differ diff --git a/Output/Debug/Cliente/Inventario_model.bpl b/Output/Debug/Cliente/Inventario_model.bpl index cfd4a5a5..4122a8cb 100644 Binary files a/Output/Debug/Cliente/Inventario_model.bpl and b/Output/Debug/Cliente/Inventario_model.bpl differ diff --git a/Output/Debug/Cliente/Inventario_plugin.bpl b/Output/Debug/Cliente/Inventario_plugin.bpl index 36755cea..08d8b994 100644 Binary files a/Output/Debug/Cliente/Inventario_plugin.bpl and b/Output/Debug/Cliente/Inventario_plugin.bpl differ diff --git a/Output/Debug/Cliente/Inventario_view.bpl b/Output/Debug/Cliente/Inventario_view.bpl index 41931bce..c822870b 100644 Binary files a/Output/Debug/Cliente/Inventario_view.bpl and b/Output/Debug/Cliente/Inventario_view.bpl differ diff --git a/Output/Debug/Cliente/PedCli_AlbCli_relation.bpl b/Output/Debug/Cliente/PedCli_AlbCli_relation.bpl index 11f39c24..d8d33c60 100644 Binary files a/Output/Debug/Cliente/PedCli_AlbCli_relation.bpl and b/Output/Debug/Cliente/PedCli_AlbCli_relation.bpl differ diff --git a/Output/Debug/Cliente/PedCli_PedProv_relation.bpl b/Output/Debug/Cliente/PedCli_PedProv_relation.bpl index 810ced97..a288004f 100644 Binary files a/Output/Debug/Cliente/PedCli_PedProv_relation.bpl and b/Output/Debug/Cliente/PedCli_PedProv_relation.bpl differ diff --git a/Output/Debug/Cliente/PedProv_AlbProv_relation.bpl b/Output/Debug/Cliente/PedProv_AlbProv_relation.bpl index c27fd0de..7eb5e414 100644 Binary files a/Output/Debug/Cliente/PedProv_AlbProv_relation.bpl and b/Output/Debug/Cliente/PedProv_AlbProv_relation.bpl differ diff --git a/Output/Debug/Cliente/PedProv_FacProv_relation.bpl b/Output/Debug/Cliente/PedProv_FacProv_relation.bpl index b5895ff8..49d65baf 100644 Binary files a/Output/Debug/Cliente/PedProv_FacProv_relation.bpl and b/Output/Debug/Cliente/PedProv_FacProv_relation.bpl differ diff --git a/Output/Debug/Cliente/PedidosCliente_controller.bpl b/Output/Debug/Cliente/PedidosCliente_controller.bpl index 3a14740e..abcd9b09 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_controller.bpl and b/Output/Debug/Cliente/PedidosCliente_controller.bpl differ diff --git a/Output/Debug/Cliente/PedidosCliente_data.bpl b/Output/Debug/Cliente/PedidosCliente_data.bpl index 8fb5b3b3..1d1f5bb0 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_data.bpl and b/Output/Debug/Cliente/PedidosCliente_data.bpl differ diff --git a/Output/Debug/Cliente/PedidosCliente_model.bpl b/Output/Debug/Cliente/PedidosCliente_model.bpl index ef697fa5..e693281c 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_model.bpl and b/Output/Debug/Cliente/PedidosCliente_model.bpl differ diff --git a/Output/Debug/Cliente/PedidosCliente_plugin.bpl b/Output/Debug/Cliente/PedidosCliente_plugin.bpl index ce35703b..eb2196db 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_plugin.bpl and b/Output/Debug/Cliente/PedidosCliente_plugin.bpl differ diff --git a/Output/Debug/Cliente/PedidosCliente_view.bpl b/Output/Debug/Cliente/PedidosCliente_view.bpl index 60709e11..80411097 100644 Binary files a/Output/Debug/Cliente/PedidosCliente_view.bpl and b/Output/Debug/Cliente/PedidosCliente_view.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_controller.bpl b/Output/Debug/Cliente/PedidosProveedor_controller.bpl index 5fd25f27..f719c412 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_controller.bpl and b/Output/Debug/Cliente/PedidosProveedor_controller.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_data.bpl b/Output/Debug/Cliente/PedidosProveedor_data.bpl index 01dacc75..9220c6e9 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_data.bpl and b/Output/Debug/Cliente/PedidosProveedor_data.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_model.bpl b/Output/Debug/Cliente/PedidosProveedor_model.bpl index b9d90ff1..c2caa746 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_model.bpl and b/Output/Debug/Cliente/PedidosProveedor_model.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_plugin.bpl b/Output/Debug/Cliente/PedidosProveedor_plugin.bpl index a66d7079..6d17f1ff 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_plugin.bpl and b/Output/Debug/Cliente/PedidosProveedor_plugin.bpl differ diff --git a/Output/Debug/Cliente/PedidosProveedor_view.bpl b/Output/Debug/Cliente/PedidosProveedor_view.bpl index a41a7b99..ce7d9620 100644 Binary files a/Output/Debug/Cliente/PedidosProveedor_view.bpl and b/Output/Debug/Cliente/PedidosProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/RecibosCliente_controller.bpl b/Output/Debug/Cliente/RecibosCliente_controller.bpl index 4a2f5309..ad83c3b2 100644 Binary files a/Output/Debug/Cliente/RecibosCliente_controller.bpl and b/Output/Debug/Cliente/RecibosCliente_controller.bpl differ diff --git a/Output/Debug/Cliente/RecibosCliente_data.bpl b/Output/Debug/Cliente/RecibosCliente_data.bpl index 6d366ebb..01ea5eba 100644 Binary files a/Output/Debug/Cliente/RecibosCliente_data.bpl and b/Output/Debug/Cliente/RecibosCliente_data.bpl differ diff --git a/Output/Debug/Cliente/RecibosCliente_model.bpl b/Output/Debug/Cliente/RecibosCliente_model.bpl index 5c666c48..7231e2b1 100644 Binary files a/Output/Debug/Cliente/RecibosCliente_model.bpl and b/Output/Debug/Cliente/RecibosCliente_model.bpl differ diff --git a/Output/Debug/Cliente/RecibosCliente_plugin.bpl b/Output/Debug/Cliente/RecibosCliente_plugin.bpl index 6d9bafaa..4566b6b4 100644 Binary files a/Output/Debug/Cliente/RecibosCliente_plugin.bpl and b/Output/Debug/Cliente/RecibosCliente_plugin.bpl differ diff --git a/Output/Debug/Cliente/RecibosCliente_view.bpl b/Output/Debug/Cliente/RecibosCliente_view.bpl index e6824242..5f3e5f2f 100644 Binary files a/Output/Debug/Cliente/RecibosCliente_view.bpl and b/Output/Debug/Cliente/RecibosCliente_view.bpl differ diff --git a/Output/Debug/Cliente/RecibosProveedor_controller.bpl b/Output/Debug/Cliente/RecibosProveedor_controller.bpl index 45c51e50..5a2d2aac 100644 Binary files a/Output/Debug/Cliente/RecibosProveedor_controller.bpl and b/Output/Debug/Cliente/RecibosProveedor_controller.bpl differ diff --git a/Output/Debug/Cliente/RecibosProveedor_data.bpl b/Output/Debug/Cliente/RecibosProveedor_data.bpl index f56346a3..cafbc3d3 100644 Binary files a/Output/Debug/Cliente/RecibosProveedor_data.bpl and b/Output/Debug/Cliente/RecibosProveedor_data.bpl differ diff --git a/Output/Debug/Cliente/RecibosProveedor_model.bpl b/Output/Debug/Cliente/RecibosProveedor_model.bpl index 343300bd..be53ee16 100644 Binary files a/Output/Debug/Cliente/RecibosProveedor_model.bpl and b/Output/Debug/Cliente/RecibosProveedor_model.bpl differ diff --git a/Output/Debug/Cliente/RecibosProveedor_plugin.bpl b/Output/Debug/Cliente/RecibosProveedor_plugin.bpl index 8dd4cf31..682176b1 100644 Binary files a/Output/Debug/Cliente/RecibosProveedor_plugin.bpl and b/Output/Debug/Cliente/RecibosProveedor_plugin.bpl differ diff --git a/Output/Debug/Cliente/RecibosProveedor_view.bpl b/Output/Debug/Cliente/RecibosProveedor_view.bpl index d348145a..f689f938 100644 Binary files a/Output/Debug/Cliente/RecibosProveedor_view.bpl and b/Output/Debug/Cliente/RecibosProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/Referencias_controller.bpl b/Output/Debug/Cliente/Referencias_controller.bpl index e397b7b0..2750cf0f 100644 Binary files a/Output/Debug/Cliente/Referencias_controller.bpl and b/Output/Debug/Cliente/Referencias_controller.bpl differ diff --git a/Output/Debug/Cliente/Referencias_data.bpl b/Output/Debug/Cliente/Referencias_data.bpl index f5e55b71..b4fee31a 100644 Binary files a/Output/Debug/Cliente/Referencias_data.bpl and b/Output/Debug/Cliente/Referencias_data.bpl differ diff --git a/Output/Debug/Cliente/Referencias_model.bpl b/Output/Debug/Cliente/Referencias_model.bpl index 0a3a8423..1ec3efd1 100644 Binary files a/Output/Debug/Cliente/Referencias_model.bpl and b/Output/Debug/Cliente/Referencias_model.bpl differ diff --git a/Output/Debug/Cliente/Referencias_plugin.bpl b/Output/Debug/Cliente/Referencias_plugin.bpl index 11e3f426..089d4edf 100644 Binary files a/Output/Debug/Cliente/Referencias_plugin.bpl and b/Output/Debug/Cliente/Referencias_plugin.bpl differ diff --git a/Output/Debug/Cliente/Referencias_view.bpl b/Output/Debug/Cliente/Referencias_view.bpl index 5274c909..8d08d4b1 100644 Binary files a/Output/Debug/Cliente/Referencias_view.bpl and b/Output/Debug/Cliente/Referencias_view.bpl differ diff --git a/Output/Debug/Cliente/RemesasCliente_controller.bpl b/Output/Debug/Cliente/RemesasCliente_controller.bpl index 3111195b..0cfec171 100644 Binary files a/Output/Debug/Cliente/RemesasCliente_controller.bpl and b/Output/Debug/Cliente/RemesasCliente_controller.bpl differ diff --git a/Output/Debug/Cliente/RemesasCliente_data.bpl b/Output/Debug/Cliente/RemesasCliente_data.bpl index 7915c10f..fd83670c 100644 Binary files a/Output/Debug/Cliente/RemesasCliente_data.bpl and b/Output/Debug/Cliente/RemesasCliente_data.bpl differ diff --git a/Output/Debug/Cliente/RemesasCliente_model.bpl b/Output/Debug/Cliente/RemesasCliente_model.bpl index 05213f1b..badae5c9 100644 Binary files a/Output/Debug/Cliente/RemesasCliente_model.bpl and b/Output/Debug/Cliente/RemesasCliente_model.bpl differ diff --git a/Output/Debug/Cliente/RemesasCliente_plugin.bpl b/Output/Debug/Cliente/RemesasCliente_plugin.bpl index 4f4b9f4f..9cadcf34 100644 Binary files a/Output/Debug/Cliente/RemesasCliente_plugin.bpl and b/Output/Debug/Cliente/RemesasCliente_plugin.bpl differ diff --git a/Output/Debug/Cliente/RemesasCliente_view.bpl b/Output/Debug/Cliente/RemesasCliente_view.bpl index 92d7a023..11a4c3ad 100644 Binary files a/Output/Debug/Cliente/RemesasCliente_view.bpl and b/Output/Debug/Cliente/RemesasCliente_view.bpl differ diff --git a/Output/Debug/Cliente/RemesasProveedor_controller.bpl b/Output/Debug/Cliente/RemesasProveedor_controller.bpl index 8ec12d53..5d919a9c 100644 Binary files a/Output/Debug/Cliente/RemesasProveedor_controller.bpl and b/Output/Debug/Cliente/RemesasProveedor_controller.bpl differ diff --git a/Output/Debug/Cliente/RemesasProveedor_data.bpl b/Output/Debug/Cliente/RemesasProveedor_data.bpl index 84de26ff..2f42e8ec 100644 Binary files a/Output/Debug/Cliente/RemesasProveedor_data.bpl and b/Output/Debug/Cliente/RemesasProveedor_data.bpl differ diff --git a/Output/Debug/Cliente/RemesasProveedor_model.bpl b/Output/Debug/Cliente/RemesasProveedor_model.bpl index 7010163e..02e1ae53 100644 Binary files a/Output/Debug/Cliente/RemesasProveedor_model.bpl and b/Output/Debug/Cliente/RemesasProveedor_model.bpl differ diff --git a/Output/Debug/Cliente/RemesasProveedor_plugin.bpl b/Output/Debug/Cliente/RemesasProveedor_plugin.bpl index 75e13e56..3ad87cd4 100644 Binary files a/Output/Debug/Cliente/RemesasProveedor_plugin.bpl and b/Output/Debug/Cliente/RemesasProveedor_plugin.bpl differ diff --git a/Output/Debug/Cliente/RemesasProveedor_view.bpl b/Output/Debug/Cliente/RemesasProveedor_view.bpl index d9771081..96c8d515 100644 Binary files a/Output/Debug/Cliente/RemesasProveedor_view.bpl and b/Output/Debug/Cliente/RemesasProveedor_view.bpl differ diff --git a/Output/Debug/Cliente/TiendaWeb_controller.bpl b/Output/Debug/Cliente/TiendaWeb_controller.bpl index d7bf958b..77c9d895 100644 Binary files a/Output/Debug/Cliente/TiendaWeb_controller.bpl and b/Output/Debug/Cliente/TiendaWeb_controller.bpl differ diff --git a/Output/Debug/Cliente/TiendaWeb_data.bpl b/Output/Debug/Cliente/TiendaWeb_data.bpl index f3f2875e..bbe49856 100644 Binary files a/Output/Debug/Cliente/TiendaWeb_data.bpl and b/Output/Debug/Cliente/TiendaWeb_data.bpl differ diff --git a/Output/Debug/Cliente/TiendaWeb_model.bpl b/Output/Debug/Cliente/TiendaWeb_model.bpl index e41f9891..5ee35337 100644 Binary files a/Output/Debug/Cliente/TiendaWeb_model.bpl and b/Output/Debug/Cliente/TiendaWeb_model.bpl differ diff --git a/Output/Debug/Cliente/TiendaWeb_plugin.bpl b/Output/Debug/Cliente/TiendaWeb_plugin.bpl index 2b3c32df..3ce08579 100644 Binary files a/Output/Debug/Cliente/TiendaWeb_plugin.bpl and b/Output/Debug/Cliente/TiendaWeb_plugin.bpl differ diff --git a/Output/Debug/Cliente/TiendaWeb_view.bpl b/Output/Debug/Cliente/TiendaWeb_view.bpl index 7239b7ca..bf5f2a3a 100644 Binary files a/Output/Debug/Cliente/TiendaWeb_view.bpl and b/Output/Debug/Cliente/TiendaWeb_view.bpl differ diff --git a/Output/Debug/Cliente/TiposIVA_controller.bpl b/Output/Debug/Cliente/TiposIVA_controller.bpl index 01823eb2..3722862e 100644 Binary files a/Output/Debug/Cliente/TiposIVA_controller.bpl and b/Output/Debug/Cliente/TiposIVA_controller.bpl differ diff --git a/Output/Debug/Cliente/TiposIVA_data.bpl b/Output/Debug/Cliente/TiposIVA_data.bpl index 0184401f..eafe6c8d 100644 Binary files a/Output/Debug/Cliente/TiposIVA_data.bpl and b/Output/Debug/Cliente/TiposIVA_data.bpl differ diff --git a/Output/Debug/Cliente/TiposIVA_model.bpl b/Output/Debug/Cliente/TiposIVA_model.bpl index ea2e37ff..705fbb32 100644 Binary files a/Output/Debug/Cliente/TiposIVA_model.bpl and b/Output/Debug/Cliente/TiposIVA_model.bpl differ diff --git a/Output/Debug/Cliente/TiposIVA_plugin.bpl b/Output/Debug/Cliente/TiposIVA_plugin.bpl index e6183608..75fdd667 100644 Binary files a/Output/Debug/Cliente/TiposIVA_plugin.bpl and b/Output/Debug/Cliente/TiposIVA_plugin.bpl differ diff --git a/Output/Debug/Cliente/TiposIVA_view.bpl b/Output/Debug/Cliente/TiposIVA_view.bpl index 070332e0..776fb09e 100644 Binary files a/Output/Debug/Cliente/TiposIVA_view.bpl and b/Output/Debug/Cliente/TiposIVA_view.bpl differ diff --git a/Output/Debug/Cliente/Usuarios.bpl b/Output/Debug/Cliente/Usuarios.bpl index 103ec9c7..fae62fe7 100644 Binary files a/Output/Debug/Cliente/Usuarios.bpl and b/Output/Debug/Cliente/Usuarios.bpl differ diff --git a/Output/Debug/Servidor/FactuGES_Server.exe b/Output/Debug/Servidor/FactuGES_Server.exe index bcd68407..faf78ea7 100644 Binary files a/Output/Debug/Servidor/FactuGES_Server.exe and b/Output/Debug/Servidor/FactuGES_Server.exe differ diff --git a/Output/Debug/Servidor/ServerLog.txt b/Output/Debug/Servidor/ServerLog.txt index dd66ad9b..1d80693c 100644 --- a/Output/Debug/Servidor/ServerLog.txt +++ b/Output/Debug/Servidor/ServerLog.txt @@ -1,9 +1,9 @@ -[01/08/2007 16:53:12] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Connect] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID @@ -16,45 +16,45 @@ Plan: PLAN (USUARIOS NATURAL) > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Prepare] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) Plan: PLAN JOIN (R INDEX (RDB$INDEX_4), F INDEX (RDB$INDEX_2)) > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = USUARIOS > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Prepare] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION Plan: PLAN SORT (JOIN (RR INDEX (RDB$INDEX_42), RI INDEX (RDB$INDEX_6))) > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = USUARIOS > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT ID @@ -68,7 +68,7 @@ PASS = luisleon07 > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Prepare] SELECT PERFILES.PERFIL @@ -80,31 +80,31 @@ Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = PERFILES > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = PERFILES > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT PERFILES.PERFIL @@ -116,7 +116,7 @@ ID_USUARIO = 1 > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID_EMPRESA @@ -127,31 +127,31 @@ Plan: PLAN (EMPRESAS_USUARIOS NATURAL) > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = EMPRESAS_USUARIOS > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = EMPRESAS_USUARIOS > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:08] +[03/08/2007 12:48:36] [Application: FactuGES (Servidor)] : [Execute] SELECT ID_EMPRESA @@ -162,7 +162,7 @@ ID_USUARIO = 1 > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -176,31 +176,31 @@ Plan: PLAN (EMPRESAS NATURAL) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = EMPRESAS > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = EMPRESAS > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -213,7 +213,7 @@ > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -225,31 +225,31 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = EMPRESAS_DATOS_BANCO > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = EMPRESAS_DATOS_BANCO > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -261,7 +261,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA ID_EMPRESA = 1 > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -275,7 +275,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS NATURAL) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -288,7 +288,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -300,7 +300,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -312,7 +312,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA ID_EMPRESA = 1 > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -326,7 +326,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -339,7 +339,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -351,7 +351,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) > -[01/08/2007 17:27:10] +[03/08/2007 12:48:39] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -363,7 +363,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA ID_EMPRESA = 1 > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA @@ -374,31 +374,31 @@ ORDER BY CATEGORIA Plan: PLAN SORT ((INFORMES NATURAL)) > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = INFORMES > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = INFORMES > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:27:12] +[03/08/2007 12:49:05] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA @@ -408,1792 +408,186 @@ ORDER BY CATEGORIA > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:28:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:28:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:28:37] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:28:37] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:30:33] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:30:35] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:30:36] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:30:36] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:31:16] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:31:18] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:31:19] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:31:19] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:31:21] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:31:21] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:32:05] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:07] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:09] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:32:09] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:32:49] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:32:51] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:32:53] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:32:53] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:34:28] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:34:31] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:34:32] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:34:32] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - Plan: PLAN (USUARIOS NATURAL) - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID - FROM - USUARIOS - WHERE USUARIO = :USUARIO AND - PASS = :PASS AND - ACTIVO = 1 - - USUARIO = Administrador - PASS = luisleon07 - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - PERFILES.PERFIL - FROM - PERFILES, PERFILES_USUARIOS - WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO - AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - - ID_USUARIO = 1 - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - Plan: PLAN (EMPRESAS_USUARIOS NATURAL) - - > -[01/08/2007 17:36:22] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID_EMPRESA - FROM - EMPRESAS_USUARIOS - WHERE ID_USUARIO = :ID_USUARIO - - ID_USUARIO = 1 - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) - - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:36:24] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:36:26] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - Plan: PLAN SORT ((INFORMES NATURAL)) - - > -[01/08/2007 17:36:26] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA - FROM - INFORMES -ORDER BY CATEGORIA - - - > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Prepare] SELECT DISTINCT -CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,SUM(CANTIDAD) AS CANTIDAD,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,SUM(IMPORTE_COMISION_AGENTE) AS IMPORTE_COMISION_AGENTE,IMPORTE_NETO_COSTE,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,SUM(IMPORTE_TOTAL_FACTURA) AS IMPORTE_TOTAL_FACTURA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE,DESCRIPC +DESCRIPCION,FAMILIA,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_ > -[01/08/2007 17:37:06]ION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,IMPORTE_NETO_COSTE,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV - - Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), SORT (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_ +[03/08/2007 12:49:12]VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURA > -[01/08/2007 17:37:06]INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))))), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))), V_INF_MARGEN_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_MARGEN_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) +[03/08/2007 12:49:12]S_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Start transaction] > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Execute] Select F.RDB$COMPUTED_BLR, F.RDB$DEFAULT_VALUE, R.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME from RDB$RELATION_FIELDS R, RDB$FIELDS F where R.RDB$RELATION_NAME = :RELATION and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME and ((not F.RDB$COMPUTED_BLR is NULL) or (not (F.RDB$DEFAULT_VALUE is NULL and R.RDB$DEFAULT_VALUE is NULL))) RELATION = > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Execute] SELECT RDB$FIELD_NAME, RDB$FIELD_POSITION FROM RDB$RELATION_CONSTRAINTS RR JOIN RDB$INDEX_SEGMENTS RI ON RR.RDB$INDEX_NAME = RI.RDB$INDEX_NAME WHERE RDB$RELATION_NAME = :relation_name AND RDB$CONSTRAINT_TYPE = 'PRIMARY KEY ' ORDER BY RDB$FIELD_POSITION RELATION_NAME = > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Commit (Hard commit)] > -[01/08/2007 17:37:06] +[03/08/2007 12:49:12] [Application: FactuGES (Servidor)] : [Execute] SELECT DISTINCT -CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,SUM(CANTIDAD) AS CANTIDAD,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,SUM(IMPORTE_COMISION_AGENTE) AS IMPORTE_COMISION_AGENTE,IMPORTE_NETO_COSTE,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,SUM(IMPORTE_TOTAL_FACTURA) AS IMPORTE_TOTAL_FACTURA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE,DESCRIPC +DESCRIPCION,FAMILIA,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV + > -[01/08/2007 17:37:06]ION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,IMPORTE_NETO_COSTE,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV +[03/08/2007 12:54:34] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV - FECHAINI = 01/08/2007 - FECHAFIN = 31/08/2007 + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN > -[01/08/2007 17:44:40] +[03/08/2007 12:54:34]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 12:54:34]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 12:54:34] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:17:28] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:17:28]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:17:28]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:17:28] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:33:21] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:33:21]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:33:21]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:33:21] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:33:36] +[Application: FactuGES (Servidor)] +: [Prepare] UPDATE INFORMES + SET + ID_EMPRESA = :ID_EMPRESA, + CATEGORIA = :CATEGORIA, + CONTROLLER = :CONTROLLER, + MODIFICABLE = :MODIFICABLE, + ICONO = :ICONO, + NOMBRE = :NOMBRE, + DESCRIPCION = :DESCRIPCION, + ORDEN = :ORDEN, + VISTA = :VISTA + WHERE + (ID = :OLD_ID) + + Plan: PLAN (INFORMES INDEX (PK_INFORMES)) + + > +[03/08/2007 13:33:36] +[Application: FactuGES (Servidor)] +: [Execute] UPDATE INFORMES + SET + ID_EMPRESA = :ID_EMPRESA, + CATEGORIA = :CATEGORIA, + CONTROLLER = :CONTROLLER, + MODIFICABLE = :MODIFICABLE, + ICONO = :ICONO, + NOMBRE = :NOMBRE, + DESCRIPCION = :DESCRIPCION, + ORDEN = :ORDEN, + VISTA = :VISTA + WHERE + (ID = :OLD_ID) + + ID_EMPRESA = 1 + CATEGORIA = VENTAS ARTICULOS + CONTROLLER = InfMargenArticuloController + MODIFICABLE = S + ICONO = 0 + NOMBRE = Margen por artículo + DESCRIPCION = + ORDEN = > + VISTA = > + OLD_ID = 17 + + > +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID @@ -2206,7 +600,7 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE Plan: PLAN (USUARIOS NATURAL) > -[01/08/2007 17:44:40] +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Execute] SELECT ID @@ -2216,11 +610,11 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE PASS = :PASS AND ACTIVO = 1 - USUARIO = Administrador - PASS = luisleon07 + USUARIO = Luis + PASS = 1 > -[01/08/2007 17:44:40] +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Prepare] SELECT PERFILES.PERFIL @@ -2232,7 +626,7 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) > -[01/08/2007 17:44:40] +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Execute] SELECT PERFILES.PERFIL @@ -2241,10 +635,10 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL - ID_USUARIO = 1 + ID_USUARIO = 2 > -[01/08/2007 17:44:40] +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID_EMPRESA @@ -2255,7 +649,7 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE Plan: PLAN (EMPRESAS_USUARIOS NATURAL) > -[01/08/2007 17:44:40] +[03/08/2007 13:33:49] [Application: FactuGES (Servidor)] : [Execute] SELECT ID_EMPRESA @@ -2263,10 +657,10 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE EMPRESAS_USUARIOS WHERE ID_USUARIO = :ID_USUARIO - ID_USUARIO = 1 + ID_USUARIO = 2 > -[01/08/2007 17:44:42] +[03/08/2007 13:33:51] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -2275,114 +669,12 @@ GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL, IVA FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:44:42] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:44:42] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:44:42] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:44:42] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - Plan: PLAN (EMPRESAS NATURAL) - - > -[01/08/2007 17:44:42] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS - - - > -[01/08/2007 17:44:43] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) - - > -[01/08/2007 17:44:43] -[Application: FactuGES (Servidor)] -: [Execute] SELECT - ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, - SUFIJO_N19, SUFIJO_N58 - FROM - EMPRESAS_DATOS_BANCO -WHERE ID_EMPRESA = :ID_EMPRESA - - ID_EMPRESA = 1 - - > -[01/08/2007 17:44:43] -[Application: FactuGES (Servidor)] -: [Prepare] SELECT - ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, - PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, - MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, - FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, - REGISTRO_MERCANTIL, IVA - FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) + EMPRESAS WHERE (ID IN (1)) Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) > -[01/08/2007 17:44:43] +[03/08/2007 13:33:51] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, @@ -2391,11 +683,11 @@ WHERE ID_EMPRESA = :ID_EMPRESA FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL, IVA FROM - EMPRESAS WHERE (EMPRESAS.ID = 1) + EMPRESAS WHERE (ID IN (1)) > -[01/08/2007 17:44:43] +[03/08/2007 13:33:51] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -2407,7 +699,7 @@ WHERE ID_EMPRESA = :ID_EMPRESA Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) > -[01/08/2007 17:44:43] +[03/08/2007 13:33:51] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, @@ -2419,7 +711,109 @@ WHERE ID_EMPRESA = :ID_EMPRESA ID_EMPRESA = 1 > -[01/08/2007 17:44:45] +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:33:51] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:33:54] [Application: FactuGES (Servidor)] : [Prepare] SELECT ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA @@ -2430,7 +824,7 @@ ORDER BY CATEGORIA Plan: PLAN SORT ((INFORMES NATURAL)) > -[01/08/2007 17:44:45] +[03/08/2007 13:33:54] [Application: FactuGES (Servidor)] : [Execute] SELECT ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA @@ -2440,105 +834,1402 @@ ORDER BY CATEGORIA > -[01/08/2007 17:44:51] +[03/08/2007 13:33:59] [Application: FactuGES (Servidor)] : [Prepare] SELECT DISTINCT -CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,SUM(CANTIDAD) AS CANTIDAD,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,SUM(IMPORTE_COMISION_AGENTE) AS IMPORTE_COMISION_AGENTE,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,SUM(IMPORTE_TOTAL_FACTURA) AS IMPORTE_TOTAL_FACTURA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PORCENTAJE_MARGEN_COSTE,PORCENTA +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN > -[01/08/2007 17:44:51]JE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,PO +[03/08/2007 13:33:59]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F > -[01/08/2007 17:44:51]BLACION_PROVEEDOR,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV - - Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), SORT (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))))), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX +[03/08/2007 13:33:59]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) > -[01/08/2007 17:44:51](IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))), V_INF_MARGEN_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_MARGEN_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) - - > -[01/08/2007 17:44:51] +[03/08/2007 13:33:59] [Application: FactuGES (Servidor)] : [Execute] SELECT DISTINCT -CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,SUM(CANTIDAD) AS CANTIDAD,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,SUM(IMPORTE_COMISION_AGENTE) AS IMPORTE_COMISION_AGENTE,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,SUM(IMPORTE_TOTAL_FACTURA) AS IMPORTE_TOTAL_FACTURA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,POBLACION_PROVEEDOR,PORCENTAJE_MARGEN_COSTE,PORCENTA +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + > -[01/08/2007 17:44:51]JE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS +[03/08/2007 13:34:18] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY CALLE_AGENTE,CALLE_CLIENTE,CALLE_PROVEEDOR,COMISION_AGENTE,COMISIONABLE,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,FECHA_FACTURA,ID_ARTICULO,ID_COMISION_FACTURA,ID_EMPRESA,ID_FACTURA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,INVENTARIABLE,NIF_CIF_AGENTE,NIF_CIF_CLIENTE,NIF_CIF_PROVEEDOR,NOMBRE_AGENTE,NOMBRE_CLIENTE,NOMBRE_COMERCIAL_CLIENTE,NOMBRE_PROVEEDOR,POBLACION_AGENTE,POBLACION_CLIENTE,PO +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) > -[01/08/2007 17:44:51]BLACION_PROVEEDOR,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,PROVINCIA_AGENTE,PROVINCIA_CLIENTE,PROVINCIA_PROVEEDOR,REFERENCIA,REFERENCIA_FACTURA,REFERENCIA_PROV +[03/08/2007 13:34:18] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS +WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV FECHAINI = 01/08/2007 FECHAFIN = 31/08/2007 > -[01/08/2007 17:45:41] +[03/08/2007 13:34:45] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:34:45] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:34:45] [Application: FactuGES (Servidor)] : [Prepare] SELECT DISTINCT -SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IM +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN > -[01/08/2007 17:45:41]PORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV - - Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), SORT (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))))), SORT (JOIN ( +[03/08/2007 13:34:45]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F > -[01/08/2007 17:45:41]V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))), V_INF_MARGEN_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_MARGEN_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) +[03/08/2007 13:34:45]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) > -[01/08/2007 17:45:41] +[03/08/2007 13:34:45] [Application: FactuGES (Servidor)] : [Execute] SELECT DISTINCT -SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IM +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + > -[01/08/2007 17:45:41]PORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV +[03/08/2007 13:36:59] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:36:59]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:36:59]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:36:59] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:37:08] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS +WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) + + > +[03/08/2007 13:37:08] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS +WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV FECHAINI = 01/08/2007 FECHAFIN = 31/08/2007 > -[01/08/2007 17:45:59] +[03/08/2007 13:39:44] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + Plan: PLAN (USUARIOS NATURAL) + + > +[03/08/2007 13:39:44] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + USUARIO = Luis + PASS = 1 + + > +[03/08/2007 13:39:44] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) + + > +[03/08/2007 13:39:45] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + ID_USUARIO = 2 + + > +[03/08/2007 13:39:45] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + Plan: PLAN (EMPRESAS_USUARIOS NATURAL) + + > +[03/08/2007 13:39:45] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + ID_USUARIO = 2 + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:39:47] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:39:48] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:39:48] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:39:51] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:39:51] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:39:51] [Application: FactuGES (Servidor)] : [Prepare] SELECT DISTINCT -SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS -WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IM +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN > -[01/08/2007 17:45:59]PORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV - - Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), SORT (JOIN (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))))), SORT (JOIN ( +[03/08/2007 13:39:51]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F > -[01/08/2007 17:45:59]V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_VENTAS_ARTICULOS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)))), V_INF_MARGEN_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_MARGEN_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) +[03/08/2007 13:39:51]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) > -[01/08/2007 17:45:59] +[03/08/2007 13:39:51] [Application: FactuGES (Servidor)] : [Execute] SELECT DISTINCT -SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IMPORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV -FROM V_INF_MARGEN_VENTAS_ARTICULOS +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:39:58] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:39:58] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:39:58] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:39:58]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:39:58]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:39:58] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:40:02] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:40:02] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:40:02] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:40:02]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:40:02]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:40:02] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + Plan: PLAN (USUARIOS NATURAL) + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + USUARIO = Luis + PASS = 1 + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + ID_USUARIO = 2 + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + Plan: PLAN (EMPRESAS_USUARIOS NATURAL) + + > +[03/08/2007 13:42:14] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + ID_USUARIO = 2 + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:42:16] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:42:18] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:42:18] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:42:22] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:42:22] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:42:22] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:42:22]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:42:22]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:42:22] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:42:33] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN -GROUP BY DESCRIPCION,DESCUENTO_CLIENTE_VENTA,DESCUENTO_PROVEEDOR_COSTE,FAMILIA,IMPORTE_MARGEN_COSTE,IMPORTE_MARGEN_PROM_COMPRA,IMPORTE_MARGEN_ULT_COMPRA,IMPORTE_NETO_COSTE,IMPORTE_NETO_PROMEDIO_COMPRA,IMPORTE_NETO_ULTIMA_COMPRA,IMPORTE_NETO_VENTA,IMPORTE_PORTE_COSTE,IM +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (JOIN (V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_VENTAS_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS)), V_INF_VENTAS_ARTICULOS PROVEEDORES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), V_INF_VENTAS_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_VENTAS_ARTICULOS AGENTES INDEX (PK_CONTACTOS)), V_INF_VENTAS_ARTICULOS AGENTES_COMISIONES INDEX (IDX_AGENTES_COMISIONES2, IDX_AGENTES_COMISIONES1)))) > -[01/08/2007 17:45:59]PORTE_PORTE_PROMEDIO_COMPRA,IMPORTE_PORTE_ULTIMA_COMPRA,IMPORTE_TOTAL_VENTA,IMPORTE_UNIDAD_COSTE,IMPORTE_UNIDAD_PROMEDIO_COMPRA,IMPORTE_UNIDAD_ULTIMA_COMPRA,IMPORTE_UNIDAD_VENTA,PORCENTAJE_MARGEN_COSTE,PORCENTAJE_MARGEN_PROM_COMPRA,PORCENTAJE_MARGEN_ULT_COMPRA,REFERENCIA,REFERENCIA_PROV +[03/08/2007 13:42:33] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +SUM(CANTIDAD) AS CANTIDAD,DESCRIPCION,FAMILIA,SUM(IMPORTE_NETO_VENTA) AS IMPORTE_NETO_VENTA,SUM(IMPORTE_TOTAL_VENTA) AS IMPORTE_TOTAL_VENTA,REFERENCIA,REFERENCIA_PROV +FROM V_INF_VENTAS_ARTICULOS +WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN +GROUP BY DESCRIPCION,FAMILIA,REFERENCIA,REFERENCIA_PROV - FECHAINI = 01/01/2007 - FECHAFIN = 31/12/2007 + FECHAINI = 01/08/2007 + FECHAFIN = 31/08/2007 + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + Plan: PLAN (USUARIOS NATURAL) + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + USUARIO = Luis + PASS = 1 + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + ID_USUARIO = 2 + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + Plan: PLAN (EMPRESAS_USUARIOS NATURAL) + + > +[03/08/2007 13:53:33] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + ID_USUARIO = 2 + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:53:36] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:53:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:53:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:53:39] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:53:39] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + + > +[03/08/2007 13:53:39] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + Plan: PLAN SORT (SORT (JOIN (JOIN (JOIN (JOIN (JOIN (SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN + + > +[03/08/2007 13:53:39]_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_ULTIMA_VENTA V_INF_FEC_ULTIMA_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE_DETALLES INDEX (IDX_FACTURAS_CLIENTE_DETALLES2), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_VENTAS V_INF_PROMEDIO_VENTA FACTURAS_CLIENTE INDEX (PK_FACTURAS_CLIENTE)))SORT (JOIN (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR)), SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_F + + > +[03/08/2007 13:53:39]EC_ULTIMA_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_ULTIMA_COMPRA V_INF_FEC_ULTIMA_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))))) +PLAN SORT (JOIN (V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR_DETALLES INDEX (IDX_FACTURAS_PROVEEDOR_DETALLES), V_INF_MARGEN_ARTICULOS V_INF_MARGEN_COMPRAS V_INF_PROMEDIO_COMPRA FACTURAS_PROVEEDOR INDEX (PK_FACTURAS_PROVEEDOR))), V_INF_MARGEN_ARTICULOS ARTICULOS INDEX (PK_ARTICULOS), V_INF_MARGEN_ARTICULOS CLIENTES INDEX (PK_CONTACTOS)), V_INF_MARGEN_ARTICULOS CLIENTES_DATOS INDEX (PK_CLIENTES_DATOS)), V_INF_MARGEN_ARTICULOS AGENTES INDEX (PK_CONTACTOS)))))) + + > +[03/08/2007 13:53:39] +[Application: FactuGES (Servidor)] +: [Execute] SELECT DISTINCT +DESCRIPCION,FAMILIA,ID_ARTICULO,AVG(IMP_MARGEN_PRO_VENT_COMPRA) AS IMP_MARGEN_PRO_VENT_COMPRA,AVG(IMP_MARGEN_PRO_VENT_PRO_COMP) AS IMP_MARGEN_PRO_VENT_PRO_COMP,AVG(IMP_MARGEN_PRO_VENT_ULT_COMP) AS IMP_MARGEN_PRO_VENT_ULT_COMP,AVG(IMP_NETO_COMPRA) AS IMP_NETO_COMPRA,AVG(IMP_NETO_PRO_COMP) AS IMP_NETO_PRO_COMP,AVG(IMP_NETO_PRO_VENT) AS IMP_NETO_PRO_VENT,AVG(IMP_NETO_ULT_COMP) AS IMP_NETO_ULT_COMP,AVG(POR_MARGEN_PRO_VENT_COMPRA) AS POR_MARGEN_PRO_VENT_COMPRA,AVG(POR_MARGEN_PRO_VENT_PRO_COMP) AS POR_MARGEN_PRO_VENT_PRO_COMP,AVG(POR_MARGEN_PRO_VENT_ULT_COMP) AS POR_MARGEN_PRO_VENT_ULT_COMP,REFERENCIA,REFERENCIA_PROV +FROM V_INF_MARGEN_ARTICULOS +GROUP BY DESCRIPCION,FAMILIA,ID_ARTICULO,REFERENCIA,REFERENCIA_PROV + + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + Plan: PLAN (USUARIOS NATURAL) + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID + FROM + USUARIOS + WHERE USUARIO = :USUARIO AND + PASS = :PASS AND + ACTIVO = 1 + + USUARIO = Luis + PASS = 1 + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + Plan: PLAN JOIN (PERFILES_USUARIOS NATURAL, PERFILES INDEX (PK_PERFILES)) + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + PERFILES.PERFIL + FROM + PERFILES, PERFILES_USUARIOS + WHERE PERFILES_USUARIOS.ID_USUARIO = :ID_USUARIO + AND PERFILES.ID = PERFILES_USUARIOS.ID_PERFIL + + ID_USUARIO = 2 + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + Plan: PLAN (EMPRESAS_USUARIOS NATURAL) + + > +[03/08/2007 13:54:35] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID_EMPRESA + FROM + EMPRESAS_USUARIOS + WHERE ID_USUARIO = :ID_USUARIO + + ID_USUARIO = 2 + + > +[03/08/2007 13:54:37] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:54:37] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (ID IN (1)) + + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + Plan: PLAN (EMPRESAS INDEX (PK_EMPRESAS)) + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, + PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, + MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, + FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, + REGISTRO_MERCANTIL, IVA + FROM + EMPRESAS WHERE (EMPRESAS.ID = 1) AND (ID IN (1)) + + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + Plan: PLAN (EMPRESAS_DATOS_BANCO INDEX (FK_EMPRESAS_DATOS_BANCO)) + + > +[03/08/2007 13:54:38] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, NOMBRE, ENTIDAD, SUCURSAL, DC, CUENTA, + SUFIJO_N19, SUFIJO_N58 + FROM + EMPRESAS_DATOS_BANCO +WHERE ID_EMPRESA = :ID_EMPRESA + + ID_EMPRESA = 1 + + > +[03/08/2007 13:54:39] +[Application: FactuGES (Servidor)] +: [Prepare] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + + Plan: PLAN SORT ((INFORMES NATURAL)) + + > +[03/08/2007 13:54:39] +[Application: FactuGES (Servidor)] +: [Execute] SELECT + ID, ID_EMPRESA, CATEGORIA, CONTROLLER, MODIFICABLE, ICONO, NOMBRE, DESCRIPCION, ORDEN, VISTA + FROM + INFORMES +ORDER BY CATEGORIA + > diff --git a/Source/Base/GUIBase/uEditorGridBase.dfm b/Source/Base/GUIBase/uEditorGridBase.dfm index 23d50433..8ee0e96f 100644 --- a/Source/Base/GUIBase/uEditorGridBase.dfm +++ b/Source/Base/GUIBase/uEditorGridBase.dfm @@ -22,7 +22,7 @@ inherited fEditorGridBase: TfEditorGridBase Top = 27 Width = 543 Height = 75 - ExplicitTop = 27 + ExplicitTop = 33 ExplicitWidth = 543 ExplicitHeight = 75 inherited tbxMain: TTBXToolbar diff --git a/Source/Base/GUIBase/uViewFiltroBase.dfm b/Source/Base/GUIBase/uViewFiltroBase.dfm index f16b9c00..3691a865 100644 --- a/Source/Base/GUIBase/uViewFiltroBase.dfm +++ b/Source/Base/GUIBase/uViewFiltroBase.dfm @@ -5,152 +5,153 @@ object frViewFiltroBase: TfrViewFiltroBase Height = 102 TabOrder = 0 Visible = False - object TBXDock1: TTBXDock + object TBXDockablePanel1: TTBXDockablePanel Left = 0 Top = 0 - Width = 565 - Height = 102 - object TBXDockablePanel1: TTBXDockablePanel + Align = alClient + Caption = 'TBXDockablePanel1' + CloseButton = False + CloseButtonWhenDocked = False + DockedHeight = 98 + DockMode = dmCannotFloatOrChangeDocks + FloatingWidth = 128 + FloatingHeight = 98 + ShowCaption = False + ShowCaptionWhenDocked = False + SupportedDocks = [dkStandardDock, dkMultiDock] + TabOrder = 0 + ExplicitWidth = 128 + ExplicitHeight = 98 + object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Caption = 'TBXDockablePanel1' - CloseButton = False - CloseButtonWhenDocked = False - DockedHeight = 98 - DockMode = dmCannotFloatOrChangeDocks - ShowCaption = False - ShowCaptionWhenDocked = False - SupportedDocks = [dkStandardDock, dkMultiDock] + Width = 565 + Height = 68 + Align = alTop + ParentBackground = True TabOrder = 0 - object dxLayoutControl1: TdxLayoutControl - Left = 0 - Top = 0 - Width = 561 - Height = 68 - Align = alTop - ParentBackground = True + AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 128 + object txtFiltroTodo: TcxTextEdit + Left = 87 + Top = 10 + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 124 - object txtFiltroTodo: TcxTextEdit - Left = 87 - Top = 10 - Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 0 - Width = 273 + Width = 273 + end + object edtFechaIniFiltro: TcxDateEdit + Left = 87 + Top = 37 + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 1 + Width = 121 + end + object edtFechaFinFiltro: TcxDateEdit + Left = 350 + Top = 37 + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 2 + Width = 121 + end + object dxLayoutControl1Group_Root: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Que contenga:' + Control = txtFiltroTodo + ControlOptions.ShowBorder = False end - object edtFechaIniFiltro: TcxDateEdit - Left = 87 - Top = 37 - Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 1 - Width = 121 - end - object edtFechaFinFiltro: TcxDateEdit - Left = 348 - Top = 37 - Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 2 - Width = 121 - end - object dxLayoutControl1Group_Root: TdxLayoutGroup + object dxLayoutControl1Group1: TdxLayoutGroup ShowCaption = False Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item1: TdxLayoutItem - Caption = 'Que contenga:' - Control = txtFiltroTodo + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Entre la fecha:' + Control = edtFechaIniFiltro ControlOptions.ShowBorder = False end - object dxLayoutControl1Group1: TdxLayoutGroup - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item2: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Entre la fecha:' - Control = edtFechaIniFiltro - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item3: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'y' - Control = edtFechaFinFiltro - ControlOptions.ShowBorder = False - end + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'y' + Control = edtFechaFinFiltro + ControlOptions.ShowBorder = False end end end - object TBXAlignmentPanel1: TTBXAlignmentPanel - Left = 0 - Top = 68 - Width = 561 + end + object TBXAlignmentPanel1: TTBXAlignmentPanel + Left = 0 + Top = 68 + Width = 565 + Height = 30 + Margins.Left = 10 + Align = alTop + TabOrder = 1 + ExplicitWidth = 128 + object tbxBotones: TTBXToolbar + Left = 10 + Top = 0 + Width = 555 Height = 30 - Margins.Left = 10 Align = alTop - TabOrder = 1 - object tbxBotones: TTBXToolbar - Left = 10 - Top = 0 - Width = 551 - Height = 30 - Align = alTop - AutoResize = False - BorderStyle = bsNone - Caption = 'tbxBotones' - ChevronHint = 'M'#225's botones|' - DockMode = dmCannotFloatOrChangeDocks - DockPos = -23 - DockRow = 1 - DragHandleStyle = dhNone - ParentShowHint = False - ShowHint = True - TabOrder = 0 - object TBXItem2: TTBXItem - Action = actQuitarFiltro - DisplayMode = nbdmImageAndText - Images = PngImageList - end + AutoResize = False + BorderStyle = bsNone + Caption = 'tbxBotones' + ChevronHint = 'M'#225's botones|' + DockMode = dmCannotFloatOrChangeDocks + DockPos = -23 + DockRow = 1 + DragHandleStyle = dhNone + ParentShowHint = False + ShowHint = True + TabOrder = 0 + ExplicitWidth = 118 + object TBXItem2: TTBXItem + Action = actQuitarFiltro + DisplayMode = nbdmImageAndText + Images = PngImageList end end end diff --git a/Source/Base/GUIBase/uViewFiltroBase.pas b/Source/Base/GUIBase/uViewFiltroBase.pas index ec3a0030..d9fe4f45 100644 --- a/Source/Base/GUIBase/uViewFiltroBase.pas +++ b/Source/Base/GUIBase/uViewFiltroBase.pas @@ -36,7 +36,6 @@ type dxLayoutControl1Item3: TdxLayoutItem; edtFechaFinFiltro: TcxDateEdit; dxLayoutControl1Group1: TdxLayoutGroup; - TBXDock1: TTBXDock; TBXDockablePanel1: TTBXDockablePanel; ActionList1: TActionList; actQuitarFiltro: TAction; diff --git a/Source/Base/GUIBase/uViewGrid.dfm b/Source/Base/GUIBase/uViewGrid.dfm index cffafcd0..8bcc1eda 100644 --- a/Source/Base/GUIBase/uViewGrid.dfm +++ b/Source/Base/GUIBase/uViewGrid.dfm @@ -19,7 +19,7 @@ inherited frViewGrid: TfrViewGrid LookAndFeel.Kind = lfOffice11 LookAndFeel.NativeStyle = True object cxGridView: TcxGridDBTableView - OnDblClick = cxGridViewDblClick + OnDblClick = cxGridViewDblClick NavigatorButtons.ConfirmDelete = False FilterBox.Visible = fvNever DataController.DataSource = dsDataSource @@ -64,36 +64,33 @@ inherited frViewGrid: TfrViewGrid TabOrder = 1 Visible = False ExplicitWidth = 554 - inherited TBXDock1: TTBXDock - Width = 554 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 554 - inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitHeight = 102 + inherited dxLayoutControl1: TdxLayoutControl + Width = 554 ExplicitWidth = 554 - inherited dxLayoutControl1: TdxLayoutControl - Width = 550 - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 341 - ExplicitLeft = 341 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 550 - ExplicitWidth = 550 - inherited tbxBotones: TTBXToolbar - Width = 540 - ExplicitWidth = 540 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 344 + ExplicitLeft = 344 + ExplicitWidth = 121 + Width = 121 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 554 + ExplicitWidth = 554 + inherited tbxBotones: TTBXToolbar + Width = 544 + ExplicitWidth = 544 end end end @@ -157,7 +154,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39287.441792465280000000 + ReportDocument.CreationDate = 39296.809313506940000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/Base/GUIBase/uViewGrid.pas b/Source/Base/GUIBase/uViewGrid.pas index 43e7f459..cf63992e 100644 --- a/Source/Base/GUIBase/uViewGrid.pas +++ b/Source/Base/GUIBase/uViewGrid.pas @@ -1,6 +1,6 @@ {*******************************************************} { } -{ Administración de puntos de venta } +{ Administración de puntos de venta } { } { Copyright (C) 2006 Rodax Software S.L. } { } diff --git a/Source/Compras_Group.bdsgroup b/Source/Compras_Group.bdsgroup index e6d68a41..2a87195f 100644 --- a/Source/Compras_Group.bdsgroup +++ b/Source/Compras_Group.bdsgroup @@ -8,21 +8,7 @@ - - - - - - - - - - - - - - - + DataAbstract_D10\DataAbstract_D10.bdsproj Base\Base.bdsproj Base\GUIBase\GUIBase.bdsproj @@ -66,7 +52,8 @@ Modulos\Remesas de proveedor\Views\RemesasProveedor_view.bdsproj Modulos\Remesas de cliente\Views\RemesasCliente_view.bdsproj Modulos\Banca electronica\Controller\BancaElectronica_controller.bdsproj - DataAbstract_D10.bpl Base.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl RecibosProveedor_model.bpl RecibosProveedor_data.bpl RecibosProveedor_controller.bpl RecibosProveedor_view.bpl RecibosProveedor_plugin.bpl FacturasProveedor_model.bpl FacturasProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbProv_FacProv_relation.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl PedidosProveedor_controller.bpl FacturasProveedor_controller.bpl PedProv_FacProv_relation.bpl FacturasProveedor_view.bpl PedidosProveedor_view.bpl FacturasProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe PedCli_PedProv_relation.bpl PedProv_AlbProv_relation.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl FacturasCliente_controller.bpl AlbCli_FacCli_relation.bpl FacturasCliente_model.bpl FacturasCliente_view.bpl RemesasCliente_model.bpl RemesasProveedor_model.bpl RemesasProveedor_data.bpl RemesasCliente_data.bpl RemesasCliente_controller.bpl RemesasProveedor_controller.bpl RemesasProveedor_view.bpl RemesasCliente_view.bpl BancaElectronica_controller.bpl + Modulos\Articulos\Model\Articulos_model.bdsproj + DataAbstract_D10.bpl Base.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl RecibosProveedor_model.bpl RecibosProveedor_data.bpl RecibosProveedor_controller.bpl RecibosProveedor_view.bpl RecibosProveedor_plugin.bpl FacturasProveedor_model.bpl FacturasProveedor_data.bpl AlbaranesProveedor_controller.bpl AlbProv_FacProv_relation.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl PedidosProveedor_controller.bpl FacturasProveedor_controller.bpl PedProv_FacProv_relation.bpl FacturasProveedor_view.bpl PedidosProveedor_view.bpl FacturasProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe PedCli_PedProv_relation.bpl PedProv_AlbProv_relation.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl FacturasCliente_controller.bpl AlbCli_FacCli_relation.bpl FacturasCliente_model.bpl FacturasCliente_view.bpl RemesasCliente_model.bpl RemesasProveedor_model.bpl RemesasProveedor_data.bpl RemesasCliente_data.bpl RemesasCliente_controller.bpl RemesasProveedor_controller.bpl RemesasProveedor_view.bpl RemesasCliente_view.bpl BancaElectronica_controller.bpl Articulos_model.bpl diff --git a/Source/Informes_Group.bdsgroup b/Source/Informes_Group.bdsgroup index 957155ae..df834ae3 100644 --- a/Source/Informes_Group.bdsgroup +++ b/Source/Informes_Group.bdsgroup @@ -8,7 +8,9 @@ - + + + DataAbstract_D10\DataAbstract_D10.bdsproj Base\Base.bdsproj Base\GUIBase\GUIBase.bdsproj @@ -21,8 +23,8 @@ Modulos\Informes base\Plugin\Informes_plugin.bdsproj Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.bdsproj Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.bdsproj - Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.bdsproj Modulos\Informe ventas por articulo\Controller\InfVentasArticulo_controller.bdsproj + Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.bdsproj Modulos\Informe ventas por articulo\Plugin\InfVentasArticulo_plugin.bdsproj Cliente\FactuGES.bdsproj Servidor\FactuGES_Server.bdsproj @@ -31,7 +33,8 @@ Modulos\Informe margen por articulo\Controller\InfMargenArticulo_controller.bdsproj Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.bdsproj Modulos\Informe margen por articulo\Plugin\InfMargenArticulo_plugin.bdsproj - DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl Informes_controller.bpl InformesBase_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_view.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl + Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.bdsproj + DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl Informes_controller.bpl InformesBase_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_view.bpl InfVentasArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl AlbaranesCliente_view.bpl diff --git a/Source/Lib/Base.dcp b/Source/Lib/Base.dcp index 5b2184fb..e3d66940 100644 Binary files a/Source/Lib/Base.dcp and b/Source/Lib/Base.dcp differ diff --git a/Source/Lib/ControllerBase.dcp b/Source/Lib/ControllerBase.dcp index 215e5dbb..6575c3df 100644 Binary files a/Source/Lib/ControllerBase.dcp and b/Source/Lib/ControllerBase.dcp differ diff --git a/Source/Lib/DataAbstract_D10.dcp b/Source/Lib/DataAbstract_D10.dcp index fbfd9614..74794b99 100644 Binary files a/Source/Lib/DataAbstract_D10.dcp and b/Source/Lib/DataAbstract_D10.dcp differ diff --git a/Source/Lib/GUIBase.dcp b/Source/Lib/GUIBase.dcp index 5fef0a9d..4624bf37 100644 Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index b4579f93..470ae78b 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -7,7 +7,7 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 596 Height = 351 RootLevelOptions.DetailTabsPosition = dtpTop - OnActiveTabChanged = cxGridActiveTabChanged + OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 inherited cxGridView: TcxGridDBTableView @@ -166,47 +166,22 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente inherited frViewFiltroBase1: TfrViewFiltroBase Width = 596 ExplicitWidth = 596 - inherited TBXDock1: TTBXDock - Width = 596 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 596 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 596 ExplicitWidth = 596 - inherited dxLayoutControl1: TdxLayoutControl - Width = 592 - ExplicitWidth = 592 - inherited txtFiltroTodo: TcxTextEdit - Left = 172 - ExplicitLeft = 172 - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - Left = 172 - ExplicitLeft = 172 - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 413 - ExplicitLeft = 413 - ExplicitWidth = 121 - Width = 121 - end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Entre la fecha prevista de envio:' - end - end - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 294 + Width = 294 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 592 - ExplicitWidth = 592 - inherited tbxBotones: TTBXToolbar - Width = 582 - ExplicitWidth = 582 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 596 + ExplicitWidth = 596 + inherited tbxBotones: TTBXToolbar + Width = 586 + ExplicitWidth = 586 end end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm index 763e7ede..26331b76 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm @@ -11,21 +11,19 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 453 - Width = 453 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 237 - Width = 237 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 199 - Width = 199 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm index e61dc378..2b717fb0 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm @@ -8,21 +8,24 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 453 - Width = 453 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 237 - Width = 237 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 240 - Width = 240 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 217 + Width = 217 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + inherited tbxBotones: TTBXToolbar + Width = 586 end end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 1b763d12..cab035cf 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -14,7 +14,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < item - Format = ',0.00 '#8364';-,0.00 '#8364 + Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter Column = cxGridViewIMPORTE_TOTAL @@ -138,37 +138,26 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 596 ExplicitWidth = 596 - inherited TBXDock1: TTBXDock - Width = 596 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 596 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 596 ExplicitWidth = 596 - inherited dxLayoutControl1: TdxLayoutControl - Width = 592 - ExplicitWidth = 592 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 367 - ExplicitLeft = 367 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 592 - ExplicitWidth = 592 - inherited tbxBotones: TTBXToolbar - Width = 582 - ExplicitWidth = 582 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 217 + Width = 217 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 596 end end end diff --git a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm index d3d45e4e..759bdb97 100644 --- a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm @@ -5,7 +5,7 @@ inherited fEditorAlmacenes: TfEditorAlmacenes PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Caption = 'Lista de almacenes' + Caption = 'Lista de almacenes' inherited Image1: TImage Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 @@ -44,7 +44,6 @@ inherited fEditorAlmacenes: TfEditorAlmacenes inherited TBXTMain2: TTBXToolbar Left = 275 DockPos = 275 - Visible = False ExplicitLeft = 275 end end @@ -85,36 +84,32 @@ inherited fEditorAlmacenes: TfEditorAlmacenes inherited frViewFiltroBase1: TfrViewFiltroBase Width = 543 ExplicitWidth = 543 - inherited TBXDock1: TTBXDock - Width = 543 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 543 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 543 ExplicitWidth = 543 - inherited dxLayoutControl1: TdxLayoutControl - Width = 539 - ExplicitWidth = 539 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 335 - ExplicitLeft = 335 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 539 - ExplicitWidth = 539 - inherited tbxBotones: TTBXToolbar - Width = 529 - ExplicitWidth = 529 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 277 + ExplicitLeft = 277 + ExplicitWidth = 200 + Width = 200 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 543 + ExplicitWidth = 543 + inherited tbxBotones: TTBXToolbar + Width = 533 + ExplicitWidth = 533 end end end diff --git a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas index fa896d46..51ef460e 100644 --- a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas +++ b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas @@ -60,7 +60,7 @@ begin raise Exception.Create('No hay ninguna vista asignada'); if not Assigned(Almacenes) then - raise Exception.Create('No hay ningún Almacen asignado'); + raise Exception.Create('No hay ningún Almacen asignado'); Almacenes.DataTable.Active := True; ViewGrid.GotoFirst; @@ -132,10 +132,10 @@ end; procedure TfEditorAlmacenes.EliminarInterno; begin - if (Application.MessageBox('¿Desea borrar este almacén?', 'Atención', MB_YESNO) = IDYES) then + if (Application.MessageBox('¿Desea borrar este almacén?', 'Atención', MB_YESNO) = IDYES) then begin inherited; - //Para que en el caso de no poderse realizar la operación se refresquen + //Para que en el caso de no poderse realizar la operación se refresquen //los datos y no nos permita eliminar un registro a la segunda if not FController.Eliminar(Almacenes) then actRefrescar.Execute; diff --git a/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm index e7dce3e9..f445fa81 100644 --- a/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm @@ -15,7 +15,7 @@ inherited frViewAlmacenes: TfrViewAlmacenes BestFitMaxWidth = 22 MinWidth = 22 Options.HorzSizing = False - Width = 22 + Width = 22 IsCaptionAssigned = True end object cxGridViewNOMBRE: TcxGridDBColumn @@ -59,29 +59,23 @@ inherited frViewAlmacenes: TfrViewAlmacenes end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end end - inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.842406053240000000 diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 6ab6def4..670a812d 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -10,7 +10,7 @@ inherited frViewArticulos: TfrViewArticulos end item Format = '0 Art'#237'culos' - Kind = skCount + Kind = skCount Column = cxGridViewDESCRIPCION end> OptionsBehavior.PullFocusing = True @@ -132,9 +132,26 @@ inherited frViewArticulos: TfrViewArticulos end end end + inherited frViewFiltroBase1: TfrViewFiltroBase + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + end + end + end inherited pnlAgrupaciones: TTBXDockablePanel Visible = True - ExplicitWidth = 554 inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXToolbar1: TTBXToolbar object TBXSeparatorItem1: TTBXSeparatorItem diff --git a/Source/Modulos/Comisiones/Views/uViewComisiones.dfm b/Source/Modulos/Comisiones/Views/uViewComisiones.dfm index e71b3ecc..dd58e353 100644 --- a/Source/Modulos/Comisiones/Views/uViewComisiones.dfm +++ b/Source/Modulos/Comisiones/Views/uViewComisiones.dfm @@ -9,7 +9,7 @@ inherited frViewComisiones: TfrViewComisiones Position = spFooter Column = cxGridViewIMPORTE_TOTAL end> - DataController.Summary.FooterSummaryItems = < + DataController.Summary.FooterSummaryItems = < item Format = '0 almacenes' Kind = skCount @@ -61,21 +61,19 @@ inherited frViewComisiones: TfrViewComisiones end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 12781f06..661fa594 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -4,7 +4,6 @@ inherited fEditorClientes: TfEditorClientes Caption = 'Lista de clientes' ClientHeight = 519 ClientWidth = 786 - ExplicitTop = -92 ExplicitWidth = 794 ExplicitHeight = 553 PixelsPerInch = 96 @@ -15,7 +14,7 @@ inherited fEditorClientes: TfEditorClientes ExplicitWidth = 786 inherited Image1: TImage Left = 759 - Picture.Data = { + Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 520000000467414D410000B18E7CFB51930000033B4944415478DADD957F6856 @@ -103,36 +102,32 @@ inherited fEditorClientes: TfEditorClientes inherited frViewFiltroBase1: TfrViewFiltroBase Width = 786 ExplicitWidth = 786 - inherited TBXDock1: TTBXDock - Width = 786 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 786 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 786 ExplicitWidth = 786 - inherited dxLayoutControl1: TdxLayoutControl - Width = 782 - ExplicitWidth = 782 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 481 - ExplicitLeft = 481 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 782 - ExplicitWidth = 782 - inherited tbxBotones: TTBXToolbar - Width = 772 - ExplicitWidth = 772 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 483 + ExplicitLeft = 483 + ExplicitWidth = 121 + Width = 121 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 786 + ExplicitWidth = 786 + inherited tbxBotones: TTBXToolbar + Width = 776 + ExplicitWidth = 776 end end end @@ -140,12 +135,14 @@ inherited fEditorClientes: TfEditorClientes inherited pnlAgrupaciones: TTBXDockablePanel Top = 372 Visible = True + ExplicitTop = 372 ExplicitWidth = 786 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 + ExplicitWidth = 786 inherited TBXToolbar1: TTBXToolbar Width = 776 - ExplicitTop = -6 + ExplicitWidth = 776 object TBXSeparatorItem17: TTBXSeparatorItem [1] end end diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index 0d0d28cc..e3605dc9 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -1,4 +1,4 @@ -unit uEditorClientes; +unit uEditorClientes; interface diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm index 36decf23..b930ed5b 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm @@ -1,13 +1,11 @@ inherited fEditorProveedores: TfEditorProveedores Caption = 'fEditorProveedores' - ExplicitWidth = 551 - ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Caption = 'Lista de proveedores' inherited Image1: TImage - Picture.Data = { + Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 520000000467414D410000AA11B57D14DC0000034D4944415478DADD957D6855 @@ -82,26 +80,32 @@ inherited fEditorProveedores: TfEditorProveedores inherited frViewFiltroBase1: TfrViewFiltroBase Width = 543 ExplicitWidth = 543 - inherited TBXDock1: TTBXDock - Width = 543 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 543 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 543 ExplicitWidth = 543 - inherited dxLayoutControl1: TdxLayoutControl - Width = 539 - ExplicitWidth = 539 - inherited edtFechaFinFiltro: TcxDateEdit - Left = 334 - ExplicitLeft = 334 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 539 - ExplicitWidth = 539 - inherited tbxBotones: TTBXToolbar - Width = 529 - ExplicitWidth = 529 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 277 + ExplicitLeft = 277 + ExplicitWidth = 201 + Width = 201 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 543 + ExplicitWidth = 543 + inherited tbxBotones: TTBXToolbar + Width = 533 + ExplicitWidth = 533 end end end diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.pas b/Source/Modulos/Contactos/Views/uEditorProveedores.pas index 0dd4edd0..6a0a907b 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.pas @@ -1,4 +1,4 @@ -unit uEditorProveedores; +unit uEditorProveedores; interface diff --git a/Source/Modulos/Contactos/Views/uViewAgentes.dfm b/Source/Modulos/Contactos/Views/uViewAgentes.dfm index c1361797..39e6f2f6 100644 --- a/Source/Modulos/Contactos/Views/uViewAgentes.dfm +++ b/Source/Modulos/Contactos/Views/uViewAgentes.dfm @@ -17,22 +17,19 @@ inherited frViewAgentes: TfrViewAgentes end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 553 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 201 + Width = 201 end end end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 7b99a022..c8f0be38 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -67,22 +67,24 @@ inherited frViewClientes: TfrViewClientes end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 553 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 453 - Width = 453 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 237 - Width = 237 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 199 - Width = 199 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + inherited tbxBotones: TTBXToolbar + Width = 547 end end end diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index 4bbbe1f0..d122e107 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -12,7 +12,7 @@ inherited frViewContactos: TfrViewContactos DataController.KeyFieldNames = 'ID' DataController.Summary.FooterSummaryItems = < item - Format = '0 clientes' + Format = '0 clientes' Kind = skCount FieldName = 'ID' Column = cxGridViewNOMBRE @@ -93,35 +93,28 @@ inherited frViewContactos: TfrViewContactos inherited frViewFiltroBase1: TfrViewFiltroBase Width = 557 ExplicitWidth = 557 - inherited TBXDock1: TTBXDock - Width = 557 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 557 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 557 ExplicitWidth = 557 - inherited dxLayoutControl1: TdxLayoutControl - Width = 553 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 343 - ExplicitLeft = 343 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 553 - ExplicitWidth = 553 - inherited tbxBotones: TTBXToolbar - Width = 543 - ExplicitWidth = 543 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 201 + Width = 201 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 557 + inherited tbxBotones: TTBXToolbar + Width = 547 end end end @@ -135,6 +128,7 @@ inherited frViewContactos: TfrViewContactos ExplicitWidth = 557 inherited TBXToolbar1: TTBXToolbar Width = 547 + ExplicitWidth = 547 end end end diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm index 478f702c..24debbfa 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm @@ -6,6 +6,8 @@ inherited frViewProveedores: TfrViewProveedores inherited cxGrid: TcxGrid Width = 483 Height = 307 + ExplicitWidth = 483 + ExplicitHeight = 307 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -13,7 +15,7 @@ inherited frViewProveedores: TfrViewProveedores Kind = skCount FieldName = 'ID' Column = cxGridViewNIF_CIF - end> + end> inherited cxGridViewICONO: TcxGridDBColumn BestFitMaxWidth = 22 MinWidth = 22 @@ -42,43 +44,43 @@ inherited frViewProveedores: TfrViewProveedores end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 483 - inherited TBXDock1: TTBXDock - Width = 483 - inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 483 + inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 483 + inherited dxLayoutControl1: TdxLayoutControl + Width = 483 ExplicitWidth = 483 - inherited dxLayoutControl1: TdxLayoutControl - Width = 479 - ExplicitWidth = 553 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 453 - Width = 453 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 237 - Width = 237 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 298 - ExplicitLeft = 298 - ExplicitWidth = 199 - Width = 199 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 479 - inherited tbxBotones: TTBXToolbar - Width = 469 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 225 + Width = 225 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 483 + inherited tbxBotones: TTBXToolbar + Width = 473 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 409 + ExplicitTop = 409 + ExplicitWidth = 483 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 483 + ExplicitWidth = 483 inherited TBXToolbar1: TTBXToolbar Width = 473 + ExplicitWidth = 473 end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index dea087c1..edaff13d 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -9,7 +9,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 531 - ExplicitHeight = 269 + ExplicitHeight = 269 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -154,35 +154,21 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente inherited frViewFiltroBase1: TfrViewFiltroBase Width = 531 ExplicitWidth = 531 - inherited TBXDock1: TTBXDock - Width = 531 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 531 ExplicitWidth = 531 - inherited dxLayoutControl1: TdxLayoutControl - Width = 527 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 328 - ExplicitLeft = 328 - ExplicitWidth = 121 - Width = 121 - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 244 + Width = 244 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 527 - ExplicitWidth = 527 - inherited tbxBotones: TTBXToolbar - Width = 517 - ExplicitWidth = 517 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + ExplicitWidth = 531 + inherited tbxBotones: TTBXToolbar + Width = 521 end end end diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm index e68b8581..9994e5a6 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm @@ -10,7 +10,7 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor Width = 640 Caption = 'Lista de facturas de proveedor' ExplicitWidth = 640 - inherited Image1: TImage + inherited Image1: TImage Left = 613 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 @@ -114,36 +114,32 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 640 ExplicitWidth = 640 - inherited TBXDock1: TTBXDock - Width = 640 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 640 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 640 ExplicitWidth = 640 - inherited dxLayoutControl1: TdxLayoutControl - Width = 636 - ExplicitWidth = 636 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 453 - Width = 453 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 237 - Width = 237 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 393 - ExplicitLeft = 393 - ExplicitWidth = 199 - Width = 199 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 636 - ExplicitWidth = 636 - inherited tbxBotones: TTBXToolbar - Width = 626 - ExplicitWidth = 626 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 295 + ExplicitLeft = 295 + ExplicitWidth = 244 + Width = 244 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 640 + ExplicitWidth = 640 + inherited tbxBotones: TTBXToolbar + Width = 630 + ExplicitWidth = 630 end end end diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index 8e9da9c3..0ade4ad2 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -10,7 +10,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 531 ExplicitHeight = 304 - inherited cxGridView: TcxGridDBTableView + inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -159,25 +159,20 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 531 ExplicitWidth = 531 - inherited TBXDock1: TTBXDock - Width = 531 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 531 ExplicitWidth = 531 - inherited dxLayoutControl1: TdxLayoutControl - Width = 527 - inherited edtFechaFinFiltro: TcxDateEdit - Left = 328 - ExplicitLeft = 328 - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 244 + Width = 244 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 527 - ExplicitWidth = 527 - inherited tbxBotones: TTBXToolbar - Width = 517 - ExplicitWidth = 517 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + inherited tbxBotones: TTBXToolbar + Width = 521 end end end diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm index 9dc7359d..a02ed227 100644 --- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm @@ -12,7 +12,7 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos Width = 669 Caption = 'Hist'#243'rico de movimientos de art'#237'culos en almac'#233'n' ExplicitWidth = 669 - inherited Image1: TImage + inherited Image1: TImage Left = 642 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 @@ -150,7 +150,6 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos end inherited TBXTMain2: TTBXToolbar Left = 334 - Visible = False ExplicitLeft = 334 end end @@ -202,36 +201,32 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos inherited frViewFiltroBase1: TfrViewFiltroBase Width = 669 ExplicitWidth = 669 - inherited TBXDock1: TTBXDock - Width = 669 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 669 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 669 ExplicitWidth = 669 - inherited dxLayoutControl1: TdxLayoutControl - Width = 665 - ExplicitWidth = 665 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 410 - ExplicitLeft = 410 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 665 - ExplicitWidth = 665 - inherited tbxBotones: TTBXToolbar - Width = 655 - ExplicitWidth = 655 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 413 + ExplicitLeft = 413 + ExplicitWidth = 121 + Width = 121 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 669 + ExplicitWidth = 669 + inherited tbxBotones: TTBXToolbar + Width = 659 + ExplicitWidth = 659 end end end diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas index 2d969f1d..c6124d77 100644 --- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas +++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas @@ -1,4 +1,4 @@ -unit uEditorHistoricoMovimientos; +unit uEditorHistoricoMovimientos; interface diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm index a389c762..3cead18f 100644 --- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm @@ -6,7 +6,7 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos DataController.KeyFieldNames = 'RecID' DataController.Summary.DefaultGroupSummaryItems = < item - Format = ',0.00 '#8364';-,0.00 '#8364 + Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter end> @@ -89,29 +89,23 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end end - inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.741107951390000000 diff --git a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm index f71b5deb..61febb48 100644 --- a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.dfm @@ -169,19 +169,6 @@ object dmInfMargenArticulo: TdmInfMargenArticulo object tbl_InfMargenArticulo: TDACDSDataTable RemoteUpdatesOptions = [] Fields = < - item - Name = 'ID_FACTURA' - DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Id factura' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_ID_FACTURA' - InPrimaryKey = True - Calculated = False - Lookup = False - LookupCache = False - end item Name = 'ID_EMPRESA' DataType = datInteger @@ -189,60 +176,18 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Id empresa' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_ID_EMPRESA' + DictionaryEntry = 'InfVentasArticulo_ID_EMPRESA' InPrimaryKey = False Calculated = False Lookup = False LookupCache = False end item - Name = 'REFERENCIA_FACTURA' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Ref. factura' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_REFERENCIA_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'FECHA_FACTURA' - DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Fecha factura' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_FECHA_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_TOTAL_FACTURA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Importe factura' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_TOTAL_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'ID_COMISION_FACTURA' + Name = 'ID_CLIENTE' DataType = datInteger BlobType = dabtUnknown DisplayWidth = 0 - DisplayLabel = 'Id comision factura' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_ID_COMISION_FACTURA' InPrimaryKey = False Calculated = False Lookup = False @@ -255,7 +200,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Id art'#237'culo' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_ID_ARTICULO' + DictionaryEntry = 'InfVentasArticulo_ID_ARTICULO' InPrimaryKey = True Calculated = False Lookup = False @@ -269,7 +214,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Familia' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_FAMILIA' + DictionaryEntry = 'InfVentasArticulo_FAMILIA' InPrimaryKey = False Calculated = False Lookup = False @@ -283,7 +228,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Referencia' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_REFERENCIA' + DictionaryEntry = 'InfVentasArticulo_REFERENCIA' InPrimaryKey = False Calculated = False Lookup = False @@ -297,7 +242,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Ref. proveedor' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_REFERENCIA_PROV' + DictionaryEntry = 'InfVentasArticulo_REFERENCIA_PROV' InPrimaryKey = False Calculated = False Lookup = False @@ -311,7 +256,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Descripci'#243'n' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_DESCRIPCION' + DictionaryEntry = 'InfVentasArticulo_DESCRIPCION' InPrimaryKey = False Calculated = False Lookup = False @@ -324,7 +269,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Comisionable' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_COMISIONABLE' + DictionaryEntry = 'InfVentasArticulo_COMISIONABLE' InPrimaryKey = False Calculated = False Lookup = False @@ -337,362 +282,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Inventariable' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_INVENTARIABLE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio coste' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PRECIO_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'DESCUENTO_PROVEEDOR_COSTE' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Descuento prov.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_DESCUENTO_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio neto' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PRECIO_NETO' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio porte' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PRECIO_PORTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio coste '#250'ltima compra' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_UNIDAD_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio neto ultima compra' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio porte '#250'ltima compra' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_PORTE_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio coste promedio ' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_UNIDAD_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio neto promedio' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Precio porte promedio' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_PORTE_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'CANTIDAD' - DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Cantidad' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_CANTIDAD' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Importe unidad' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_UNIDAD' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'DESCUENTO_CLIENTE_VENTA' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Descuento cli.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_DESCUENTO_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Importe neto venta' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_VENTA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_VENTA' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_PORTE_VENTA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_TOTAL_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Importe total' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_TOTAL' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Margen coste' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_COSTE' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = '% margen coste' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_ULT_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Margen '#250'ltima compra' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_ULT_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_ULT_COMPRA' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = '% '#250'ltima compra' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_ULT_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_PROM_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Margen promedio' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_PROM_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_PROM_COMPRA' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = '% margen promedio' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_PROM_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'NIF_CIF_PROVEEDOR' - DataType = datString - Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'NIF/CIF prov.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NIF_CIF_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'NOMBRE_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Proveedor' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NOMBRE_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'CALLE_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Calle prov.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_CALLE_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Poblaci'#243'n prov.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_POBLACION_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Provincia prov.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_PROVINCIA_PROVEEDOR' + DictionaryEntry = 'InfVentasArticulo_INVENTARIABLE' InPrimaryKey = False Calculated = False Lookup = False @@ -706,7 +296,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'NIF/CIF cli.' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NIF_CIF_CLIENTE' + DictionaryEntry = 'InfVentasArticulo_NIF_CIF_CLIENTE' InPrimaryKey = False Calculated = False Lookup = False @@ -720,7 +310,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Cliente' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NOMBRE_CLIENTE' + DictionaryEntry = 'InfVentasArticulo_NOMBRE_CLIENTE' InPrimaryKey = False Calculated = False Lookup = False @@ -734,49 +324,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Nombre comercial' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NOMBRE_COMERCIAL_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'CALLE_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Calle cli.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_CALLE_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Poblaci'#243'n cli.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_POBLACION_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Provincia cli.' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_PROVINCIA_CLIENTE' + DictionaryEntry = 'InfVentasArticulo_NOMBRE_COMERCIAL_CLIENTE' InPrimaryKey = False Calculated = False Lookup = False @@ -790,7 +338,7 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'NIF/CIF agente' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NIF_CIF_AGENTE' + DictionaryEntry = 'InfVentasArticulo_NIF_CIF_AGENTE' InPrimaryKey = False Calculated = False Lookup = False @@ -804,93 +352,310 @@ object dmInfMargenArticulo: TdmInfMargenArticulo DisplayWidth = 0 DisplayLabel = 'Agente' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_NOMBRE_AGENTE' + DictionaryEntry = 'InfVentasArticulo_NOMBRE_AGENTE' InPrimaryKey = False Calculated = False Lookup = False LookupCache = False end item - Name = 'CALLE_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Calle agente' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_CALLE_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Poblaci'#243'n agente' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_POBLACION_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - DisplayLabel = 'Provincia agente' - Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_PROVINCIA_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'COMISION_AGENTE' + Name = 'IMP_UNIDAD_ULT_VENT' DataType = datFloat BlobType = dabtUnknown DisplayWidth = 0 - DisplayLabel = 'Comisi'#243'n' Alignment = taLeftJustify - DictionaryEntry = 'InfMargenArticulo_COMISION_AGENTE' InPrimaryKey = False Calculated = False Lookup = False LookupCache = False end item - Name = 'IMPORTE_COMISION_AGENTE' - DataType = datCurrency + Name = 'IMP_NETO_ULT_VENT' + DataType = datFloat BlobType = dabtUnknown DisplayWidth = 0 - DisplayLabel = 'Importe comisi'#243'n' - Alignment = taRightJustify - DictionaryEntry = 'InfMargenArticulo_IMPORTE_COMISION_AGENTE' + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_ULT_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify InPrimaryKey = False Calculated = False Lookup = False LookupCache = False end> - Params = < - item - Name = 'FECHAINI' - BlobType = dabtUnknown - Value = '' - ParamType = daptInput - end - item - Name = 'FECHAFIN' - BlobType = dabtUnknown - Value = '' - ParamType = daptInput - end> + Params = <> MasterMappingMode = mmDataRequest StreamingOptions = [soDisableEventsWhileStreaming] SchemaCall.MethodName = 'GetDatasetSchema' diff --git a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas index cd316a19..c64e2e91 100644 --- a/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas +++ b/Source/Modulos/Informe margen por articulo/Data/uDataModuleInfMargenArticulo.pas @@ -63,7 +63,7 @@ begin AInfMargenArticulo.BusinessRulesID := BIZ_InfMargenArticulo; //Importante inicializar columnas visibles - AInfMargenArticulo.FieldByName(fld_InfMargenArticuloID_FACTURA).Visible := False; +// AInfMargenArticulo.FieldByName(fld_InfMargenArticuloID_FACTURA).Visible := False; AInfMargenArticulo.FieldByName(fld_InfMargenArticuloID_ARTICULO).Visible := False; AInfMargenArticulo.LoadSchema; (AInfMargenArticulo as IBizInfMargenArticulo).VisibleColumns := GetNameColumns; diff --git a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas index ba6c1cb8..38eb7468 100644 --- a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas +++ b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas @@ -9,18 +9,14 @@ 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_InfMargenArticulo = '{2DD59805-C1A8-4B91-B689-421A44964DA9}'; + RID_InfMargenArticulo = '{C7326EC8-8B75-4411-A72B-D4DC22188E12}'; { Data table names } nme_InfMargenArticulo = 'InfMargenArticulo'; { InfMargenArticulo fields } - fld_InfMargenArticuloID_FACTURA = 'ID_FACTURA'; fld_InfMargenArticuloID_EMPRESA = 'ID_EMPRESA'; - fld_InfMargenArticuloREFERENCIA_FACTURA = 'REFERENCIA_FACTURA'; - fld_InfMargenArticuloFECHA_FACTURA = 'FECHA_FACTURA'; - fld_InfMargenArticuloIMPORTE_TOTAL_FACTURA = 'IMPORTE_TOTAL_FACTURA'; - fld_InfMargenArticuloID_COMISION_FACTURA = 'ID_COMISION_FACTURA'; + fld_InfMargenArticuloID_CLIENTE = 'ID_CLIENTE'; fld_InfMargenArticuloID_ARTICULO = 'ID_ARTICULO'; fld_InfMargenArticuloFAMILIA = 'FAMILIA'; fld_InfMargenArticuloREFERENCIA = 'REFERENCIA'; @@ -28,119 +24,91 @@ const fld_InfMargenArticuloDESCRIPCION = 'DESCRIPCION'; fld_InfMargenArticuloCOMISIONABLE = 'COMISIONABLE'; fld_InfMargenArticuloINVENTARIABLE = 'INVENTARIABLE'; - fld_InfMargenArticuloIMPORTE_UNIDAD_COSTE = 'IMPORTE_UNIDAD_COSTE'; - fld_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE = 'DESCUENTO_PROVEEDOR_COSTE'; - fld_InfMargenArticuloIMPORTE_NETO_COSTE = 'IMPORTE_NETO_COSTE'; - fld_InfMargenArticuloIMPORTE_PORTE_COSTE = 'IMPORTE_PORTE_COSTE'; - fld_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA = 'IMPORTE_UNIDAD_ULTIMA_COMPRA'; - fld_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA = 'IMPORTE_NETO_ULTIMA_COMPRA'; - fld_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA = 'IMPORTE_PORTE_ULTIMA_COMPRA'; - fld_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA'; - fld_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA = 'IMPORTE_NETO_PROMEDIO_COMPRA'; - fld_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA = 'IMPORTE_PORTE_PROMEDIO_COMPRA'; - fld_InfMargenArticuloCANTIDAD = 'CANTIDAD'; - fld_InfMargenArticuloIMPORTE_UNIDAD_VENTA = 'IMPORTE_UNIDAD_VENTA'; - fld_InfMargenArticuloDESCUENTO_CLIENTE_VENTA = 'DESCUENTO_CLIENTE_VENTA'; - fld_InfMargenArticuloIMPORTE_NETO_VENTA = 'IMPORTE_NETO_VENTA'; - fld_InfMargenArticuloIMPORTE_PORTE_VENTA = 'IMPORTE_PORTE_VENTA'; - fld_InfMargenArticuloIMPORTE_TOTAL_VENTA = 'IMPORTE_TOTAL_VENTA'; - fld_InfMargenArticuloIMPORTE_MARGEN_COSTE = 'IMPORTE_MARGEN_COSTE'; - fld_InfMargenArticuloPORCENTAJE_MARGEN_COSTE = 'PORCENTAJE_MARGEN_COSTE'; - fld_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA = 'IMPORTE_MARGEN_ULT_COMPRA'; - fld_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA = 'PORCENTAJE_MARGEN_ULT_COMPRA'; - fld_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA = 'IMPORTE_MARGEN_PROM_COMPRA'; - fld_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA = 'PORCENTAJE_MARGEN_PROM_COMPRA'; - fld_InfMargenArticuloNIF_CIF_PROVEEDOR = 'NIF_CIF_PROVEEDOR'; - fld_InfMargenArticuloNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR'; - fld_InfMargenArticuloCALLE_PROVEEDOR = 'CALLE_PROVEEDOR'; - fld_InfMargenArticuloPOBLACION_PROVEEDOR = 'POBLACION_PROVEEDOR'; - fld_InfMargenArticuloPROVINCIA_PROVEEDOR = 'PROVINCIA_PROVEEDOR'; fld_InfMargenArticuloNIF_CIF_CLIENTE = 'NIF_CIF_CLIENTE'; fld_InfMargenArticuloNOMBRE_CLIENTE = 'NOMBRE_CLIENTE'; fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE = 'NOMBRE_COMERCIAL_CLIENTE'; - fld_InfMargenArticuloCALLE_CLIENTE = 'CALLE_CLIENTE'; - fld_InfMargenArticuloPOBLACION_CLIENTE = 'POBLACION_CLIENTE'; - fld_InfMargenArticuloPROVINCIA_CLIENTE = 'PROVINCIA_CLIENTE'; fld_InfMargenArticuloNIF_CIF_AGENTE = 'NIF_CIF_AGENTE'; fld_InfMargenArticuloNOMBRE_AGENTE = 'NOMBRE_AGENTE'; - fld_InfMargenArticuloCALLE_AGENTE = 'CALLE_AGENTE'; - fld_InfMargenArticuloPOBLACION_AGENTE = 'POBLACION_AGENTE'; - fld_InfMargenArticuloPROVINCIA_AGENTE = 'PROVINCIA_AGENTE'; - fld_InfMargenArticuloCOMISION_AGENTE = 'COMISION_AGENTE'; - fld_InfMargenArticuloIMPORTE_COMISION_AGENTE = 'IMPORTE_COMISION_AGENTE'; + fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT = 'IMP_UNIDAD_ULT_VENT'; + fld_InfMargenArticuloIMP_NETO_ULT_VENT = 'IMP_NETO_ULT_VENT'; + fld_InfMargenArticuloIMP_PORTE_ULT_VENT = 'IMP_PORTE_ULT_VENT'; + fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT = 'IMP_UNIDAD_PRO_VENT'; + fld_InfMargenArticuloIMP_NETO_PRO_VENT = 'IMP_NETO_PRO_VENT'; + fld_InfMargenArticuloIMP_PORTE_PRO_VENT = 'IMP_PORTE_PRO_VENT'; + fld_InfMargenArticuloIMP_UNIDAD_COMPRA = 'IMP_UNIDAD_COMPRA'; + fld_InfMargenArticuloIMP_NETO_COMPRA = 'IMP_NETO_COMPRA'; + fld_InfMargenArticuloIMP_PORTE_COMPRA = 'IMP_PORTE_COMPRA'; + fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP = 'IMP_UNIDAD_ULT_COMP'; + fld_InfMargenArticuloIMP_NETO_ULT_COMP = 'IMP_NETO_ULT_COMP'; + fld_InfMargenArticuloIMP_PORTE_ULT_COMP = 'IMP_PORTE_ULT_COMP'; + fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP = 'IMP_UNIDAD_PRO_COMP'; + fld_InfMargenArticuloIMP_NETO_PRO_COMP = 'IMP_NETO_PRO_COMP'; + fld_InfMargenArticuloIMP_PORTE_PRO_COMP = 'IMP_PORTE_PRO_COMP'; + fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA = 'IMP_MARGEN_ULT_VENT_COMPRA'; + fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA = 'POR_MARGEN_ULT_VENT_COMPRA'; + fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 'IMP_MARGEN_ULT_VENT_ULT_COMP'; + fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 'POR_MARGEN_ULT_VENT_ULT_COMP'; + fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 'IMP_MARGEN_ULT_VENT_PRO_COMP'; + fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 'POR_MARGEN_ULT_VENT_PRO_COMP'; + fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA = 'IMP_MARGEN_PRO_VENT_COMPRA'; + fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA = 'POR_MARGEN_PRO_VENT_COMPRA'; + fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 'IMP_MARGEN_PRO_VENT_ULT_COMP'; + fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 'POR_MARGEN_PRO_VENT_ULT_COMP'; + fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 'IMP_MARGEN_PRO_VENT_PRO_COMP'; + fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 'POR_MARGEN_PRO_VENT_PRO_COMP'; { InfMargenArticulo field indexes } - idx_InfMargenArticuloID_FACTURA = 0; - idx_InfMargenArticuloID_EMPRESA = 1; - idx_InfMargenArticuloREFERENCIA_FACTURA = 2; - idx_InfMargenArticuloFECHA_FACTURA = 3; - idx_InfMargenArticuloIMPORTE_TOTAL_FACTURA = 4; - idx_InfMargenArticuloID_COMISION_FACTURA = 5; - idx_InfMargenArticuloID_ARTICULO = 6; - idx_InfMargenArticuloFAMILIA = 7; - idx_InfMargenArticuloREFERENCIA = 8; - idx_InfMargenArticuloREFERENCIA_PROV = 9; - idx_InfMargenArticuloDESCRIPCION = 10; - idx_InfMargenArticuloCOMISIONABLE = 11; - idx_InfMargenArticuloINVENTARIABLE = 12; - idx_InfMargenArticuloIMPORTE_UNIDAD_COSTE = 13; - idx_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE = 14; - idx_InfMargenArticuloIMPORTE_NETO_COSTE = 15; - idx_InfMargenArticuloIMPORTE_PORTE_COSTE = 16; - idx_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA = 17; - idx_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA = 18; - idx_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA = 19; - idx_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA = 20; - idx_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA = 21; - idx_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA = 22; - idx_InfMargenArticuloCANTIDAD = 23; - idx_InfMargenArticuloIMPORTE_UNIDAD_VENTA = 24; - idx_InfMargenArticuloDESCUENTO_CLIENTE_VENTA = 25; - idx_InfMargenArticuloIMPORTE_NETO_VENTA = 26; - idx_InfMargenArticuloIMPORTE_PORTE_VENTA = 27; - idx_InfMargenArticuloIMPORTE_TOTAL_VENTA = 28; - idx_InfMargenArticuloIMPORTE_MARGEN_COSTE = 29; - idx_InfMargenArticuloPORCENTAJE_MARGEN_COSTE = 30; - idx_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA = 31; - idx_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA = 32; - idx_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA = 33; - idx_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA = 34; - idx_InfMargenArticuloNIF_CIF_PROVEEDOR = 35; - idx_InfMargenArticuloNOMBRE_PROVEEDOR = 36; - idx_InfMargenArticuloCALLE_PROVEEDOR = 37; - idx_InfMargenArticuloPOBLACION_PROVEEDOR = 38; - idx_InfMargenArticuloPROVINCIA_PROVEEDOR = 39; - idx_InfMargenArticuloNIF_CIF_CLIENTE = 40; - idx_InfMargenArticuloNOMBRE_CLIENTE = 41; - idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE = 42; - idx_InfMargenArticuloCALLE_CLIENTE = 43; - idx_InfMargenArticuloPOBLACION_CLIENTE = 44; - idx_InfMargenArticuloPROVINCIA_CLIENTE = 45; - idx_InfMargenArticuloNIF_CIF_AGENTE = 46; - idx_InfMargenArticuloNOMBRE_AGENTE = 47; - idx_InfMargenArticuloCALLE_AGENTE = 48; - idx_InfMargenArticuloPOBLACION_AGENTE = 49; - idx_InfMargenArticuloPROVINCIA_AGENTE = 50; - idx_InfMargenArticuloCOMISION_AGENTE = 51; - idx_InfMargenArticuloIMPORTE_COMISION_AGENTE = 52; + idx_InfMargenArticuloID_EMPRESA = 0; + idx_InfMargenArticuloID_CLIENTE = 1; + idx_InfMargenArticuloID_ARTICULO = 2; + idx_InfMargenArticuloFAMILIA = 3; + idx_InfMargenArticuloREFERENCIA = 4; + idx_InfMargenArticuloREFERENCIA_PROV = 5; + idx_InfMargenArticuloDESCRIPCION = 6; + idx_InfMargenArticuloCOMISIONABLE = 7; + idx_InfMargenArticuloINVENTARIABLE = 8; + idx_InfMargenArticuloNIF_CIF_CLIENTE = 9; + idx_InfMargenArticuloNOMBRE_CLIENTE = 10; + idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE = 11; + idx_InfMargenArticuloNIF_CIF_AGENTE = 12; + idx_InfMargenArticuloNOMBRE_AGENTE = 13; + idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT = 14; + idx_InfMargenArticuloIMP_NETO_ULT_VENT = 15; + idx_InfMargenArticuloIMP_PORTE_ULT_VENT = 16; + idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT = 17; + idx_InfMargenArticuloIMP_NETO_PRO_VENT = 18; + idx_InfMargenArticuloIMP_PORTE_PRO_VENT = 19; + idx_InfMargenArticuloIMP_UNIDAD_COMPRA = 20; + idx_InfMargenArticuloIMP_NETO_COMPRA = 21; + idx_InfMargenArticuloIMP_PORTE_COMPRA = 22; + idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP = 23; + idx_InfMargenArticuloIMP_NETO_ULT_COMP = 24; + idx_InfMargenArticuloIMP_PORTE_ULT_COMP = 25; + idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP = 26; + idx_InfMargenArticuloIMP_NETO_PRO_COMP = 27; + idx_InfMargenArticuloIMP_PORTE_PRO_COMP = 28; + idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA = 29; + idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA = 30; + idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP = 31; + idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP = 32; + idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP = 33; + idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP = 34; + idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA = 35; + idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA = 36; + idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP = 37; + idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP = 38; + idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP = 39; + idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP = 40; type { IInfMargenArticulo } IInfMargenArticulo = interface(IDAStronglyTypedDataTable) - ['{5C058494-52F5-48F3-A25C-1A5F74D7C2E3}'] + ['{3F971B3F-A487-494A-9878-1F8C907698A0}'] { Property getters and setters } - function GetID_FACTURAValue: Integer; - procedure SetID_FACTURAValue(const aValue: Integer); function GetID_EMPRESAValue: Integer; procedure SetID_EMPRESAValue(const aValue: Integer); - function GetREFERENCIA_FACTURAValue: String; - procedure SetREFERENCIA_FACTURAValue(const aValue: String); - function GetFECHA_FACTURAValue: DateTime; - procedure SetFECHA_FACTURAValue(const aValue: DateTime); - function GetIMPORTE_TOTAL_FACTURAValue: Currency; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); - function GetID_COMISION_FACTURAValue: Integer; - procedure SetID_COMISION_FACTURAValue(const aValue: Integer); + function GetID_CLIENTEValue: Integer; + procedure SetID_CLIENTEValue(const aValue: Integer); function GetID_ARTICULOValue: Integer; procedure SetID_ARTICULOValue(const aValue: Integer); function GetFAMILIAValue: String; @@ -155,95 +123,75 @@ type procedure SetCOMISIONABLEValue(const aValue: Integer); function GetINVENTARIABLEValue: Integer; procedure SetINVENTARIABLEValue(const aValue: Integer); - function GetIMPORTE_UNIDAD_COSTEValue: Currency; - procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); - function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; - procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); - function GetIMPORTE_NETO_COSTEValue: Currency; - procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); - function GetIMPORTE_PORTE_COSTEValue: Currency; - procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); - function GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; - procedure SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue(const aValue: Currency); - function GetIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; - procedure SetIMPORTE_NETO_ULTIMA_COMPRAValue(const aValue: Currency); - function GetIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; - procedure SetIMPORTE_PORTE_ULTIMA_COMPRAValue(const aValue: Currency); - function GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; - procedure SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue(const aValue: Currency); - function GetIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; - procedure SetIMPORTE_NETO_PROMEDIO_COMPRAValue(const aValue: Currency); - function GetIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; - procedure SetIMPORTE_PORTE_PROMEDIO_COMPRAValue(const aValue: Currency); - function GetCANTIDADValue: Integer; - procedure SetCANTIDADValue(const aValue: Integer); - function GetIMPORTE_UNIDAD_VENTAValue: Currency; - procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); - function GetDESCUENTO_CLIENTE_VENTAValue: Float; - procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); - function GetIMPORTE_NETO_VENTAValue: Currency; - procedure SetIMPORTE_NETO_VENTAValue(const aValue: Currency); - function GetIMPORTE_PORTE_VENTAValue: Float; - procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); - function GetIMPORTE_TOTAL_VENTAValue: Currency; - procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); - function GetIMPORTE_MARGEN_COSTEValue: Currency; - procedure SetIMPORTE_MARGEN_COSTEValue(const aValue: Currency); - function GetPORCENTAJE_MARGEN_COSTEValue: Float; - procedure SetPORCENTAJE_MARGEN_COSTEValue(const aValue: Float); - function GetIMPORTE_MARGEN_ULT_COMPRAValue: Currency; - procedure SetIMPORTE_MARGEN_ULT_COMPRAValue(const aValue: Currency); - function GetPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; - procedure SetPORCENTAJE_MARGEN_ULT_COMPRAValue(const aValue: Float); - function GetIMPORTE_MARGEN_PROM_COMPRAValue: Currency; - procedure SetIMPORTE_MARGEN_PROM_COMPRAValue(const aValue: Currency); - function GetPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; - procedure SetPORCENTAJE_MARGEN_PROM_COMPRAValue(const aValue: Float); - function GetNIF_CIF_PROVEEDORValue: String; - procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); - function GetNOMBRE_PROVEEDORValue: String; - procedure SetNOMBRE_PROVEEDORValue(const aValue: String); - function GetCALLE_PROVEEDORValue: String; - procedure SetCALLE_PROVEEDORValue(const aValue: String); - function GetPOBLACION_PROVEEDORValue: String; - procedure SetPOBLACION_PROVEEDORValue(const aValue: String); - function GetPROVINCIA_PROVEEDORValue: String; - procedure SetPROVINCIA_PROVEEDORValue(const aValue: String); function GetNIF_CIF_CLIENTEValue: String; procedure SetNIF_CIF_CLIENTEValue(const aValue: String); function GetNOMBRE_CLIENTEValue: String; procedure SetNOMBRE_CLIENTEValue(const aValue: String); function GetNOMBRE_COMERCIAL_CLIENTEValue: String; procedure SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String); - function GetCALLE_CLIENTEValue: String; - procedure SetCALLE_CLIENTEValue(const aValue: String); - function GetPOBLACION_CLIENTEValue: String; - procedure SetPOBLACION_CLIENTEValue(const aValue: String); - function GetPROVINCIA_CLIENTEValue: String; - procedure SetPROVINCIA_CLIENTEValue(const aValue: String); function GetNIF_CIF_AGENTEValue: String; procedure SetNIF_CIF_AGENTEValue(const aValue: String); function GetNOMBRE_AGENTEValue: String; procedure SetNOMBRE_AGENTEValue(const aValue: String); - function GetCALLE_AGENTEValue: String; - procedure SetCALLE_AGENTEValue(const aValue: String); - function GetPOBLACION_AGENTEValue: String; - procedure SetPOBLACION_AGENTEValue(const aValue: String); - function GetPROVINCIA_AGENTEValue: String; - procedure SetPROVINCIA_AGENTEValue(const aValue: String); - function GetCOMISION_AGENTEValue: Float; - procedure SetCOMISION_AGENTEValue(const aValue: Float); - function GetIMPORTE_COMISION_AGENTEValue: Currency; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); + function GetIMP_UNIDAD_ULT_VENTValue: Float; + procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); + function GetIMP_NETO_ULT_VENTValue: Float; + procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float); + function GetIMP_PORTE_ULT_VENTValue: Float; + procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float); + function GetIMP_UNIDAD_PRO_VENTValue: Float; + procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); + function GetIMP_NETO_PRO_VENTValue: Float; + procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float); + function GetIMP_PORTE_PRO_VENTValue: Float; + procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float); + function GetIMP_UNIDAD_COMPRAValue: Float; + procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float); + function GetIMP_NETO_COMPRAValue: Float; + procedure SetIMP_NETO_COMPRAValue(const aValue: Float); + function GetIMP_PORTE_COMPRAValue: Float; + procedure SetIMP_PORTE_COMPRAValue(const aValue: Float); + function GetIMP_UNIDAD_ULT_COMPValue: Float; + procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); + function GetIMP_NETO_ULT_COMPValue: Float; + procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float); + function GetIMP_PORTE_ULT_COMPValue: Float; + procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float); + function GetIMP_UNIDAD_PRO_COMPValue: Float; + procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); + function GetIMP_NETO_PRO_COMPValue: Float; + procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float); + function GetIMP_PORTE_PRO_COMPValue: Float; + procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float); + function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; + procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); + function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; + procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); + function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; + procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); + function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; + procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); + function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; + procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); + function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; + procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); + function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; + procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); + function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; + procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); + function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; + procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); + function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; + procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); + function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; + procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); + function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; + procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); { Properties } - property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; - property REFERENCIA_FACTURA: String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; - property FECHA_FACTURA: DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA: Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; - property ID_COMISION_FACTURA: Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; + property ID_CLIENTE: Integer read GetID_CLIENTEValue write SetID_CLIENTEValue; property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue; property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue; @@ -251,46 +199,38 @@ type property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue; property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; - property IMPORTE_UNIDAD_COSTE: Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; - property DESCUENTO_PROVEEDOR_COSTE: Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; - property IMPORTE_NETO_COSTE: Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; - property IMPORTE_PORTE_COSTE: Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; - property IMPORTE_UNIDAD_ULTIMA_COMPRA: Currency read GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue write SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue; - property IMPORTE_NETO_ULTIMA_COMPRA: Currency read GetIMPORTE_NETO_ULTIMA_COMPRAValue write SetIMPORTE_NETO_ULTIMA_COMPRAValue; - property IMPORTE_PORTE_ULTIMA_COMPRA: Currency read GetIMPORTE_PORTE_ULTIMA_COMPRAValue write SetIMPORTE_PORTE_ULTIMA_COMPRAValue; - property IMPORTE_UNIDAD_PROMEDIO_COMPRA: Currency read GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue write SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue; - property IMPORTE_NETO_PROMEDIO_COMPRA: Currency read GetIMPORTE_NETO_PROMEDIO_COMPRAValue write SetIMPORTE_NETO_PROMEDIO_COMPRAValue; - property IMPORTE_PORTE_PROMEDIO_COMPRA: Currency read GetIMPORTE_PORTE_PROMEDIO_COMPRAValue write SetIMPORTE_PORTE_PROMEDIO_COMPRAValue; - property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; - property IMPORTE_UNIDAD_VENTA: Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; - property DESCUENTO_CLIENTE_VENTA: Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; - property IMPORTE_NETO_VENTA: Currency read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; - property IMPORTE_PORTE_VENTA: Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; - property IMPORTE_TOTAL_VENTA: Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; - property IMPORTE_MARGEN_COSTE: Currency read GetIMPORTE_MARGEN_COSTEValue write SetIMPORTE_MARGEN_COSTEValue; - property PORCENTAJE_MARGEN_COSTE: Float read GetPORCENTAJE_MARGEN_COSTEValue write SetPORCENTAJE_MARGEN_COSTEValue; - property IMPORTE_MARGEN_ULT_COMPRA: Currency read GetIMPORTE_MARGEN_ULT_COMPRAValue write SetIMPORTE_MARGEN_ULT_COMPRAValue; - property PORCENTAJE_MARGEN_ULT_COMPRA: Float read GetPORCENTAJE_MARGEN_ULT_COMPRAValue write SetPORCENTAJE_MARGEN_ULT_COMPRAValue; - property IMPORTE_MARGEN_PROM_COMPRA: Currency read GetIMPORTE_MARGEN_PROM_COMPRAValue write SetIMPORTE_MARGEN_PROM_COMPRAValue; - property PORCENTAJE_MARGEN_PROM_COMPRA: Float read GetPORCENTAJE_MARGEN_PROM_COMPRAValue write SetPORCENTAJE_MARGEN_PROM_COMPRAValue; - property NIF_CIF_PROVEEDOR: String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; - property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; - property CALLE_PROVEEDOR: String read GetCALLE_PROVEEDORValue write SetCALLE_PROVEEDORValue; - property POBLACION_PROVEEDOR: String read GetPOBLACION_PROVEEDORValue write SetPOBLACION_PROVEEDORValue; - property PROVINCIA_PROVEEDOR: String read GetPROVINCIA_PROVEEDORValue write SetPROVINCIA_PROVEEDORValue; property NIF_CIF_CLIENTE: String read GetNIF_CIF_CLIENTEValue write SetNIF_CIF_CLIENTEValue; property NOMBRE_CLIENTE: String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue; property NOMBRE_COMERCIAL_CLIENTE: String read GetNOMBRE_COMERCIAL_CLIENTEValue write SetNOMBRE_COMERCIAL_CLIENTEValue; - property CALLE_CLIENTE: String read GetCALLE_CLIENTEValue write SetCALLE_CLIENTEValue; - property POBLACION_CLIENTE: String read GetPOBLACION_CLIENTEValue write SetPOBLACION_CLIENTEValue; - property PROVINCIA_CLIENTE: String read GetPROVINCIA_CLIENTEValue write SetPROVINCIA_CLIENTEValue; property NIF_CIF_AGENTE: String read GetNIF_CIF_AGENTEValue write SetNIF_CIF_AGENTEValue; property NOMBRE_AGENTE: String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; - property CALLE_AGENTE: String read GetCALLE_AGENTEValue write SetCALLE_AGENTEValue; - property POBLACION_AGENTE: String read GetPOBLACION_AGENTEValue write SetPOBLACION_AGENTEValue; - property PROVINCIA_AGENTE: String read GetPROVINCIA_AGENTEValue write SetPROVINCIA_AGENTEValue; - property COMISION_AGENTE: Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE: Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; + property IMP_UNIDAD_ULT_VENT: Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue; + property IMP_NETO_ULT_VENT: Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue; + property IMP_PORTE_ULT_VENT: Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue; + property IMP_UNIDAD_PRO_VENT: Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue; + property IMP_NETO_PRO_VENT: Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue; + property IMP_PORTE_PRO_VENT: Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue; + property IMP_UNIDAD_COMPRA: Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue; + property IMP_NETO_COMPRA: Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue; + property IMP_PORTE_COMPRA: Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue; + property IMP_UNIDAD_ULT_COMP: Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue; + property IMP_NETO_ULT_COMP: Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue; + property IMP_PORTE_ULT_COMP: Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue; + property IMP_UNIDAD_PRO_COMP: Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue; + property IMP_NETO_PRO_COMP: Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue; + property IMP_PORTE_PRO_COMP: Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue; + property IMP_MARGEN_ULT_VENT_COMPRA: Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue; + property POR_MARGEN_ULT_VENT_COMPRA: Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue; + property IMP_MARGEN_ULT_VENT_ULT_COMP: Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue; + property POR_MARGEN_ULT_VENT_ULT_COMP: Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue; + property IMP_MARGEN_ULT_VENT_PRO_COMP: Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue; + property POR_MARGEN_ULT_VENT_PRO_COMP: Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue; + property IMP_MARGEN_PRO_VENT_COMPRA: Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue; + property POR_MARGEN_PRO_VENT_COMPRA: Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue; + property IMP_MARGEN_PRO_VENT_ULT_COMP: Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue; + property POR_MARGEN_PRO_VENT_ULT_COMP: Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue; + property IMP_MARGEN_PRO_VENT_PRO_COMP: Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue; + property POR_MARGEN_PRO_VENT_PRO_COMP: Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue; end; { TInfMargenArticuloDataTableRules } @@ -298,18 +238,10 @@ type private protected { Property getters and setters } - function GetID_FACTURAValue: Integer; virtual; - procedure SetID_FACTURAValue(const aValue: Integer); virtual; function GetID_EMPRESAValue: Integer; virtual; procedure SetID_EMPRESAValue(const aValue: Integer); virtual; - function GetREFERENCIA_FACTURAValue: String; virtual; - procedure SetREFERENCIA_FACTURAValue(const aValue: String); virtual; - function GetFECHA_FACTURAValue: DateTime; virtual; - procedure SetFECHA_FACTURAValue(const aValue: DateTime); virtual; - function GetIMPORTE_TOTAL_FACTURAValue: Currency; virtual; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); virtual; - function GetID_COMISION_FACTURAValue: Integer; virtual; - procedure SetID_COMISION_FACTURAValue(const aValue: Integer); virtual; + function GetID_CLIENTEValue: Integer; virtual; + procedure SetID_CLIENTEValue(const aValue: Integer); virtual; function GetID_ARTICULOValue: Integer; virtual; procedure SetID_ARTICULOValue(const aValue: Integer); virtual; function GetFAMILIAValue: String; virtual; @@ -324,94 +256,74 @@ type procedure SetCOMISIONABLEValue(const aValue: Integer); virtual; function GetINVENTARIABLEValue: Integer; virtual; procedure SetINVENTARIABLEValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDAD_COSTEValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); virtual; - function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; - procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); virtual; - function GetIMPORTE_NETO_COSTEValue: Currency; virtual; - procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_COSTEValue: Currency; virtual; - procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); virtual; - function GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_NETO_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_PORTE_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_NETO_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_PORTE_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetCANTIDADValue: Integer; virtual; - procedure SetCANTIDADValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDAD_VENTAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); virtual; - function GetDESCUENTO_CLIENTE_VENTAValue: Float; virtual; - procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); virtual; - function GetIMPORTE_NETO_VENTAValue: Currency; virtual; - procedure SetIMPORTE_NETO_VENTAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_VENTAValue: Float; virtual; - procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); virtual; - function GetIMPORTE_TOTAL_VENTAValue: Currency; virtual; - procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); virtual; - function GetIMPORTE_MARGEN_COSTEValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_COSTEValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_COSTEValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_COSTEValue(const aValue: Float); virtual; - function GetIMPORTE_MARGEN_ULT_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_ULT_COMPRAValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_ULT_COMPRAValue(const aValue: Float); virtual; - function GetIMPORTE_MARGEN_PROM_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_PROM_COMPRAValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_PROM_COMPRAValue(const aValue: Float); virtual; - function GetNIF_CIF_PROVEEDORValue: String; virtual; - procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); virtual; - function GetNOMBRE_PROVEEDORValue: String; virtual; - procedure SetNOMBRE_PROVEEDORValue(const aValue: String); virtual; - function GetCALLE_PROVEEDORValue: String; virtual; - procedure SetCALLE_PROVEEDORValue(const aValue: String); virtual; - function GetPOBLACION_PROVEEDORValue: String; virtual; - procedure SetPOBLACION_PROVEEDORValue(const aValue: String); virtual; - function GetPROVINCIA_PROVEEDORValue: String; virtual; - procedure SetPROVINCIA_PROVEEDORValue(const aValue: String); virtual; function GetNIF_CIF_CLIENTEValue: String; virtual; procedure SetNIF_CIF_CLIENTEValue(const aValue: String); virtual; function GetNOMBRE_CLIENTEValue: String; virtual; procedure SetNOMBRE_CLIENTEValue(const aValue: String); virtual; function GetNOMBRE_COMERCIAL_CLIENTEValue: String; virtual; procedure SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String); virtual; - function GetCALLE_CLIENTEValue: String; virtual; - procedure SetCALLE_CLIENTEValue(const aValue: String); virtual; - function GetPOBLACION_CLIENTEValue: String; virtual; - procedure SetPOBLACION_CLIENTEValue(const aValue: String); virtual; - function GetPROVINCIA_CLIENTEValue: String; virtual; - procedure SetPROVINCIA_CLIENTEValue(const aValue: String); virtual; function GetNIF_CIF_AGENTEValue: String; virtual; procedure SetNIF_CIF_AGENTEValue(const aValue: String); virtual; function GetNOMBRE_AGENTEValue: String; virtual; procedure SetNOMBRE_AGENTEValue(const aValue: String); virtual; - function GetCALLE_AGENTEValue: String; virtual; - procedure SetCALLE_AGENTEValue(const aValue: String); virtual; - function GetPOBLACION_AGENTEValue: String; virtual; - procedure SetPOBLACION_AGENTEValue(const aValue: String); virtual; - function GetPROVINCIA_AGENTEValue: String; virtual; - procedure SetPROVINCIA_AGENTEValue(const aValue: String); virtual; - function GetCOMISION_AGENTEValue: Float; virtual; - procedure SetCOMISION_AGENTEValue(const aValue: Float); virtual; - function GetIMPORTE_COMISION_AGENTEValue: Currency; virtual; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); virtual; + function GetIMP_UNIDAD_ULT_VENTValue: Float; virtual; + procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_NETO_ULT_VENTValue: Float; virtual; + procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_PORTE_ULT_VENTValue: Float; virtual; + procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_PRO_VENTValue: Float; virtual; + procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_NETO_PRO_VENTValue: Float; virtual; + procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_PORTE_PRO_VENTValue: Float; virtual; + procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_COMPRAValue: Float; virtual; + procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float); virtual; + function GetIMP_NETO_COMPRAValue: Float; virtual; + procedure SetIMP_NETO_COMPRAValue(const aValue: Float); virtual; + function GetIMP_PORTE_COMPRAValue: Float; virtual; + procedure SetIMP_PORTE_COMPRAValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_ULT_COMPValue: Float; virtual; + procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_NETO_ULT_COMPValue: Float; virtual; + procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_PORTE_ULT_COMPValue: Float; virtual; + procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_PRO_COMPValue: Float; virtual; + procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_NETO_PRO_COMPValue: Float; virtual; + procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_PORTE_PRO_COMPValue: Float; virtual; + procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual; { Properties } - property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; - property REFERENCIA_FACTURA: String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; - property FECHA_FACTURA: DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA: Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; - property ID_COMISION_FACTURA: Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; + property ID_CLIENTE: Integer read GetID_CLIENTEValue write SetID_CLIENTEValue; property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue; property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue; @@ -419,46 +331,38 @@ type property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue; property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; - property IMPORTE_UNIDAD_COSTE: Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; - property DESCUENTO_PROVEEDOR_COSTE: Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; - property IMPORTE_NETO_COSTE: Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; - property IMPORTE_PORTE_COSTE: Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; - property IMPORTE_UNIDAD_ULTIMA_COMPRA: Currency read GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue write SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue; - property IMPORTE_NETO_ULTIMA_COMPRA: Currency read GetIMPORTE_NETO_ULTIMA_COMPRAValue write SetIMPORTE_NETO_ULTIMA_COMPRAValue; - property IMPORTE_PORTE_ULTIMA_COMPRA: Currency read GetIMPORTE_PORTE_ULTIMA_COMPRAValue write SetIMPORTE_PORTE_ULTIMA_COMPRAValue; - property IMPORTE_UNIDAD_PROMEDIO_COMPRA: Currency read GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue write SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue; - property IMPORTE_NETO_PROMEDIO_COMPRA: Currency read GetIMPORTE_NETO_PROMEDIO_COMPRAValue write SetIMPORTE_NETO_PROMEDIO_COMPRAValue; - property IMPORTE_PORTE_PROMEDIO_COMPRA: Currency read GetIMPORTE_PORTE_PROMEDIO_COMPRAValue write SetIMPORTE_PORTE_PROMEDIO_COMPRAValue; - property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; - property IMPORTE_UNIDAD_VENTA: Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; - property DESCUENTO_CLIENTE_VENTA: Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; - property IMPORTE_NETO_VENTA: Currency read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; - property IMPORTE_PORTE_VENTA: Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; - property IMPORTE_TOTAL_VENTA: Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; - property IMPORTE_MARGEN_COSTE: Currency read GetIMPORTE_MARGEN_COSTEValue write SetIMPORTE_MARGEN_COSTEValue; - property PORCENTAJE_MARGEN_COSTE: Float read GetPORCENTAJE_MARGEN_COSTEValue write SetPORCENTAJE_MARGEN_COSTEValue; - property IMPORTE_MARGEN_ULT_COMPRA: Currency read GetIMPORTE_MARGEN_ULT_COMPRAValue write SetIMPORTE_MARGEN_ULT_COMPRAValue; - property PORCENTAJE_MARGEN_ULT_COMPRA: Float read GetPORCENTAJE_MARGEN_ULT_COMPRAValue write SetPORCENTAJE_MARGEN_ULT_COMPRAValue; - property IMPORTE_MARGEN_PROM_COMPRA: Currency read GetIMPORTE_MARGEN_PROM_COMPRAValue write SetIMPORTE_MARGEN_PROM_COMPRAValue; - property PORCENTAJE_MARGEN_PROM_COMPRA: Float read GetPORCENTAJE_MARGEN_PROM_COMPRAValue write SetPORCENTAJE_MARGEN_PROM_COMPRAValue; - property NIF_CIF_PROVEEDOR: String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; - property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; - property CALLE_PROVEEDOR: String read GetCALLE_PROVEEDORValue write SetCALLE_PROVEEDORValue; - property POBLACION_PROVEEDOR: String read GetPOBLACION_PROVEEDORValue write SetPOBLACION_PROVEEDORValue; - property PROVINCIA_PROVEEDOR: String read GetPROVINCIA_PROVEEDORValue write SetPROVINCIA_PROVEEDORValue; property NIF_CIF_CLIENTE: String read GetNIF_CIF_CLIENTEValue write SetNIF_CIF_CLIENTEValue; property NOMBRE_CLIENTE: String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue; property NOMBRE_COMERCIAL_CLIENTE: String read GetNOMBRE_COMERCIAL_CLIENTEValue write SetNOMBRE_COMERCIAL_CLIENTEValue; - property CALLE_CLIENTE: String read GetCALLE_CLIENTEValue write SetCALLE_CLIENTEValue; - property POBLACION_CLIENTE: String read GetPOBLACION_CLIENTEValue write SetPOBLACION_CLIENTEValue; - property PROVINCIA_CLIENTE: String read GetPROVINCIA_CLIENTEValue write SetPROVINCIA_CLIENTEValue; property NIF_CIF_AGENTE: String read GetNIF_CIF_AGENTEValue write SetNIF_CIF_AGENTEValue; property NOMBRE_AGENTE: String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; - property CALLE_AGENTE: String read GetCALLE_AGENTEValue write SetCALLE_AGENTEValue; - property POBLACION_AGENTE: String read GetPOBLACION_AGENTEValue write SetPOBLACION_AGENTEValue; - property PROVINCIA_AGENTE: String read GetPROVINCIA_AGENTEValue write SetPROVINCIA_AGENTEValue; - property COMISION_AGENTE: Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE: Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; + property IMP_UNIDAD_ULT_VENT: Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue; + property IMP_NETO_ULT_VENT: Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue; + property IMP_PORTE_ULT_VENT: Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue; + property IMP_UNIDAD_PRO_VENT: Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue; + property IMP_NETO_PRO_VENT: Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue; + property IMP_PORTE_PRO_VENT: Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue; + property IMP_UNIDAD_COMPRA: Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue; + property IMP_NETO_COMPRA: Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue; + property IMP_PORTE_COMPRA: Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue; + property IMP_UNIDAD_ULT_COMP: Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue; + property IMP_NETO_ULT_COMP: Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue; + property IMP_PORTE_ULT_COMP: Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue; + property IMP_UNIDAD_PRO_COMP: Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue; + property IMP_NETO_PRO_COMP: Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue; + property IMP_PORTE_PRO_COMP: Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue; + property IMP_MARGEN_ULT_VENT_COMPRA: Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue; + property POR_MARGEN_ULT_VENT_COMPRA: Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue; + property IMP_MARGEN_ULT_VENT_ULT_COMP: Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue; + property POR_MARGEN_ULT_VENT_ULT_COMP: Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue; + property IMP_MARGEN_ULT_VENT_PRO_COMP: Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue; + property POR_MARGEN_ULT_VENT_PRO_COMP: Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue; + property IMP_MARGEN_PRO_VENT_COMPRA: Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue; + property POR_MARGEN_PRO_VENT_COMPRA: Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue; + property IMP_MARGEN_PRO_VENT_ULT_COMP: Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue; + property POR_MARGEN_PRO_VENT_ULT_COMP: Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue; + property IMP_MARGEN_PRO_VENT_PRO_COMP: Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue; + property POR_MARGEN_PRO_VENT_PRO_COMP: Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue; public constructor Create(aDataTable: TDADataTable); override; @@ -481,16 +385,6 @@ begin inherited; end; -function TInfMargenArticuloDataTableRules.GetID_FACTURAValue: Integer; -begin - result := DataTable.Fields[idx_InfMargenArticuloID_FACTURA].AsInteger; -end; - -procedure TInfMargenArticuloDataTableRules.SetID_FACTURAValue(const aValue: Integer); -begin - DataTable.Fields[idx_InfMargenArticuloID_FACTURA].AsInteger := aValue; -end; - function TInfMargenArticuloDataTableRules.GetID_EMPRESAValue: Integer; begin result := DataTable.Fields[idx_InfMargenArticuloID_EMPRESA].AsInteger; @@ -501,44 +395,14 @@ begin DataTable.Fields[idx_InfMargenArticuloID_EMPRESA].AsInteger := aValue; end; -function TInfMargenArticuloDataTableRules.GetREFERENCIA_FACTURAValue: String; +function TInfMargenArticuloDataTableRules.GetID_CLIENTEValue: Integer; begin - result := DataTable.Fields[idx_InfMargenArticuloREFERENCIA_FACTURA].AsString; + result := DataTable.Fields[idx_InfMargenArticuloID_CLIENTE].AsInteger; end; -procedure TInfMargenArticuloDataTableRules.SetREFERENCIA_FACTURAValue(const aValue: String); +procedure TInfMargenArticuloDataTableRules.SetID_CLIENTEValue(const aValue: Integer); begin - DataTable.Fields[idx_InfMargenArticuloREFERENCIA_FACTURA].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetFECHA_FACTURAValue: DateTime; -begin - result := DataTable.Fields[idx_InfMargenArticuloFECHA_FACTURA].AsDateTime; -end; - -procedure TInfMargenArticuloDataTableRules.SetFECHA_FACTURAValue(const aValue: DateTime); -begin - DataTable.Fields[idx_InfMargenArticuloFECHA_FACTURA].AsDateTime := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_TOTAL_FACTURAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_TOTAL_FACTURA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_TOTAL_FACTURA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetID_COMISION_FACTURAValue: Integer; -begin - result := DataTable.Fields[idx_InfMargenArticuloID_COMISION_FACTURA].AsInteger; -end; - -procedure TInfMargenArticuloDataTableRules.SetID_COMISION_FACTURAValue(const aValue: Integer); -begin - DataTable.Fields[idx_InfMargenArticuloID_COMISION_FACTURA].AsInteger := aValue; + DataTable.Fields[idx_InfMargenArticuloID_CLIENTE].AsInteger := aValue; end; function TInfMargenArticuloDataTableRules.GetID_ARTICULOValue: Integer; @@ -611,276 +475,6 @@ begin DataTable.Fields[idx_InfMargenArticuloINVENTARIABLE].AsInteger := aValue; end; -function TInfMargenArticuloDataTableRules.GetIMPORTE_UNIDAD_COSTEValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_COSTE].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_COSTE].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetDESCUENTO_PROVEEDOR_COSTEValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_NETO_COSTEValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_COSTE].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_NETO_COSTEValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_COSTE].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_PORTE_COSTEValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_COSTE].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_COSTE].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_NETO_ULTIMA_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_PORTE_ULTIMA_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_NETO_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_PORTE_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetCANTIDADValue: Integer; -begin - result := DataTable.Fields[idx_InfMargenArticuloCANTIDAD].AsInteger; -end; - -procedure TInfMargenArticuloDataTableRules.SetCANTIDADValue(const aValue: Integer); -begin - DataTable.Fields[idx_InfMargenArticuloCANTIDAD].AsInteger := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_UNIDAD_VENTAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_VENTA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_UNIDAD_VENTA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetDESCUENTO_CLIENTE_VENTAValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloDESCUENTO_CLIENTE_VENTA].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloDESCUENTO_CLIENTE_VENTA].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_NETO_VENTAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_VENTA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_NETO_VENTAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_NETO_VENTA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_PORTE_VENTAValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_VENTA].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_PORTE_VENTAValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_PORTE_VENTA].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_TOTAL_VENTAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_TOTAL_VENTA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_TOTAL_VENTA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_MARGEN_COSTEValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_COSTE].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_MARGEN_COSTEValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_COSTE].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPORCENTAJE_MARGEN_COSTEValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_COSTE].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetPORCENTAJE_MARGEN_COSTEValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_COSTE].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_MARGEN_ULT_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_MARGEN_ULT_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetPORCENTAJE_MARGEN_ULT_COMPRAValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetIMPORTE_MARGEN_PROM_COMPRAValue: Currency; -begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA].AsCurrency; -end; - -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_MARGEN_PROM_COMPRAValue(const aValue: Currency); -begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA].AsCurrency := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; -begin - result := DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA].AsFloat; -end; - -procedure TInfMargenArticuloDataTableRules.SetPORCENTAJE_MARGEN_PROM_COMPRAValue(const aValue: Float); -begin - DataTable.Fields[idx_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA].AsFloat := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetNIF_CIF_PROVEEDORValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloNIF_CIF_PROVEEDOR].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetNIF_CIF_PROVEEDORValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloNIF_CIF_PROVEEDOR].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetNOMBRE_PROVEEDORValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloNOMBRE_PROVEEDOR].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetNOMBRE_PROVEEDORValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloNOMBRE_PROVEEDOR].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetCALLE_PROVEEDORValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloCALLE_PROVEEDOR].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetCALLE_PROVEEDORValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloCALLE_PROVEEDOR].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPOBLACION_PROVEEDORValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloPOBLACION_PROVEEDOR].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetPOBLACION_PROVEEDORValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloPOBLACION_PROVEEDOR].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPROVINCIA_PROVEEDORValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloPROVINCIA_PROVEEDOR].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetPROVINCIA_PROVEEDORValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloPROVINCIA_PROVEEDOR].AsString := aValue; -end; - function TInfMargenArticuloDataTableRules.GetNIF_CIF_CLIENTEValue: String; begin result := DataTable.Fields[idx_InfMargenArticuloNIF_CIF_CLIENTE].AsString; @@ -911,36 +505,6 @@ begin DataTable.Fields[idx_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE].AsString := aValue; end; -function TInfMargenArticuloDataTableRules.GetCALLE_CLIENTEValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloCALLE_CLIENTE].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetCALLE_CLIENTEValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloCALLE_CLIENTE].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPOBLACION_CLIENTEValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloPOBLACION_CLIENTE].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetPOBLACION_CLIENTEValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloPOBLACION_CLIENTE].AsString := aValue; -end; - -function TInfMargenArticuloDataTableRules.GetPROVINCIA_CLIENTEValue: String; -begin - result := DataTable.Fields[idx_InfMargenArticuloPROVINCIA_CLIENTE].AsString; -end; - -procedure TInfMargenArticuloDataTableRules.SetPROVINCIA_CLIENTEValue(const aValue: String); -begin - DataTable.Fields[idx_InfMargenArticuloPROVINCIA_CLIENTE].AsString := aValue; -end; - function TInfMargenArticuloDataTableRules.GetNIF_CIF_AGENTEValue: String; begin result := DataTable.Fields[idx_InfMargenArticuloNIF_CIF_AGENTE].AsString; @@ -961,54 +525,274 @@ begin DataTable.Fields[idx_InfMargenArticuloNOMBRE_AGENTE].AsString := aValue; end; -function TInfMargenArticuloDataTableRules.GetCALLE_AGENTEValue: String; +function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_ULT_VENTValue: Float; begin - result := DataTable.Fields[idx_InfMargenArticuloCALLE_AGENTE].AsString; + result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT].AsFloat; end; -procedure TInfMargenArticuloDataTableRules.SetCALLE_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); begin - DataTable.Fields[idx_InfMargenArticuloCALLE_AGENTE].AsString := aValue; + DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_VENT].AsFloat := aValue; end; -function TInfMargenArticuloDataTableRules.GetPOBLACION_AGENTEValue: String; +function TInfMargenArticuloDataTableRules.GetIMP_NETO_ULT_VENTValue: Float; begin - result := DataTable.Fields[idx_InfMargenArticuloPOBLACION_AGENTE].AsString; + result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_VENT].AsFloat; end; -procedure TInfMargenArticuloDataTableRules.SetPOBLACION_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float); begin - DataTable.Fields[idx_InfMargenArticuloPOBLACION_AGENTE].AsString := aValue; + DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_VENT].AsFloat := aValue; end; -function TInfMargenArticuloDataTableRules.GetPROVINCIA_AGENTEValue: String; +function TInfMargenArticuloDataTableRules.GetIMP_PORTE_ULT_VENTValue: Float; begin - result := DataTable.Fields[idx_InfMargenArticuloPROVINCIA_AGENTE].AsString; + result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_VENT].AsFloat; end; -procedure TInfMargenArticuloDataTableRules.SetPROVINCIA_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float); begin - DataTable.Fields[idx_InfMargenArticuloPROVINCIA_AGENTE].AsString := aValue; + DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_VENT].AsFloat := aValue; end; -function TInfMargenArticuloDataTableRules.GetCOMISION_AGENTEValue: Float; +function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_PRO_VENTValue: Float; begin - result := DataTable.Fields[idx_InfMargenArticuloCOMISION_AGENTE].AsFloat; + result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT].AsFloat; end; -procedure TInfMargenArticuloDataTableRules.SetCOMISION_AGENTEValue(const aValue: Float); +procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); begin - DataTable.Fields[idx_InfMargenArticuloCOMISION_AGENTE].AsFloat := aValue; + DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_VENT].AsFloat := aValue; end; -function TInfMargenArticuloDataTableRules.GetIMPORTE_COMISION_AGENTEValue: Currency; +function TInfMargenArticuloDataTableRules.GetIMP_NETO_PRO_VENTValue: Float; begin - result := DataTable.Fields[idx_InfMargenArticuloIMPORTE_COMISION_AGENTE].AsCurrency; + result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_VENT].AsFloat; end; -procedure TInfMargenArticuloDataTableRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); +procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float); begin - DataTable.Fields[idx_InfMargenArticuloIMPORTE_COMISION_AGENTE].AsCurrency := aValue; + DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_VENT].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_PORTE_PRO_VENTValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_VENT].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_VENT].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_NETO_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_NETO_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_PORTE_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_NETO_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_NETO_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_PORTE_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_UNIDAD_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_UNIDAD_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_NETO_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_NETO_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_PORTE_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_PORTE_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue; +end; + +function TInfMargenArticuloDataTableRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat; +end; + +procedure TInfMargenArticuloDataTableRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); +begin + DataTable.Fields[idx_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP].AsFloat := aValue; end; diff --git a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas index ee0816f3..bf91787e 100644 --- a/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas +++ b/Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloServer_Intf.pas @@ -9,19 +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_InfMargenArticuloDelta = '{0078F486-303D-4681-9081-2524C6EF6B07}'; + RID_InfMargenArticuloDelta = '{CDF81831-CF6A-48A3-8833-4574CB195605}'; type { IInfMargenArticuloDelta } IInfMargenArticuloDelta = interface(IInfMargenArticulo) - ['{0078F486-303D-4681-9081-2524C6EF6B07}'] + ['{CDF81831-CF6A-48A3-8833-4574CB195605}'] { Property getters and setters } - function GetOldID_FACTURAValue : Integer; function GetOldID_EMPRESAValue : Integer; - function GetOldREFERENCIA_FACTURAValue : String; - function GetOldFECHA_FACTURAValue : DateTime; - function GetOldIMPORTE_TOTAL_FACTURAValue : Currency; - function GetOldID_COMISION_FACTURAValue : Integer; + function GetOldID_CLIENTEValue : Integer; function GetOldID_ARTICULOValue : Integer; function GetOldFAMILIAValue : String; function GetOldREFERENCIAValue : String; @@ -29,54 +25,42 @@ type function GetOldDESCRIPCIONValue : String; function GetOldCOMISIONABLEValue : Integer; function GetOldINVENTARIABLEValue : Integer; - function GetOldIMPORTE_UNIDAD_COSTEValue : Currency; - function GetOldDESCUENTO_PROVEEDOR_COSTEValue : Float; - function GetOldIMPORTE_NETO_COSTEValue : Currency; - function GetOldIMPORTE_PORTE_COSTEValue : Currency; - function GetOldIMPORTE_UNIDAD_ULTIMA_COMPRAValue : Currency; - function GetOldIMPORTE_NETO_ULTIMA_COMPRAValue : Currency; - function GetOldIMPORTE_PORTE_ULTIMA_COMPRAValue : Currency; - function GetOldIMPORTE_UNIDAD_PROMEDIO_COMPRAValue : Currency; - function GetOldIMPORTE_NETO_PROMEDIO_COMPRAValue : Currency; - function GetOldIMPORTE_PORTE_PROMEDIO_COMPRAValue : Currency; - function GetOldCANTIDADValue : Integer; - function GetOldIMPORTE_UNIDAD_VENTAValue : Currency; - function GetOldDESCUENTO_CLIENTE_VENTAValue : Float; - function GetOldIMPORTE_NETO_VENTAValue : Currency; - function GetOldIMPORTE_PORTE_VENTAValue : Float; - function GetOldIMPORTE_TOTAL_VENTAValue : Currency; - function GetOldIMPORTE_MARGEN_COSTEValue : Currency; - function GetOldPORCENTAJE_MARGEN_COSTEValue : Float; - function GetOldIMPORTE_MARGEN_ULT_COMPRAValue : Currency; - function GetOldPORCENTAJE_MARGEN_ULT_COMPRAValue : Float; - function GetOldIMPORTE_MARGEN_PROM_COMPRAValue : Currency; - function GetOldPORCENTAJE_MARGEN_PROM_COMPRAValue : Float; - function GetOldNIF_CIF_PROVEEDORValue : String; - function GetOldNOMBRE_PROVEEDORValue : String; - function GetOldCALLE_PROVEEDORValue : String; - function GetOldPOBLACION_PROVEEDORValue : String; - function GetOldPROVINCIA_PROVEEDORValue : String; function GetOldNIF_CIF_CLIENTEValue : String; function GetOldNOMBRE_CLIENTEValue : String; function GetOldNOMBRE_COMERCIAL_CLIENTEValue : String; - function GetOldCALLE_CLIENTEValue : String; - function GetOldPOBLACION_CLIENTEValue : String; - function GetOldPROVINCIA_CLIENTEValue : String; function GetOldNIF_CIF_AGENTEValue : String; function GetOldNOMBRE_AGENTEValue : String; - function GetOldCALLE_AGENTEValue : String; - function GetOldPOBLACION_AGENTEValue : String; - function GetOldPROVINCIA_AGENTEValue : String; - function GetOldCOMISION_AGENTEValue : Float; - function GetOldIMPORTE_COMISION_AGENTEValue : Currency; + function GetOldIMP_UNIDAD_ULT_VENTValue : Float; + function GetOldIMP_NETO_ULT_VENTValue : Float; + function GetOldIMP_PORTE_ULT_VENTValue : Float; + function GetOldIMP_UNIDAD_PRO_VENTValue : Float; + function GetOldIMP_NETO_PRO_VENTValue : Float; + function GetOldIMP_PORTE_PRO_VENTValue : Float; + function GetOldIMP_UNIDAD_COMPRAValue : Float; + function GetOldIMP_NETO_COMPRAValue : Float; + function GetOldIMP_PORTE_COMPRAValue : Float; + function GetOldIMP_UNIDAD_ULT_COMPValue : Float; + function GetOldIMP_NETO_ULT_COMPValue : Float; + function GetOldIMP_PORTE_ULT_COMPValue : Float; + function GetOldIMP_UNIDAD_PRO_COMPValue : Float; + function GetOldIMP_NETO_PRO_COMPValue : Float; + function GetOldIMP_PORTE_PRO_COMPValue : Float; + function GetOldIMP_MARGEN_ULT_VENT_COMPRAValue : Float; + function GetOldPOR_MARGEN_ULT_VENT_COMPRAValue : Float; + function GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue : Float; + function GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue : Float; + function GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue : Float; + function GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue : Float; + function GetOldIMP_MARGEN_PRO_VENT_COMPRAValue : Float; + function GetOldPOR_MARGEN_PRO_VENT_COMPRAValue : Float; + function GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue : Float; + function GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue : Float; + function GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue : Float; + function GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue : Float; { Properties } - property OldID_FACTURA : Integer read GetOldID_FACTURAValue; property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue; - property OldREFERENCIA_FACTURA : String read GetOldREFERENCIA_FACTURAValue; - property OldFECHA_FACTURA : DateTime read GetOldFECHA_FACTURAValue; - property OldIMPORTE_TOTAL_FACTURA : Currency read GetOldIMPORTE_TOTAL_FACTURAValue; - property OldID_COMISION_FACTURA : Integer read GetOldID_COMISION_FACTURAValue; + property OldID_CLIENTE : Integer read GetOldID_CLIENTEValue; property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue; property OldFAMILIA : String read GetOldFAMILIAValue; property OldREFERENCIA : String read GetOldREFERENCIAValue; @@ -84,46 +68,38 @@ type property OldDESCRIPCION : String read GetOldDESCRIPCIONValue; property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue; property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue; - property OldIMPORTE_UNIDAD_COSTE : Currency read GetOldIMPORTE_UNIDAD_COSTEValue; - property OldDESCUENTO_PROVEEDOR_COSTE : Float read GetOldDESCUENTO_PROVEEDOR_COSTEValue; - property OldIMPORTE_NETO_COSTE : Currency read GetOldIMPORTE_NETO_COSTEValue; - property OldIMPORTE_PORTE_COSTE : Currency read GetOldIMPORTE_PORTE_COSTEValue; - property OldIMPORTE_UNIDAD_ULTIMA_COMPRA : Currency read GetOldIMPORTE_UNIDAD_ULTIMA_COMPRAValue; - property OldIMPORTE_NETO_ULTIMA_COMPRA : Currency read GetOldIMPORTE_NETO_ULTIMA_COMPRAValue; - property OldIMPORTE_PORTE_ULTIMA_COMPRA : Currency read GetOldIMPORTE_PORTE_ULTIMA_COMPRAValue; - property OldIMPORTE_UNIDAD_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_UNIDAD_PROMEDIO_COMPRAValue; - property OldIMPORTE_NETO_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_NETO_PROMEDIO_COMPRAValue; - property OldIMPORTE_PORTE_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_PORTE_PROMEDIO_COMPRAValue; - property OldCANTIDAD : Integer read GetOldCANTIDADValue; - property OldIMPORTE_UNIDAD_VENTA : Currency read GetOldIMPORTE_UNIDAD_VENTAValue; - property OldDESCUENTO_CLIENTE_VENTA : Float read GetOldDESCUENTO_CLIENTE_VENTAValue; - property OldIMPORTE_NETO_VENTA : Currency read GetOldIMPORTE_NETO_VENTAValue; - property OldIMPORTE_PORTE_VENTA : Float read GetOldIMPORTE_PORTE_VENTAValue; - property OldIMPORTE_TOTAL_VENTA : Currency read GetOldIMPORTE_TOTAL_VENTAValue; - property OldIMPORTE_MARGEN_COSTE : Currency read GetOldIMPORTE_MARGEN_COSTEValue; - property OldPORCENTAJE_MARGEN_COSTE : Float read GetOldPORCENTAJE_MARGEN_COSTEValue; - property OldIMPORTE_MARGEN_ULT_COMPRA : Currency read GetOldIMPORTE_MARGEN_ULT_COMPRAValue; - property OldPORCENTAJE_MARGEN_ULT_COMPRA : Float read GetOldPORCENTAJE_MARGEN_ULT_COMPRAValue; - property OldIMPORTE_MARGEN_PROM_COMPRA : Currency read GetOldIMPORTE_MARGEN_PROM_COMPRAValue; - property OldPORCENTAJE_MARGEN_PROM_COMPRA : Float read GetOldPORCENTAJE_MARGEN_PROM_COMPRAValue; - property OldNIF_CIF_PROVEEDOR : String read GetOldNIF_CIF_PROVEEDORValue; - property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue; - property OldCALLE_PROVEEDOR : String read GetOldCALLE_PROVEEDORValue; - property OldPOBLACION_PROVEEDOR : String read GetOldPOBLACION_PROVEEDORValue; - property OldPROVINCIA_PROVEEDOR : String read GetOldPROVINCIA_PROVEEDORValue; property OldNIF_CIF_CLIENTE : String read GetOldNIF_CIF_CLIENTEValue; property OldNOMBRE_CLIENTE : String read GetOldNOMBRE_CLIENTEValue; property OldNOMBRE_COMERCIAL_CLIENTE : String read GetOldNOMBRE_COMERCIAL_CLIENTEValue; - property OldCALLE_CLIENTE : String read GetOldCALLE_CLIENTEValue; - property OldPOBLACION_CLIENTE : String read GetOldPOBLACION_CLIENTEValue; - property OldPROVINCIA_CLIENTE : String read GetOldPROVINCIA_CLIENTEValue; property OldNIF_CIF_AGENTE : String read GetOldNIF_CIF_AGENTEValue; property OldNOMBRE_AGENTE : String read GetOldNOMBRE_AGENTEValue; - property OldCALLE_AGENTE : String read GetOldCALLE_AGENTEValue; - property OldPOBLACION_AGENTE : String read GetOldPOBLACION_AGENTEValue; - property OldPROVINCIA_AGENTE : String read GetOldPROVINCIA_AGENTEValue; - property OldCOMISION_AGENTE : Float read GetOldCOMISION_AGENTEValue; - property OldIMPORTE_COMISION_AGENTE : Currency read GetOldIMPORTE_COMISION_AGENTEValue; + property OldIMP_UNIDAD_ULT_VENT : Float read GetOldIMP_UNIDAD_ULT_VENTValue; + property OldIMP_NETO_ULT_VENT : Float read GetOldIMP_NETO_ULT_VENTValue; + property OldIMP_PORTE_ULT_VENT : Float read GetOldIMP_PORTE_ULT_VENTValue; + property OldIMP_UNIDAD_PRO_VENT : Float read GetOldIMP_UNIDAD_PRO_VENTValue; + property OldIMP_NETO_PRO_VENT : Float read GetOldIMP_NETO_PRO_VENTValue; + property OldIMP_PORTE_PRO_VENT : Float read GetOldIMP_PORTE_PRO_VENTValue; + property OldIMP_UNIDAD_COMPRA : Float read GetOldIMP_UNIDAD_COMPRAValue; + property OldIMP_NETO_COMPRA : Float read GetOldIMP_NETO_COMPRAValue; + property OldIMP_PORTE_COMPRA : Float read GetOldIMP_PORTE_COMPRAValue; + property OldIMP_UNIDAD_ULT_COMP : Float read GetOldIMP_UNIDAD_ULT_COMPValue; + property OldIMP_NETO_ULT_COMP : Float read GetOldIMP_NETO_ULT_COMPValue; + property OldIMP_PORTE_ULT_COMP : Float read GetOldIMP_PORTE_ULT_COMPValue; + property OldIMP_UNIDAD_PRO_COMP : Float read GetOldIMP_UNIDAD_PRO_COMPValue; + property OldIMP_NETO_PRO_COMP : Float read GetOldIMP_NETO_PRO_COMPValue; + property OldIMP_PORTE_PRO_COMP : Float read GetOldIMP_PORTE_PRO_COMPValue; + property OldIMP_MARGEN_ULT_VENT_COMPRA : Float read GetOldIMP_MARGEN_ULT_VENT_COMPRAValue; + property OldPOR_MARGEN_ULT_VENT_COMPRA : Float read GetOldPOR_MARGEN_ULT_VENT_COMPRAValue; + property OldIMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue; + property OldPOR_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue; + property OldIMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue; + property OldPOR_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue; + property OldIMP_MARGEN_PRO_VENT_COMPRA : Float read GetOldIMP_MARGEN_PRO_VENT_COMPRAValue; + property OldPOR_MARGEN_PRO_VENT_COMPRA : Float read GetOldPOR_MARGEN_PRO_VENT_COMPRAValue; + property OldIMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue; + property OldPOR_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue; + property OldIMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue; + property OldPOR_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue; end; { TInfMargenArticuloBusinessProcessorRules } @@ -131,24 +107,12 @@ type private protected { Property getters and setters } - function GetID_FACTURAValue: Integer; virtual; - function GetOldID_FACTURAValue: Integer; virtual; - procedure SetID_FACTURAValue(const aValue: Integer); virtual; function GetID_EMPRESAValue: Integer; virtual; function GetOldID_EMPRESAValue: Integer; virtual; procedure SetID_EMPRESAValue(const aValue: Integer); virtual; - function GetREFERENCIA_FACTURAValue: String; virtual; - function GetOldREFERENCIA_FACTURAValue: String; virtual; - procedure SetREFERENCIA_FACTURAValue(const aValue: String); virtual; - function GetFECHA_FACTURAValue: DateTime; virtual; - function GetOldFECHA_FACTURAValue: DateTime; virtual; - procedure SetFECHA_FACTURAValue(const aValue: DateTime); virtual; - function GetIMPORTE_TOTAL_FACTURAValue: Currency; virtual; - function GetOldIMPORTE_TOTAL_FACTURAValue: Currency; virtual; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); virtual; - function GetID_COMISION_FACTURAValue: Integer; virtual; - function GetOldID_COMISION_FACTURAValue: Integer; virtual; - procedure SetID_COMISION_FACTURAValue(const aValue: Integer); virtual; + function GetID_CLIENTEValue: Integer; virtual; + function GetOldID_CLIENTEValue: Integer; virtual; + procedure SetID_CLIENTEValue(const aValue: Integer); virtual; function GetID_ARTICULOValue: Integer; virtual; function GetOldID_ARTICULOValue: Integer; virtual; procedure SetID_ARTICULOValue(const aValue: Integer); virtual; @@ -170,87 +134,6 @@ type function GetINVENTARIABLEValue: Integer; virtual; function GetOldINVENTARIABLEValue: Integer; virtual; procedure SetINVENTARIABLEValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDAD_COSTEValue: Currency; virtual; - function GetOldIMPORTE_UNIDAD_COSTEValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); virtual; - function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; - function GetOldDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; - procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); virtual; - function GetIMPORTE_NETO_COSTEValue: Currency; virtual; - function GetOldIMPORTE_NETO_COSTEValue: Currency; virtual; - procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_COSTEValue: Currency; virtual; - function GetOldIMPORTE_PORTE_COSTEValue: Currency; virtual; - procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); virtual; - function GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_NETO_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_PORTE_ULTIMA_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_NETO_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_PORTE_PROMEDIO_COMPRAValue(const aValue: Currency); virtual; - function GetCANTIDADValue: Integer; virtual; - function GetOldCANTIDADValue: Integer; virtual; - procedure SetCANTIDADValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDAD_VENTAValue: Currency; virtual; - function GetOldIMPORTE_UNIDAD_VENTAValue: Currency; virtual; - procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); virtual; - function GetDESCUENTO_CLIENTE_VENTAValue: Float; virtual; - function GetOldDESCUENTO_CLIENTE_VENTAValue: Float; virtual; - procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); virtual; - function GetIMPORTE_NETO_VENTAValue: Currency; virtual; - function GetOldIMPORTE_NETO_VENTAValue: Currency; virtual; - procedure SetIMPORTE_NETO_VENTAValue(const aValue: Currency); virtual; - function GetIMPORTE_PORTE_VENTAValue: Float; virtual; - function GetOldIMPORTE_PORTE_VENTAValue: Float; virtual; - procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); virtual; - function GetIMPORTE_TOTAL_VENTAValue: Currency; virtual; - function GetOldIMPORTE_TOTAL_VENTAValue: Currency; virtual; - procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); virtual; - function GetIMPORTE_MARGEN_COSTEValue: Currency; virtual; - function GetOldIMPORTE_MARGEN_COSTEValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_COSTEValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_COSTEValue: Float; virtual; - function GetOldPORCENTAJE_MARGEN_COSTEValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_COSTEValue(const aValue: Float); virtual; - function GetIMPORTE_MARGEN_ULT_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_MARGEN_ULT_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_ULT_COMPRAValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; virtual; - function GetOldPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_ULT_COMPRAValue(const aValue: Float); virtual; - function GetIMPORTE_MARGEN_PROM_COMPRAValue: Currency; virtual; - function GetOldIMPORTE_MARGEN_PROM_COMPRAValue: Currency; virtual; - procedure SetIMPORTE_MARGEN_PROM_COMPRAValue(const aValue: Currency); virtual; - function GetPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; virtual; - function GetOldPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; virtual; - procedure SetPORCENTAJE_MARGEN_PROM_COMPRAValue(const aValue: Float); virtual; - function GetNIF_CIF_PROVEEDORValue: String; virtual; - function GetOldNIF_CIF_PROVEEDORValue: String; virtual; - procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); virtual; - function GetNOMBRE_PROVEEDORValue: String; virtual; - function GetOldNOMBRE_PROVEEDORValue: String; virtual; - procedure SetNOMBRE_PROVEEDORValue(const aValue: String); virtual; - function GetCALLE_PROVEEDORValue: String; virtual; - function GetOldCALLE_PROVEEDORValue: String; virtual; - procedure SetCALLE_PROVEEDORValue(const aValue: String); virtual; - function GetPOBLACION_PROVEEDORValue: String; virtual; - function GetOldPOBLACION_PROVEEDORValue: String; virtual; - procedure SetPOBLACION_PROVEEDORValue(const aValue: String); virtual; - function GetPROVINCIA_PROVEEDORValue: String; virtual; - function GetOldPROVINCIA_PROVEEDORValue: String; virtual; - procedure SetPROVINCIA_PROVEEDORValue(const aValue: String); virtual; function GetNIF_CIF_CLIENTEValue: String; virtual; function GetOldNIF_CIF_CLIENTEValue: String; virtual; procedure SetNIF_CIF_CLIENTEValue(const aValue: String); virtual; @@ -260,50 +143,99 @@ type function GetNOMBRE_COMERCIAL_CLIENTEValue: String; virtual; function GetOldNOMBRE_COMERCIAL_CLIENTEValue: String; virtual; procedure SetNOMBRE_COMERCIAL_CLIENTEValue(const aValue: String); virtual; - function GetCALLE_CLIENTEValue: String; virtual; - function GetOldCALLE_CLIENTEValue: String; virtual; - procedure SetCALLE_CLIENTEValue(const aValue: String); virtual; - function GetPOBLACION_CLIENTEValue: String; virtual; - function GetOldPOBLACION_CLIENTEValue: String; virtual; - procedure SetPOBLACION_CLIENTEValue(const aValue: String); virtual; - function GetPROVINCIA_CLIENTEValue: String; virtual; - function GetOldPROVINCIA_CLIENTEValue: String; virtual; - procedure SetPROVINCIA_CLIENTEValue(const aValue: String); virtual; function GetNIF_CIF_AGENTEValue: String; virtual; function GetOldNIF_CIF_AGENTEValue: String; virtual; procedure SetNIF_CIF_AGENTEValue(const aValue: String); virtual; function GetNOMBRE_AGENTEValue: String; virtual; function GetOldNOMBRE_AGENTEValue: String; virtual; procedure SetNOMBRE_AGENTEValue(const aValue: String); virtual; - function GetCALLE_AGENTEValue: String; virtual; - function GetOldCALLE_AGENTEValue: String; virtual; - procedure SetCALLE_AGENTEValue(const aValue: String); virtual; - function GetPOBLACION_AGENTEValue: String; virtual; - function GetOldPOBLACION_AGENTEValue: String; virtual; - procedure SetPOBLACION_AGENTEValue(const aValue: String); virtual; - function GetPROVINCIA_AGENTEValue: String; virtual; - function GetOldPROVINCIA_AGENTEValue: String; virtual; - procedure SetPROVINCIA_AGENTEValue(const aValue: String); virtual; - function GetCOMISION_AGENTEValue: Float; virtual; - function GetOldCOMISION_AGENTEValue: Float; virtual; - procedure SetCOMISION_AGENTEValue(const aValue: Float); virtual; - function GetIMPORTE_COMISION_AGENTEValue: Currency; virtual; - function GetOldIMPORTE_COMISION_AGENTEValue: Currency; virtual; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); virtual; + function GetIMP_UNIDAD_ULT_VENTValue: Float; virtual; + function GetOldIMP_UNIDAD_ULT_VENTValue: Float; virtual; + procedure SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_NETO_ULT_VENTValue: Float; virtual; + function GetOldIMP_NETO_ULT_VENTValue: Float; virtual; + procedure SetIMP_NETO_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_PORTE_ULT_VENTValue: Float; virtual; + function GetOldIMP_PORTE_ULT_VENTValue: Float; virtual; + procedure SetIMP_PORTE_ULT_VENTValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_PRO_VENTValue: Float; virtual; + function GetOldIMP_UNIDAD_PRO_VENTValue: Float; virtual; + procedure SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_NETO_PRO_VENTValue: Float; virtual; + function GetOldIMP_NETO_PRO_VENTValue: Float; virtual; + procedure SetIMP_NETO_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_PORTE_PRO_VENTValue: Float; virtual; + function GetOldIMP_PORTE_PRO_VENTValue: Float; virtual; + procedure SetIMP_PORTE_PRO_VENTValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_COMPRAValue: Float; virtual; + function GetOldIMP_UNIDAD_COMPRAValue: Float; virtual; + procedure SetIMP_UNIDAD_COMPRAValue(const aValue: Float); virtual; + function GetIMP_NETO_COMPRAValue: Float; virtual; + function GetOldIMP_NETO_COMPRAValue: Float; virtual; + procedure SetIMP_NETO_COMPRAValue(const aValue: Float); virtual; + function GetIMP_PORTE_COMPRAValue: Float; virtual; + function GetOldIMP_PORTE_COMPRAValue: Float; virtual; + procedure SetIMP_PORTE_COMPRAValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_ULT_COMPValue: Float; virtual; + function GetOldIMP_UNIDAD_ULT_COMPValue: Float; virtual; + procedure SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_NETO_ULT_COMPValue: Float; virtual; + function GetOldIMP_NETO_ULT_COMPValue: Float; virtual; + procedure SetIMP_NETO_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_PORTE_ULT_COMPValue: Float; virtual; + function GetOldIMP_PORTE_ULT_COMPValue: Float; virtual; + procedure SetIMP_PORTE_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_UNIDAD_PRO_COMPValue: Float; virtual; + function GetOldIMP_UNIDAD_PRO_COMPValue: Float; virtual; + procedure SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_NETO_PRO_COMPValue: Float; virtual; + function GetOldIMP_NETO_PRO_COMPValue: Float; virtual; + procedure SetIMP_NETO_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_PORTE_PRO_COMPValue: Float; virtual; + function GetOldIMP_PORTE_PRO_COMPValue: Float; virtual; + procedure SetIMP_PORTE_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + function GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + function GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + function GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + function GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + function GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + function GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + function GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + function GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + function GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + function GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); virtual; + function GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + function GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + procedure SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual; + function GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + function GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; virtual; + procedure SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); virtual; { Properties } - property ID_FACTURA : Integer read GetID_FACTURAValue write SetID_FACTURAValue; - property OldID_FACTURA : Integer read GetOldID_FACTURAValue; property ID_EMPRESA : Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue; - property REFERENCIA_FACTURA : String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; - property OldREFERENCIA_FACTURA : String read GetOldREFERENCIA_FACTURAValue; - property FECHA_FACTURA : DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; - property OldFECHA_FACTURA : DateTime read GetOldFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA : Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; - property OldIMPORTE_TOTAL_FACTURA : Currency read GetOldIMPORTE_TOTAL_FACTURAValue; - property ID_COMISION_FACTURA : Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; - property OldID_COMISION_FACTURA : Integer read GetOldID_COMISION_FACTURAValue; + property ID_CLIENTE : Integer read GetID_CLIENTEValue write SetID_CLIENTEValue; + property OldID_CLIENTE : Integer read GetOldID_CLIENTEValue; property ID_ARTICULO : Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue; property FAMILIA : String read GetFAMILIAValue write SetFAMILIAValue; @@ -318,86 +250,70 @@ type property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue; property INVENTARIABLE : Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue; - property IMPORTE_UNIDAD_COSTE : Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; - property OldIMPORTE_UNIDAD_COSTE : Currency read GetOldIMPORTE_UNIDAD_COSTEValue; - property DESCUENTO_PROVEEDOR_COSTE : Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; - property OldDESCUENTO_PROVEEDOR_COSTE : Float read GetOldDESCUENTO_PROVEEDOR_COSTEValue; - property IMPORTE_NETO_COSTE : Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; - property OldIMPORTE_NETO_COSTE : Currency read GetOldIMPORTE_NETO_COSTEValue; - property IMPORTE_PORTE_COSTE : Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; - property OldIMPORTE_PORTE_COSTE : Currency read GetOldIMPORTE_PORTE_COSTEValue; - property IMPORTE_UNIDAD_ULTIMA_COMPRA : Currency read GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue write SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue; - property OldIMPORTE_UNIDAD_ULTIMA_COMPRA : Currency read GetOldIMPORTE_UNIDAD_ULTIMA_COMPRAValue; - property IMPORTE_NETO_ULTIMA_COMPRA : Currency read GetIMPORTE_NETO_ULTIMA_COMPRAValue write SetIMPORTE_NETO_ULTIMA_COMPRAValue; - property OldIMPORTE_NETO_ULTIMA_COMPRA : Currency read GetOldIMPORTE_NETO_ULTIMA_COMPRAValue; - property IMPORTE_PORTE_ULTIMA_COMPRA : Currency read GetIMPORTE_PORTE_ULTIMA_COMPRAValue write SetIMPORTE_PORTE_ULTIMA_COMPRAValue; - property OldIMPORTE_PORTE_ULTIMA_COMPRA : Currency read GetOldIMPORTE_PORTE_ULTIMA_COMPRAValue; - property IMPORTE_UNIDAD_PROMEDIO_COMPRA : Currency read GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue write SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue; - property OldIMPORTE_UNIDAD_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_UNIDAD_PROMEDIO_COMPRAValue; - property IMPORTE_NETO_PROMEDIO_COMPRA : Currency read GetIMPORTE_NETO_PROMEDIO_COMPRAValue write SetIMPORTE_NETO_PROMEDIO_COMPRAValue; - property OldIMPORTE_NETO_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_NETO_PROMEDIO_COMPRAValue; - property IMPORTE_PORTE_PROMEDIO_COMPRA : Currency read GetIMPORTE_PORTE_PROMEDIO_COMPRAValue write SetIMPORTE_PORTE_PROMEDIO_COMPRAValue; - property OldIMPORTE_PORTE_PROMEDIO_COMPRA : Currency read GetOldIMPORTE_PORTE_PROMEDIO_COMPRAValue; - property CANTIDAD : Integer read GetCANTIDADValue write SetCANTIDADValue; - property OldCANTIDAD : Integer read GetOldCANTIDADValue; - property IMPORTE_UNIDAD_VENTA : Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; - property OldIMPORTE_UNIDAD_VENTA : Currency read GetOldIMPORTE_UNIDAD_VENTAValue; - property DESCUENTO_CLIENTE_VENTA : Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; - property OldDESCUENTO_CLIENTE_VENTA : Float read GetOldDESCUENTO_CLIENTE_VENTAValue; - property IMPORTE_NETO_VENTA : Currency read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; - property OldIMPORTE_NETO_VENTA : Currency read GetOldIMPORTE_NETO_VENTAValue; - property IMPORTE_PORTE_VENTA : Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; - property OldIMPORTE_PORTE_VENTA : Float read GetOldIMPORTE_PORTE_VENTAValue; - property IMPORTE_TOTAL_VENTA : Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; - property OldIMPORTE_TOTAL_VENTA : Currency read GetOldIMPORTE_TOTAL_VENTAValue; - property IMPORTE_MARGEN_COSTE : Currency read GetIMPORTE_MARGEN_COSTEValue write SetIMPORTE_MARGEN_COSTEValue; - property OldIMPORTE_MARGEN_COSTE : Currency read GetOldIMPORTE_MARGEN_COSTEValue; - property PORCENTAJE_MARGEN_COSTE : Float read GetPORCENTAJE_MARGEN_COSTEValue write SetPORCENTAJE_MARGEN_COSTEValue; - property OldPORCENTAJE_MARGEN_COSTE : Float read GetOldPORCENTAJE_MARGEN_COSTEValue; - property IMPORTE_MARGEN_ULT_COMPRA : Currency read GetIMPORTE_MARGEN_ULT_COMPRAValue write SetIMPORTE_MARGEN_ULT_COMPRAValue; - property OldIMPORTE_MARGEN_ULT_COMPRA : Currency read GetOldIMPORTE_MARGEN_ULT_COMPRAValue; - property PORCENTAJE_MARGEN_ULT_COMPRA : Float read GetPORCENTAJE_MARGEN_ULT_COMPRAValue write SetPORCENTAJE_MARGEN_ULT_COMPRAValue; - property OldPORCENTAJE_MARGEN_ULT_COMPRA : Float read GetOldPORCENTAJE_MARGEN_ULT_COMPRAValue; - property IMPORTE_MARGEN_PROM_COMPRA : Currency read GetIMPORTE_MARGEN_PROM_COMPRAValue write SetIMPORTE_MARGEN_PROM_COMPRAValue; - property OldIMPORTE_MARGEN_PROM_COMPRA : Currency read GetOldIMPORTE_MARGEN_PROM_COMPRAValue; - property PORCENTAJE_MARGEN_PROM_COMPRA : Float read GetPORCENTAJE_MARGEN_PROM_COMPRAValue write SetPORCENTAJE_MARGEN_PROM_COMPRAValue; - property OldPORCENTAJE_MARGEN_PROM_COMPRA : Float read GetOldPORCENTAJE_MARGEN_PROM_COMPRAValue; - property NIF_CIF_PROVEEDOR : String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; - property OldNIF_CIF_PROVEEDOR : String read GetOldNIF_CIF_PROVEEDORValue; - property NOMBRE_PROVEEDOR : String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; - property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue; - property CALLE_PROVEEDOR : String read GetCALLE_PROVEEDORValue write SetCALLE_PROVEEDORValue; - property OldCALLE_PROVEEDOR : String read GetOldCALLE_PROVEEDORValue; - property POBLACION_PROVEEDOR : String read GetPOBLACION_PROVEEDORValue write SetPOBLACION_PROVEEDORValue; - property OldPOBLACION_PROVEEDOR : String read GetOldPOBLACION_PROVEEDORValue; - property PROVINCIA_PROVEEDOR : String read GetPROVINCIA_PROVEEDORValue write SetPROVINCIA_PROVEEDORValue; - property OldPROVINCIA_PROVEEDOR : String read GetOldPROVINCIA_PROVEEDORValue; property NIF_CIF_CLIENTE : String read GetNIF_CIF_CLIENTEValue write SetNIF_CIF_CLIENTEValue; property OldNIF_CIF_CLIENTE : String read GetOldNIF_CIF_CLIENTEValue; property NOMBRE_CLIENTE : String read GetNOMBRE_CLIENTEValue write SetNOMBRE_CLIENTEValue; property OldNOMBRE_CLIENTE : String read GetOldNOMBRE_CLIENTEValue; property NOMBRE_COMERCIAL_CLIENTE : String read GetNOMBRE_COMERCIAL_CLIENTEValue write SetNOMBRE_COMERCIAL_CLIENTEValue; property OldNOMBRE_COMERCIAL_CLIENTE : String read GetOldNOMBRE_COMERCIAL_CLIENTEValue; - property CALLE_CLIENTE : String read GetCALLE_CLIENTEValue write SetCALLE_CLIENTEValue; - property OldCALLE_CLIENTE : String read GetOldCALLE_CLIENTEValue; - property POBLACION_CLIENTE : String read GetPOBLACION_CLIENTEValue write SetPOBLACION_CLIENTEValue; - property OldPOBLACION_CLIENTE : String read GetOldPOBLACION_CLIENTEValue; - property PROVINCIA_CLIENTE : String read GetPROVINCIA_CLIENTEValue write SetPROVINCIA_CLIENTEValue; - property OldPROVINCIA_CLIENTE : String read GetOldPROVINCIA_CLIENTEValue; property NIF_CIF_AGENTE : String read GetNIF_CIF_AGENTEValue write SetNIF_CIF_AGENTEValue; property OldNIF_CIF_AGENTE : String read GetOldNIF_CIF_AGENTEValue; property NOMBRE_AGENTE : String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; property OldNOMBRE_AGENTE : String read GetOldNOMBRE_AGENTEValue; - property CALLE_AGENTE : String read GetCALLE_AGENTEValue write SetCALLE_AGENTEValue; - property OldCALLE_AGENTE : String read GetOldCALLE_AGENTEValue; - property POBLACION_AGENTE : String read GetPOBLACION_AGENTEValue write SetPOBLACION_AGENTEValue; - property OldPOBLACION_AGENTE : String read GetOldPOBLACION_AGENTEValue; - property PROVINCIA_AGENTE : String read GetPROVINCIA_AGENTEValue write SetPROVINCIA_AGENTEValue; - property OldPROVINCIA_AGENTE : String read GetOldPROVINCIA_AGENTEValue; - property COMISION_AGENTE : Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; - property OldCOMISION_AGENTE : Float read GetOldCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE : Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; - property OldIMPORTE_COMISION_AGENTE : Currency read GetOldIMPORTE_COMISION_AGENTEValue; + property IMP_UNIDAD_ULT_VENT : Float read GetIMP_UNIDAD_ULT_VENTValue write SetIMP_UNIDAD_ULT_VENTValue; + property OldIMP_UNIDAD_ULT_VENT : Float read GetOldIMP_UNIDAD_ULT_VENTValue; + property IMP_NETO_ULT_VENT : Float read GetIMP_NETO_ULT_VENTValue write SetIMP_NETO_ULT_VENTValue; + property OldIMP_NETO_ULT_VENT : Float read GetOldIMP_NETO_ULT_VENTValue; + property IMP_PORTE_ULT_VENT : Float read GetIMP_PORTE_ULT_VENTValue write SetIMP_PORTE_ULT_VENTValue; + property OldIMP_PORTE_ULT_VENT : Float read GetOldIMP_PORTE_ULT_VENTValue; + property IMP_UNIDAD_PRO_VENT : Float read GetIMP_UNIDAD_PRO_VENTValue write SetIMP_UNIDAD_PRO_VENTValue; + property OldIMP_UNIDAD_PRO_VENT : Float read GetOldIMP_UNIDAD_PRO_VENTValue; + property IMP_NETO_PRO_VENT : Float read GetIMP_NETO_PRO_VENTValue write SetIMP_NETO_PRO_VENTValue; + property OldIMP_NETO_PRO_VENT : Float read GetOldIMP_NETO_PRO_VENTValue; + property IMP_PORTE_PRO_VENT : Float read GetIMP_PORTE_PRO_VENTValue write SetIMP_PORTE_PRO_VENTValue; + property OldIMP_PORTE_PRO_VENT : Float read GetOldIMP_PORTE_PRO_VENTValue; + property IMP_UNIDAD_COMPRA : Float read GetIMP_UNIDAD_COMPRAValue write SetIMP_UNIDAD_COMPRAValue; + property OldIMP_UNIDAD_COMPRA : Float read GetOldIMP_UNIDAD_COMPRAValue; + property IMP_NETO_COMPRA : Float read GetIMP_NETO_COMPRAValue write SetIMP_NETO_COMPRAValue; + property OldIMP_NETO_COMPRA : Float read GetOldIMP_NETO_COMPRAValue; + property IMP_PORTE_COMPRA : Float read GetIMP_PORTE_COMPRAValue write SetIMP_PORTE_COMPRAValue; + property OldIMP_PORTE_COMPRA : Float read GetOldIMP_PORTE_COMPRAValue; + property IMP_UNIDAD_ULT_COMP : Float read GetIMP_UNIDAD_ULT_COMPValue write SetIMP_UNIDAD_ULT_COMPValue; + property OldIMP_UNIDAD_ULT_COMP : Float read GetOldIMP_UNIDAD_ULT_COMPValue; + property IMP_NETO_ULT_COMP : Float read GetIMP_NETO_ULT_COMPValue write SetIMP_NETO_ULT_COMPValue; + property OldIMP_NETO_ULT_COMP : Float read GetOldIMP_NETO_ULT_COMPValue; + property IMP_PORTE_ULT_COMP : Float read GetIMP_PORTE_ULT_COMPValue write SetIMP_PORTE_ULT_COMPValue; + property OldIMP_PORTE_ULT_COMP : Float read GetOldIMP_PORTE_ULT_COMPValue; + property IMP_UNIDAD_PRO_COMP : Float read GetIMP_UNIDAD_PRO_COMPValue write SetIMP_UNIDAD_PRO_COMPValue; + property OldIMP_UNIDAD_PRO_COMP : Float read GetOldIMP_UNIDAD_PRO_COMPValue; + property IMP_NETO_PRO_COMP : Float read GetIMP_NETO_PRO_COMPValue write SetIMP_NETO_PRO_COMPValue; + property OldIMP_NETO_PRO_COMP : Float read GetOldIMP_NETO_PRO_COMPValue; + property IMP_PORTE_PRO_COMP : Float read GetIMP_PORTE_PRO_COMPValue write SetIMP_PORTE_PRO_COMPValue; + property OldIMP_PORTE_PRO_COMP : Float read GetOldIMP_PORTE_PRO_COMPValue; + property IMP_MARGEN_ULT_VENT_COMPRA : Float read GetIMP_MARGEN_ULT_VENT_COMPRAValue write SetIMP_MARGEN_ULT_VENT_COMPRAValue; + property OldIMP_MARGEN_ULT_VENT_COMPRA : Float read GetOldIMP_MARGEN_ULT_VENT_COMPRAValue; + property POR_MARGEN_ULT_VENT_COMPRA : Float read GetPOR_MARGEN_ULT_VENT_COMPRAValue write SetPOR_MARGEN_ULT_VENT_COMPRAValue; + property OldPOR_MARGEN_ULT_VENT_COMPRA : Float read GetOldPOR_MARGEN_ULT_VENT_COMPRAValue; + property IMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetIMP_MARGEN_ULT_VENT_ULT_COMPValue write SetIMP_MARGEN_ULT_VENT_ULT_COMPValue; + property OldIMP_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue; + property POR_MARGEN_ULT_VENT_ULT_COMP : Float read GetPOR_MARGEN_ULT_VENT_ULT_COMPValue write SetPOR_MARGEN_ULT_VENT_ULT_COMPValue; + property OldPOR_MARGEN_ULT_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue; + property IMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetIMP_MARGEN_ULT_VENT_PRO_COMPValue write SetIMP_MARGEN_ULT_VENT_PRO_COMPValue; + property OldIMP_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue; + property POR_MARGEN_ULT_VENT_PRO_COMP : Float read GetPOR_MARGEN_ULT_VENT_PRO_COMPValue write SetPOR_MARGEN_ULT_VENT_PRO_COMPValue; + property OldPOR_MARGEN_ULT_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue; + property IMP_MARGEN_PRO_VENT_COMPRA : Float read GetIMP_MARGEN_PRO_VENT_COMPRAValue write SetIMP_MARGEN_PRO_VENT_COMPRAValue; + property OldIMP_MARGEN_PRO_VENT_COMPRA : Float read GetOldIMP_MARGEN_PRO_VENT_COMPRAValue; + property POR_MARGEN_PRO_VENT_COMPRA : Float read GetPOR_MARGEN_PRO_VENT_COMPRAValue write SetPOR_MARGEN_PRO_VENT_COMPRAValue; + property OldPOR_MARGEN_PRO_VENT_COMPRA : Float read GetOldPOR_MARGEN_PRO_VENT_COMPRAValue; + property IMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetIMP_MARGEN_PRO_VENT_ULT_COMPValue write SetIMP_MARGEN_PRO_VENT_ULT_COMPValue; + property OldIMP_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue; + property POR_MARGEN_PRO_VENT_ULT_COMP : Float read GetPOR_MARGEN_PRO_VENT_ULT_COMPValue write SetPOR_MARGEN_PRO_VENT_ULT_COMPValue; + property OldPOR_MARGEN_PRO_VENT_ULT_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue; + property IMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetIMP_MARGEN_PRO_VENT_PRO_COMPValue write SetIMP_MARGEN_PRO_VENT_PRO_COMPValue; + property OldIMP_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue; + property POR_MARGEN_PRO_VENT_PRO_COMP : Float read GetPOR_MARGEN_PRO_VENT_PRO_COMPValue write SetPOR_MARGEN_PRO_VENT_PRO_COMPValue; + property OldPOR_MARGEN_PRO_VENT_PRO_COMP : Float read GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -421,21 +337,6 @@ begin inherited; end; -function TInfMargenArticuloBusinessProcessorRules.GetID_FACTURAValue: Integer; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_FACTURA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldID_FACTURAValue: Integer; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_FACTURA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetID_FACTURAValue(const aValue: Integer); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_FACTURA] := aValue; -end; - function TInfMargenArticuloBusinessProcessorRules.GetID_EMPRESAValue: Integer; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_EMPRESA]; @@ -451,64 +352,19 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_EMPRESA] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetREFERENCIA_FACTURAValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetID_CLIENTEValue: Integer; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA_FACTURA]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_CLIENTE]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldREFERENCIA_FACTURAValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetOldID_CLIENTEValue: Integer; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloREFERENCIA_FACTURA]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_CLIENTE]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetREFERENCIA_FACTURAValue(const aValue: String); +procedure TInfMargenArticuloBusinessProcessorRules.SetID_CLIENTEValue(const aValue: Integer); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloREFERENCIA_FACTURA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetFECHA_FACTURAValue: DateTime; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloFECHA_FACTURA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldFECHA_FACTURAValue: DateTime; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloFECHA_FACTURA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetFECHA_FACTURAValue(const aValue: DateTime); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloFECHA_FACTURA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_TOTAL_FACTURAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_FACTURA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_TOTAL_FACTURAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_FACTURA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_FACTURA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetID_COMISION_FACTURAValue: Integer; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_COMISION_FACTURA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldID_COMISION_FACTURAValue: Integer; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloID_COMISION_FACTURA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetID_COMISION_FACTURAValue(const aValue: Integer); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_COMISION_FACTURA] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloID_CLIENTE] := aValue; end; function TInfMargenArticuloBusinessProcessorRules.GetID_ARTICULOValue: Integer; @@ -616,411 +472,6 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloINVENTARIABLE] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetDESCUENTO_PROVEEDOR_COSTEValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldDESCUENTO_PROVEEDOR_COSTEValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCUENTO_PROVEEDOR_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_NETO_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_NETO_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_NETO_COSTEValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_PORTE_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_PORTE_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_ULTIMA_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_ULTIMA_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_NETO_ULTIMA_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_ULTIMA_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_ULTIMA_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_PORTE_ULTIMA_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_ULTIMA_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_PROMEDIO_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_NETO_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_PROMEDIO_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_PROMEDIO_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_PORTE_PROMEDIO_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_PROMEDIO_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetCANTIDADValue: Integer; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCANTIDAD]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldCANTIDADValue: Integer; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCANTIDAD]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetCANTIDADValue(const aValue: Integer); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCANTIDAD] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_VENTA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_VENTA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_UNIDAD_VENTA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetDESCUENTO_CLIENTE_VENTAValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCUENTO_CLIENTE_VENTA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldDESCUENTO_CLIENTE_VENTAValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloDESCUENTO_CLIENTE_VENTA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloDESCUENTO_CLIENTE_VENTA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_NETO_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_VENTA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_NETO_VENTA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_NETO_VENTAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_NETO_VENTA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_PORTE_VENTAValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_VENTA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_VENTAValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_PORTE_VENTA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_PORTE_VENTAValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_PORTE_VENTA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_TOTAL_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_VENTA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_TOTAL_VENTAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_VENTA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_TOTAL_VENTA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_MARGEN_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_MARGEN_COSTEValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_MARGEN_COSTEValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPORCENTAJE_MARGEN_COSTEValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_COSTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPORCENTAJE_MARGEN_COSTEValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_COSTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPORCENTAJE_MARGEN_COSTEValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_COSTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_MARGEN_ULT_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_MARGEN_ULT_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_MARGEN_ULT_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_ULT_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPORCENTAJE_MARGEN_ULT_COMPRAValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPORCENTAJE_MARGEN_ULT_COMPRAValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_ULT_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_MARGEN_PROM_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_MARGEN_PROM_COMPRAValue: Currency; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_MARGEN_PROM_COMPRAValue(const aValue: Currency); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_MARGEN_PROM_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPORCENTAJE_MARGEN_PROM_COMPRAValue: Float; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPORCENTAJE_MARGEN_PROM_COMPRAValue(const aValue: Float); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPORCENTAJE_MARGEN_PROM_COMPRA] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetNIF_CIF_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_PROVEEDOR]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldNIF_CIF_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNIF_CIF_PROVEEDOR]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetNIF_CIF_PROVEEDORValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_PROVEEDOR] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetNOMBRE_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_PROVEEDOR]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldNOMBRE_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloNOMBRE_PROVEEDOR]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetNOMBRE_PROVEEDORValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_PROVEEDOR] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetCALLE_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_PROVEEDOR]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldCALLE_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCALLE_PROVEEDOR]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetCALLE_PROVEEDORValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_PROVEEDOR] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPOBLACION_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_PROVEEDOR]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPOBLACION_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOBLACION_PROVEEDOR]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPOBLACION_PROVEEDORValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_PROVEEDOR] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPROVINCIA_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_PROVEEDOR]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPROVINCIA_PROVEEDORValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPROVINCIA_PROVEEDOR]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPROVINCIA_PROVEEDORValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_PROVEEDOR] := aValue; -end; - function TInfMargenArticuloBusinessProcessorRules.GetNIF_CIF_CLIENTEValue: String; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_CLIENTE]; @@ -1066,51 +517,6 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_COMERCIAL_CLIENTE] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetCALLE_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_CLIENTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldCALLE_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCALLE_CLIENTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetCALLE_CLIENTEValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_CLIENTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPOBLACION_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_CLIENTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPOBLACION_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOBLACION_CLIENTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPOBLACION_CLIENTEValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_CLIENTE] := aValue; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetPROVINCIA_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_CLIENTE]; -end; - -function TInfMargenArticuloBusinessProcessorRules.GetOldPROVINCIA_CLIENTEValue: String; -begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPROVINCIA_CLIENTE]; -end; - -procedure TInfMargenArticuloBusinessProcessorRules.SetPROVINCIA_CLIENTEValue(const aValue: String); -begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_CLIENTE] := aValue; -end; - function TInfMargenArticuloBusinessProcessorRules.GetNIF_CIF_AGENTEValue: String; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNIF_CIF_AGENTE]; @@ -1141,79 +547,409 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloNOMBRE_AGENTE] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetCALLE_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_AGENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldCALLE_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCALLE_AGENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetCALLE_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_VENTValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCALLE_AGENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_VENT] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetPOBLACION_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_AGENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldPOBLACION_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOBLACION_AGENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetPOBLACION_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_ULT_VENTValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOBLACION_AGENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_VENT] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetPROVINCIA_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_AGENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldPROVINCIA_AGENTEValue: String; +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPROVINCIA_AGENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetPROVINCIA_AGENTEValue(const aValue: String); +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_VENTValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPROVINCIA_AGENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_VENT] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetCOMISION_AGENTEValue: Float; +function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCOMISION_AGENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldCOMISION_AGENTEValue: Float; +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloCOMISION_AGENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetCOMISION_AGENTEValue(const aValue: Float); +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_VENTValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloCOMISION_AGENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_VENT] := aValue; end; -function TInfMargenArticuloBusinessProcessorRules.GetIMPORTE_COMISION_AGENTEValue: Currency; +function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_PRO_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_COMISION_AGENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT]; end; -function TInfMargenArticuloBusinessProcessorRules.GetOldIMPORTE_COMISION_AGENTEValue: Currency; +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_VENTValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMPORTE_COMISION_AGENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT]; end; -procedure TInfMargenArticuloBusinessProcessorRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_PRO_VENTValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMPORTE_COMISION_AGENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_VENT] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_VENTValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_VENTValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_VENTValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_VENT] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_UNIDAD_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_UNIDAD_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_UNIDAD_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_UNIDAD_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_NETO_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_NETO_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_NETO_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_NETO_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_PORTE_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_PORTE_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_PORTE_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_PORTE_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_ULT_VENT_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_ULT_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_ULT_VENT_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_ULT_VENT_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_COMPRAValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_COMPRAValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_COMPRA] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_ULT_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_ULT_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_ULT_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldIMP_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetIMP_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloIMP_MARGEN_PRO_VENT_PRO_COMP] := aValue; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP]; +end; + +function TInfMargenArticuloBusinessProcessorRules.GetOldPOR_MARGEN_PRO_VENT_PRO_COMPValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP]; +end; + +procedure TInfMargenArticuloBusinessProcessorRules.SetPOR_MARGEN_PRO_VENT_PRO_COMPValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfMargenArticuloPOR_MARGEN_PRO_VENT_PRO_COMP] := aValue; end; diff --git a/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas index b4d906a9..e4e5739c 100644 --- a/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas +++ b/Source/Modulos/Informe margen por articulo/Model/uBizInfMargenArticulo.pas @@ -69,9 +69,9 @@ procedure TBizInfMargenArticulo.OnBeforeDataRequestCall( begin Request.ParamByName('Columns').AsString := VisibleColumns; FDateParams.Clear; - NewDatasetParam(FDateParams, 'FECHAINI', DataTable.ParamByName('FECHAINI').AsDateTime); - NewDatasetParam(FDateParams, 'FECHAFIN', DataTable.ParamByName('FECHAFIN').AsDateTime); - Request.ParamByName('Params').AsComplexType := FDateParams; +// NewDatasetParam(FDateParams, 'FECHAINI', DataTable.ParamByName('FECHAINI').AsDateTime); +// NewDatasetParam(FDateParams, 'FECHAFIN', DataTable.ParamByName('FECHAFIN').AsDateTime); +// Request.ParamByName('Params').AsComplexType := FDateParams; end; procedure TBizInfMargenArticulo.OnBeforeSchemaCall(DataTable: TDADataTable; Request: TDARemoteRequest); diff --git a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm index 9486245f..cb4c7cc8 100644 --- a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm +++ b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.dfm @@ -11,64 +11,31 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo DataDictionary = DataDictionary Datasets = < item - Params = < - item - Name = 'FECHAINI' - BlobType = dabtUnknown - Value = '' - ParamType = daptInput - end - item - Name = 'FECHAFIN' - BlobType = dabtUnknown - Value = '' - ParamType = daptInput - end> + Params = <> Statements = < item Connection = 'IBX' - TargetTable = 'V_INF_MARGEN_VENTAS_ARTICULOS' + TargetTable = 'V_INF_MARGEN_ARTICULOS' SQL = - 'SELECT'#10' ID_FACTURA,'#10' ID_EMPRESA,'#10' REFERENCIA_FACTURA,'#10' ' + - ' FECHA_FACTURA,'#10' IMPORTE_TOTAL_FACTURA,'#10' ID_COMISION_FAC' + - 'TURA,'#10' '#10' ID_ARTICULO,'#10' FAMILIA,'#10' REFERENCIA,'#10' REF' + - 'ERENCIA_PROV,'#10' DESCRIPCION,'#10' COMISIONABLE,'#10' INVENTARIAB' + - 'LE,'#10#10' IMPORTE_UNIDAD_COSTE,'#10' DESCUENTO_PROVEEDOR_COSTE,'#10' ' + - ' IMPORTE_NETO_COSTE,'#10' IMPORTE_PORTE_COSTE,'#10#10' IMPORTE_UNID' + - 'AD_ULTIMA_COMPRA,'#10' IMPORTE_NETO_ULTIMA_COMPRA,'#10' IMPORTE_PO' + - 'RTE_ULTIMA_COMPRA,'#10#10' IMPORTE_UNIDAD_PROMEDIO_COMPRA,'#10' IMPO' + - 'RTE_NETO_PROMEDIO_COMPRA,'#10' IMPORTE_PORTE_PROMEDIO_COMPRA,'#10#10' ' + - ' CANTIDAD,'#10' IMPORTE_UNIDAD_VENTA,'#10' DESCUENTO_CLIENTE_VENT' + - 'A,'#10' IMPORTE_NETO_VENTA,'#10' IMPORTE_PORTE_VENTA,'#10' IMPORTE_' + - 'TOTAL_VENTA,'#10#10' IMPORTE_MARGEN_COSTE,'#10' PORCENTAJE_MARGEN_CO' + - 'STE,'#10#10' IMPORTE_MARGEN_ULT_COMPRA,'#10' PORCENTAJE_MARGEN_ULT_C' + - 'OMPRA,'#10#10' IMPORTE_MARGEN_PROM_COMPRA,'#10' PORCENTAJE_MARGEN_PR' + - 'OM_COMPRA,'#10#10' NIF_CIF_PROVEEDOR,'#10' NOMBRE_PROVEEDOR,'#10' CAL' + - 'LE_PROVEEDOR,'#10' POBLACION_PROVEEDOR,'#10' PROVINCIA_PROVEEDOR,'#10 + - #10' NIF_CIF_CLIENTE,'#10' NOMBRE_CLIENTE,'#10' NOMBRE_COMERCIAL_C' + - 'LIENTE,'#10' CALLE_CLIENTE,'#10' POBLACION_CLIENTE,'#10' PROVINCIA_' + - 'CLIENTE,'#10#10' NIF_CIF_AGENTE,'#10' NOMBRE_AGENTE,'#10' CALLE_AGENT' + - 'E,'#10' POBLACION_AGENTE,'#10' PROVINCIA_AGENTE,'#10' COMISION_AGEN' + - 'TE,'#10' IMPORTE_COMISION_AGENTE'#10' '#10'FROM V_INF_MARGEN_VENTAS_AR' + - 'TICULOS'#10'WHERE FECHA_FACTURA BETWEEN :FECHAINI AND :FECHAFIN' + 'SELECT'#10' ID_EMPRESA,'#10' ID_CLIENTE,'#10' ID_ARTICULO,'#10' NIF_' + + 'CIF_CLIENTE,'#10' NOMBRE_CLIENTE,'#10' NOMBRE_COMERCIAL_CLIENTE,'#10' ' + + ' NIF_CIF_AGENTE,'#10' NOMBRE_AGENTE,'#10' FAMILIA,'#10' REFERENCI' + + 'A,'#10' REFERENCIA_PROV,'#10' DESCRIPCION,'#10' COMISIONABLE,'#10' I' + + 'NVENTARIABLE,'#10' IMP_UNIDAD_ULT_VENT,'#10' IMP_NETO_ULT_VENT,'#10' ' + + ' IMP_PORTE_ULT_VENT,'#10' IMP_UNIDAD_PRO_VENT,'#10' IMP_NETO_PRO_' + + 'VENT,'#10' IMP_PORTE_PRO_VENT,'#10' IMP_UNIDAD_COMPRA,'#10' IMP_NET' + + 'O_COMPRA,'#10' IMP_PORTE_COMPRA,'#10' IMP_UNIDAD_ULT_COMP,'#10' IMP' + + '_NETO_ULT_COMP,'#10' IMP_PORTE_ULT_COMP,'#10' IMP_UNIDAD_PRO_COMP,' + + #10' IMP_NETO_PRO_COMP,'#10' IMP_PORTE_PRO_COMP,'#10' IMP_MARGEN_U' + + 'LT_VENT_COMPRA,'#10' POR_MARGEN_ULT_VENT_COMPRA,'#10' IMP_MARGEN_U' + + 'LT_VENT_ULT_COMP,'#10' POR_MARGEN_ULT_VENT_ULT_COMP,'#10' IMP_MARG' + + 'EN_ULT_VENT_PRO_COMP,'#10' POR_MARGEN_ULT_VENT_PRO_COMP,'#10' IMP_' + + 'MARGEN_PRO_VENT_COMPRA,'#10' POR_MARGEN_PRO_VENT_COMPRA,'#10' IMP_' + + 'MARGEN_PRO_VENT_ULT_COMP,'#10' POR_MARGEN_PRO_VENT_ULT_COMP,'#10' ' + + 'IMP_MARGEN_PRO_VENT_PRO_COMP,'#10' POR_MARGEN_PRO_VENT_PRO_COMP'#10' ' + + ' '#10'FROM V_INF_MARGEN_ARTICULOS' StatementType = stSQL ColumnMappings = < - item - DatasetField = 'ID_FACTURA' - TableField = 'ID_FACTURA' - end - item - DatasetField = 'FECHA_FACTURA' - TableField = 'FECHA_FACTURA' - end - item - DatasetField = 'IMPORTE_TOTAL_FACTURA' - TableField = 'IMPORTE_TOTAL_FACTURA' - end - item - DatasetField = 'ID_COMISION_FACTURA' - TableField = 'ID_COMISION_FACTURA' - end item DatasetField = 'ID_ARTICULO' TableField = 'ID_ARTICULO' @@ -97,30 +64,6 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo DatasetField = 'INVENTARIABLE' TableField = 'INVENTARIABLE' end - item - DatasetField = 'CANTIDAD' - TableField = 'CANTIDAD' - end - item - DatasetField = 'NIF_CIF_PROVEEDOR' - TableField = 'NIF_CIF_PROVEEDOR' - end - item - DatasetField = 'NOMBRE_PROVEEDOR' - TableField = 'NOMBRE_PROVEEDOR' - end - item - DatasetField = 'CALLE_PROVEEDOR' - TableField = 'CALLE_PROVEEDOR' - end - item - DatasetField = 'POBLACION_PROVEEDOR' - TableField = 'POBLACION_PROVEEDOR' - end - item - DatasetField = 'PROVINCIA_PROVEEDOR' - TableField = 'PROVINCIA_PROVEEDOR' - end item DatasetField = 'NIF_CIF_CLIENTE' TableField = 'NIF_CIF_CLIENTE' @@ -133,18 +76,6 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo DatasetField = 'NOMBRE_COMERCIAL_CLIENTE' TableField = 'NOMBRE_COMERCIAL_CLIENTE' end - item - DatasetField = 'CALLE_CLIENTE' - TableField = 'CALLE_CLIENTE' - end - item - DatasetField = 'POBLACION_CLIENTE' - TableField = 'POBLACION_CLIENTE' - end - item - DatasetField = 'PROVINCIA_CLIENTE' - TableField = 'PROVINCIA_CLIENTE' - end item DatasetField = 'NIF_CIF_AGENTE' TableField = 'NIF_CIF_AGENTE' @@ -153,131 +84,125 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo DatasetField = 'NOMBRE_AGENTE' TableField = 'NOMBRE_AGENTE' end - item - DatasetField = 'CALLE_AGENTE' - TableField = 'CALLE_AGENTE' - end - item - DatasetField = 'POBLACION_AGENTE' - TableField = 'POBLACION_AGENTE' - end - item - DatasetField = 'PROVINCIA_AGENTE' - TableField = 'PROVINCIA_AGENTE' - end - item - DatasetField = 'COMISION_AGENTE' - TableField = 'COMISION_AGENTE' - end - item - DatasetField = 'IMPORTE_COMISION_AGENTE' - TableField = 'IMPORTE_COMISION_AGENTE' - end item DatasetField = 'ID_EMPRESA' TableField = 'ID_EMPRESA' end item - DatasetField = 'REFERENCIA_FACTURA' - TableField = 'REFERENCIA_FACTURA' + DatasetField = 'ID_CLIENTE' + TableField = 'ID_CLIENTE' end item - DatasetField = 'IMPORTE_UNIDAD_COSTE' - TableField = 'IMPORTE_UNIDAD_COSTE' + DatasetField = 'IMP_UNIDAD_ULT_VENT' + TableField = 'IMP_UNIDAD_ULT_VENT' end item - DatasetField = 'DESCUENTO_PROVEEDOR_COSTE' - TableField = 'DESCUENTO_PROVEEDOR_COSTE' + DatasetField = 'IMP_NETO_ULT_VENT' + TableField = 'IMP_NETO_ULT_VENT' end item - DatasetField = 'IMPORTE_NETO_COSTE' - TableField = 'IMPORTE_NETO_COSTE' + DatasetField = 'IMP_PORTE_ULT_VENT' + TableField = 'IMP_PORTE_ULT_VENT' end item - DatasetField = 'IMPORTE_PORTE_COSTE' - TableField = 'IMPORTE_PORTE_COSTE' + DatasetField = 'IMP_UNIDAD_PRO_VENT' + TableField = 'IMP_UNIDAD_PRO_VENT' end item - DatasetField = 'IMPORTE_UNIDAD_VENTA' - TableField = 'IMPORTE_UNIDAD_VENTA' + DatasetField = 'IMP_NETO_PRO_VENT' + TableField = 'IMP_NETO_PRO_VENT' end item - DatasetField = 'DESCUENTO_CLIENTE_VENTA' - TableField = 'DESCUENTO_CLIENTE_VENTA' + DatasetField = 'IMP_PORTE_PRO_VENT' + TableField = 'IMP_PORTE_PRO_VENT' end item - DatasetField = 'IMPORTE_NETO_VENTA' - TableField = 'IMPORTE_NETO_VENTA' + DatasetField = 'IMP_UNIDAD_COMPRA' + TableField = 'IMP_UNIDAD_COMPRA' end item - DatasetField = 'IMPORTE_PORTE_VENTA' - TableField = 'IMPORTE_PORTE_VENTA' + DatasetField = 'IMP_NETO_COMPRA' + TableField = 'IMP_NETO_COMPRA' end item - DatasetField = 'IMPORTE_TOTAL_VENTA' - TableField = 'IMPORTE_TOTAL_VENTA' + DatasetField = 'IMP_PORTE_COMPRA' + TableField = 'IMP_PORTE_COMPRA' end item - DatasetField = 'IMPORTE_UNIDAD_ULTIMA_COMPRA' - TableField = 'IMPORTE_UNIDAD_ULTIMA_COMPRA' + DatasetField = 'IMP_UNIDAD_ULT_COMP' + TableField = 'IMP_UNIDAD_ULT_COMP' end item - DatasetField = 'IMPORTE_NETO_ULTIMA_COMPRA' - TableField = 'IMPORTE_NETO_ULTIMA_COMPRA' + DatasetField = 'IMP_NETO_ULT_COMP' + TableField = 'IMP_NETO_ULT_COMP' end item - DatasetField = 'IMPORTE_PORTE_ULTIMA_COMPRA' - TableField = 'IMPORTE_PORTE_ULTIMA_COMPRA' + DatasetField = 'IMP_PORTE_ULT_COMP' + TableField = 'IMP_PORTE_ULT_COMP' end item - DatasetField = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA' - TableField = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA' + DatasetField = 'IMP_UNIDAD_PRO_COMP' + TableField = 'IMP_UNIDAD_PRO_COMP' end item - DatasetField = 'IMPORTE_NETO_PROMEDIO_COMPRA' - TableField = 'IMPORTE_NETO_PROMEDIO_COMPRA' + DatasetField = 'IMP_NETO_PRO_COMP' + TableField = 'IMP_NETO_PRO_COMP' end item - DatasetField = 'IMPORTE_PORTE_PROMEDIO_COMPRA' - TableField = 'IMPORTE_PORTE_PROMEDIO_COMPRA' + DatasetField = 'IMP_PORTE_PRO_COMP' + TableField = 'IMP_PORTE_PRO_COMP' end item - DatasetField = 'IMPORTE_MARGEN_COSTE' - TableField = 'IMPORTE_MARGEN_COSTE' + DatasetField = 'IMP_MARGEN_ULT_VENT_COMPRA' + TableField = 'IMP_MARGEN_ULT_VENT_COMPRA' end item - DatasetField = 'PORCENTAJE_MARGEN_COSTE' - TableField = 'PORCENTAJE_MARGEN_COSTE' + DatasetField = 'POR_MARGEN_ULT_VENT_COMPRA' + TableField = 'POR_MARGEN_ULT_VENT_COMPRA' end item - DatasetField = 'IMPORTE_MARGEN_ULT_COMPRA' - TableField = 'IMPORTE_MARGEN_ULT_COMPRA' + DatasetField = 'IMP_MARGEN_ULT_VENT_ULT_COMP' + TableField = 'IMP_MARGEN_ULT_VENT_ULT_COMP' end item - DatasetField = 'PORCENTAJE_MARGEN_ULT_COMPRA' - TableField = 'PORCENTAJE_MARGEN_ULT_COMPRA' + DatasetField = 'POR_MARGEN_ULT_VENT_ULT_COMP' + TableField = 'POR_MARGEN_ULT_VENT_ULT_COMP' end item - DatasetField = 'IMPORTE_MARGEN_PROM_COMPRA' - TableField = 'IMPORTE_MARGEN_PROM_COMPRA' + DatasetField = 'IMP_MARGEN_ULT_VENT_PRO_COMP' + TableField = 'IMP_MARGEN_ULT_VENT_PRO_COMP' end item - DatasetField = 'PORCENTAJE_MARGEN_PROM_COMPRA' - TableField = 'PORCENTAJE_MARGEN_PROM_COMPRA' + DatasetField = 'POR_MARGEN_ULT_VENT_PRO_COMP' + TableField = 'POR_MARGEN_ULT_VENT_PRO_COMP' + end + item + DatasetField = 'IMP_MARGEN_PRO_VENT_COMPRA' + TableField = 'IMP_MARGEN_PRO_VENT_COMPRA' + end + item + DatasetField = 'POR_MARGEN_PRO_VENT_COMPRA' + TableField = 'POR_MARGEN_PRO_VENT_COMPRA' + end + item + DatasetField = 'IMP_MARGEN_PRO_VENT_ULT_COMP' + TableField = 'IMP_MARGEN_PRO_VENT_ULT_COMP' + end + item + DatasetField = 'POR_MARGEN_PRO_VENT_ULT_COMP' + TableField = 'POR_MARGEN_PRO_VENT_ULT_COMP' + end + item + DatasetField = 'IMP_MARGEN_PRO_VENT_PRO_COMP' + TableField = 'IMP_MARGEN_PRO_VENT_PRO_COMP' + end + item + DatasetField = 'POR_MARGEN_PRO_VENT_PRO_COMP' + TableField = 'POR_MARGEN_PRO_VENT_PRO_COMP' end> end> Name = 'InfMargenArticulo' Fields = < - item - Name = 'ID_FACTURA' - DataType = datInteger - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_ID_FACTURA' - InPrimaryKey = True - Calculated = False - Lookup = False - LookupCache = False - end item Name = 'ID_EMPRESA' DataType = datInteger @@ -289,41 +214,11 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo LookupCache = False end item - Name = 'REFERENCIA_FACTURA' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_REFERENCIA_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'FECHA_FACTURA' - DataType = datDateTime - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_FECHA_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_TOTAL_FACTURA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_IMPORTE_TOTAL_FACTURA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'ID_COMISION_FACTURA' + Name = 'ID_CLIENTE' DataType = datInteger BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_ID_COMISION_FACTURA' + DisplayWidth = 0 + Alignment = taLeftJustify InPrimaryKey = False Calculated = False Lookup = False @@ -403,281 +298,6 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo Lookup = False LookupCache = False end - item - Name = 'IMPORTE_UNIDAD_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PRECIO_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'DESCUENTO_PROVEEDOR_COSTE' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_DESCUENTO_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PRECIO_NETO' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PRECIO_PORTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_UNIDAD_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_ULTIMA_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_PORTE_ULTIMA_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_UNIDAD_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_PROMEDIO_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_PORTE_PROMEDIO_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'CANTIDAD' - DataType = datInteger - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_CANTIDAD' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_UNIDAD_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_IMPORTE_UNIDAD' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'DESCUENTO_CLIENTE_VENTA' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_DESCUENTO_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_NETO_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_NETO_VENTA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_PORTE_VENTA' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_IMPORTE_PORTE_VENTA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_TOTAL_VENTA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_IMPORTE_TOTAL' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_COSTE' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_COSTE' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_COSTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_ULT_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_ULT_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_ULT_COMPRA' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_ULT_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'IMPORTE_MARGEN_PROM_COMPRA' - DataType = datCurrency - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_IMPORTE_MARGEN_PROM_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PORCENTAJE_MARGEN_PROM_COMPRA' - DataType = datFloat - BlobType = dabtUnknown - DictionaryEntry = 'InfMargenArticulo_PORCENTAJE_MARGEN_PROM_COMPRA' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'NIF_CIF_PROVEEDOR' - DataType = datString - Size = 15 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_NIF_CIF_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'NOMBRE_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_NOMBRE_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'CALLE_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_CALLE_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_POBLACION_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_PROVEEDOR' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PROVINCIA_PROVEEDOR' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end item Name = 'NIF_CIF_CLIENTE' DataType = datString @@ -711,39 +331,6 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo Lookup = False LookupCache = False end - item - Name = 'CALLE_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_CALLE_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_POBLACION_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_CLIENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PROVINCIA_CLIENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end item Name = 'NIF_CIF_AGENTE' DataType = datString @@ -767,53 +354,297 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo LookupCache = False end item - Name = 'CALLE_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_CALLE_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'POBLACION_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_POBLACION_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'PROVINCIA_AGENTE' - DataType = datString - Size = 255 - BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_PROVINCIA_AGENTE' - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False - end - item - Name = 'COMISION_AGENTE' + Name = 'IMP_UNIDAD_ULT_VENT' DataType = datFloat BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_COMISION_AGENTE' + DisplayWidth = 0 + Alignment = taLeftJustify InPrimaryKey = False Calculated = False Lookup = False LookupCache = False end item - Name = 'IMPORTE_COMISION_AGENTE' - DataType = datCurrency + Name = 'IMP_NETO_ULT_VENT' + DataType = datFloat BlobType = dabtUnknown - DictionaryEntry = 'InfVentasArticulo_IMPORTE_COMISION_AGENTE' + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_ULT_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_PRO_VENT' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_UNIDAD_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_NETO_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_PORTE_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_ULT_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_ULT_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_COMPRA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_ULT_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMP_MARGEN_PRO_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'POR_MARGEN_PRO_VENT_PRO_COMP' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify InPrimaryKey = False Calculated = False Lookup = False @@ -1220,7 +1051,7 @@ object srvInfMargenArticulo: TsrvInfMargenArticulo DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 - DisplayLabel = 'Precio coste promedio ' + DisplayLabel = 'Precio coste promedio' Alignment = taRightJustify end item diff --git a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.pas b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.pas index 5b15e9eb..e0b56622 100644 --- a/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.pas +++ b/Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.pas @@ -37,7 +37,11 @@ uses {Generated:} FactuGES_Invk, uSchemaUtilsServer, dialogs; const - CAMPOS_SUMA = '#IMPORTE_TOTAL_FACTURA#PRECIO_COSTE#PRECIO_NETO#PRECIO_PORTE#CANTIDAD#IMPORTE_UNIDAD#IMPORTE_PORTE#IMPORTE_TOTAL#IMPORTE_COMISION_AGENTE#'; + CAMPOS_AVG1 = '#IMP_NETO_ULT_VENT#IMP_NETO_PRO_VENT#IMP_NETO_COMPRA#IMP_NETO_ULT_COMP#IMP_NETO_PRO_COMP#IMP_MARGEN_ULT_VENT_COMPRA#POR_MARGEN_ULT_VENT_COMPRA#IMP_MARGEN_ULT_VENT_ULT_COMP#POR_MARGEN_ULT_VENT_ULT_COMP#'; + CAMPOS_AVG2 = '#IMP_MARGEN_ULT_VENT_PRO_COMP#POR_MARGEN_ULT_VENT_PRO_COMP#IMP_MARGEN_PRO_VENT_COMPRA#POR_MARGEN_PRO_VENT_COMPRA#IMP_MARGEN_PRO_VENT_ULT_COMP#POR_MARGEN_PRO_VENT_ULT_COMP#IMP_MARGEN_PRO_VENT_PRO_COMP#POR_MARGEN_PRO_VENT_PRO_COMP#'; + + CAMPOS_SUMA = ''; + procedure Create_srv_InfMargenArticulo(out anInstance : IUnknown); begin @@ -63,6 +67,7 @@ begin Service := Self; Columnas := Columns; ColumnasQueSuman := CAMPOS_SUMA; + ColumnasQueAVG := CAMPOS_AVG1 + CAMPOS_AVG2; try ds := GetNewDataSet; finally diff --git a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm index 47eb671e..db04d661 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.dfm @@ -163,400 +163,12 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo end inherited pgPaginas: TPageControl Width = 679 - Height = 478 + Height = 452 ExplicitWidth = 679 - ExplicitHeight = 478 + ExplicitHeight = 452 inherited pagGeneral: TTabSheet ExplicitWidth = 671 - ExplicitHeight = 450 - inline frViewInfMargenArticulo1: TfrViewInfMargenArticulo - Left = 0 - Top = 0 - Width = 671 - Height = 450 - Align = alClient - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - TabOrder = 0 - ReadOnly = False - ExplicitWidth = 671 - ExplicitHeight = 450 - inherited TBXMultiDock1: TTBXMultiDock - Height = 350 - ExplicitHeight = 350 - inherited pnlParametros: TTBXDockablePanel - ExplicitHeight = 159 - inherited pcParametros: TPageControl - Height = 70 - ExplicitHeight = 70 - inherited TabSheet5: TTabSheet - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 - end - inherited tsColumnas: TTabSheet - ExplicitHeight = 60 - inherited frViewColumnas1: TfrViewColumnas - Height = 60 - ExplicitHeight = 60 - inherited lbColumnas: TcxCheckListBox - Height = 31 - ExplicitHeight = 31 - end - end - end - inherited tsAgrupacion: TTabSheet - ExplicitHeight = 29 - inherited frViewAgrupaciones1: TfrViewAgrupaciones - Height = 29 - ExplicitHeight = 29 - end - end - end - end - inherited pnlTareas: TTBXDockablePanel - Top = 159 - DockPos = 159 - ExplicitTop = 159 - ExplicitHeight = 175 - inherited TBXPageScroller1: TTBXPageScroller - Height = 153 - ExplicitHeight = 153 - inherited pcTareas: TPageControl - Height = 105 - ExplicitHeight = 105 - inherited tsSumarios: TTabSheet - ExplicitHeight = 48 - inherited frViewSumarios1: TfrViewSumarios - Height = 48 - ExplicitHeight = 48 - inherited vgSumarios: TcxVerticalGrid - Height = 19 - ExplicitHeight = 19 - end - end - end - inherited tsFiltros: TTabSheet - ExplicitHeight = 95 - inherited frViewFiltros1: TfrViewFiltros - Height = 95 - ExplicitHeight = 95 - inherited cxFilterControl1: TcxFilterControl - Height = 36 - ExplicitHeight = 36 - end - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 65 - ExplicitTop = 65 - end - end - end - end - end - end - end - inherited TBXMultiDock2: TTBXMultiDock - Width = 671 - ExplicitWidth = 671 - inherited pnlIntervaloFechas: TTBXDockablePanel - ExplicitWidth = 655 - inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 651 - ExplicitWidth = 651 - end - inherited frViewPeriodoFechas1: TfrViewPeriodoFechas - Width = 651 - ExplicitWidth = 651 - inherited dxLayoutControl1: TdxLayoutControl - Width = 651 - ExplicitWidth = 651 - end - end - end - end - inherited frViewInfMargenArticuloGrid1: TfrViewInfMargenArticuloGrid - Width = 449 - Height = 350 - ExplicitWidth = 449 - ExplicitHeight = 350 - inherited cxGrid: TcxGrid - Width = 449 - Height = 350 - ExplicitWidth = 449 - ExplicitHeight = 350 - inherited cxGridView: TcxGridDBTableView - inherited cxGridViewID_FACTURA: TcxGridDBColumn - Caption = 'Id factura' - end - inherited cxGridViewID_EMPRESA: TcxGridDBColumn - Caption = 'Id empresa' - end - inherited cxGridViewREFERENCIA_FACTURA: TcxGridDBColumn - Caption = 'Ref. factura' - end - inherited cxGridViewFECHA_FACTURA: TcxGridDBColumn - Caption = 'Fecha factura' - end - inherited cxGridViewIMPORTE_TOTAL_FACTURA: TcxGridDBColumn - Caption = 'Importe factura' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewID_COMISION_FACTURA: TcxGridDBColumn - Caption = 'Id comisi'#243'n factura' - end - inherited cxGridViewID_ARTICULO: TcxGridDBColumn - Caption = 'Id art'#237'culo' - end - inherited cxGridViewFAMILIA: TcxGridDBColumn - Caption = 'Familia' - end - inherited cxGridViewREFERENCIA: TcxGridDBColumn - Caption = 'Referencia' - end - inherited cxGridViewREFERENCIA_PROV: TcxGridDBColumn - Caption = 'Ref. proveedor' - end - inherited cxGridViewDESCRIPCION: TcxGridDBColumn - Caption = 'Descripci'#243'n' - end - inherited cxGridViewCOMISIONABLE: TcxGridDBColumn - Caption = 'Comisionable' - end - inherited cxGridViewINVENTARIABLE: TcxGridDBColumn - Caption = 'Inventariable' - end - inherited cxGridViewIMPORTE_UNIDAD_COSTE: TcxGridDBColumn - Caption = 'Precio coste' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewDESCUENTO_PROVEEDOR_COSTE: TcxGridDBColumn - Caption = 'Dto proveedor' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_NETO_COSTE: TcxGridDBColumn - Caption = 'Precio neto' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_PORTE_COSTE: TcxGridDBColumn - Caption = 'Precio porte' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_UNIDAD_ULTIMA_COMPRA: TcxGridDBColumn - Caption = 'Precio '#250'ltima compra' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_NETO_ULTIMA_COMPRA: TcxGridDBColumn - Caption = 'Precio neto '#250'ltima compra' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_PORTE_ULTIMA_COMPRA: TcxGridDBColumn - Caption = 'Precio porte '#250'ltima compra' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_UNIDAD_PROMEDIO_COMPRA: TcxGridDBColumn - Caption = 'Precio promedio' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_NETO_PROMEDIO_COMPRA: TcxGridDBColumn - Caption = 'Precio neto promedio' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_PORTE_PROMEDIO_COMPRA: TcxGridDBColumn - Caption = 'Precio porte promedio' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Caption = 'Cantidad' - PropertiesClassName = 'TcxSpinEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_UNIDAD_VENTA: TcxGridDBColumn - Caption = 'Precio venta' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewDESCUENTO_CLIENTE_VENTA: TcxGridDBColumn - Caption = 'Dto cliente' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn - Caption = 'Precio neto venta' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn - Caption = 'Importe total venta' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_MARGEN_COSTE: TcxGridDBColumn - Caption = 'Margen coste' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPORCENTAJE_MARGEN_COSTE: TcxGridDBColumn - Caption = '% margen coste' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_MARGEN_ULT_COMPRA: TcxGridDBColumn - Caption = 'Margen '#250'ltima compra' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPORCENTAJE_MARGEN_ULT_COMPRA: TcxGridDBColumn - Caption = '% margen '#250'ltima compra' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_MARGEN_PROM_COMPRA: TcxGridDBColumn - Caption = 'Margen promedio' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPORCENTAJE_MARGEN_PROM_COMPRA: TcxGridDBColumn - Caption = '% margen promedio' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn - Caption = 'NIF / CIF prov.' - end - inherited cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn - Caption = 'Proveedor' - end - inherited cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn - Caption = 'Calle prov.' - end - inherited cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn - Caption = 'Poblaci'#243'n prov.' - end - inherited cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn - Caption = 'Provincia prov.' - end - inherited cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn - Caption = 'NIF / CIF cli.' - end - inherited cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn - Caption = 'Cliente' - end - inherited cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn - Caption = 'Nombre comercial cli.' - end - inherited cxGridViewCALLE_CLIENTE: TcxGridDBColumn - Caption = 'Calle cli.' - end - inherited cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn - Caption = 'Poblaci'#243'n cli.' - end - inherited cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn - Caption = 'Provincia cli.' - end - inherited cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn - Caption = 'NIF / CIF agente' - end - inherited cxGridViewNOMBRE_AGENTE: TcxGridDBColumn - Caption = 'Nombre agente' - end - inherited cxGridViewCALLE_AGENTE: TcxGridDBColumn - Caption = 'Calle agente' - end - inherited cxGridViewPOBLACION_AGENTE: TcxGridDBColumn - Caption = 'Poblaci'#243'n agente' - end - inherited cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn - Caption = 'Provincia agente' - end - inherited cxGridViewCOMISION_AGENTE: TcxGridDBColumn - Caption = 'Comisi'#243'n agente' - end - inherited cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn - Caption = 'Importe comisi'#243'n' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - end - end - inherited dxPrintStyleManager1: TdxPrintStyleManager - inherited dxPrintStyleManager1Style1: TdxPSPrintStyle - BuiltInStyle = True - end - end - inherited dxComponentPrinter: TdxComponentPrinter - inherited dxPrinterLinkcxGrid: TdxGridReportLink - BuiltInReportLink = True - end - end - end - end + ExplicitHeight = 424 end end inherited StatusBar: TJvStatusBar @@ -565,9 +177,144 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo ExplicitTop = 554 ExplicitWidth = 679 end - inherited JvAppRegistryStorage: TJvAppRegistryStorage [4] + inline frViewInfMargenArticulo1: TfrViewInfMargenArticulo [4] + Left = 0 + Top = 102 + Width = 679 + Height = 452 + Align = alClient + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + TabOrder = 4 + ReadOnly = False + ExplicitWidth = 671 + ExplicitHeight = 424 + inherited TBXMultiDock1: TTBXMultiDock + Height = 347 + ExplicitHeight = 319 + inherited pnlParametros: TTBXDockablePanel + ExplicitHeight = 158 + inherited pcParametros: TPageControl + Height = 69 + ExplicitHeight = 55 + inherited TabSheet5: TTabSheet + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 29 + end + inherited tsColumnas: TTabSheet + ExplicitHeight = 45 + inherited frViewColumnas1: TfrViewColumnas + Height = 59 + ExplicitHeight = 45 + inherited lbColumnas: TcxCheckListBox + Height = 30 + ExplicitHeight = 16 + end + end + end + inherited tsAgrupacion: TTabSheet + ExplicitHeight = 29 + inherited frViewAgrupaciones1: TfrViewAgrupaciones + Height = 29 + ExplicitHeight = 29 + end + end + end + end + inherited pnlTareas: TTBXDockablePanel + Top = 158 + DockPos = 158 + ExplicitTop = 158 + ExplicitHeight = 173 + inherited TBXPageScroller1: TTBXPageScroller + Height = 151 + ExplicitHeight = 137 + inherited pcTareas: TPageControl + Height = 103 + ExplicitHeight = 89 + inherited tsSumarios: TTabSheet + ExplicitHeight = 48 + inherited frViewSumarios1: TfrViewSumarios + Height = 48 + ExplicitHeight = 48 + inherited vgSumarios: TcxVerticalGrid + Height = 19 + ExplicitHeight = 19 + end + end + end + inherited tsFiltros: TTabSheet + ExplicitHeight = 79 + inherited frViewFiltros1: TfrViewFiltros + Height = 93 + ExplicitHeight = 79 + inherited cxFilterControl1: TcxFilterControl + Height = 34 + ExplicitHeight = 20 + end + inherited TBXAlignmentPanel3: TTBXAlignmentPanel + Top = 63 + ExplicitTop = 49 + end + end + end + end + end + end + end + inherited TBXMultiDock2: TTBXMultiDock + Width = 679 + ExplicitWidth = 671 + inherited pnlIntervaloFechas: TTBXDockablePanel + ExplicitWidth = 663 + inherited TBXAlignmentPanel3: TTBXAlignmentPanel + Width = 659 + ExplicitWidth = 651 + end + end + end + inherited frViewInfMargenArticuloGrid1: TfrViewInfMargenArticuloGrid + Width = 457 + Height = 347 + ExplicitWidth = 449 + ExplicitHeight = 319 + inherited cxGrid: TcxGrid + Width = 457 + Height = 347 + ExplicitWidth = 449 + ExplicitHeight = 319 + inherited cxGridView: TcxGridDBTableView + inherited cxGridViewREFERENCIA: TcxGridDBColumn [9] + end + inherited cxGridViewFAMILIA: TcxGridDBColumn [10] + end + inherited cxGridViewINVENTARIABLE: TcxGridDBColumn [13] + end + inherited cxGridViewCOMISIONABLE: TcxGridDBColumn [14] + end + end + end + inherited dxPrintStyleManager1: TdxPrintStyleManager + inherited dxPrintStyleManager1Style1: TdxPSPrintStyle + BuiltInStyle = True + end + end + inherited dxComponentPrinter: TdxComponentPrinter + inherited dxPrinterLinkcxGrid: TdxGridReportLink + BuiltInReportLink = True + end + end + end end - inherited SmallImages: TPngImageList + inherited JvAppRegistryStorage: TJvAppRegistryStorage [5] + end + inherited SmallImages: TPngImageList [6] PngImages = < item PngImage.Data = { @@ -1100,7 +847,7 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo end> Bitmap = {} end - inherited LargeImages: TPngImageList + inherited LargeImages: TPngImageList [7] PngImages = < item PngImage.Data = { @@ -1930,7 +1677,9 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo end> Bitmap = {} end - inherited EditorActionList: TActionList [8] + inherited JvFormStorage: TJvFormStorage [8] + end + inherited EditorActionList: TActionList [9] object actExpandir: TAction Category = 'Ver' Caption = 'Expandir todo' @@ -1950,7 +1699,7 @@ inherited fEditorInfMargenArticulo: TfEditorInfMargenArticulo OnExecute = actAnchoAutoExecute end end - inherited dsDataTable: TDADataSource [9] + inherited dsDataTable: TDADataSource [10] end object dsVentasTerminadas: TDADataSource Left = 320 diff --git a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas index a71c12f8..02b661cd 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas +++ b/Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas @@ -1,4 +1,4 @@ -unit uEditorInfMargenArticulo; +unit uEditorInfMargenArticulo; interface @@ -10,7 +10,8 @@ uses TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uBizInformes, uCustomView, uViewBase, uViewInformeBase, uViewInfMargenArticulo, Grids, DBGrids, pngimage, JvExComCtrls, JvStatusBar, uInfMargenArticuloController, - uIEditorInfMargenArticulo, uBizInfMargenArticulo, uInformesController; + uIEditorInfMargenArticulo, uBizInfMargenArticulo, uInformesController, + uViewGridBase, TB2ExtItems, TBXExtItems; type @@ -72,7 +73,8 @@ implementation uses uROClasses, cxControls, cxGridCustomView, //cxGridCustomTableView, - cxGridTableView, uCustomEditor, uDataModuleUsuarios, uSistemaFunc; + cxGridTableView, uCustomEditor, uDataModuleUsuarios, uSistemaFunc, + uEditorBase; {$R *.dfm} @@ -241,7 +243,7 @@ var NombreFichero: String; begin try - //Creamos un fichero temporal para guardar la configuración del informe que viene dada + //Creamos un fichero temporal para guardar la configuración del informe que viene dada //por su campo vista, para luego restaurarla en el grid a partir de dicho fichero porque el Stream falla NombreFichero := DarFicheroTemporal; AssignFile(Fichero, NombreFichero); @@ -249,7 +251,7 @@ begin Writeln(Fichero, FInforme.VISTA.Text); CloseFile(Fichero); - //Restauramos la configuración + //Restauramos la configuración frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridView.RestoreFromIniFile(NombreFichero,True,false,[gsoUseFilter,gsoUseSummary]); finally @@ -270,6 +272,8 @@ begin if FInforme.DataTable.State = dsInsert then // Si es nuevo obligamos a meter nombre actPropiedades.Execute; + + actRefrescar.Execute; end; procedure TfEditorInfMargenArticulo.actPrevisualizarExecute( @@ -316,9 +320,9 @@ begin LeftTitle.Add(FInforme.DESCRIPCION); RightTitle.Clear; - RightTitle.Add(DateToStr(frViewInfMargenArticulo1.frViewPeriodoFechas1.edtFechaIni.Date) + - ' - ' + DateToStr(frViewInfMargenArticulo1.frViewPeriodoFechas1.edtFechaFin.Date)); - RightTitle.Add(frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.FocusedView.DataController.Filter.FilterText); +// RightTitle.Add(DateToStr(frViewInfMargenArticulo1.frViewPeriodoFechas1.edtFechaIni.Date) + +// ' - ' + DateToStr(frViewInfMargenArticulo1.frViewPeriodoFechas1.edtFechaFin.Date)); +// RightTitle.Add(frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.FocusedView.DataController.Filter.FilterText); end; end; diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm index 6086ef46..2982d340 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm @@ -1,77 +1,78 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo Width = 834 - Height = 420 + Height = 448 ExplicitWidth = 834 - ExplicitHeight = 420 + ExplicitHeight = 448 inherited TBXMultiDock1: TTBXMultiDock - Top = 100 - Height = 320 - ExplicitTop = 100 - ExplicitHeight = 229 + Top = 105 + Height = 343 + ExplicitTop = 105 + ExplicitHeight = 343 inherited pnlParametros: TTBXDockablePanel - ExplicitHeight = 145 + ExplicitHeight = 156 inherited pcParametros: TPageControl - Height = 56 - ExplicitHeight = 18 + Height = 67 + ExplicitHeight = 67 inherited TabSheet5: TTabSheet ExplicitLeft = 4 ExplicitTop = 6 ExplicitWidth = 210 - ExplicitHeight = 46 + ExplicitHeight = 57 end inherited tsColumnas: TTabSheet - ExplicitHeight = 8 + ExplicitHeight = 57 inherited frViewColumnas1: TfrViewColumnas - Height = 46 - ExplicitHeight = 8 + Height = 57 + ExplicitHeight = 57 inherited lbColumnas: TcxCheckListBox - Height = 17 - ExplicitHeight = 94 + Height = 28 + ExplicitHeight = 28 end end end inherited tsAgrupacion: TTabSheet - ExplicitHeight = 8 + ExplicitHeight = 57 inherited frViewAgrupaciones1: TfrViewAgrupaciones - Height = 46 - ExplicitHeight = 8 + Height = 57 + ExplicitHeight = 57 end end end end inherited pnlTareas: TTBXDockablePanel - Top = 145 - DockPos = 145 - ExplicitTop = 145 - ExplicitHeight = 159 + Top = 156 + DockPos = 156 + ExplicitTop = 156 + ExplicitHeight = 171 inherited TBXPageScroller1: TTBXPageScroller - Height = 137 - ExplicitHeight = 84 + Height = 149 + ExplicitHeight = 149 inherited pcTareas: TPageControl - Height = 89 - ExplicitHeight = 36 + Height = 101 + ExplicitHeight = 101 inherited tsSumarios: TTabSheet - ExplicitHeight = 26 + ExplicitHeight = 91 inherited frViewSumarios1: TfrViewSumarios - Height = 79 - ExplicitHeight = 26 + Height = 91 + ExplicitHeight = 91 inherited vgSumarios: TcxVerticalGrid - Height = 50 - ExplicitHeight = 50 + Height = 62 + ExplicitHeight = 62 end end end inherited tsFiltros: TTabSheet - ExplicitHeight = 26 + ExplicitHeight = 91 inherited frViewFiltros1: TfrViewFiltros - Height = 79 - ExplicitHeight = 26 + Height = 91 + ExplicitHeight = 91 inherited cxFilterControl1: TcxFilterControl - Height = 20 + Height = 32 + ExplicitHeight = 32 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 49 - ExplicitTop = -4 + Top = 61 + ExplicitTop = 61 end end end @@ -81,62 +82,29 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo end inherited TBXMultiDock2: TTBXMultiDock Width = 834 - Height = 100 - ExplicitHeight = 100 + Height = 105 + Visible = False + ExplicitWidth = 834 + ExplicitHeight = 105 inherited pnlIntervaloFechas: TTBXDockablePanel - DockedHeight = 96 + DockedHeight = 101 ShowCaption = False ShowCaptionWhenDocked = False ExplicitWidth = 818 - ExplicitHeight = 100 + ExplicitHeight = 105 inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 66 + Top = 71 Width = 814 - ExplicitTop = 66 - ExplicitWidth = 679 - end - inline frViewPeriodoFechas1: TfrViewPeriodoFechas - Left = 0 - Top = 0 - Width = 814 - Height = 66 - Align = alClient - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [] - ParentFont = False - TabOrder = 1 - ReadOnly = False - ExplicitWidth = 679 - ExplicitHeight = 66 - inherited dxLayoutControl1: TdxLayoutControl - Width = 814 - Height = 66 - ExplicitWidth = 679 - ExplicitHeight = 66 - inherited cbPeriodo: TcxComboBox - Left = 54 - ExplicitLeft = 54 - end - inherited edtFechaIni: TcxDateEdit - Left = 269 - ExplicitLeft = 269 - end - inherited edtFechaFin: TcxDateEdit - Left = 54 - ExplicitLeft = 54 - end - end + ExplicitTop = 71 + ExplicitWidth = 814 end end end inline frViewInfMargenArticuloGrid1: TfrViewInfMargenArticuloGrid [2] Left = 222 - Top = 100 + Top = 105 Width = 612 - Height = 320 + Height = 343 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -146,11 +114,15 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo ParentFont = False TabOrder = 2 ReadOnly = False - ExplicitLeft = 251 - ExplicitTop = 42 + ExplicitLeft = 222 + ExplicitTop = 105 + ExplicitWidth = 612 + ExplicitHeight = 343 inherited cxGrid: TcxGrid Width = 612 - Height = 320 + Height = 343 + ExplicitWidth = 612 + ExplicitHeight = 343 end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle @@ -163,9 +135,11 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo end end end - inherited SmallImages: TPngImageList [3] + inherited dsDataSource: TDADataSource [3] end - inherited LargeImages: TPngImageList [4] + inherited SmallImages: TPngImageList [4] + end + inherited LargeImages: TPngImageList [5] end inherited EditorActionList: TActionList Left = 248 diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas index 2b93c986..ed491e50 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.pas @@ -1,4 +1,4 @@ -unit uViewInfMargenArticulo; +unit uViewInfMargenArticulo; interface @@ -12,7 +12,8 @@ uses cxDBData, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, cxTextEdit, uViewFiltros, uBizInfMargenArticulo, - uViewPeriodoFechas, uViewInfMargenArticuloGrid; + uViewPeriodoFechas, uViewInfMargenArticuloGrid, cxContainer, uViewFiltroBase, + uDADataTable; type IViewInfMargenArticulo = interface(IViewInformeBase) @@ -23,7 +24,6 @@ type end; TfrViewInfMargenArticulo = class(TfrViewInformeBase, IViewInfMargenArticulo) - frViewPeriodoFechas1: TfrViewPeriodoFechas; actPeriodoFechas: TAction; frViewInfMargenArticuloGrid1: TfrViewInfMargenArticuloGrid; procedure actRefrescarExecute(Sender: TObject); @@ -34,7 +34,7 @@ type procedure OnViewInformeBaseGridChanged(Sender : TObject); procedure OnFilterChanged(Sender : TObject); procedure ActivarTarea(const ATarea: Integer); override; - + function GetFocusedView: TcxGridDBTableView; override; function GetDatos : IBizInfMargenArticulo; procedure SetDatos (const Value : IBizInfMargenArticulo); @@ -46,10 +46,6 @@ type implementation -//uses -// uBizInfMargenArticulo; -// uDataModuleVentasTerminadas, uBizControlVentasTerminadas, ; - const PERIODO = 0; @@ -74,6 +70,11 @@ begin Result := FDatos; end; +function TfrViewInfMargenArticulo.GetFocusedView: TcxGridDBTableView; +begin + Result := frViewInfMargenArticuloGrid1.cxGridView; +end; + procedure TfrViewInfMargenArticulo.Refresh; var AColumns : TStringList; @@ -93,7 +94,7 @@ begin AColumns.sorted := true; AColumns.Duplicates := dupIgnore; - //Añadimos el nombre de los campos a los que referencia los captions de agrupacion + //Añadimos el nombre de los campos a los que referencia los captions de agrupacion AColumnsGroup := frViewAgrupaciones1.GetAgrupaciones; for i:= 0 to AColumnsGroup.Count - 1 do AColumns.Add((frViewInfMargenArticuloGrid1 as IViewInformeBaseGrid).GetColumnByCaption(AColumnsGroup.Strings[i]).DataBinding.FieldName); @@ -108,8 +109,8 @@ begin LoadSchema; - ParamByName('FECHAINI').AsDateTime := frViewPeriodoFechas1.FechaInicial; - ParamByName('FECHAFIN').AsDateTime := frViewPeriodoFechas1.FechaFinal; +// ParamByName('FECHAINI').AsDateTime := frViewPeriodoFechas1.FechaInicial; +// ParamByName('FECHAFIN').AsDateTime := frViewPeriodoFechas1.FechaFinal; Active := True; @@ -177,3 +178,4 @@ begin end; end. + diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm index f71a6878..43157c21 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm @@ -15,6 +15,7 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.CustomizeDialog = False + FilterBox.Visible = fvNever DataController.Filter.Options = [fcoCaseInsensitive] DataController.Filter.OnChanged = cxGridViewDataControllerFilterChanged DataController.KeyFieldNames = 'RecID' @@ -23,7 +24,6 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> DataController.Summary.OnAfterSummary = cxGridViewDataControllerSummaryAfterSummary - DataController.OnCompare = cxGridViewDataControllerCompare DataController.OnGroupingChanged = cxGridViewDataControllerGroupingChanged DataController.OnSortingChanged = cxGridViewDataControllerSortingChanged OptionsBehavior.CellHints = True @@ -54,161 +54,283 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid DataBinding.FieldName = 'RecID' Visible = False end - object cxGridViewID_FACTURA: TcxGridDBColumn - DataBinding.FieldName = 'ID_FACTURA' - end object cxGridViewID_EMPRESA: TcxGridDBColumn + Caption = 'Id_empresa' DataBinding.FieldName = 'ID_EMPRESA' end - object cxGridViewREFERENCIA_FACTURA: TcxGridDBColumn - DataBinding.FieldName = 'REFERENCIA_FACTURA' - end - object cxGridViewFECHA_FACTURA: TcxGridDBColumn - DataBinding.FieldName = 'FECHA_FACTURA' - end - object cxGridViewIMPORTE_TOTAL_FACTURA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_TOTAL_FACTURA' - end - object cxGridViewID_COMISION_FACTURA: TcxGridDBColumn - DataBinding.FieldName = 'ID_COMISION_FACTURA' + object cxGridViewID_CLIENTE: TcxGridDBColumn + Caption = 'Id_cliente' + DataBinding.FieldName = 'ID_CLIENTE' end object cxGridViewID_ARTICULO: TcxGridDBColumn + Caption = 'Id_articulo' DataBinding.FieldName = 'ID_ARTICULO' end - object cxGridViewFAMILIA: TcxGridDBColumn - DataBinding.FieldName = 'FAMILIA' - end - object cxGridViewREFERENCIA: TcxGridDBColumn - DataBinding.FieldName = 'REFERENCIA' - end - object cxGridViewREFERENCIA_PROV: TcxGridDBColumn - DataBinding.FieldName = 'REFERENCIA_PROV' - end - object cxGridViewDESCRIPCION: TcxGridDBColumn - DataBinding.FieldName = 'DESCRIPCION' - end - object cxGridViewCOMISIONABLE: TcxGridDBColumn - DataBinding.FieldName = 'COMISIONABLE' - end - object cxGridViewINVENTARIABLE: TcxGridDBColumn - DataBinding.FieldName = 'INVENTARIABLE' - end - object cxGridViewIMPORTE_UNIDAD_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_UNIDAD_COSTE' - end - object cxGridViewDESCUENTO_PROVEEDOR_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'DESCUENTO_PROVEEDOR_COSTE' - end - object cxGridViewIMPORTE_NETO_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_NETO_COSTE' - end - object cxGridViewIMPORTE_PORTE_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_PORTE_COSTE' - end - object cxGridViewIMPORTE_UNIDAD_ULTIMA_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_UNIDAD_ULTIMA_COMPRA' - end - object cxGridViewIMPORTE_NETO_ULTIMA_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_NETO_ULTIMA_COMPRA' - end - object cxGridViewIMPORTE_PORTE_ULTIMA_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_PORTE_ULTIMA_COMPRA' - end - object cxGridViewIMPORTE_UNIDAD_PROMEDIO_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_UNIDAD_PROMEDIO_COMPRA' - end - object cxGridViewIMPORTE_NETO_PROMEDIO_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_NETO_PROMEDIO_COMPRA' - end - object cxGridViewIMPORTE_PORTE_PROMEDIO_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_PORTE_PROMEDIO_COMPRA' - end - object cxGridViewCANTIDAD: TcxGridDBColumn - DataBinding.FieldName = 'CANTIDAD' - end - object cxGridViewIMPORTE_UNIDAD_VENTA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_UNIDAD_VENTA' - end - object cxGridViewDESCUENTO_CLIENTE_VENTA: TcxGridDBColumn - DataBinding.FieldName = 'DESCUENTO_CLIENTE_VENTA' - end - object cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_NETO_VENTA' - end - object cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_TOTAL_VENTA' - end - object cxGridViewIMPORTE_MARGEN_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_MARGEN_COSTE' - end - object cxGridViewPORCENTAJE_MARGEN_COSTE: TcxGridDBColumn - DataBinding.FieldName = 'PORCENTAJE_MARGEN_COSTE' - end - object cxGridViewIMPORTE_MARGEN_ULT_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_MARGEN_ULT_COMPRA' - end - object cxGridViewPORCENTAJE_MARGEN_ULT_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'PORCENTAJE_MARGEN_ULT_COMPRA' - end - object cxGridViewIMPORTE_MARGEN_PROM_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_MARGEN_PROM_COMPRA' - end - object cxGridViewPORCENTAJE_MARGEN_PROM_COMPRA: TcxGridDBColumn - DataBinding.FieldName = 'PORCENTAJE_MARGEN_PROM_COMPRA' - end - object cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'NIF_CIF_PROVEEDOR' - end - object cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'NOMBRE_PROVEEDOR' - end - object cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_PROVEEDOR' - end - object cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_PROVEEDOR' - end - object cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_PROVEEDOR' - end object cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn + Caption = 'NIF/CIF cliente' DataBinding.FieldName = 'NIF_CIF_CLIENTE' end object cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn + Caption = 'Cliente' DataBinding.FieldName = 'NOMBRE_CLIENTE' end object cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn + Caption = 'Nombre comercial cli.' DataBinding.FieldName = 'NOMBRE_COMERCIAL_CLIENTE' end - object cxGridViewCALLE_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_CLIENTE' - end - object cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_CLIENTE' - end - object cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_CLIENTE' - end object cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn + Caption = 'NIF/CIF agente' DataBinding.FieldName = 'NIF_CIF_AGENTE' end object cxGridViewNOMBRE_AGENTE: TcxGridDBColumn + Caption = 'Agente' DataBinding.FieldName = 'NOMBRE_AGENTE' end - object cxGridViewCALLE_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_AGENTE' + object cxGridViewFAMILIA: TcxGridDBColumn + Caption = 'Familia' + DataBinding.FieldName = 'FAMILIA' end - object cxGridViewPOBLACION_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_AGENTE' + object cxGridViewREFERENCIA: TcxGridDBColumn + Caption = 'Referencia' + DataBinding.FieldName = 'REFERENCIA' end - object cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_AGENTE' + object cxGridViewREFERENCIA_PROV: TcxGridDBColumn + Caption = 'Ref. proveedor' + DataBinding.FieldName = 'REFERENCIA_PROV' end - object cxGridViewCOMISION_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'COMISION_AGENTE' + object cxGridViewDESCRIPCION: TcxGridDBColumn + Caption = 'Descripci'#243'n' + DataBinding.FieldName = 'DESCRIPCION' end - object cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'IMPORTE_COMISION_AGENTE' + object cxGridViewCOMISIONABLE: TcxGridDBColumn + Caption = 'Comisionable' + DataBinding.FieldName = 'COMISIONABLE' + end + object cxGridViewINVENTARIABLE: TcxGridDBColumn + Caption = 'Inventariable' + DataBinding.FieldName = 'INVENTARIABLE' + end + object cxGridViewIMP_UNIDAD_ULT_VENT: TcxGridDBColumn + Caption = 'Precio uni. ult. venta' + DataBinding.FieldName = 'IMP_UNIDAD_ULT_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_NETO_ULT_VENT: TcxGridDBColumn + Caption = 'Precio neto ult. venta' + DataBinding.FieldName = 'IMP_NETO_ULT_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_PORTE_ULT_VENT: TcxGridDBColumn + Caption = 'Precio porte ult. venta' + DataBinding.FieldName = 'IMP_PORTE_ULT_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_UNIDAD_PRO_VENT: TcxGridDBColumn + Caption = 'Precio uni. venta pro.' + DataBinding.FieldName = 'IMP_UNIDAD_PRO_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_NETO_PRO_VENT: TcxGridDBColumn + Caption = 'Precio neto venta pro.' + DataBinding.FieldName = 'IMP_NETO_PRO_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_PORTE_PRO_VENT: TcxGridDBColumn + Caption = 'Precio porte venta pro.' + DataBinding.FieldName = 'IMP_PORTE_PRO_VENT' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_UNIDAD_COMPRA: TcxGridDBColumn + Caption = 'Precio uni. compra' + DataBinding.FieldName = 'IMP_UNIDAD_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_NETO_COMPRA: TcxGridDBColumn + Caption = 'Precio neto compra' + DataBinding.FieldName = 'IMP_NETO_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_PORTE_COMPRA: TcxGridDBColumn + Caption = 'Precio porte compra' + DataBinding.FieldName = 'IMP_PORTE_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_UNIDAD_ULT_COMP: TcxGridDBColumn + Caption = 'Precio uni. ult. compra' + DataBinding.FieldName = 'IMP_UNIDAD_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_NETO_ULT_COMP: TcxGridDBColumn + Caption = 'Precio neto ult. compra' + DataBinding.FieldName = 'IMP_NETO_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_PORTE_ULT_COMP: TcxGridDBColumn + Caption = 'Precio porte ult. compra' + DataBinding.FieldName = 'IMP_PORTE_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_UNIDAD_PRO_COMP: TcxGridDBColumn + Caption = 'Precio uni. compra pro.' + DataBinding.FieldName = 'IMP_UNIDAD_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_NETO_PRO_COMP: TcxGridDBColumn + Caption = 'Precio neto compra pro.' + DataBinding.FieldName = 'IMP_NETO_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_PORTE_PRO_COMP: TcxGridDBColumn + Caption = 'Precio porte compra pro.' + DataBinding.FieldName = 'IMP_PORTE_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn + Caption = 'Margen ult. venta - compra' + DataBinding.FieldName = 'IMP_MARGEN_ULT_VENT_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn + Caption = '% margen ult. venta - compra' + DataBinding.FieldName = 'POR_MARGEN_ULT_VENT_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn + Caption = 'Margen ult. venta - ult. compra' + DataBinding.FieldName = 'IMP_MARGEN_ULT_VENT_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn + Caption = '% margen ult. venta - ult. compra' + DataBinding.FieldName = 'POR_MARGEN_ULT_VENT_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn + Caption = 'Margen ult. venta - compra pro.' + DataBinding.FieldName = 'IMP_MARGEN_ULT_VENT_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn + Caption = '% margen ult. venta - compra pro.' + DataBinding.FieldName = 'POR_MARGEN_ULT_VENT_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn + Caption = 'Margen venta pro. - compra' + DataBinding.FieldName = 'IMP_MARGEN_PRO_VENT_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn + Caption = '% margen venta pro. - compra' + DataBinding.FieldName = 'POR_MARGEN_PRO_VENT_COMPRA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn + Caption = 'Margen venta pro. - ult. compra' + DataBinding.FieldName = 'IMP_MARGEN_PRO_VENT_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn + Caption = '% margen venta pro. - ult. compra' + DataBinding.FieldName = 'POR_MARGEN_PRO_VENT_ULT_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn + Caption = 'Margen venta pro. - compra pro.' + DataBinding.FieldName = 'IMP_MARGEN_PRO_VENT_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn + Caption = '% margen venta pro. - compra pro.' + DataBinding.FieldName = 'POR_MARGEN_PRO_VENT_PRO_COMP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end end object cxGridLevel: TcxGridLevel diff --git a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas index a972ed88..dd75b076 100644 --- a/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas +++ b/Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas @@ -27,12 +27,8 @@ type cxStyleBlue: TcxStyle; cxStyleFilterBox: TcxStyle; cxGridViewRecID: TcxGridDBColumn; - cxGridViewID_FACTURA: TcxGridDBColumn; cxGridViewID_EMPRESA: TcxGridDBColumn; - cxGridViewREFERENCIA_FACTURA: TcxGridDBColumn; - cxGridViewFECHA_FACTURA: TcxGridDBColumn; - cxGridViewIMPORTE_TOTAL_FACTURA: TcxGridDBColumn; - cxGridViewID_COMISION_FACTURA: TcxGridDBColumn; + cxGridViewID_CLIENTE: TcxGridDBColumn; cxGridViewID_ARTICULO: TcxGridDBColumn; cxGridViewFAMILIA: TcxGridDBColumn; cxGridViewREFERENCIA: TcxGridDBColumn; @@ -40,45 +36,38 @@ type cxGridViewDESCRIPCION: TcxGridDBColumn; cxGridViewCOMISIONABLE: TcxGridDBColumn; cxGridViewINVENTARIABLE: TcxGridDBColumn; - cxGridViewIMPORTE_UNIDAD_COSTE: TcxGridDBColumn; - cxGridViewDESCUENTO_PROVEEDOR_COSTE: TcxGridDBColumn; - cxGridViewIMPORTE_NETO_COSTE: TcxGridDBColumn; - cxGridViewIMPORTE_PORTE_COSTE: TcxGridDBColumn; - cxGridViewCANTIDAD: TcxGridDBColumn; - cxGridViewIMPORTE_UNIDAD_VENTA: TcxGridDBColumn; - cxGridViewDESCUENTO_CLIENTE_VENTA: TcxGridDBColumn; - cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn; - cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn; - cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn; - cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn; - cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn; - cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn; + cxGridViewIMP_UNIDAD_COMPRA: TcxGridDBColumn; + cxGridViewIMP_NETO_COMPRA: TcxGridDBColumn; + cxGridViewIMP_PORTE_COMPRA: TcxGridDBColumn; + cxGridViewIMP_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn; + cxGridViewPOR_MARGEN_ULT_VENT_COMPRA: TcxGridDBColumn; + cxGridViewPOR_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn; cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn; cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn; cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn; - cxGridViewCALLE_CLIENTE: TcxGridDBColumn; - cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn; - cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn; cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn; cxGridViewNOMBRE_AGENTE: TcxGridDBColumn; - cxGridViewCALLE_AGENTE: TcxGridDBColumn; - cxGridViewPOBLACION_AGENTE: TcxGridDBColumn; - cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn; - cxGridViewCOMISION_AGENTE: TcxGridDBColumn; - cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn; - cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn; - cxGridViewIMPORTE_UNIDAD_ULTIMA_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_NETO_ULTIMA_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_PORTE_ULTIMA_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_UNIDAD_PROMEDIO_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_NETO_PROMEDIO_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_PORTE_PROMEDIO_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_MARGEN_COSTE: TcxGridDBColumn; - cxGridViewPORCENTAJE_MARGEN_COSTE: TcxGridDBColumn; - cxGridViewIMPORTE_MARGEN_ULT_COMPRA: TcxGridDBColumn; - cxGridViewPORCENTAJE_MARGEN_ULT_COMPRA: TcxGridDBColumn; - cxGridViewIMPORTE_MARGEN_PROM_COMPRA: TcxGridDBColumn; - cxGridViewPORCENTAJE_MARGEN_PROM_COMPRA: TcxGridDBColumn; + cxGridViewIMP_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn; + cxGridViewIMP_MARGEN_ULT_VENT_ULT_COMP: TcxGridDBColumn; + cxGridViewIMP_UNIDAD_ULT_COMP: TcxGridDBColumn; + cxGridViewIMP_NETO_ULT_COMP: TcxGridDBColumn; + cxGridViewIMP_PORTE_ULT_COMP: TcxGridDBColumn; + cxGridViewIMP_UNIDAD_PRO_COMP: TcxGridDBColumn; + cxGridViewIMP_NETO_PRO_COMP: TcxGridDBColumn; + cxGridViewIMP_PORTE_PRO_COMP: TcxGridDBColumn; + cxGridViewIMP_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn; + cxGridViewPOR_MARGEN_ULT_VENT_PRO_COMP: TcxGridDBColumn; + cxGridViewIMP_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn; + cxGridViewPOR_MARGEN_PRO_VENT_COMPRA: TcxGridDBColumn; + cxGridViewIMP_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn; + cxGridViewPOR_MARGEN_PRO_VENT_ULT_COMP: TcxGridDBColumn; + cxGridViewIMP_UNIDAD_ULT_VENT: TcxGridDBColumn; + cxGridViewIMP_NETO_ULT_VENT: TcxGridDBColumn; + cxGridViewIMP_PORTE_ULT_VENT: TcxGridDBColumn; + cxGridViewIMP_UNIDAD_PRO_VENT: TcxGridDBColumn; + cxGridViewIMP_NETO_PRO_VENT: TcxGridDBColumn; + cxGridViewIMP_PORTE_PRO_VENT: TcxGridDBColumn; + cxGridViewPOR_MARGEN_PRO_VENT_PRO_COMP: TcxGridDBColumn; procedure cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); @@ -88,21 +77,8 @@ type AColumn: TcxGridColumn); procedure cxGridViewDataControllerGroupingChanged(Sender: TObject); procedure cxGridViewDataControllerSortingChanged(Sender: TObject); - procedure cxGridViewDataControllerSummaryAfterSummary( - ASender: TcxDataSummary); -// procedure cxGridViewCENTROPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewVENDEDORPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewPRODUCTOPropertiesInitPopup(Sender: TObject); + procedure cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary); procedure cxGridViewDataControllerFilterChanged(Sender: TObject); -// procedure cxGridViewDIASEMANAPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewMESPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewGRUPOPRODUCTOPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewTIPOPRODUCTOPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewCOLECCIONPropertiesInitPopup(Sender: TObject); - procedure cxGridViewDataControllerCompare( - ADataController: TcxCustomDataController; ARecordIndex1, - ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; - var Compare: Integer); protected procedure ActivarEventos; override; procedure DesactivarEventos; override; @@ -142,19 +118,6 @@ begin FocusedView.DataController.FocusedRowIndex := FocusedRow; FocusedView.Controller.TopRowIndex := TopRow; - - { Esta chapuzilla es para que se rellenen los combobox de los filtros - por que el cxFilterControl no coge los valores la 1ª vez si los - combos están vacíos. } -{ TcxComboBoxProperties(cxGridViewPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewCENTRO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewVENDEDOR.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewDIASEMANA.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewMES.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewGRUPOPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewTIPOPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewCOLECCION.Properties).OnInitPopup(nil); -} end; end; @@ -229,47 +192,6 @@ begin FOnViewChanged(Self); end; -{ -procedure TfrViewInfMargenArticuloGrid.cxGridViewCENTROPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewCENTRO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewCENTRO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfMargenArticuloGrid.cxGridViewVENDEDORPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewVENDEDOR.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewVENDEDOR.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfMargenArticuloGrid.cxGridViewPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - procedure TfrViewInfMargenArticuloGrid.cxGridViewDataControllerFilterChanged( Sender: TObject); begin @@ -310,107 +232,5 @@ begin end; end; -{ -procedure TfrViewInfMargenArticuloGrid.cxGridViewDIASEMANAPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewDIASEMANA.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewDIASEMANA.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - -{ -procedure TfrViewInfMargenArticuloGrid.cxGridViewMESPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewMES.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewMES.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfMargenArticuloGrid.cxGridViewGRUPOPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewGRUPOPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewGRUPOPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfMargenArticuloGrid.cxGridViewTIPOPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewTIPOPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewTIPOPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfMargenArticuloGrid.cxGridViewCOLECCIONPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewCOLECCION.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewCOLECCION.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - -procedure TfrViewInfMargenArticuloGrid.cxGridViewDataControllerCompare( - ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, - AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); -var - AValue1, - AValue2 : Variant; -begin - // Por defecto -{ - Compare := VarCompare(V1, V2); - try - if (AItemIndex = cxGridViewDIASEMANA.Index) then - begin - AValue1 := ADataController.Values[ARecordIndex1, cxGridViewDIASEMANA.Index]; - AValue2 := ADataController.Values[ARecordIndex2, cxGridViewDIASEMANA.Index]; - if (not VarIsNull(AValue1)) and (not VarIsNull(AValue2)) then - Compare := VarCompare(NumberDayOfTheWeek(AValue1), NumberDayOfTheWeek(AValue2)) - end - else begin - if (AItemIndex = cxGridViewMES.Index) then - begin - AValue1 := ADataController.Values[ARecordIndex1, cxGridViewMES.Index]; - AValue2 := ADataController.Values[ARecordIndex2, cxGridViewMES.Index]; - if (not VarIsNull(AValue1)) and (not VarIsNull(AValue2)) then - Compare := VarCompare(NumberMonthOfTheYear(AValue1), NumberMonthOfTheYear(AValue2)) - end - end; - except - //ShowMessage(VarToStr(ARecordIndex1) + ' ' + VarToStr(ARecordIndex1)); - end; -} -end; - end. diff --git a/Source/Modulos/Informe ventas por articulo/Data/uDataModuleInfVentasArticulo.dfm b/Source/Modulos/Informe ventas por articulo/Data/uDataModuleInfVentasArticulo.dfm index fd400567..2f434cd2 100644 --- a/Source/Modulos/Informe ventas por articulo/Data/uDataModuleInfVentasArticulo.dfm +++ b/Source/Modulos/Informe ventas por articulo/Data/uDataModuleInfVentasArticulo.dfm @@ -344,7 +344,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'PRECIO_COSTE' + Name = 'IMPORTE_UNIDAD_COSTE' DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 @@ -357,7 +357,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'DESCUENTO_PROVEEDOR' + Name = 'DESCUENTO_PROVEEDOR_COSTE' DataType = datFloat BlobType = dabtUnknown DisplayWidth = 0 @@ -370,7 +370,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'PRECIO_NETO' + Name = 'IMPORTE_NETO_COSTE' DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 @@ -383,7 +383,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'PRECIO_PORTE' + Name = 'IMPORTE_PORTE_COSTE' DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 @@ -409,7 +409,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'IMPORTE_UNIDAD' + Name = 'IMPORTE_UNIDAD_VENTA' DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 @@ -422,7 +422,7 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'DESCUENTO_CLIENTE' + Name = 'DESCUENTO_CLIENTE_VENTA' DataType = datFloat BlobType = dabtUnknown DisplayWidth = 0 @@ -435,7 +435,30 @@ object dmInfVentasArticulo: TdmInfVentasArticulo LookupCache = False end item - Name = 'IMPORTE_TOTAL' + Name = 'IMPORTE_NETO_VENTA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taRightJustify + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMPORTE_PORTE_VENTA' + DataType = datFloat + BlobType = dabtUnknown + DisplayWidth = 0 + Alignment = taLeftJustify + DictionaryEntry = 'InfVentasArticulo_IMPORTE_PORTE_VENTA' + InPrimaryKey = False + Calculated = False + Lookup = False + LookupCache = False + end + item + Name = 'IMPORTE_TOTAL_VENTA' DataType = datCurrency BlobType = dabtUnknown DisplayWidth = 0 diff --git a/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloClient_Intf.pas b/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloClient_Intf.pas index d09bceaf..976637d1 100644 --- a/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloClient_Intf.pas +++ b/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloClient_Intf.pas @@ -9,7 +9,7 @@ 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_InfVentasArticulo = '{016815E5-79DF-4362-8711-65CD3586EA12}'; + RID_InfVentasArticulo = '{0585A6F2-C390-425E-A7A6-8609D559D3B3}'; { Data table names } nme_InfVentasArticulo = 'InfVentasArticulo'; @@ -17,7 +17,7 @@ const { InfVentasArticulo fields } fld_InfVentasArticuloID_FACTURA = 'ID_FACTURA'; fld_InfVentasArticuloID_EMPRESA = 'ID_EMPRESA'; - fld_InfVentasArticuloID_REFERENCIA_FACTURA = 'ID_REFERENCIA_FACTURA'; + fld_InfVentasArticuloREFERENCIA_FACTURA = 'REFERENCIA_FACTURA'; fld_InfVentasArticuloFECHA_FACTURA = 'FECHA_FACTURA'; fld_InfVentasArticuloIMPORTE_TOTAL_FACTURA = 'IMPORTE_TOTAL_FACTURA'; fld_InfVentasArticuloID_COMISION_FACTURA = 'ID_COMISION_FACTURA'; @@ -28,15 +28,16 @@ const fld_InfVentasArticuloDESCRIPCION = 'DESCRIPCION'; fld_InfVentasArticuloCOMISIONABLE = 'COMISIONABLE'; fld_InfVentasArticuloINVENTARIABLE = 'INVENTARIABLE'; - fld_InfVentasArticuloPRECIO_COSTE = 'PRECIO_COSTE'; - fld_InfVentasArticuloDESCUENTO_PROVEEDOR = 'DESCUENTO_PROVEEDOR'; - fld_InfVentasArticuloPRECIO_NETO = 'PRECIO_NETO'; - fld_InfVentasArticuloPRECIO_PORTE = 'PRECIO_PORTE'; + fld_InfVentasArticuloIMPORTE_UNIDAD_COSTE = 'IMPORTE_UNIDAD_COSTE'; + fld_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE = 'DESCUENTO_PROVEEDOR_COSTE'; + fld_InfVentasArticuloIMPORTE_NETO_COSTE = 'IMPORTE_NETO_COSTE'; + fld_InfVentasArticuloIMPORTE_PORTE_COSTE = 'IMPORTE_PORTE_COSTE'; fld_InfVentasArticuloCANTIDAD = 'CANTIDAD'; - fld_InfVentasArticuloIMPORTE_UNIDAD = 'IMPORTE_UNIDAD'; - fld_InfVentasArticuloDESCUENTO_CLIENTE = 'DESCUENTO_CLIENTE'; - fld_InfVentasArticuloIMPORTE_PORTE = 'IMPORTE_PORTE'; - fld_InfVentasArticuloIMPORTE_TOTAL = 'IMPORTE_TOTAL'; + fld_InfVentasArticuloIMPORTE_UNIDAD_VENTA = 'IMPORTE_UNIDAD_VENTA'; + fld_InfVentasArticuloDESCUENTO_CLIENTE_VENTA = 'DESCUENTO_CLIENTE_VENTA'; + fld_InfVentasArticuloIMPORTE_NETO_VENTA = 'IMPORTE_NETO_VENTA'; + fld_InfVentasArticuloIMPORTE_PORTE_VENTA = 'IMPORTE_PORTE_VENTA'; + fld_InfVentasArticuloIMPORTE_TOTAL_VENTA = 'IMPORTE_TOTAL_VENTA'; fld_InfVentasArticuloNIF_CIF_PROVEEDOR = 'NIF_CIF_PROVEEDOR'; fld_InfVentasArticuloNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR'; fld_InfVentasArticuloCALLE_PROVEEDOR = 'CALLE_PROVEEDOR'; @@ -59,7 +60,7 @@ const { InfVentasArticulo field indexes } idx_InfVentasArticuloID_FACTURA = 0; idx_InfVentasArticuloID_EMPRESA = 1; - idx_InfVentasArticuloID_REFERENCIA_FACTURA = 2; + idx_InfVentasArticuloREFERENCIA_FACTURA = 2; idx_InfVentasArticuloFECHA_FACTURA = 3; idx_InfVentasArticuloIMPORTE_TOTAL_FACTURA = 4; idx_InfVentasArticuloID_COMISION_FACTURA = 5; @@ -70,49 +71,50 @@ const idx_InfVentasArticuloDESCRIPCION = 10; idx_InfVentasArticuloCOMISIONABLE = 11; idx_InfVentasArticuloINVENTARIABLE = 12; - idx_InfVentasArticuloPRECIO_COSTE = 13; - idx_InfVentasArticuloDESCUENTO_PROVEEDOR = 14; - idx_InfVentasArticuloPRECIO_NETO = 15; - idx_InfVentasArticuloPRECIO_PORTE = 16; + idx_InfVentasArticuloIMPORTE_UNIDAD_COSTE = 13; + idx_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE = 14; + idx_InfVentasArticuloIMPORTE_NETO_COSTE = 15; + idx_InfVentasArticuloIMPORTE_PORTE_COSTE = 16; idx_InfVentasArticuloCANTIDAD = 17; - idx_InfVentasArticuloIMPORTE_UNIDAD = 18; - idx_InfVentasArticuloDESCUENTO_CLIENTE = 19; - idx_InfVentasArticuloIMPORTE_PORTE = 20; - idx_InfVentasArticuloIMPORTE_TOTAL = 21; - idx_InfVentasArticuloNIF_CIF_PROVEEDOR = 22; - idx_InfVentasArticuloNOMBRE_PROVEEDOR = 23; - idx_InfVentasArticuloCALLE_PROVEEDOR = 24; - idx_InfVentasArticuloPOBLACION_PROVEEDOR = 25; - idx_InfVentasArticuloPROVINCIA_PROVEEDOR = 26; - idx_InfVentasArticuloNIF_CIF_CLIENTE = 27; - idx_InfVentasArticuloNOMBRE_CLIENTE = 28; - idx_InfVentasArticuloNOMBRE_COMERCIAL_CLIENTE = 29; - idx_InfVentasArticuloCALLE_CLIENTE = 30; - idx_InfVentasArticuloPOBLACION_CLIENTE = 31; - idx_InfVentasArticuloPROVINCIA_CLIENTE = 32; - idx_InfVentasArticuloNIF_CIF_AGENTE = 33; - idx_InfVentasArticuloNOMBRE_AGENTE = 34; - idx_InfVentasArticuloCALLE_AGENTE = 35; - idx_InfVentasArticuloPOBLACION_AGENTE = 36; - idx_InfVentasArticuloPROVINCIA_AGENTE = 37; - idx_InfVentasArticuloCOMISION_AGENTE = 38; - idx_InfVentasArticuloIMPORTE_COMISION_AGENTE = 39; + idx_InfVentasArticuloIMPORTE_UNIDAD_VENTA = 18; + idx_InfVentasArticuloDESCUENTO_CLIENTE_VENTA = 19; + idx_InfVentasArticuloIMPORTE_NETO_VENTA = 20; + idx_InfVentasArticuloIMPORTE_PORTE_VENTA = 21; + idx_InfVentasArticuloIMPORTE_TOTAL_VENTA = 22; + idx_InfVentasArticuloNIF_CIF_PROVEEDOR = 23; + idx_InfVentasArticuloNOMBRE_PROVEEDOR = 24; + idx_InfVentasArticuloCALLE_PROVEEDOR = 25; + idx_InfVentasArticuloPOBLACION_PROVEEDOR = 26; + idx_InfVentasArticuloPROVINCIA_PROVEEDOR = 27; + idx_InfVentasArticuloNIF_CIF_CLIENTE = 28; + idx_InfVentasArticuloNOMBRE_CLIENTE = 29; + idx_InfVentasArticuloNOMBRE_COMERCIAL_CLIENTE = 30; + idx_InfVentasArticuloCALLE_CLIENTE = 31; + idx_InfVentasArticuloPOBLACION_CLIENTE = 32; + idx_InfVentasArticuloPROVINCIA_CLIENTE = 33; + idx_InfVentasArticuloNIF_CIF_AGENTE = 34; + idx_InfVentasArticuloNOMBRE_AGENTE = 35; + idx_InfVentasArticuloCALLE_AGENTE = 36; + idx_InfVentasArticuloPOBLACION_AGENTE = 37; + idx_InfVentasArticuloPROVINCIA_AGENTE = 38; + idx_InfVentasArticuloCOMISION_AGENTE = 39; + idx_InfVentasArticuloIMPORTE_COMISION_AGENTE = 40; type { IInfVentasArticulo } IInfVentasArticulo = interface(IDAStronglyTypedDataTable) - ['{4314FCE5-D87A-4B78-9AB4-CB1FD554B40F}'] + ['{91CC4592-F38D-477E-8271-C7D2E9747130}'] { Property getters and setters } function GetID_FACTURAValue: Integer; procedure SetID_FACTURAValue(const aValue: Integer); function GetID_EMPRESAValue: Integer; procedure SetID_EMPRESAValue(const aValue: Integer); - function GetID_REFERENCIA_FACTURAValue: String; - procedure SetID_REFERENCIA_FACTURAValue(const aValue: String); + function GetREFERENCIA_FACTURAValue: String; + procedure SetREFERENCIA_FACTURAValue(const aValue: String); function GetFECHA_FACTURAValue: DateTime; procedure SetFECHA_FACTURAValue(const aValue: DateTime); - function GetIMPORTE_TOTAL_FACTURAValue: Float; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Float); + function GetIMPORTE_TOTAL_FACTURAValue: Currency; + procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); function GetID_COMISION_FACTURAValue: Integer; procedure SetID_COMISION_FACTURAValue(const aValue: Integer); function GetID_ARTICULOValue: Integer; @@ -129,24 +131,26 @@ type procedure SetCOMISIONABLEValue(const aValue: Integer); function GetINVENTARIABLEValue: Integer; procedure SetINVENTARIABLEValue(const aValue: Integer); - function GetPRECIO_COSTEValue: Float; - procedure SetPRECIO_COSTEValue(const aValue: Float); - function GetDESCUENTO_PROVEEDORValue: Float; - procedure SetDESCUENTO_PROVEEDORValue(const aValue: Float); - function GetPRECIO_NETOValue: Float; - procedure SetPRECIO_NETOValue(const aValue: Float); - function GetPRECIO_PORTEValue: Float; - procedure SetPRECIO_PORTEValue(const aValue: Float); + function GetIMPORTE_UNIDAD_COSTEValue: Currency; + procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); + function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; + procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); + function GetIMPORTE_NETO_COSTEValue: Currency; + procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); + function GetIMPORTE_PORTE_COSTEValue: Currency; + procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); function GetCANTIDADValue: Integer; procedure SetCANTIDADValue(const aValue: Integer); - function GetIMPORTE_UNIDADValue: Float; - procedure SetIMPORTE_UNIDADValue(const aValue: Float); - function GetDESCUENTO_CLIENTEValue: Float; - procedure SetDESCUENTO_CLIENTEValue(const aValue: Float); - function GetIMPORTE_PORTEValue: Float; - procedure SetIMPORTE_PORTEValue(const aValue: Float); - function GetIMPORTE_TOTALValue: Float; - procedure SetIMPORTE_TOTALValue(const aValue: Float); + function GetIMPORTE_UNIDAD_VENTAValue: Currency; + procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); + function GetDESCUENTO_CLIENTE_VENTAValue: Float; + procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); + function GetIMPORTE_NETO_VENTAValue: Float; + procedure SetIMPORTE_NETO_VENTAValue(const aValue: Float); + function GetIMPORTE_PORTE_VENTAValue: Float; + procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); + function GetIMPORTE_TOTAL_VENTAValue: Currency; + procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); function GetNIF_CIF_PROVEEDORValue: String; procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); function GetNOMBRE_PROVEEDORValue: String; @@ -181,16 +185,16 @@ type procedure SetPROVINCIA_AGENTEValue(const aValue: String); function GetCOMISION_AGENTEValue: Float; procedure SetCOMISION_AGENTEValue(const aValue: Float); - function GetIMPORTE_COMISION_AGENTEValue: Float; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Float); + function GetIMPORTE_COMISION_AGENTEValue: Currency; + procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); { Properties } property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; - property ID_REFERENCIA_FACTURA: String read GetID_REFERENCIA_FACTURAValue write SetID_REFERENCIA_FACTURAValue; + property REFERENCIA_FACTURA: String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; property FECHA_FACTURA: DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA: Float read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; + property IMPORTE_TOTAL_FACTURA: Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; property ID_COMISION_FACTURA: Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue; @@ -199,15 +203,16 @@ type property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue; property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; - property PRECIO_COSTE: Float read GetPRECIO_COSTEValue write SetPRECIO_COSTEValue; - property DESCUENTO_PROVEEDOR: Float read GetDESCUENTO_PROVEEDORValue write SetDESCUENTO_PROVEEDORValue; - property PRECIO_NETO: Float read GetPRECIO_NETOValue write SetPRECIO_NETOValue; - property PRECIO_PORTE: Float read GetPRECIO_PORTEValue write SetPRECIO_PORTEValue; + property IMPORTE_UNIDAD_COSTE: Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; + property DESCUENTO_PROVEEDOR_COSTE: Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; + property IMPORTE_NETO_COSTE: Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; + property IMPORTE_PORTE_COSTE: Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; - property IMPORTE_UNIDAD: Float read GetIMPORTE_UNIDADValue write SetIMPORTE_UNIDADValue; - property DESCUENTO_CLIENTE: Float read GetDESCUENTO_CLIENTEValue write SetDESCUENTO_CLIENTEValue; - property IMPORTE_PORTE: Float read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue; - property IMPORTE_TOTAL: Float read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue; + property IMPORTE_UNIDAD_VENTA: Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; + property DESCUENTO_CLIENTE_VENTA: Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; + property IMPORTE_NETO_VENTA: Float read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; + property IMPORTE_PORTE_VENTA: Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; + property IMPORTE_TOTAL_VENTA: Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; property NIF_CIF_PROVEEDOR: String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; property CALLE_PROVEEDOR: String read GetCALLE_PROVEEDORValue write SetCALLE_PROVEEDORValue; @@ -225,7 +230,7 @@ type property POBLACION_AGENTE: String read GetPOBLACION_AGENTEValue write SetPOBLACION_AGENTEValue; property PROVINCIA_AGENTE: String read GetPROVINCIA_AGENTEValue write SetPROVINCIA_AGENTEValue; property COMISION_AGENTE: Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE: Float read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; + property IMPORTE_COMISION_AGENTE: Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; end; { TInfVentasArticuloDataTableRules } @@ -237,12 +242,12 @@ type procedure SetID_FACTURAValue(const aValue: Integer); virtual; function GetID_EMPRESAValue: Integer; virtual; procedure SetID_EMPRESAValue(const aValue: Integer); virtual; - function GetID_REFERENCIA_FACTURAValue: String; virtual; - procedure SetID_REFERENCIA_FACTURAValue(const aValue: String); virtual; + function GetREFERENCIA_FACTURAValue: String; virtual; + procedure SetREFERENCIA_FACTURAValue(const aValue: String); virtual; function GetFECHA_FACTURAValue: DateTime; virtual; procedure SetFECHA_FACTURAValue(const aValue: DateTime); virtual; - function GetIMPORTE_TOTAL_FACTURAValue: Float; virtual; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Float); virtual; + function GetIMPORTE_TOTAL_FACTURAValue: Currency; virtual; + procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); virtual; function GetID_COMISION_FACTURAValue: Integer; virtual; procedure SetID_COMISION_FACTURAValue(const aValue: Integer); virtual; function GetID_ARTICULOValue: Integer; virtual; @@ -259,24 +264,26 @@ type procedure SetCOMISIONABLEValue(const aValue: Integer); virtual; function GetINVENTARIABLEValue: Integer; virtual; procedure SetINVENTARIABLEValue(const aValue: Integer); virtual; - function GetPRECIO_COSTEValue: Float; virtual; - procedure SetPRECIO_COSTEValue(const aValue: Float); virtual; - function GetDESCUENTO_PROVEEDORValue: Float; virtual; - procedure SetDESCUENTO_PROVEEDORValue(const aValue: Float); virtual; - function GetPRECIO_NETOValue: Float; virtual; - procedure SetPRECIO_NETOValue(const aValue: Float); virtual; - function GetPRECIO_PORTEValue: Float; virtual; - procedure SetPRECIO_PORTEValue(const aValue: Float); virtual; + function GetIMPORTE_UNIDAD_COSTEValue: Currency; virtual; + procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); virtual; + function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; + procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); virtual; + function GetIMPORTE_NETO_COSTEValue: Currency; virtual; + procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); virtual; + function GetIMPORTE_PORTE_COSTEValue: Currency; virtual; + procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); virtual; function GetCANTIDADValue: Integer; virtual; procedure SetCANTIDADValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDADValue: Float; virtual; - procedure SetIMPORTE_UNIDADValue(const aValue: Float); virtual; - function GetDESCUENTO_CLIENTEValue: Float; virtual; - procedure SetDESCUENTO_CLIENTEValue(const aValue: Float); virtual; - function GetIMPORTE_PORTEValue: Float; virtual; - procedure SetIMPORTE_PORTEValue(const aValue: Float); virtual; - function GetIMPORTE_TOTALValue: Float; virtual; - procedure SetIMPORTE_TOTALValue(const aValue: Float); virtual; + function GetIMPORTE_UNIDAD_VENTAValue: Currency; virtual; + procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); virtual; + function GetDESCUENTO_CLIENTE_VENTAValue: Float; virtual; + procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_NETO_VENTAValue: Float; virtual; + procedure SetIMPORTE_NETO_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_PORTE_VENTAValue: Float; virtual; + procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_TOTAL_VENTAValue: Currency; virtual; + procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); virtual; function GetNIF_CIF_PROVEEDORValue: String; virtual; procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); virtual; function GetNOMBRE_PROVEEDORValue: String; virtual; @@ -311,15 +318,15 @@ type procedure SetPROVINCIA_AGENTEValue(const aValue: String); virtual; function GetCOMISION_AGENTEValue: Float; virtual; procedure SetCOMISION_AGENTEValue(const aValue: Float); virtual; - function GetIMPORTE_COMISION_AGENTEValue: Float; virtual; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Float); virtual; + function GetIMPORTE_COMISION_AGENTEValue: Currency; virtual; + procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); virtual; { Properties } property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue; property ID_EMPRESA: Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; - property ID_REFERENCIA_FACTURA: String read GetID_REFERENCIA_FACTURAValue write SetID_REFERENCIA_FACTURAValue; + property REFERENCIA_FACTURA: String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; property FECHA_FACTURA: DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA: Float read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; + property IMPORTE_TOTAL_FACTURA: Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; property ID_COMISION_FACTURA: Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; property ID_ARTICULO: Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue; @@ -328,15 +335,16 @@ type property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue; property COMISIONABLE: Integer read GetCOMISIONABLEValue write SetCOMISIONABLEValue; property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; - property PRECIO_COSTE: Float read GetPRECIO_COSTEValue write SetPRECIO_COSTEValue; - property DESCUENTO_PROVEEDOR: Float read GetDESCUENTO_PROVEEDORValue write SetDESCUENTO_PROVEEDORValue; - property PRECIO_NETO: Float read GetPRECIO_NETOValue write SetPRECIO_NETOValue; - property PRECIO_PORTE: Float read GetPRECIO_PORTEValue write SetPRECIO_PORTEValue; + property IMPORTE_UNIDAD_COSTE: Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; + property DESCUENTO_PROVEEDOR_COSTE: Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; + property IMPORTE_NETO_COSTE: Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; + property IMPORTE_PORTE_COSTE: Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; property CANTIDAD: Integer read GetCANTIDADValue write SetCANTIDADValue; - property IMPORTE_UNIDAD: Float read GetIMPORTE_UNIDADValue write SetIMPORTE_UNIDADValue; - property DESCUENTO_CLIENTE: Float read GetDESCUENTO_CLIENTEValue write SetDESCUENTO_CLIENTEValue; - property IMPORTE_PORTE: Float read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue; - property IMPORTE_TOTAL: Float read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue; + property IMPORTE_UNIDAD_VENTA: Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; + property DESCUENTO_CLIENTE_VENTA: Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; + property IMPORTE_NETO_VENTA: Float read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; + property IMPORTE_PORTE_VENTA: Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; + property IMPORTE_TOTAL_VENTA: Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; property NIF_CIF_PROVEEDOR: String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; property CALLE_PROVEEDOR: String read GetCALLE_PROVEEDORValue write SetCALLE_PROVEEDORValue; @@ -354,7 +362,7 @@ type property POBLACION_AGENTE: String read GetPOBLACION_AGENTEValue write SetPOBLACION_AGENTEValue; property PROVINCIA_AGENTE: String read GetPROVINCIA_AGENTEValue write SetPROVINCIA_AGENTEValue; property COMISION_AGENTE: Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE: Float read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; + property IMPORTE_COMISION_AGENTE: Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; public constructor Create(aDataTable: TDADataTable); override; @@ -397,14 +405,14 @@ begin DataTable.Fields[idx_InfVentasArticuloID_EMPRESA].AsInteger := aValue; end; -function TInfVentasArticuloDataTableRules.GetID_REFERENCIA_FACTURAValue: String; +function TInfVentasArticuloDataTableRules.GetREFERENCIA_FACTURAValue: String; begin - result := DataTable.Fields[idx_InfVentasArticuloID_REFERENCIA_FACTURA].AsString; + result := DataTable.Fields[idx_InfVentasArticuloREFERENCIA_FACTURA].AsString; end; -procedure TInfVentasArticuloDataTableRules.SetID_REFERENCIA_FACTURAValue(const aValue: String); +procedure TInfVentasArticuloDataTableRules.SetREFERENCIA_FACTURAValue(const aValue: String); begin - DataTable.Fields[idx_InfVentasArticuloID_REFERENCIA_FACTURA].AsString := aValue; + DataTable.Fields[idx_InfVentasArticuloREFERENCIA_FACTURA].AsString := aValue; end; function TInfVentasArticuloDataTableRules.GetFECHA_FACTURAValue: DateTime; @@ -417,14 +425,14 @@ begin DataTable.Fields[idx_InfVentasArticuloFECHA_FACTURA].AsDateTime := aValue; end; -function TInfVentasArticuloDataTableRules.GetIMPORTE_TOTAL_FACTURAValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_TOTAL_FACTURAValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_FACTURA].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_FACTURA].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_FACTURA].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_FACTURA].AsCurrency := aValue; end; function TInfVentasArticuloDataTableRules.GetID_COMISION_FACTURAValue: Integer; @@ -507,44 +515,44 @@ begin DataTable.Fields[idx_InfVentasArticuloINVENTARIABLE].AsInteger := aValue; end; -function TInfVentasArticuloDataTableRules.GetPRECIO_COSTEValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_UNIDAD_COSTEValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloPRECIO_COSTE].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD_COSTE].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetPRECIO_COSTEValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloPRECIO_COSTE].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD_COSTE].AsCurrency := aValue; end; -function TInfVentasArticuloDataTableRules.GetDESCUENTO_PROVEEDORValue: Float; +function TInfVentasArticuloDataTableRules.GetDESCUENTO_PROVEEDOR_COSTEValue: Float; begin - result := DataTable.Fields[idx_InfVentasArticuloDESCUENTO_PROVEEDOR].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE].AsFloat; end; -procedure TInfVentasArticuloDataTableRules.SetDESCUENTO_PROVEEDORValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); begin - DataTable.Fields[idx_InfVentasArticuloDESCUENTO_PROVEEDOR].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE].AsFloat := aValue; end; -function TInfVentasArticuloDataTableRules.GetPRECIO_NETOValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_NETO_COSTEValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloPRECIO_NETO].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_NETO_COSTE].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetPRECIO_NETOValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_NETO_COSTEValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloPRECIO_NETO].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_NETO_COSTE].AsCurrency := aValue; end; -function TInfVentasArticuloDataTableRules.GetPRECIO_PORTEValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_PORTE_COSTEValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloPRECIO_PORTE].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE_COSTE].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetPRECIO_PORTEValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloPRECIO_PORTE].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE_COSTE].AsCurrency := aValue; end; function TInfVentasArticuloDataTableRules.GetCANTIDADValue: Integer; @@ -557,44 +565,54 @@ begin DataTable.Fields[idx_InfVentasArticuloCANTIDAD].AsInteger := aValue; end; -function TInfVentasArticuloDataTableRules.GetIMPORTE_UNIDADValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_UNIDAD_VENTAValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD_VENTA].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetIMPORTE_UNIDADValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_UNIDAD_VENTA].AsCurrency := aValue; end; -function TInfVentasArticuloDataTableRules.GetDESCUENTO_CLIENTEValue: Float; +function TInfVentasArticuloDataTableRules.GetDESCUENTO_CLIENTE_VENTAValue: Float; begin - result := DataTable.Fields[idx_InfVentasArticuloDESCUENTO_CLIENTE].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloDESCUENTO_CLIENTE_VENTA].AsFloat; end; -procedure TInfVentasArticuloDataTableRules.SetDESCUENTO_CLIENTEValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); begin - DataTable.Fields[idx_InfVentasArticuloDESCUENTO_CLIENTE].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloDESCUENTO_CLIENTE_VENTA].AsFloat := aValue; end; -function TInfVentasArticuloDataTableRules.GetIMPORTE_PORTEValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_NETO_VENTAValue: Float; begin - result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_NETO_VENTA].AsFloat; end; -procedure TInfVentasArticuloDataTableRules.SetIMPORTE_PORTEValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_NETO_VENTAValue(const aValue: Float); begin - DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_NETO_VENTA].AsFloat := aValue; end; -function TInfVentasArticuloDataTableRules.GetIMPORTE_TOTALValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_PORTE_VENTAValue: Float; begin - result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE_VENTA].AsFloat; end; -procedure TInfVentasArticuloDataTableRules.SetIMPORTE_TOTALValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_PORTE_VENTAValue(const aValue: Float); begin - DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_PORTE_VENTA].AsFloat := aValue; +end; + +function TInfVentasArticuloDataTableRules.GetIMPORTE_TOTAL_VENTAValue: Currency; +begin + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_VENTA].AsCurrency; +end; + +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); +begin + DataTable.Fields[idx_InfVentasArticuloIMPORTE_TOTAL_VENTA].AsCurrency := aValue; end; function TInfVentasArticuloDataTableRules.GetNIF_CIF_PROVEEDORValue: String; @@ -767,14 +785,14 @@ begin DataTable.Fields[idx_InfVentasArticuloCOMISION_AGENTE].AsFloat := aValue; end; -function TInfVentasArticuloDataTableRules.GetIMPORTE_COMISION_AGENTEValue: Float; +function TInfVentasArticuloDataTableRules.GetIMPORTE_COMISION_AGENTEValue: Currency; begin - result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_COMISION_AGENTE].AsFloat; + result := DataTable.Fields[idx_InfVentasArticuloIMPORTE_COMISION_AGENTE].AsCurrency; end; -procedure TInfVentasArticuloDataTableRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Float); +procedure TInfVentasArticuloDataTableRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); begin - DataTable.Fields[idx_InfVentasArticuloIMPORTE_COMISION_AGENTE].AsFloat := aValue; + DataTable.Fields[idx_InfVentasArticuloIMPORTE_COMISION_AGENTE].AsCurrency := aValue; end; diff --git a/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloServer_Intf.pas b/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloServer_Intf.pas index 002818e9..6f0555d0 100644 --- a/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloServer_Intf.pas +++ b/Source/Modulos/Informe ventas por articulo/Model/schInfVentasArticuloServer_Intf.pas @@ -9,18 +9,18 @@ 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_InfVentasArticuloDelta = '{41CF36F8-6F1E-47E5-A111-BE05FD77D941}'; + RID_InfVentasArticuloDelta = '{6635FE65-F0F8-4CD2-B59F-7D652D70ED1A}'; type { IInfVentasArticuloDelta } IInfVentasArticuloDelta = interface(IInfVentasArticulo) - ['{41CF36F8-6F1E-47E5-A111-BE05FD77D941}'] + ['{6635FE65-F0F8-4CD2-B59F-7D652D70ED1A}'] { Property getters and setters } function GetOldID_FACTURAValue : Integer; function GetOldID_EMPRESAValue : Integer; - function GetOldID_REFERENCIA_FACTURAValue : String; + function GetOldREFERENCIA_FACTURAValue : String; function GetOldFECHA_FACTURAValue : DateTime; - function GetOldIMPORTE_TOTAL_FACTURAValue : Float; + function GetOldIMPORTE_TOTAL_FACTURAValue : Currency; function GetOldID_COMISION_FACTURAValue : Integer; function GetOldID_ARTICULOValue : Integer; function GetOldFAMILIAValue : String; @@ -29,15 +29,16 @@ type function GetOldDESCRIPCIONValue : String; function GetOldCOMISIONABLEValue : Integer; function GetOldINVENTARIABLEValue : Integer; - function GetOldPRECIO_COSTEValue : Float; - function GetOldDESCUENTO_PROVEEDORValue : Float; - function GetOldPRECIO_NETOValue : Float; - function GetOldPRECIO_PORTEValue : Float; + function GetOldIMPORTE_UNIDAD_COSTEValue : Currency; + function GetOldDESCUENTO_PROVEEDOR_COSTEValue : Float; + function GetOldIMPORTE_NETO_COSTEValue : Currency; + function GetOldIMPORTE_PORTE_COSTEValue : Currency; function GetOldCANTIDADValue : Integer; - function GetOldIMPORTE_UNIDADValue : Float; - function GetOldDESCUENTO_CLIENTEValue : Float; - function GetOldIMPORTE_PORTEValue : Float; - function GetOldIMPORTE_TOTALValue : Float; + function GetOldIMPORTE_UNIDAD_VENTAValue : Currency; + function GetOldDESCUENTO_CLIENTE_VENTAValue : Float; + function GetOldIMPORTE_NETO_VENTAValue : Float; + function GetOldIMPORTE_PORTE_VENTAValue : Float; + function GetOldIMPORTE_TOTAL_VENTAValue : Currency; function GetOldNIF_CIF_PROVEEDORValue : String; function GetOldNOMBRE_PROVEEDORValue : String; function GetOldCALLE_PROVEEDORValue : String; @@ -55,14 +56,14 @@ type function GetOldPOBLACION_AGENTEValue : String; function GetOldPROVINCIA_AGENTEValue : String; function GetOldCOMISION_AGENTEValue : Float; - function GetOldIMPORTE_COMISION_AGENTEValue : Float; + function GetOldIMPORTE_COMISION_AGENTEValue : Currency; { Properties } property OldID_FACTURA : Integer read GetOldID_FACTURAValue; property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue; - property OldID_REFERENCIA_FACTURA : String read GetOldID_REFERENCIA_FACTURAValue; + property OldREFERENCIA_FACTURA : String read GetOldREFERENCIA_FACTURAValue; property OldFECHA_FACTURA : DateTime read GetOldFECHA_FACTURAValue; - property OldIMPORTE_TOTAL_FACTURA : Float read GetOldIMPORTE_TOTAL_FACTURAValue; + property OldIMPORTE_TOTAL_FACTURA : Currency read GetOldIMPORTE_TOTAL_FACTURAValue; property OldID_COMISION_FACTURA : Integer read GetOldID_COMISION_FACTURAValue; property OldID_ARTICULO : Integer read GetOldID_ARTICULOValue; property OldFAMILIA : String read GetOldFAMILIAValue; @@ -71,15 +72,16 @@ type property OldDESCRIPCION : String read GetOldDESCRIPCIONValue; property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue; property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue; - property OldPRECIO_COSTE : Float read GetOldPRECIO_COSTEValue; - property OldDESCUENTO_PROVEEDOR : Float read GetOldDESCUENTO_PROVEEDORValue; - property OldPRECIO_NETO : Float read GetOldPRECIO_NETOValue; - property OldPRECIO_PORTE : Float read GetOldPRECIO_PORTEValue; + property OldIMPORTE_UNIDAD_COSTE : Currency read GetOldIMPORTE_UNIDAD_COSTEValue; + property OldDESCUENTO_PROVEEDOR_COSTE : Float read GetOldDESCUENTO_PROVEEDOR_COSTEValue; + property OldIMPORTE_NETO_COSTE : Currency read GetOldIMPORTE_NETO_COSTEValue; + property OldIMPORTE_PORTE_COSTE : Currency read GetOldIMPORTE_PORTE_COSTEValue; property OldCANTIDAD : Integer read GetOldCANTIDADValue; - property OldIMPORTE_UNIDAD : Float read GetOldIMPORTE_UNIDADValue; - property OldDESCUENTO_CLIENTE : Float read GetOldDESCUENTO_CLIENTEValue; - property OldIMPORTE_PORTE : Float read GetOldIMPORTE_PORTEValue; - property OldIMPORTE_TOTAL : Float read GetOldIMPORTE_TOTALValue; + property OldIMPORTE_UNIDAD_VENTA : Currency read GetOldIMPORTE_UNIDAD_VENTAValue; + property OldDESCUENTO_CLIENTE_VENTA : Float read GetOldDESCUENTO_CLIENTE_VENTAValue; + property OldIMPORTE_NETO_VENTA : Float read GetOldIMPORTE_NETO_VENTAValue; + property OldIMPORTE_PORTE_VENTA : Float read GetOldIMPORTE_PORTE_VENTAValue; + property OldIMPORTE_TOTAL_VENTA : Currency read GetOldIMPORTE_TOTAL_VENTAValue; property OldNIF_CIF_PROVEEDOR : String read GetOldNIF_CIF_PROVEEDORValue; property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue; property OldCALLE_PROVEEDOR : String read GetOldCALLE_PROVEEDORValue; @@ -97,7 +99,7 @@ type property OldPOBLACION_AGENTE : String read GetOldPOBLACION_AGENTEValue; property OldPROVINCIA_AGENTE : String read GetOldPROVINCIA_AGENTEValue; property OldCOMISION_AGENTE : Float read GetOldCOMISION_AGENTEValue; - property OldIMPORTE_COMISION_AGENTE : Float read GetOldIMPORTE_COMISION_AGENTEValue; + property OldIMPORTE_COMISION_AGENTE : Currency read GetOldIMPORTE_COMISION_AGENTEValue; end; { TInfVentasArticuloBusinessProcessorRules } @@ -111,15 +113,15 @@ type function GetID_EMPRESAValue: Integer; virtual; function GetOldID_EMPRESAValue: Integer; virtual; procedure SetID_EMPRESAValue(const aValue: Integer); virtual; - function GetID_REFERENCIA_FACTURAValue: String; virtual; - function GetOldID_REFERENCIA_FACTURAValue: String; virtual; - procedure SetID_REFERENCIA_FACTURAValue(const aValue: String); virtual; + function GetREFERENCIA_FACTURAValue: String; virtual; + function GetOldREFERENCIA_FACTURAValue: String; virtual; + procedure SetREFERENCIA_FACTURAValue(const aValue: String); virtual; function GetFECHA_FACTURAValue: DateTime; virtual; function GetOldFECHA_FACTURAValue: DateTime; virtual; procedure SetFECHA_FACTURAValue(const aValue: DateTime); virtual; - function GetIMPORTE_TOTAL_FACTURAValue: Float; virtual; - function GetOldIMPORTE_TOTAL_FACTURAValue: Float; virtual; - procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Float); virtual; + function GetIMPORTE_TOTAL_FACTURAValue: Currency; virtual; + function GetOldIMPORTE_TOTAL_FACTURAValue: Currency; virtual; + procedure SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); virtual; function GetID_COMISION_FACTURAValue: Integer; virtual; function GetOldID_COMISION_FACTURAValue: Integer; virtual; procedure SetID_COMISION_FACTURAValue(const aValue: Integer); virtual; @@ -144,33 +146,36 @@ type function GetINVENTARIABLEValue: Integer; virtual; function GetOldINVENTARIABLEValue: Integer; virtual; procedure SetINVENTARIABLEValue(const aValue: Integer); virtual; - function GetPRECIO_COSTEValue: Float; virtual; - function GetOldPRECIO_COSTEValue: Float; virtual; - procedure SetPRECIO_COSTEValue(const aValue: Float); virtual; - function GetDESCUENTO_PROVEEDORValue: Float; virtual; - function GetOldDESCUENTO_PROVEEDORValue: Float; virtual; - procedure SetDESCUENTO_PROVEEDORValue(const aValue: Float); virtual; - function GetPRECIO_NETOValue: Float; virtual; - function GetOldPRECIO_NETOValue: Float; virtual; - procedure SetPRECIO_NETOValue(const aValue: Float); virtual; - function GetPRECIO_PORTEValue: Float; virtual; - function GetOldPRECIO_PORTEValue: Float; virtual; - procedure SetPRECIO_PORTEValue(const aValue: Float); virtual; + function GetIMPORTE_UNIDAD_COSTEValue: Currency; virtual; + function GetOldIMPORTE_UNIDAD_COSTEValue: Currency; virtual; + procedure SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); virtual; + function GetDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; + function GetOldDESCUENTO_PROVEEDOR_COSTEValue: Float; virtual; + procedure SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); virtual; + function GetIMPORTE_NETO_COSTEValue: Currency; virtual; + function GetOldIMPORTE_NETO_COSTEValue: Currency; virtual; + procedure SetIMPORTE_NETO_COSTEValue(const aValue: Currency); virtual; + function GetIMPORTE_PORTE_COSTEValue: Currency; virtual; + function GetOldIMPORTE_PORTE_COSTEValue: Currency; virtual; + procedure SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); virtual; function GetCANTIDADValue: Integer; virtual; function GetOldCANTIDADValue: Integer; virtual; procedure SetCANTIDADValue(const aValue: Integer); virtual; - function GetIMPORTE_UNIDADValue: Float; virtual; - function GetOldIMPORTE_UNIDADValue: Float; virtual; - procedure SetIMPORTE_UNIDADValue(const aValue: Float); virtual; - function GetDESCUENTO_CLIENTEValue: Float; virtual; - function GetOldDESCUENTO_CLIENTEValue: Float; virtual; - procedure SetDESCUENTO_CLIENTEValue(const aValue: Float); virtual; - function GetIMPORTE_PORTEValue: Float; virtual; - function GetOldIMPORTE_PORTEValue: Float; virtual; - procedure SetIMPORTE_PORTEValue(const aValue: Float); virtual; - function GetIMPORTE_TOTALValue: Float; virtual; - function GetOldIMPORTE_TOTALValue: Float; virtual; - procedure SetIMPORTE_TOTALValue(const aValue: Float); virtual; + function GetIMPORTE_UNIDAD_VENTAValue: Currency; virtual; + function GetOldIMPORTE_UNIDAD_VENTAValue: Currency; virtual; + procedure SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); virtual; + function GetDESCUENTO_CLIENTE_VENTAValue: Float; virtual; + function GetOldDESCUENTO_CLIENTE_VENTAValue: Float; virtual; + procedure SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_NETO_VENTAValue: Float; virtual; + function GetOldIMPORTE_NETO_VENTAValue: Float; virtual; + procedure SetIMPORTE_NETO_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_PORTE_VENTAValue: Float; virtual; + function GetOldIMPORTE_PORTE_VENTAValue: Float; virtual; + procedure SetIMPORTE_PORTE_VENTAValue(const aValue: Float); virtual; + function GetIMPORTE_TOTAL_VENTAValue: Currency; virtual; + function GetOldIMPORTE_TOTAL_VENTAValue: Currency; virtual; + procedure SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); virtual; function GetNIF_CIF_PROVEEDORValue: String; virtual; function GetOldNIF_CIF_PROVEEDORValue: String; virtual; procedure SetNIF_CIF_PROVEEDORValue(const aValue: String); virtual; @@ -222,21 +227,21 @@ type function GetCOMISION_AGENTEValue: Float; virtual; function GetOldCOMISION_AGENTEValue: Float; virtual; procedure SetCOMISION_AGENTEValue(const aValue: Float); virtual; - function GetIMPORTE_COMISION_AGENTEValue: Float; virtual; - function GetOldIMPORTE_COMISION_AGENTEValue: Float; virtual; - procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Float); virtual; + function GetIMPORTE_COMISION_AGENTEValue: Currency; virtual; + function GetOldIMPORTE_COMISION_AGENTEValue: Currency; virtual; + procedure SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); virtual; { Properties } property ID_FACTURA : Integer read GetID_FACTURAValue write SetID_FACTURAValue; property OldID_FACTURA : Integer read GetOldID_FACTURAValue; property ID_EMPRESA : Integer read GetID_EMPRESAValue write SetID_EMPRESAValue; property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue; - property ID_REFERENCIA_FACTURA : String read GetID_REFERENCIA_FACTURAValue write SetID_REFERENCIA_FACTURAValue; - property OldID_REFERENCIA_FACTURA : String read GetOldID_REFERENCIA_FACTURAValue; + property REFERENCIA_FACTURA : String read GetREFERENCIA_FACTURAValue write SetREFERENCIA_FACTURAValue; + property OldREFERENCIA_FACTURA : String read GetOldREFERENCIA_FACTURAValue; property FECHA_FACTURA : DateTime read GetFECHA_FACTURAValue write SetFECHA_FACTURAValue; property OldFECHA_FACTURA : DateTime read GetOldFECHA_FACTURAValue; - property IMPORTE_TOTAL_FACTURA : Float read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; - property OldIMPORTE_TOTAL_FACTURA : Float read GetOldIMPORTE_TOTAL_FACTURAValue; + property IMPORTE_TOTAL_FACTURA : Currency read GetIMPORTE_TOTAL_FACTURAValue write SetIMPORTE_TOTAL_FACTURAValue; + property OldIMPORTE_TOTAL_FACTURA : Currency read GetOldIMPORTE_TOTAL_FACTURAValue; property ID_COMISION_FACTURA : Integer read GetID_COMISION_FACTURAValue write SetID_COMISION_FACTURAValue; property OldID_COMISION_FACTURA : Integer read GetOldID_COMISION_FACTURAValue; property ID_ARTICULO : Integer read GetID_ARTICULOValue write SetID_ARTICULOValue; @@ -253,24 +258,26 @@ type property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue; property INVENTARIABLE : Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue; property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue; - property PRECIO_COSTE : Float read GetPRECIO_COSTEValue write SetPRECIO_COSTEValue; - property OldPRECIO_COSTE : Float read GetOldPRECIO_COSTEValue; - property DESCUENTO_PROVEEDOR : Float read GetDESCUENTO_PROVEEDORValue write SetDESCUENTO_PROVEEDORValue; - property OldDESCUENTO_PROVEEDOR : Float read GetOldDESCUENTO_PROVEEDORValue; - property PRECIO_NETO : Float read GetPRECIO_NETOValue write SetPRECIO_NETOValue; - property OldPRECIO_NETO : Float read GetOldPRECIO_NETOValue; - property PRECIO_PORTE : Float read GetPRECIO_PORTEValue write SetPRECIO_PORTEValue; - property OldPRECIO_PORTE : Float read GetOldPRECIO_PORTEValue; + property IMPORTE_UNIDAD_COSTE : Currency read GetIMPORTE_UNIDAD_COSTEValue write SetIMPORTE_UNIDAD_COSTEValue; + property OldIMPORTE_UNIDAD_COSTE : Currency read GetOldIMPORTE_UNIDAD_COSTEValue; + property DESCUENTO_PROVEEDOR_COSTE : Float read GetDESCUENTO_PROVEEDOR_COSTEValue write SetDESCUENTO_PROVEEDOR_COSTEValue; + property OldDESCUENTO_PROVEEDOR_COSTE : Float read GetOldDESCUENTO_PROVEEDOR_COSTEValue; + property IMPORTE_NETO_COSTE : Currency read GetIMPORTE_NETO_COSTEValue write SetIMPORTE_NETO_COSTEValue; + property OldIMPORTE_NETO_COSTE : Currency read GetOldIMPORTE_NETO_COSTEValue; + property IMPORTE_PORTE_COSTE : Currency read GetIMPORTE_PORTE_COSTEValue write SetIMPORTE_PORTE_COSTEValue; + property OldIMPORTE_PORTE_COSTE : Currency read GetOldIMPORTE_PORTE_COSTEValue; property CANTIDAD : Integer read GetCANTIDADValue write SetCANTIDADValue; property OldCANTIDAD : Integer read GetOldCANTIDADValue; - property IMPORTE_UNIDAD : Float read GetIMPORTE_UNIDADValue write SetIMPORTE_UNIDADValue; - property OldIMPORTE_UNIDAD : Float read GetOldIMPORTE_UNIDADValue; - property DESCUENTO_CLIENTE : Float read GetDESCUENTO_CLIENTEValue write SetDESCUENTO_CLIENTEValue; - property OldDESCUENTO_CLIENTE : Float read GetOldDESCUENTO_CLIENTEValue; - property IMPORTE_PORTE : Float read GetIMPORTE_PORTEValue write SetIMPORTE_PORTEValue; - property OldIMPORTE_PORTE : Float read GetOldIMPORTE_PORTEValue; - property IMPORTE_TOTAL : Float read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue; - property OldIMPORTE_TOTAL : Float read GetOldIMPORTE_TOTALValue; + property IMPORTE_UNIDAD_VENTA : Currency read GetIMPORTE_UNIDAD_VENTAValue write SetIMPORTE_UNIDAD_VENTAValue; + property OldIMPORTE_UNIDAD_VENTA : Currency read GetOldIMPORTE_UNIDAD_VENTAValue; + property DESCUENTO_CLIENTE_VENTA : Float read GetDESCUENTO_CLIENTE_VENTAValue write SetDESCUENTO_CLIENTE_VENTAValue; + property OldDESCUENTO_CLIENTE_VENTA : Float read GetOldDESCUENTO_CLIENTE_VENTAValue; + property IMPORTE_NETO_VENTA : Float read GetIMPORTE_NETO_VENTAValue write SetIMPORTE_NETO_VENTAValue; + property OldIMPORTE_NETO_VENTA : Float read GetOldIMPORTE_NETO_VENTAValue; + property IMPORTE_PORTE_VENTA : Float read GetIMPORTE_PORTE_VENTAValue write SetIMPORTE_PORTE_VENTAValue; + property OldIMPORTE_PORTE_VENTA : Float read GetOldIMPORTE_PORTE_VENTAValue; + property IMPORTE_TOTAL_VENTA : Currency read GetIMPORTE_TOTAL_VENTAValue write SetIMPORTE_TOTAL_VENTAValue; + property OldIMPORTE_TOTAL_VENTA : Currency read GetOldIMPORTE_TOTAL_VENTAValue; property NIF_CIF_PROVEEDOR : String read GetNIF_CIF_PROVEEDORValue write SetNIF_CIF_PROVEEDORValue; property OldNIF_CIF_PROVEEDOR : String read GetOldNIF_CIF_PROVEEDORValue; property NOMBRE_PROVEEDOR : String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue; @@ -305,8 +312,8 @@ type property OldPROVINCIA_AGENTE : String read GetOldPROVINCIA_AGENTEValue; property COMISION_AGENTE : Float read GetCOMISION_AGENTEValue write SetCOMISION_AGENTEValue; property OldCOMISION_AGENTE : Float read GetOldCOMISION_AGENTEValue; - property IMPORTE_COMISION_AGENTE : Float read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; - property OldIMPORTE_COMISION_AGENTE : Float read GetOldIMPORTE_COMISION_AGENTEValue; + property IMPORTE_COMISION_AGENTE : Currency read GetIMPORTE_COMISION_AGENTEValue write SetIMPORTE_COMISION_AGENTEValue; + property OldIMPORTE_COMISION_AGENTE : Currency read GetOldIMPORTE_COMISION_AGENTEValue; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -360,19 +367,19 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloID_EMPRESA] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetID_REFERENCIA_FACTURAValue: String; +function TInfVentasArticuloBusinessProcessorRules.GetREFERENCIA_FACTURAValue: String; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloID_REFERENCIA_FACTURA]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloREFERENCIA_FACTURA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldID_REFERENCIA_FACTURAValue: String; +function TInfVentasArticuloBusinessProcessorRules.GetOldREFERENCIA_FACTURAValue: String; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloID_REFERENCIA_FACTURA]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloREFERENCIA_FACTURA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetID_REFERENCIA_FACTURAValue(const aValue: String); +procedure TInfVentasArticuloBusinessProcessorRules.SetREFERENCIA_FACTURAValue(const aValue: String); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloID_REFERENCIA_FACTURA] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloREFERENCIA_FACTURA] := aValue; end; function TInfVentasArticuloBusinessProcessorRules.GetFECHA_FACTURAValue: DateTime; @@ -390,17 +397,17 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloFECHA_FACTURA] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_TOTAL_FACTURAValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_TOTAL_FACTURAValue: Currency; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_FACTURA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_TOTAL_FACTURAValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_TOTAL_FACTURAValue: Currency; begin result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_FACTURA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_TOTAL_FACTURAValue(const aValue: Currency); begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_FACTURA] := aValue; end; @@ -525,64 +532,64 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloINVENTARIABLE] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetPRECIO_COSTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_COSTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_COSTE]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldPRECIO_COSTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloPRECIO_COSTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_COSTE]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetPRECIO_COSTEValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_COSTEValue(const aValue: Currency); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_COSTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_COSTE] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetDESCUENTO_PROVEEDORValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetDESCUENTO_PROVEEDOR_COSTEValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldDESCUENTO_PROVEEDORValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldDESCUENTO_PROVEEDOR_COSTEValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetDESCUENTO_PROVEEDORValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetDESCUENTO_PROVEEDOR_COSTEValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_PROVEEDOR_COSTE] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetPRECIO_NETOValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_NETO_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_NETO]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_NETO_COSTE]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldPRECIO_NETOValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloPRECIO_NETO]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_NETO_COSTE]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetPRECIO_NETOValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_NETO_COSTEValue(const aValue: Currency); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_NETO] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_NETO_COSTE] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetPRECIO_PORTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_PORTE_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_PORTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE_COSTE]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldPRECIO_PORTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_COSTEValue: Currency; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloPRECIO_PORTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_PORTE_COSTE]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetPRECIO_PORTEValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_PORTE_COSTEValue(const aValue: Currency); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloPRECIO_PORTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE_COSTE] := aValue; end; function TInfVentasArticuloBusinessProcessorRules.GetCANTIDADValue: Integer; @@ -600,64 +607,79 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloCANTIDAD] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_UNIDADValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_UNIDAD_VENTAValue: Currency; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_VENTA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDADValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_UNIDAD_VENTAValue: Currency; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_VENTA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_UNIDADValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_UNIDAD_VENTAValue(const aValue: Currency); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_UNIDAD_VENTA] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetDESCUENTO_CLIENTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetDESCUENTO_CLIENTE_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE_VENTA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldDESCUENTO_CLIENTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldDESCUENTO_CLIENTE_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE_VENTA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetDESCUENTO_CLIENTEValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetDESCUENTO_CLIENTE_VENTAValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloDESCUENTO_CLIENTE_VENTA] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_PORTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_NETO_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_NETO_VENTA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_PORTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_NETO_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_PORTE]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_NETO_VENTA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_PORTEValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_NETO_VENTAValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_NETO_VENTA] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_TOTALValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_PORTE_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL]; + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE_VENTA]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_TOTALValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_PORTE_VENTAValue: Float; begin - result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_TOTAL]; + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_PORTE_VENTA]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_TOTALValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_PORTE_VENTAValue(const aValue: Float); begin - BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL] := aValue; + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_PORTE_VENTA] := aValue; +end; + +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_TOTAL_VENTAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_VENTA]; +end; + +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_TOTAL_VENTAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_VENTA]; +end; + +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_TOTAL_VENTAValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_TOTAL_VENTA] := aValue; end; function TInfVentasArticuloBusinessProcessorRules.GetNIF_CIF_PROVEEDORValue: String; @@ -915,17 +937,17 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloCOMISION_AGENTE] := aValue; end; -function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_COMISION_AGENTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetIMPORTE_COMISION_AGENTEValue: Currency; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_COMISION_AGENTE]; end; -function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_COMISION_AGENTEValue: Float; +function TInfVentasArticuloBusinessProcessorRules.GetOldIMPORTE_COMISION_AGENTEValue: Currency; begin result := BusinessProcessor.CurrentChange.OldValueByName[fld_InfVentasArticuloIMPORTE_COMISION_AGENTE]; end; -procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Float); +procedure TInfVentasArticuloBusinessProcessorRules.SetIMPORTE_COMISION_AGENTEValue(const aValue: Currency); begin BusinessProcessor.CurrentChange.NewValueByName[fld_InfVentasArticuloIMPORTE_COMISION_AGENTE] := aValue; end; diff --git a/Source/Modulos/Informe ventas por articulo/Servidor/srvInfVentasArticulo_Impl.pas b/Source/Modulos/Informe ventas por articulo/Servidor/srvInfVentasArticulo_Impl.pas index 52cef492..9b0cc708 100644 --- a/Source/Modulos/Informe ventas por articulo/Servidor/srvInfVentasArticulo_Impl.pas +++ b/Source/Modulos/Informe ventas por articulo/Servidor/srvInfVentasArticulo_Impl.pas @@ -37,8 +37,9 @@ uses {Generated:} FactuGES_Invk, uSchemaUtilsServer, dialogs; const - CAMPOS_SUMA = '#IMPORTE_TOTAL_FACTURA#PRECIO_COSTE#PRECIO_NETO#PRECIO_PORTE#CANTIDAD#IMPORTE_UNIDAD#IMPORTE_PORTE#IMPORTE_TOTAL#IMPORTE_COMISION_AGENTE#'; + CAMPOS_SUMA = '#IMPORTE_TOTAL_FACTURA#IMPORTE_UNIDAD_COSTE#IMPORTE_NETO_COSTE#IMPORTE_PORTE_COSTE#CANTIDAD#IMPORTE_UNIDAD_VENTA#IMPORTE_NETO_VENTA#IMPORTE_PORTE_VENTA#IMPORTE_TOTAL_VENTA#IMPORTE_COMISION_AGENTE#'; + procedure Create_srv_InfVentasArticulo(out anInstance : IUnknown); begin anInstance := TsrvInfVentasArticulo.Create(NIL); diff --git a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.bdsproj b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.bdsproj index cc464e35..ab44990b 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.bdsproj +++ b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.bdsproj @@ -170,7 +170,9 @@ 1.0.0.0 - + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration diff --git a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.dpk b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.dpk index 4e3c2aae..6f8d723d 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.dpk +++ b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.dpk @@ -68,12 +68,13 @@ requires JvPageCompsD10R, InfVentasArticulo_model, InfVentasArticulo_controller, - Informes_view; + Informes_view, + JvCtrlsD10R; contains - uViewInfVentasArticuloGrid in 'uViewInfVentasArticuloGrid.pas' {frViewInfVentasArticuloGrid: TFrame}, uViewInfVentasArticulo in 'uViewInfVentasArticulo.pas' {frViewInfVentasArticulo: TFrame}, - uEditorInfVentasArticulo in 'uEditorInfVentasArticulo.pas' {fEditorInfVentasArticulo: TCustomEditor}, - uInfVentasArticuloViewRegister in 'uInfVentasArticuloViewRegister.pas'; + uInfVentasArticuloViewRegister in 'uInfVentasArticuloViewRegister.pas', + uEditorInfVentasArticulo in 'uEditorInfVentasArticulo.pas' {frEditorInfVentasArticulo: TForm}, + uViewInfVentasArticuloGrid in 'uViewInfVentasArticuloGrid.pas' {frViewInfVentasArticuloGrid: TFrame}; end. diff --git a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.res b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.res index 36f26e23..86c94e6a 100644 Binary files a/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.res and b/Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.res differ diff --git a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm index fc376900..ee96403a 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm +++ b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.dfm @@ -2,19 +2,19 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo Left = 531 Top = 329 Caption = 'fEditorInfVentasArticulo' - ClientHeight = 573 - ClientWidth = 679 + ClientHeight = 671 + ClientWidth = 899 OnCreate = CustomEditorCreate OnGetModified = CustomEditorGetModified - ExplicitWidth = 687 - ExplicitHeight = 607 + ExplicitWidth = 907 + ExplicitHeight = 705 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 679 - ExplicitWidth = 679 + Width = 899 + ExplicitWidth = 899 inherited Image1: TImage - Left = 652 + Left = 872 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -127,10 +127,10 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited TBXDock: TTBXDock - Width = 679 - ExplicitWidth = 679 + Width = 899 + ExplicitWidth = 899 inherited tbxMain: TTBXToolbar - ExplicitWidth = 679 + ExplicitWidth = 745 object TBXSeparatorItem16: TTBXSeparatorItem [13] end object tbxiExpandir: TTBXItem [14] @@ -145,7 +145,7 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 679 + ExplicitWidth = 899 inherited TBXSubmenuItem6: TTBXSubmenuItem object TBXItem37: TTBXItem [0] Action = actExpandir @@ -162,20 +162,26 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited pgPaginas: TPageControl - Width = 679 - Height = 478 - ExplicitWidth = 679 - ExplicitHeight = 478 + Width = 899 + Height = 550 + ExplicitWidth = 899 + ExplicitHeight = 550 inherited pagGeneral: TTabSheet - ExplicitWidth = 671 - ExplicitHeight = 450 + ExplicitWidth = 891 + ExplicitHeight = 522 end end - inline frViewInfVentasArticulo1: TfrViewInfVentasArticulo [3] + inherited StatusBar: TJvStatusBar + Top = 652 + Width = 899 + ExplicitTop = 652 + ExplicitWidth = 899 + end + inline frViewInfVentasArticulo1: TfrViewInfVentasArticulo [4] Left = 0 - Top = 76 - Width = 679 - Height = 478 + Top = 102 + Width = 899 + Height = 550 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -183,61 +189,33 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 3 + TabOrder = 4 ReadOnly = False - ExplicitTop = 76 - ExplicitWidth = 679 - ExplicitHeight = 478 + ExplicitWidth = 891 + ExplicitHeight = 522 inherited TBXMultiDock1: TTBXMultiDock - Top = 110 - Width = 234 - Height = 368 + Height = 440 ExplicitTop = 110 - ExplicitWidth = 234 - ExplicitHeight = 368 + ExplicitHeight = 412 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 230 - SplitHeight = 258 - ExplicitWidth = 234 - ExplicitHeight = 203 - inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 230 - ExplicitWidth = 230 - inherited TBXLink1: TTBXLink - Width = 222 - ExplicitWidth = 222 - end - inherited TBXLink5: TTBXLink - Width = 222 - ExplicitWidth = 222 - end - inherited TBXLink2: TTBXLink - Width = 222 - ExplicitWidth = 222 - end - end + ExplicitHeight = 205 inherited pcParametros: TPageControl - Width = 230 - Height = 114 - ExplicitWidth = 230 - ExplicitHeight = 114 + Height = 116 + ExplicitHeight = 102 + inherited TabSheet5: TTabSheet + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 29 + end inherited tsColumnas: TTabSheet - ExplicitWidth = 222 - ExplicitHeight = 104 + ExplicitHeight = 92 inherited frViewColumnas1: TfrViewColumnas - Width = 222 - Height = 104 - ExplicitWidth = 222 - ExplicitHeight = 104 - inherited TBXLabel1: TTBXLabel - Width = 222 - ExplicitWidth = 222 - end + Height = 106 + ExplicitHeight = 92 inherited lbColumnas: TcxCheckListBox - Width = 222 - Height = 75 - ExplicitWidth = 222 - ExplicitHeight = 75 + Height = 77 + ExplicitHeight = 63 end end end @@ -246,54 +224,21 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo inherited frViewAgrupaciones1: TfrViewAgrupaciones Height = 29 ExplicitHeight = 29 - inherited pnlAgrupaciones: TTBXAlignmentPanel - inherited TBXButton1: TTBXButton - Width = 107 - ExplicitWidth = 107 - end - inherited TBXButton3: TTBXButton - Width = 107 - ExplicitWidth = 107 - end - inherited TBXButton2: TTBXButton - Width = 107 - ExplicitWidth = 107 - end - end end end end end inherited pnlTareas: TTBXDockablePanel - Top = 203 - DockedWidth = 230 - DockPos = 203 - SplitHeight = 204 - ExplicitTop = 203 - ExplicitWidth = 234 - ExplicitHeight = 149 + Top = 205 + DockPos = 205 + ExplicitTop = 205 + ExplicitHeight = 219 inherited TBXPageScroller1: TTBXPageScroller - Width = 230 - Height = 127 - ExplicitWidth = 230 - ExplicitHeight = 127 - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 230 - ExplicitWidth = 230 - inherited bFiltros: TTBXLink - Width = 222 - ExplicitWidth = 222 - end - inherited bSumarios: TTBXLink - Width = 222 - ExplicitWidth = 222 - end - end + Height = 197 + ExplicitHeight = 183 inherited pcTareas: TPageControl - Width = 230 - Height = 79 - ExplicitWidth = 230 - ExplicitHeight = 79 + Height = 149 + ExplicitHeight = 135 inherited tsSumarios: TTabSheet ExplicitHeight = 48 inherited frViewSumarios1: TfrViewSumarios @@ -306,31 +251,17 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited tsFiltros: TTabSheet - ExplicitWidth = 222 - ExplicitHeight = 69 + ExplicitHeight = 125 inherited frViewFiltros1: TfrViewFiltros - Width = 222 - Height = 69 - ExplicitWidth = 222 - ExplicitHeight = 69 - inherited TBXLabel1: TTBXLabel - Width = 222 - ExplicitWidth = 222 - end + Height = 139 + ExplicitHeight = 125 inherited cxFilterControl1: TcxFilterControl - Width = 222 - Height = 10 - ExplicitWidth = 222 - ExplicitHeight = 10 + Height = 80 + ExplicitHeight = 66 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 39 - Width = 222 - ExplicitTop = 39 - ExplicitWidth = 222 - end - inherited cxStyleRepository1: TcxStyleRepository - Top = 72 + Top = 109 + ExplicitTop = 95 end end end @@ -339,190 +270,15 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited frViewInfVentasArticuloGrid1: TfrViewInfVentasArticuloGrid - Left = 234 - Top = 110 - Width = 445 - Height = 368 - ExplicitLeft = 234 - ExplicitTop = 110 - ExplicitWidth = 445 - ExplicitHeight = 368 + Width = 677 + Height = 440 + ExplicitWidth = 669 + ExplicitHeight = 412 inherited cxGrid: TcxGrid - Width = 445 - Height = 368 - ExplicitWidth = 445 - ExplicitHeight = 368 - inherited cxGridView: TcxGridDBTableView - DataController.Filter.OnChanged = nil - DataController.Summary.OnAfterSummary = nil - DataController.OnCompare = nil - DataController.OnGroupingChanged = nil - DataController.OnSortingChanged = nil - Styles.OnGetContentStyle = nil - OnColumnPosChanged = nil - OnColumnSizeChanged = nil - inherited cxGridViewID_FACTURA: TcxGridDBColumn - Caption = 'Id factura' - end - inherited cxGridViewID_EMPRESA: TcxGridDBColumn - Caption = 'Id empresa' - end - inherited cxGridViewREFERENCIA_FACTURA: TcxGridDBColumn - Caption = 'Ref. factura' - end - inherited cxGridViewFECHA_FACTURA: TcxGridDBColumn - Caption = 'Fecha factura' - end - inherited cxGridViewIMPORTE_TOTAL_FACTURA: TcxGridDBColumn - Caption = 'Importe factura' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewID_COMISION_FACTURA: TcxGridDBColumn - Caption = 'Id comision factura' - end - inherited cxGridViewID_ARTICULO: TcxGridDBColumn - Caption = 'Id art'#237'culo' - end - inherited cxGridViewFAMILIA: TcxGridDBColumn - Caption = 'Familia' - end - inherited cxGridViewREFERENCIA: TcxGridDBColumn - Caption = 'Referencia' - end - inherited cxGridViewREFERENCIA_PROV: TcxGridDBColumn - Caption = 'Ref. proveedor' - end - inherited cxGridViewDESCRIPCION: TcxGridDBColumn - Caption = 'Descripci'#243'n' - end - inherited cxGridViewCOMISIONABLE: TcxGridDBColumn - Caption = 'Comisionable' - end - inherited cxGridViewINVENTARIABLE: TcxGridDBColumn - Caption = 'Inventariable' - end - inherited cxGridViewIMPORTE_UNIDAD_COSTE: TcxGridDBColumn - Caption = 'Precio coste' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewDESCUENTO_PROVEEDOR_COSTE: TcxGridDBColumn - Caption = 'Dto proveedor' - end - inherited cxGridViewIMPORTE_NETO_COSTE: TcxGridDBColumn - Caption = 'Precio neto' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_PORTE_COSTE: TcxGridDBColumn - Caption = 'Precio porte' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Caption = 'Cantidad' - PropertiesClassName = 'TcxSpinEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_UNIDAD_VENTA: TcxGridDBColumn - Caption = 'Importe unidad' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewDESCUENTO_CLIENTE_VENTA: TcxGridDBColumn - Caption = 'Dto cliente' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 %;-,0.00 %' - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn - Caption = 'Importe neto' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn - Caption = 'Importe total' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn - Caption = 'NIF/CIF prov.' - end - inherited cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn - Caption = 'Proveedor' - end - inherited cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn - Caption = 'Calle prov.' - end - inherited cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn - Caption = 'Poblaci'#243'n prov.' - end - inherited cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn - Caption = 'Provincia prov.' - end - inherited cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn - Caption = 'NIF/CIF cli.' - end - inherited cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn - Caption = 'Cliente' - end - inherited cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn - Caption = 'Nombre comercial cli.' - end - inherited cxGridViewCALLE_CLIENTE: TcxGridDBColumn - Caption = 'Calle cli.' - end - inherited cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn - Caption = 'Poblaci'#243'n cli.' - end - inherited cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn - Caption = 'Provincia cli.' - end - inherited cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn - Caption = 'NIF/CIF agente' - end - inherited cxGridViewNOMBRE_AGENTE: TcxGridDBColumn - Caption = 'Agente' - end - inherited cxGridViewCALLE_AGENTE: TcxGridDBColumn - Caption = 'Calle agente' - end - inherited cxGridViewPOBLACION_AGENTE: TcxGridDBColumn - Caption = 'Poblaci'#243'n agente' - end - inherited cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn - Caption = 'Provincia agente' - end - inherited cxGridViewCOMISION_AGENTE: TcxGridDBColumn - Caption = 'Comisi'#243'n agente' - end - inherited cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn - Caption = 'Importe comisi'#243'n' - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - end + Width = 677 + Height = 440 + ExplicitWidth = 669 + ExplicitHeight = 412 end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle @@ -536,42 +292,29 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo end end inherited TBXMultiDock2: TTBXMultiDock - Width = 679 - Height = 110 - ExplicitWidth = 679 - ExplicitHeight = 110 + Width = 899 + ExplicitWidth = 891 inherited pnlIntervaloFechas: TTBXDockablePanel - DockedHeight = 106 - ExplicitWidth = 663 - ExplicitHeight = 110 + ExplicitWidth = 883 inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 76 - Width = 659 + Width = 879 ExplicitTop = 76 - ExplicitWidth = 659 + ExplicitWidth = 871 end inherited frViewPeriodoFechas1: TfrViewPeriodoFechas - Width = 659 - Height = 76 - ExplicitWidth = 659 - ExplicitHeight = 76 - inherited dxLayoutControl1: TdxLayoutControl - Width = 659 - Height = 76 - ParentBackground = True - ExplicitWidth = 659 - ExplicitHeight = 76 + Width = 879 + ExplicitWidth = 871 + inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 871 + inherited dxLayoutControl1: TdxLayoutControl + Width = 879 + ExplicitWidth = 871 + end end end end end end - inherited StatusBar: TJvStatusBar [4] - Top = 554 - Width = 679 - ExplicitTop = 554 - ExplicitWidth = 679 - end inherited JvAppRegistryStorage: TJvAppRegistryStorage [5] end inherited SmallImages: TPngImageList [6] @@ -1940,19 +1683,19 @@ inherited fEditorInfVentasArticulo: TfEditorInfVentasArticulo inherited JvFormStorage: TJvFormStorage [8] end inherited EditorActionList: TActionList [9] - object actExpandir: TAction + object actExpandir: TAction [23] Category = 'Ver' Caption = 'Expandir todo' ImageIndex = 21 OnExecute = actExpandirExecute end - object actContraer: TAction + object actContraer: TAction [24] Category = 'Ver' Caption = 'Contraer todo' ImageIndex = 22 OnExecute = actContraerExecute end - object actAnchoAuto: TAction + object actAnchoAuto: TAction [25] Category = 'Ver' Caption = 'Ancho autom'#225'tico' ImageIndex = 23 diff --git a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas index f99a94fe..9f1140d7 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uEditorInfVentasArticulo.pas @@ -10,7 +10,11 @@ uses TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uBizInformes, uCustomView, uViewBase, uViewInformeBase, uViewInfVentasArticulo, Grids, DBGrids, pngimage, JvExComCtrls, JvStatusBar, uInfVentasArticuloController, - uIEditorInfVentasArticulo, uBizInfVentasArticulo, uInformesController; + uIEditorInfVentasArticulo, uBizInfVentasArticulo, uInformesController, + uViewGridBase, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, + cxDataStorage, cxEdit, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, + cxGrid, TB2ExtItems, TBXExtItems; type @@ -71,8 +75,9 @@ type implementation uses - uROClasses, cxControls, cxGridCustomView, //cxGridCustomTableView, - cxGridTableView, uCustomEditor, uDataModuleUsuarios, uSistemaFunc; + uROClasses, //cxControls, cxGridCustomView, //cxGridCustomTableView, + //cxGridTableView, + uCustomEditor, uDataModuleUsuarios, uSistemaFunc; {$R *.dfm} diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm index 64643244..eefd8c89 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.dfm @@ -1,61 +1,76 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo - Height = 329 - ExplicitHeight = 329 + Height = 509 + ExplicitHeight = 509 inherited TBXMultiDock1: TTBXMultiDock - Top = 100 - Height = 229 - ExplicitTop = 100 - ExplicitHeight = 229 + Top = 110 + Height = 399 + ExplicitTop = 170 + ExplicitHeight = 339 inherited pnlParametros: TTBXDockablePanel - ExplicitHeight = 107 + ExplicitHeight = 184 inherited pcParametros: TPageControl - Height = 18 - ExplicitHeight = 18 + Height = 95 + ExplicitHeight = 65 + inherited TabSheet5: TTabSheet + ExplicitLeft = 4 + ExplicitTop = 6 + ExplicitWidth = 210 + ExplicitHeight = 55 + end inherited tsColumnas: TTabSheet - ExplicitHeight = 8 + ExplicitHeight = 55 inherited frViewColumnas1: TfrViewColumnas - Height = 8 - ExplicitHeight = 8 + Height = 85 + ExplicitHeight = 55 inherited lbColumnas: TcxCheckListBox - ExplicitHeight = 94 + Height = 56 + ExplicitHeight = 26 end end end inherited tsAgrupacion: TTabSheet - ExplicitHeight = 8 + ExplicitHeight = 55 inherited frViewAgrupaciones1: TfrViewAgrupaciones - Height = 8 - ExplicitHeight = 8 + Height = 85 + ExplicitHeight = 55 end end end end inherited pnlTareas: TTBXDockablePanel - Top = 107 - DockPos = 107 - ExplicitTop = 107 - ExplicitHeight = 106 + Top = 184 + DockPos = 184 + ExplicitTop = 184 + ExplicitHeight = 199 inherited TBXPageScroller1: TTBXPageScroller - Height = 84 - ExplicitHeight = 84 + Height = 177 + ExplicitHeight = 147 inherited pcTareas: TPageControl - Height = 36 - ExplicitHeight = 36 + Height = 129 + ExplicitHeight = 99 inherited tsSumarios: TTabSheet - ExplicitHeight = 26 + ExplicitHeight = 89 inherited frViewSumarios1: TfrViewSumarios - Height = 26 - ExplicitHeight = 26 + Height = 119 + ExplicitHeight = 89 + inherited vgSumarios: TcxVerticalGrid + Height = 90 + ExplicitHeight = 60 + end end end inherited tsFiltros: TTabSheet - ExplicitHeight = 26 + ExplicitHeight = 89 inherited frViewFiltros1: TfrViewFiltros - Height = 26 - ExplicitHeight = 26 + Height = 119 + ExplicitHeight = 89 + inherited cxFilterControl1: TcxFilterControl + Height = 60 + ExplicitHeight = 30 + end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = -4 - ExplicitTop = -4 + Top = 89 + ExplicitTop = 59 end end end @@ -65,9 +80,9 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo end inline frViewInfVentasArticuloGrid1: TfrViewInfVentasArticuloGrid [1] Left = 222 - Top = 100 + Top = 110 Width = 477 - Height = 229 + Height = 399 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -78,14 +93,14 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo TabOrder = 1 ReadOnly = False ExplicitLeft = 222 - ExplicitTop = 100 + ExplicitTop = 170 ExplicitWidth = 477 - ExplicitHeight = 229 + ExplicitHeight = 339 inherited cxGrid: TcxGrid Width = 477 - Height = 229 + Height = 399 ExplicitWidth = 477 - ExplicitHeight = 229 + ExplicitHeight = 339 end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle @@ -99,24 +114,24 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo end end inherited TBXMultiDock2: TTBXMultiDock [2] - Height = 100 - ExplicitHeight = 100 + Height = 110 + ExplicitHeight = 110 inherited pnlIntervaloFechas: TTBXDockablePanel - DockedHeight = 96 + DockedHeight = 106 ShowCaption = False ShowCaptionWhenDocked = False - ExplicitHeight = 100 + ExplicitHeight = 110 inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Top = 66 + Top = 76 Width = 679 - ExplicitTop = 66 + ExplicitTop = 136 ExplicitWidth = 679 end inline frViewPeriodoFechas1: TfrViewPeriodoFechas Left = 0 Top = 0 Width = 679 - Height = 66 + Height = 76 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -128,30 +143,36 @@ inherited frViewInfVentasArticulo: TfrViewInfVentasArticulo ReadOnly = False ExplicitWidth = 679 ExplicitHeight = 66 - inherited dxLayoutControl1: TdxLayoutControl - Width = 679 - Height = 66 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 679 - ExplicitHeight = 66 - inherited cbPeriodo: TcxComboBox - Left = 54 - ExplicitLeft = 54 - end - inherited edtFechaIni: TcxDateEdit - Left = 269 - ExplicitLeft = 269 - end - inherited edtFechaFin: TcxDateEdit - Left = 54 - ExplicitLeft = 54 + ExplicitHeight = 136 + inherited dxLayoutControl1: TdxLayoutControl + Width = 679 + Height = 76 + ExplicitWidth = 679 + ExplicitHeight = 136 + inherited cbPeriodo: TcxComboBox + Left = 54 + ExplicitLeft = 54 + end + inherited edtFechaIni: TcxDateEdit + Left = 54 + ExplicitLeft = 54 + end + inherited edtFechaFin: TcxDateEdit + Left = 266 + ExplicitLeft = 266 + end end end end end end - inherited SmallImages: TPngImageList [3] + inherited dsDataSource: TDADataSource [3] end - inherited LargeImages: TPngImageList [4] + inherited SmallImages: TPngImageList [4] + end + inherited LargeImages: TPngImageList [5] end inherited EditorActionList: TActionList Left = 248 diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas index 8043dc7d..1450b13a 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticulo.pas @@ -12,7 +12,7 @@ uses cxDBData, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, cxTextEdit, uViewFiltros, uBizInfVentasArticulo, - uViewPeriodoFechas, uViewInfVentasArticuloGrid; + uViewPeriodoFechas, uViewInfVentasArticuloGrid, uDADataTable, uViewFiltroBase; type IViewInfVentasArticulo = interface(IViewInformeBase) @@ -34,7 +34,7 @@ type procedure OnViewInformeBaseGridChanged(Sender : TObject); procedure OnFilterChanged(Sender : TObject); procedure ActivarTarea(const ATarea: Integer); override; - + function GetFocusedView: TcxGridDBTableView; override; function GetDatos : IBizInfVentasArticulo; procedure SetDatos (const Value : IBizInfVentasArticulo); @@ -46,10 +46,6 @@ type implementation -//uses -// uBizInfVentasArticulo; -// uDataModuleVentasTerminadas, uBizControlVentasTerminadas, ; - const PERIODO = 0; @@ -74,6 +70,11 @@ begin Result := FDatos; end; +function TfrViewInfVentasArticulo.GetFocusedView: TcxGridDBTableView; +begin + Result := frViewInfVentasArticuloGrid1.cxGridView; +end; + procedure TfrViewInfVentasArticulo.Refresh; var AColumns : TStringList; diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.dfm b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.dfm index 1b175f1a..516507ad 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.dfm +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.dfm @@ -15,6 +15,7 @@ inherited frViewInfVentasArticuloGrid: TfrViewInfVentasArticuloGrid object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.CustomizeDialog = False + FilterBox.Visible = fvNever DataController.Filter.Options = [fcoCaseInsensitive] DataController.Filter.OnChanged = cxGridViewDataControllerFilterChanged DataController.KeyFieldNames = 'RecID' @@ -23,12 +24,12 @@ inherited frViewInfVentasArticuloGrid: TfrViewInfVentasArticuloGrid DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> DataController.Summary.OnAfterSummary = cxGridViewDataControllerSummaryAfterSummary - DataController.OnCompare = cxGridViewDataControllerCompare DataController.OnGroupingChanged = cxGridViewDataControllerGroupingChanged DataController.OnSortingChanged = cxGridViewDataControllerSortingChanged OptionsBehavior.CellHints = True OptionsCustomize.ColumnFiltering = False OptionsCustomize.ColumnGrouping = False + OptionsCustomize.ColumnsQuickCustomization = True OptionsCustomize.DataRowSizing = True OptionsCustomize.GroupRowSizing = True OptionsData.Deleting = False @@ -46,6 +47,7 @@ inherited frViewInfVentasArticuloGrid: TfrViewInfVentasArticuloGrid OptionsView.GroupByBox = False OptionsView.GroupFooters = gfAlwaysVisible OptionsView.HeaderEndEllipsis = True + OptionsView.NewItemRowInfoText = 'Click here to add a new row' Styles.FilterBox = cxStyleFilterBox Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle OnColumnPosChanged = cxGridViewColumnPosChanged @@ -55,124 +57,171 @@ inherited frViewInfVentasArticuloGrid: TfrViewInfVentasArticuloGrid Visible = False end object cxGridViewID_FACTURA: TcxGridDBColumn + Caption = 'Id_factura' DataBinding.FieldName = 'ID_FACTURA' end object cxGridViewID_EMPRESA: TcxGridDBColumn + Caption = 'Id_empresa' DataBinding.FieldName = 'ID_EMPRESA' end object cxGridViewREFERENCIA_FACTURA: TcxGridDBColumn + Caption = 'Ref. factura' DataBinding.FieldName = 'REFERENCIA_FACTURA' end object cxGridViewFECHA_FACTURA: TcxGridDBColumn + Caption = 'Fecha factura' DataBinding.FieldName = 'FECHA_FACTURA' end object cxGridViewIMPORTE_TOTAL_FACTURA: TcxGridDBColumn + Caption = 'Importe factura' DataBinding.FieldName = 'IMPORTE_TOTAL_FACTURA' end object cxGridViewID_COMISION_FACTURA: TcxGridDBColumn + Caption = 'Id_comision' DataBinding.FieldName = 'ID_COMISION_FACTURA' end object cxGridViewID_ARTICULO: TcxGridDBColumn + Caption = 'Id_articulo' DataBinding.FieldName = 'ID_ARTICULO' end object cxGridViewFAMILIA: TcxGridDBColumn + Caption = 'Familia' DataBinding.FieldName = 'FAMILIA' end object cxGridViewREFERENCIA: TcxGridDBColumn + Caption = 'Referencia' DataBinding.FieldName = 'REFERENCIA' end - object cxGridViewREFERENCIA_PROV: TcxGridDBColumn - DataBinding.FieldName = 'REFERENCIA_PROV' - end object cxGridViewDESCRIPCION: TcxGridDBColumn + Caption = 'Descripci'#243'n' DataBinding.FieldName = 'DESCRIPCION' end + object cxGridViewREFERENCIA_PROV: TcxGridDBColumn + Caption = 'Ref. proveedor' + DataBinding.FieldName = 'REFERENCIA_PROV' + end object cxGridViewCOMISIONABLE: TcxGridDBColumn + Caption = 'Comisionable' DataBinding.FieldName = 'COMISIONABLE' end object cxGridViewINVENTARIABLE: TcxGridDBColumn + Caption = 'Inventariable' DataBinding.FieldName = 'INVENTARIABLE' end object cxGridViewIMPORTE_UNIDAD_COSTE: TcxGridDBColumn + Caption = 'Precio uni. compra' DataBinding.FieldName = 'IMPORTE_UNIDAD_COSTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewDESCUENTO_PROVEEDOR_COSTE: TcxGridDBColumn + Caption = 'Dto proveedor' DataBinding.FieldName = 'DESCUENTO_PROVEEDOR_COSTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewIMPORTE_NETO_COSTE: TcxGridDBColumn + Caption = 'Precio neto compra' DataBinding.FieldName = 'IMPORTE_NETO_COSTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewIMPORTE_PORTE_COSTE: TcxGridDBColumn + Caption = 'Precio porte compra' DataBinding.FieldName = 'IMPORTE_PORTE_COSTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewCANTIDAD: TcxGridDBColumn + Caption = 'Cantidad' DataBinding.FieldName = 'CANTIDAD' end object cxGridViewIMPORTE_UNIDAD_VENTA: TcxGridDBColumn + Caption = 'Precio uni. venta' DataBinding.FieldName = 'IMPORTE_UNIDAD_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewDESCUENTO_CLIENTE_VENTA: TcxGridDBColumn + Caption = 'Dto. cliente' DataBinding.FieldName = 'DESCUENTO_CLIENTE_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn + Caption = 'Precio neto venta' DataBinding.FieldName = 'IMPORTE_NETO_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn + Caption = 'Importe total venta' DataBinding.FieldName = 'IMPORTE_TOTAL_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn + Caption = 'NIF/CIF prov.' DataBinding.FieldName = 'NIF_CIF_PROVEEDOR' end object cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn + Caption = 'Proveedor' DataBinding.FieldName = 'NOMBRE_PROVEEDOR' end - object cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_PROVEEDOR' - end - object cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_PROVEEDOR' - end - object cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_PROVEEDOR' - end object cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn + Caption = 'NIF/CIF cli.' DataBinding.FieldName = 'NIF_CIF_CLIENTE' end object cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn + Caption = 'Cliente' DataBinding.FieldName = 'NOMBRE_CLIENTE' end object cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn + Caption = 'Nombre comercial cli.' DataBinding.FieldName = 'NOMBRE_COMERCIAL_CLIENTE' end - object cxGridViewCALLE_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_CLIENTE' - end - object cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_CLIENTE' - end - object cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_CLIENTE' - end object cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn + Caption = 'NIF/CIF agente' DataBinding.FieldName = 'NIF_CIF_AGENTE' end object cxGridViewNOMBRE_AGENTE: TcxGridDBColumn + Caption = 'Agente' DataBinding.FieldName = 'NOMBRE_AGENTE' end - object cxGridViewCALLE_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'CALLE_AGENTE' - end - object cxGridViewPOBLACION_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'POBLACION_AGENTE' - end - object cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn - DataBinding.FieldName = 'PROVINCIA_AGENTE' - end object cxGridViewCOMISION_AGENTE: TcxGridDBColumn + Caption = 'Comisi'#243'n agente' DataBinding.FieldName = 'COMISION_AGENTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end object cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn + Caption = 'Importe comisi'#243'n' DataBinding.FieldName = 'IMPORTE_COMISION_AGENTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + HeaderAlignmentHorz = taRightJustify end end object cxGridLevel: TcxGridLevel diff --git a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.pas b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.pas index aab9011f..9b475f0a 100644 --- a/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.pas +++ b/Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.pas @@ -50,47 +50,22 @@ type cxGridViewIMPORTE_TOTAL_VENTA: TcxGridDBColumn; cxGridViewNIF_CIF_PROVEEDOR: TcxGridDBColumn; cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn; - cxGridViewCALLE_PROVEEDOR: TcxGridDBColumn; - cxGridViewPOBLACION_PROVEEDOR: TcxGridDBColumn; - cxGridViewPROVINCIA_PROVEEDOR: TcxGridDBColumn; cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn; cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn; cxGridViewNOMBRE_COMERCIAL_CLIENTE: TcxGridDBColumn; - cxGridViewCALLE_CLIENTE: TcxGridDBColumn; - cxGridViewPOBLACION_CLIENTE: TcxGridDBColumn; - cxGridViewPROVINCIA_CLIENTE: TcxGridDBColumn; cxGridViewNIF_CIF_AGENTE: TcxGridDBColumn; cxGridViewNOMBRE_AGENTE: TcxGridDBColumn; - cxGridViewCALLE_AGENTE: TcxGridDBColumn; - cxGridViewPOBLACION_AGENTE: TcxGridDBColumn; - cxGridViewPROVINCIA_AGENTE: TcxGridDBColumn; cxGridViewCOMISION_AGENTE: TcxGridDBColumn; cxGridViewIMPORTE_COMISION_AGENTE: TcxGridDBColumn; cxGridViewIMPORTE_NETO_VENTA: TcxGridDBColumn; - procedure cxGridViewStylesGetContentStyle( - Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; + procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); - procedure cxGridViewColumnPosChanged(Sender: TcxGridTableView; - AColumn: TcxGridColumn); - procedure cxGridViewColumnSizeChanged(Sender: TcxGridTableView; - AColumn: TcxGridColumn); + procedure cxGridViewColumnPosChanged(Sender: TcxGridTableView; AColumn: TcxGridColumn); + procedure cxGridViewColumnSizeChanged(Sender: TcxGridTableView; AColumn: TcxGridColumn); procedure cxGridViewDataControllerGroupingChanged(Sender: TObject); procedure cxGridViewDataControllerSortingChanged(Sender: TObject); - procedure cxGridViewDataControllerSummaryAfterSummary( - ASender: TcxDataSummary); -// procedure cxGridViewCENTROPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewVENDEDORPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewPRODUCTOPropertiesInitPopup(Sender: TObject); + procedure cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary); procedure cxGridViewDataControllerFilterChanged(Sender: TObject); -// procedure cxGridViewDIASEMANAPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewMESPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewGRUPOPRODUCTOPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewTIPOPRODUCTOPropertiesInitPopup(Sender: TObject); -// procedure cxGridViewCOLECCIONPropertiesInitPopup(Sender: TObject); - procedure cxGridViewDataControllerCompare( - ADataController: TcxCustomDataController; ARecordIndex1, - ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; - var Compare: Integer); protected procedure ActivarEventos; override; procedure DesactivarEventos; override; @@ -130,19 +105,6 @@ begin FocusedView.DataController.FocusedRowIndex := FocusedRow; FocusedView.Controller.TopRowIndex := TopRow; - - { Esta chapuzilla es para que se rellenen los combobox de los filtros - por que el cxFilterControl no coge los valores la 1ª vez si los - combos están vacíos. } -{ TcxComboBoxProperties(cxGridViewPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewCENTRO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewVENDEDOR.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewDIASEMANA.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewMES.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewGRUPOPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewTIPOPRODUCTO.Properties).OnInitPopup(nil); - TcxComboBoxProperties(cxGridViewCOLECCION.Properties).OnInitPopup(nil); -} end; end; @@ -217,47 +179,6 @@ begin FOnViewChanged(Self); end; -{ -procedure TfrViewInfVentasArticuloGrid.cxGridViewCENTROPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewCENTRO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewCENTRO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfVentasArticuloGrid.cxGridViewVENDEDORPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewVENDEDOR.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewVENDEDOR.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfVentasArticuloGrid.cxGridViewPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - procedure TfrViewInfVentasArticuloGrid.cxGridViewDataControllerFilterChanged( Sender: TObject); begin @@ -298,107 +219,5 @@ begin end; end; -{ -procedure TfrViewInfVentasArticuloGrid.cxGridViewDIASEMANAPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewDIASEMANA.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewDIASEMANA.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - -{ -procedure TfrViewInfVentasArticuloGrid.cxGridViewMESPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewMES.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewMES.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfVentasArticuloGrid.cxGridViewGRUPOPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewGRUPOPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewGRUPOPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfVentasArticuloGrid.cxGridViewTIPOPRODUCTOPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewTIPOPRODUCTO.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewTIPOPRODUCTO.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; - -procedure TfrViewInfVentasArticuloGrid.cxGridViewCOLECCIONPropertiesInitPopup( - Sender: TObject); -begin - inherited; - with TcxComboBoxProperties(cxGridViewCOLECCION.Properties) do - begin - Items.Clear; - Items.AddStrings(FilterValueList[cxGridViewCOLECCION.Index]); - Items.Delete(1); // "Personalizado" - Items.Delete(0); // "Todos" - end; -end; -} - -procedure TfrViewInfVentasArticuloGrid.cxGridViewDataControllerCompare( - ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, - AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); -var - AValue1, - AValue2 : Variant; -begin - // Por defecto -{ - Compare := VarCompare(V1, V2); - try - if (AItemIndex = cxGridViewDIASEMANA.Index) then - begin - AValue1 := ADataController.Values[ARecordIndex1, cxGridViewDIASEMANA.Index]; - AValue2 := ADataController.Values[ARecordIndex2, cxGridViewDIASEMANA.Index]; - if (not VarIsNull(AValue1)) and (not VarIsNull(AValue2)) then - Compare := VarCompare(NumberDayOfTheWeek(AValue1), NumberDayOfTheWeek(AValue2)) - end - else begin - if (AItemIndex = cxGridViewMES.Index) then - begin - AValue1 := ADataController.Values[ARecordIndex1, cxGridViewMES.Index]; - AValue2 := ADataController.Values[ARecordIndex2, cxGridViewMES.Index]; - if (not VarIsNull(AValue1)) and (not VarIsNull(AValue2)) then - Compare := VarCompare(NumberMonthOfTheYear(AValue1), NumberMonthOfTheYear(AValue2)) - end - end; - except - //ShowMessage(VarToStr(ARecordIndex1) + ' ' + VarToStr(ARecordIndex1)); - end; -} -end; - end. diff --git a/Source/Modulos/Informes base/Views/uEditorInformeBase.dfm b/Source/Modulos/Informes base/Views/uEditorInformeBase.dfm index 0b6cbbe2..07a24b88 100644 --- a/Source/Modulos/Informes base/Views/uEditorInformeBase.dfm +++ b/Source/Modulos/Informes base/Views/uEditorInformeBase.dfm @@ -4,7 +4,12 @@ inherited fEditorInformeBase: TfEditorInformeBase Caption = '' PixelsPerInch = 96 TextHeight = 13 + inherited JvNavPanelHeader: TJvNavPanelHeader + Top = 75 + end inherited TBXDock: TTBXDock + Height = 75 + ExplicitHeight = 75 inherited tbxMain: TTBXToolbar ExplicitWidth = 580 inherited TBXItem2: TTBXItem @@ -33,8 +38,42 @@ inherited fEditorInformeBase: TfEditorInformeBase end end end + object tbxFiltro: TTBXToolbar + Left = 0 + Top = 49 + Align = alRight + CloseButton = False + DefaultDock = TBXDock + DockMode = dmCannotFloatOrChangeDocks + DockPos = 0 + DockRow = 2 + DragHandleStyle = dhDouble + Images = SmallImages + ParentShowHint = False + Resizable = False + ShowHint = True + ShrinkMode = tbsmNone + TabOrder = 2 + object TBXLabelItem1: TTBXLabelItem + Caption = 'Filtrar:' + end + object tbxEditFiltro: TTBXEditItem + EditWidth = 200 + ImageIndex = 10 + EditorFontSettings.Italic = tsTrue + ExtendedAccept = True + Images = SmallImages + ShowImage = True + OnChange = tbxEditFiltroChange + end + object TBXItem34: TTBXItem + Action = actQuitarFiltro + end + end end inherited pgPaginas: TPageControl + Top = 102 + Height = 340 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 @@ -55,6 +94,12 @@ inherited fEditorInformeBase: TfEditorInformeBase ImageIndex = 20 OnExecute = actPropiedadesExecute end + object actQuitarFiltro: TAction + Category = 'Buscar' + Caption = 'Quitar filtro' + ImageIndex = 19 + OnExecute = actQuitarFiltroExecute + end end inherited SmallImages: TPngImageList PngImages = < diff --git a/Source/Modulos/Informes base/Views/uEditorInformeBase.pas b/Source/Modulos/Informes base/Views/uEditorInformeBase.pas index edffa932..0bd8fc7b 100644 --- a/Source/Modulos/Informes base/Views/uEditorInformeBase.pas +++ b/Source/Modulos/Informes base/Views/uEditorInformeBase.pas @@ -9,7 +9,7 @@ uses PngImageList, StdActns, ActnList, ComCtrls, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uBizInformes, schInformesClient_Intf, uViewInformeBase, JvExComCtrls, - JvStatusBar, pngimage; + JvStatusBar, pngimage, TB2ExtItems, TBXExtItems; type IEditorInformeBase = interface(IEditorDBItem) @@ -25,12 +25,19 @@ type TBXSeparatorItem14: TTBXSeparatorItem; tbxiPropiedades: TTBXItem; tbxiPropiedades2: TTBXItem; + tbxFiltro: TTBXToolbar; + TBXLabelItem1: TTBXLabelItem; + tbxEditFiltro: TTBXEditItem; + TBXItem34: TTBXItem; + actQuitarFiltro: TAction; procedure actPropiedadesExecute(Sender: TObject); procedure actGuardarCerrarUpdate(Sender: TObject); procedure actGuardarUpdate(Sender: TObject); procedure actPrevisualizarExecute(Sender: TObject); procedure actImprimirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); + procedure actQuitarFiltroExecute(Sender: TObject); + procedure tbxEditFiltroChange(Sender: TObject; const Text: string); private procedure ComprobarPrivilegios; @@ -52,7 +59,8 @@ type implementation -uses uEditorDBBase, uEditorBase, uDataModuleUsuarios, uFormPropiedadesInforme; +uses uEditorDBBase, uEditorBase, uDataModuleUsuarios, uFormPropiedadesInforme, +uViewGridBase; {$R *.dfm} @@ -82,6 +90,18 @@ begin FViewInforme.Informe := FInforme; end; +procedure TfEditorInformeBase.tbxEditFiltroChange(Sender: TObject; const Text: string); +begin + inherited; + if not Assigned(FViewInforme) then + Exit; + + if Length(Text) > 0 then + FViewInforme.Filter := Text + else + actQuitarFiltro.Execute; +end; + procedure TfEditorInformeBase.actPropiedadesExecute(Sender: TObject); begin inherited; @@ -110,6 +130,16 @@ begin end; end; +procedure TfEditorInformeBase.actQuitarFiltroExecute(Sender: TObject); +begin + inherited; + if Assigned(FViewInforme) then + begin + tbxEditFiltro.Text := ''; + FViewInforme.Filter := ''; + end; +end; + procedure TfEditorInformeBase.ComprobarPrivilegios; begin if not dmUsuarios.EsAdministrador then diff --git a/Source/Modulos/Informes base/Views/uEditorInformes.pas b/Source/Modulos/Informes base/Views/uEditorInformes.pas index 02969efb..c87590ac 100644 --- a/Source/Modulos/Informes base/Views/uEditorInformes.pas +++ b/Source/Modulos/Informes base/Views/uEditorInformes.pas @@ -144,8 +144,8 @@ begin if not Assigned(FController) then raise Exception.Create('No hay ningún Controller asignado'); -// FViewController.OnDblClick := actModificar.OnExecute; -// FViewController.PopupMenu := ViewPopupMenu; + FViewInformes.OnDblClick := actModificar.OnExecute; + FViewInformes.PopupMenu := ViewPopupMenu; Informes.DataTable.Active := True; FViewInformes.Refresh; diff --git a/Source/Modulos/Informes base/Views/uViewInformeBase.dfm b/Source/Modulos/Informes base/Views/uViewInformeBase.dfm index ad3d270d..e09e9aca 100644 --- a/Source/Modulos/Informes base/Views/uViewInformeBase.dfm +++ b/Source/Modulos/Informes base/Views/uViewInformeBase.dfm @@ -3,7 +3,7 @@ inherited frViewInformeBase: TfrViewInformeBase Height = 607 ExplicitWidth = 699 ExplicitHeight = 607 - object TBXMultiDock1: TTBXMultiDock + object TBXMultiDock1: TTBXMultiDock [0] Left = 0 Top = 132 Width = 222 @@ -110,20 +110,18 @@ inherited frViewInformeBase: TfrViewInformeBase Align = alClient Style = tsFlatButtons TabOrder = 1 - ExplicitHeight = 39 object TabSheet5: TTabSheet Caption = 'TabSheet5' TabVisible = False ExplicitLeft = 0 ExplicitTop = 0 ExplicitWidth = 0 - ExplicitHeight = 159 + ExplicitHeight = 0 end object tsColumnas: TTabSheet Caption = 'tsColumnas' ImageIndex = 1 TabVisible = False - ExplicitHeight = 29 inline frViewColumnas1: TfrViewColumnas Left = 0 Top = 0 @@ -133,7 +131,7 @@ inherited frViewInformeBase: TfrViewInformeBase TabOrder = 0 ReadOnly = False ExplicitWidth = 210 - ExplicitHeight = 29 + ExplicitHeight = 123 inherited TBXLabel1: TTBXLabel Width = 210 ExplicitWidth = 210 @@ -142,7 +140,7 @@ inherited frViewInformeBase: TfrViewInformeBase Width = 210 Height = 94 ExplicitWidth = 210 - ExplicitHeight = 0 + ExplicitHeight = 94 end end end @@ -241,7 +239,6 @@ inherited frViewInformeBase: TfrViewInformeBase DoubleBuffered = False Range = 0 TabOrder = 0 - ExplicitHeight = 106 object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 Top = 0 @@ -306,7 +303,6 @@ inherited frViewInformeBase: TfrViewInformeBase Align = alClient Style = tsButtons TabOrder = 1 - ExplicitHeight = 58 object tsSumarios: TTabSheet Caption = 'tsSumarios' ImageIndex = 2 @@ -329,7 +325,7 @@ inherited frViewInformeBase: TfrViewInformeBase Width = 210 Height = 128 ExplicitWidth = 210 - ExplicitHeight = 194 + ExplicitHeight = 128 end end end @@ -378,7 +374,7 @@ inherited frViewInformeBase: TfrViewInformeBase end end end - object TBXMultiDock2: TTBXMultiDock + object TBXMultiDock2: TTBXMultiDock [1] Left = 0 Top = 0 Width = 699 diff --git a/Source/Modulos/Informes base/Views/uViewInformeBase.pas b/Source/Modulos/Informes base/Views/uViewInformeBase.pas index ce8dcb17..7cc9742c 100644 --- a/Source/Modulos/Informes base/Views/uViewInformeBase.pas +++ b/Source/Modulos/Informes base/Views/uViewInformeBase.pas @@ -1,4 +1,4 @@ -unit uViewInformeBase; +unit uViewInformeBase; interface @@ -6,11 +6,12 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Forms, Dialogs, uViewBase, TBXDkPanels, StdCtrls, ComCtrls, TB2Dock, uViewAgrupaciones, uCustomView, uViewColumnas, ImgList, PngImageList, - ActnList, uViewInformeBaseGrid, uBizInformes, uViewSumarios, - uViewInformeBaseParametros, uViewFiltros, cxStyles, Controls; + ActnList, uViewInformeBaseGrid, uBizInformes, uViewSumarios, uViewGridBase, + uViewInformeBaseParametros, uViewFiltros, cxStyles, Controls, uViewFiltroBase, + DB, uDADataTable; type - IViewInformeBase = interface(IViewBase) + IViewInformeBase = interface(IViewGridBase) ['{D716BE6B-1F41-4825-9385-0231D2AEF819}'] function GetModificable: Boolean; procedure SetModificable(const Value: Boolean); @@ -25,7 +26,7 @@ type property OnViewChanged: TNotifyEvent read GetOnViewChanged write SetOnViewChanged; end; - TfrViewInformeBase = class(TfrViewBase, IViewInformeBase) + TfrViewInformeBase = class(TfrViewGridBase, IViewInformeBase) TBXMultiDock1: TTBXMultiDock; pnlParametros: TTBXDockablePanel; TBXAlignmentPanel2: TTBXAlignmentPanel; @@ -79,11 +80,13 @@ type procedure SetOnViewChanged(const Value : TNotifyEvent); virtual; function GetModificable: Boolean; virtual; procedure SetModificable(const Value: Boolean); virtual; + public property Modificable : Boolean read GetModificable write SetModificable; property OnViewChanged: TNotifyEvent read GetOnViewChanged write SetOnViewChanged; property Informe: IBizInforme read GetInforme write SetInforme; constructor Create(AOwner: TComponent); override; + destructor Destroy; override; end; implementation @@ -127,7 +130,7 @@ begin frViewAgrupaciones1.Refresh; ComprobarPrivilegios; - // ¿Es modificable el InformeBase? + // ¿Es modificable el InformeBase? // Self.Modificable := FInformeBase.EsModificable; end; @@ -177,6 +180,12 @@ begin FOnViewChanged := nil; end; +destructor TfrViewInformeBase.Destroy; +begin + ViewFiltros := Nil; + inherited; +end; + function TfrViewInformeBase.GetModificable: Boolean; begin Result := FModificable; diff --git a/Source/Modulos/Informes base/Views/uViewInformes.dfm b/Source/Modulos/Informes base/Views/uViewInformes.dfm index a727b5b8..2139328d 100644 --- a/Source/Modulos/Informes base/Views/uViewInformes.dfm +++ b/Source/Modulos/Informes base/Views/uViewInformes.dfm @@ -44,6 +44,7 @@ inherited frViewInformes: TfrViewInformes TabOrder = 0 View = elsTile OnItemContextMenu = EasyListviewItemContextMenu + OnItemDblClick = EasyListviewItemDblClick OnItemSelectionChanged = EasyListviewItemSelectionChanged end object ReportImages: TPngImageList diff --git a/Source/Modulos/Informes base/Views/uViewInformes.pas b/Source/Modulos/Informes base/Views/uViewInformes.pas index 6de480c3..57ff6d68 100644 --- a/Source/Modulos/Informes base/Views/uViewInformes.pas +++ b/Source/Modulos/Informes base/Views/uViewInformes.pas @@ -7,7 +7,7 @@ uses Dialogs, uViewBase, cxGraphics, cxCustomData, cxStyles, cxTL, cxImageComboBox, cxMaskEdit, cxTextEdit, cxInplaceContainer, cxDBTL, cxControls, cxTLData, Menus, uBizInformes, DB, uDADataTable, - ImgList, PngImageList, EasyListview, + ImgList, PngImageList, EasyListview, MPCommonUtilities, MPCommonObjects, pngimage, JSDialog; type @@ -41,6 +41,8 @@ type var Handled: Boolean); procedure EasyListviewItemSelectionChanged(Sender: TCustomEasyListview; Item: TEasyItem); + procedure EasyListviewItemDblClick(Sender: TCustomEasyListview; + Button: TCommonMouseButton; MousePos: TPoint; HitInfo: TEasyHitInfoItem); protected FInformes : IBizInforme; FOnDblClick: TNotifyEvent; @@ -189,15 +191,6 @@ begin FPopupMenu := Value; end; -{procedure TfrViewInformes.EasyListviewItemDblClick( - Sender: TCustomEasyListview; Button: TEasyMouseButton; MousePos: TPoint; - HitInfo: TEasyHitInfoItem); -begin - inherited; -// if Assigned(FOnDblClick) then -// FOnDblClick(Self); -end; } - procedure TfrViewInformes.EasyListviewItemContextMenu( Sender: TCustomEasyListview; HitInfo: TEasyHitInfoItem; WindowPoint: TPoint; var Menu: TPopupMenu; var Handled: Boolean); @@ -207,6 +200,14 @@ begin Menu := FPopupMenu; end; +procedure TfrViewInformes.EasyListviewItemDblClick(Sender: TCustomEasyListview; + Button: TCommonMouseButton; MousePos: TPoint; HitInfo: TEasyHitInfoItem); +begin + inherited; + if Assigned(FOnDblClick) then + FOnDblClick(Self); +end; + procedure TfrViewInformes.EasyListviewItemSelectionChanged( Sender: TCustomEasyListview; Item: TEasyItem); begin diff --git a/Source/Modulos/Informes base/Views/uViewPeriodoFechas.dfm b/Source/Modulos/Informes base/Views/uViewPeriodoFechas.dfm index b03c31b6..d6aca5f8 100644 --- a/Source/Modulos/Informes base/Views/uViewPeriodoFechas.dfm +++ b/Source/Modulos/Informes base/Views/uViewPeriodoFechas.dfm @@ -1,116 +1,131 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas - Width = 455 - Height = 74 - ExplicitWidth = 455 - ExplicitHeight = 74 - object dxLayoutControl1: TdxLayoutControl + Width = 769 + Height = 75 + ExplicitWidth = 769 + ExplicitHeight = 75 + object TBXDockablePanel1: TTBXDockablePanel Left = 0 Top = 0 - Width = 455 - Height = 74 Align = alClient + Caption = 'TBXDockablePanel1' + FloatingWidth = 128 + FloatingHeight = 128 + SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - ExplicitWidth = 449 - ExplicitHeight = 73 - DesignSize = ( - 455 - 74) - object cbPeriodo: TcxComboBox - Left = 55 - Top = 37 - RepositoryItem = cxRepositoryPeriodos - Anchors = [akLeft, akTop, akRight] - Properties.OnChange = cbPeriodoPropertiesChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 2 - Text = 'Este mes' - Width = 385 - end - object edtFechaIni: TcxDateEdit - Left = 270 - Top = 10 - Properties.DateButtons = [btnToday] - Properties.PostPopupValueOnTab = True - Properties.SaveTime = False - Properties.ShowTime = False - Properties.OnValidate = edtFechaIni2PropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 1 - Width = 170 - end - object edtFechaFin: TcxDateEdit - Left = 55 - Top = 10 - Properties.DateButtons = [btnToday] - Properties.PostPopupValueOnTab = True - Properties.SaveTime = False - Properties.ShowTime = False - Properties.OnValidate = edtFechaFinPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True + ExplicitTop = 3 + ExplicitWidth = 128 + ExplicitHeight = 128 + object dxLayoutControl1: TdxLayoutControl + Left = 0 + Top = 0 + Width = 769 + Height = 75 + Align = alClient + ParentBackground = True TabOrder = 0 - Width = 170 - end - object dxLayoutControl1Group_Root: TdxLayoutGroup - ShowCaption = False - Hidden = True - ShowBorder = False - object dxLayoutControl1Group1: TdxLayoutGroup + LookAndFeel = dxLayoutStandardLookAndFeel1 + ExplicitWidth = 455 + ExplicitHeight = 74 + DesignSize = ( + 769 + 75) + object cbPeriodo: TcxComboBox + Left = 55 + Top = 37 + RepositoryItem = cxRepositoryPeriodos + Anchors = [akLeft, akTop, akRight] + Properties.OnChange = cbPeriodoPropertiesChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 2 + Text = 'Este mes' + Width = 385 + end + object edtFechaIni: TcxDateEdit + Left = 55 + Top = 10 + Properties.DateButtons = [btnToday] + Properties.PostPopupValueOnTab = True + Properties.SaveTime = False + Properties.ShowTime = False + Properties.OnValidate = edtFechaIni2PropertiesValidate + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 0 + Width = 170 + end + object edtFechaFin: TcxDateEdit + Left = 268 + Top = 10 + Properties.DateButtons = [btnToday] + Properties.PostPopupValueOnTab = True + Properties.SaveTime = False + Properties.ShowTime = False + Properties.OnValidate = edtFechaFinPropertiesValidate + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 1 + Width = 170 + end + object dxLayoutGroup1: TdxLayoutGroup ShowCaption = False Hidden = True - LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item3: TdxLayoutItem - Caption = 'Hasta:' - Control = edtFechaFin + object dxLayoutGroup2: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Desde:' + Control = edtFechaIni + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item3: TdxLayoutItem + Caption = 'Hasta:' + Control = edtFechaFin + ControlOptions.ShowBorder = False + end + end + object dxLayoutItem1: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'Periodo:' + Control = cbPeriodo ControlOptions.ShowBorder = False end - object dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Desde:' - Control = edtFechaIni - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Item1: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Periodo:' - Control = cbPeriodo - ControlOptions.ShowBorder = False end end end @@ -139,4 +154,10 @@ inherited frViewPeriodoFechas: TfrViewPeriodoFechas Properties.ReadOnly = False end end + object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 136 + Top = 16 + object dxLayoutStandardLookAndFeel1: TdxLayoutStandardLookAndFeel + end + end end diff --git a/Source/Modulos/Informes base/Views/uViewPeriodoFechas.pas b/Source/Modulos/Informes base/Views/uViewPeriodoFechas.pas index ceeecee9..c937783b 100644 --- a/Source/Modulos/Informes base/Views/uViewPeriodoFechas.pas +++ b/Source/Modulos/Informes base/Views/uViewPeriodoFechas.pas @@ -7,7 +7,7 @@ uses Dialogs, cxGraphics, cxEdit, cxDropDownEdit, cxCalendar, StdCtrls, cxControls, cxContainer, cxTextEdit, cxMaskEdit, TBXDkPanels, cxEditRepositoryItems, dxLayoutControl, dxLayoutLookAndFeels, uViewBase, - Mask, JvExMask, JvToolEdit, uViewInformeBaseParametros; + Mask, JvExMask, JvToolEdit, uViewInformeBaseParametros, TB2Dock; type IViewPeriodoFechas = interface(IViewInformeBaseParametros) @@ -17,15 +17,18 @@ type TfrViewPeriodoFechas = class(TfrViewInformeBaseParametros, IViewPeriodoFechas) cxRepository: TcxEditRepository; cxRepositoryPeriodos: TcxEditRepositoryComboBoxItem; - dxLayoutControl1Group_Root: TdxLayoutGroup; + dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; + dxLayoutStandardLookAndFeel1: TdxLayoutStandardLookAndFeel; + TBXDockablePanel1: TTBXDockablePanel; dxLayoutControl1: TdxLayoutControl; - dxLayoutControl1Item1: TdxLayoutItem; cbPeriodo: TcxComboBox; - dxLayoutControl1Item2: TdxLayoutItem; edtFechaIni: TcxDateEdit; - dxLayoutControl1Item3: TdxLayoutItem; edtFechaFin: TcxDateEdit; - dxLayoutControl1Group1: TdxLayoutGroup; + dxLayoutGroup1: TdxLayoutGroup; + dxLayoutGroup2: TdxLayoutGroup; + dxLayoutControl1Item2: TdxLayoutItem; + dxLayoutControl1Item3: TdxLayoutItem; + dxLayoutItem1: TdxLayoutItem; procedure cbPeriodoPropertiesChange(Sender: TObject); procedure edtFechaIni2PropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm index 90d239fb..ed3c92ff 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm +++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm @@ -164,36 +164,32 @@ inherited fEditorInventario: TfEditorInventario Width = 669 TabOrder = 0 ExplicitWidth = 669 - inherited TBXDock1: TTBXDock - Width = 669 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 669 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 669 ExplicitWidth = 669 - inherited dxLayoutControl1: TdxLayoutControl - Width = 665 - ExplicitWidth = 665 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 410 - ExplicitLeft = 410 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 468 + Width = 468 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 665 - ExplicitWidth = 665 - inherited tbxBotones: TTBXToolbar - Width = 655 - ExplicitWidth = 655 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 246 + Width = 246 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 412 + ExplicitLeft = 412 + ExplicitWidth = 205 + Width = 205 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 669 + ExplicitWidth = 669 + inherited tbxBotones: TTBXToolbar + Width = 659 + ExplicitWidth = 659 end end end @@ -215,7 +211,6 @@ inherited fEditorInventario: TfEditorInventario inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink Active = False - Component = nil ReportDocument.CreationDate = 39211.788061157410000000 BuiltInReportLink = True end diff --git a/Source/Modulos/Inventario/Views/uViewDetalleReservas.dfm b/Source/Modulos/Inventario/Views/uViewDetalleReservas.dfm index 7edb045c..f6ee9c78 100644 --- a/Source/Modulos/Inventario/Views/uViewDetalleReservas.dfm +++ b/Source/Modulos/Inventario/Views/uViewDetalleReservas.dfm @@ -10,7 +10,7 @@ inherited frViewDetalleReservas: TfrViewDetalleReservas Kind = skSum Position = spFooter end> - DataController.Summary.FooterSummaryItems = < + DataController.Summary.FooterSummaryItems = < item Format = '0 art'#237'culos' Kind = skCount @@ -102,21 +102,19 @@ inherited frViewDetalleReservas: TfrViewDetalleReservas end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 464 - Width = 464 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 244 - Width = 244 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 203 - Width = 203 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm index b8efb7f3..04fd023a 100644 --- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm +++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm @@ -53,21 +53,19 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas index 440160bc..9bb61f31 100644 --- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas +++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas @@ -38,7 +38,7 @@ type cxGridViewREFERENCIA_PROV: TcxGridDBColumn; cxGridViewSTOCK: TcxGridDBColumn; private -//Es para cuando el almacen destino sea relativo a cada artículo, como lo vamos a +//Es para cuando el almacen destino sea relativo a cada artículo, como lo vamos a //hacer relativo al conjunto esto sobra // FController: IAlmacenesController; // FAlmacenes: IBizAlmacen; diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm index 00e04b79..f26ec0aa 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.dfm +++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm @@ -9,7 +9,7 @@ inherited frViewInventario: TfrViewInventario Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter - Column = cxGridViewCOSTE_UNIDADES + Column = cxGridViewCOSTE_UNIDADES end> DataController.Summary.FooterSummaryItems = < item @@ -144,29 +144,23 @@ inherited frViewInventario: TfrViewInventario end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 464 - Width = 464 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 244 - Width = 244 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 203 - Width = 203 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end end - inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.741107951390000000 diff --git a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp index b916e980..ed92af24 100644 Binary files a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp and b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp differ diff --git a/Source/Modulos/Lib/AlbProv_FacProv_relation.dcp b/Source/Modulos/Lib/AlbProv_FacProv_relation.dcp index 8f6dac1f..f050161e 100644 Binary files a/Source/Modulos/Lib/AlbProv_FacProv_relation.dcp and b/Source/Modulos/Lib/AlbProv_FacProv_relation.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp index 8089b91d..8448eda2 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp and b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_data.dcp b/Source/Modulos/Lib/AlbaranesCliente_data.dcp index c43003ac..f3f7e819 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_data.dcp and b/Source/Modulos/Lib/AlbaranesCliente_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_model.dcp b/Source/Modulos/Lib/AlbaranesCliente_model.dcp index b979cb79..49b1beb7 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_model.dcp and b/Source/Modulos/Lib/AlbaranesCliente_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp index 287b289b..8cd7a354 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp and b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_view.dcp b/Source/Modulos/Lib/AlbaranesCliente_view.dcp index 4eef56cd..48352e6c 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_view.dcp and b/Source/Modulos/Lib/AlbaranesCliente_view.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp index 38a4eef0..14512258 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp index 268627f3..2ca84572 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp index 8bd83a18..426042c0 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp index 58cfe33f..28e5fa65 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp index 8b86199e..119e0a70 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_controller.dcp b/Source/Modulos/Lib/Almacenes_controller.dcp index 15003cd4..dd0ad02f 100644 Binary files a/Source/Modulos/Lib/Almacenes_controller.dcp and b/Source/Modulos/Lib/Almacenes_controller.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_data.dcp b/Source/Modulos/Lib/Almacenes_data.dcp index 26086fc5..f3baae93 100644 Binary files a/Source/Modulos/Lib/Almacenes_data.dcp and b/Source/Modulos/Lib/Almacenes_data.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_model.dcp b/Source/Modulos/Lib/Almacenes_model.dcp index 68ec3da9..bc4e4bf8 100644 Binary files a/Source/Modulos/Lib/Almacenes_model.dcp and b/Source/Modulos/Lib/Almacenes_model.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_plugin.dcp b/Source/Modulos/Lib/Almacenes_plugin.dcp index 9d9072ff..6194a78b 100644 Binary files a/Source/Modulos/Lib/Almacenes_plugin.dcp and b/Source/Modulos/Lib/Almacenes_plugin.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_view.dcp b/Source/Modulos/Lib/Almacenes_view.dcp index 57857249..883db5b8 100644 Binary files a/Source/Modulos/Lib/Almacenes_view.dcp and b/Source/Modulos/Lib/Almacenes_view.dcp differ diff --git a/Source/Modulos/Lib/Articulos_controller.dcp b/Source/Modulos/Lib/Articulos_controller.dcp index eb124086..fd4eda52 100644 Binary files a/Source/Modulos/Lib/Articulos_controller.dcp and b/Source/Modulos/Lib/Articulos_controller.dcp differ diff --git a/Source/Modulos/Lib/Articulos_data.dcp b/Source/Modulos/Lib/Articulos_data.dcp index 71a59fc3..1b2f63fa 100644 Binary files a/Source/Modulos/Lib/Articulos_data.dcp and b/Source/Modulos/Lib/Articulos_data.dcp differ diff --git a/Source/Modulos/Lib/Articulos_model.dcp b/Source/Modulos/Lib/Articulos_model.dcp index a4a8caa6..c6e2063c 100644 Binary files a/Source/Modulos/Lib/Articulos_model.dcp and b/Source/Modulos/Lib/Articulos_model.dcp differ diff --git a/Source/Modulos/Lib/Articulos_plugin.dcp b/Source/Modulos/Lib/Articulos_plugin.dcp index 3e5da6bd..2cc94e83 100644 Binary files a/Source/Modulos/Lib/Articulos_plugin.dcp and b/Source/Modulos/Lib/Articulos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Articulos_view.dcp b/Source/Modulos/Lib/Articulos_view.dcp index b0e7e456..7ffeb8a1 100644 Binary files a/Source/Modulos/Lib/Articulos_view.dcp and b/Source/Modulos/Lib/Articulos_view.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_controller.dcp b/Source/Modulos/Lib/BancaElectronica_controller.dcp index 46157c71..4e0e1ce3 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_controller.dcp and b/Source/Modulos/Lib/BancaElectronica_controller.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_plugin.dcp b/Source/Modulos/Lib/BancaElectronica_plugin.dcp index a1a6630b..912bb157 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_plugin.dcp and b/Source/Modulos/Lib/BancaElectronica_plugin.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_view.dcp b/Source/Modulos/Lib/BancaElectronica_view.dcp index f946f2c6..23f20859 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_view.dcp and b/Source/Modulos/Lib/BancaElectronica_view.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_controller.dcp b/Source/Modulos/Lib/Comisiones_controller.dcp index 8171c046..ada2da37 100644 Binary files a/Source/Modulos/Lib/Comisiones_controller.dcp and b/Source/Modulos/Lib/Comisiones_controller.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_data.dcp b/Source/Modulos/Lib/Comisiones_data.dcp index bae650ac..28d435a3 100644 Binary files a/Source/Modulos/Lib/Comisiones_data.dcp and b/Source/Modulos/Lib/Comisiones_data.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_model.dcp b/Source/Modulos/Lib/Comisiones_model.dcp index dd59ec47..d73adcb2 100644 Binary files a/Source/Modulos/Lib/Comisiones_model.dcp and b/Source/Modulos/Lib/Comisiones_model.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_plugin.dcp b/Source/Modulos/Lib/Comisiones_plugin.dcp index 9f0dc227..1999bbe7 100644 Binary files a/Source/Modulos/Lib/Comisiones_plugin.dcp and b/Source/Modulos/Lib/Comisiones_plugin.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_view.dcp b/Source/Modulos/Lib/Comisiones_view.dcp index 8ea83b65..a681c710 100644 Binary files a/Source/Modulos/Lib/Comisiones_view.dcp and b/Source/Modulos/Lib/Comisiones_view.dcp differ diff --git a/Source/Modulos/Lib/Contactos_controller.dcp b/Source/Modulos/Lib/Contactos_controller.dcp index 5286d24a..8ee002de 100644 Binary files a/Source/Modulos/Lib/Contactos_controller.dcp and b/Source/Modulos/Lib/Contactos_controller.dcp differ diff --git a/Source/Modulos/Lib/Contactos_data.dcp b/Source/Modulos/Lib/Contactos_data.dcp index 72e27806..39bb207e 100644 Binary files a/Source/Modulos/Lib/Contactos_data.dcp and b/Source/Modulos/Lib/Contactos_data.dcp differ diff --git a/Source/Modulos/Lib/Contactos_model.dcp b/Source/Modulos/Lib/Contactos_model.dcp index 0c34bc7b..e22dc2d8 100644 Binary files a/Source/Modulos/Lib/Contactos_model.dcp and b/Source/Modulos/Lib/Contactos_model.dcp differ diff --git a/Source/Modulos/Lib/Contactos_plugin.dcp b/Source/Modulos/Lib/Contactos_plugin.dcp index 40b7e136..a3d9f699 100644 Binary files a/Source/Modulos/Lib/Contactos_plugin.dcp and b/Source/Modulos/Lib/Contactos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Contactos_view.dcp b/Source/Modulos/Lib/Contactos_view.dcp index d900a7cd..a02169a3 100644 Binary files a/Source/Modulos/Lib/Contactos_view.dcp and b/Source/Modulos/Lib/Contactos_view.dcp differ diff --git a/Source/Modulos/Lib/Empresas_controller.dcp b/Source/Modulos/Lib/Empresas_controller.dcp index e29e9e4b..0eca34e9 100644 Binary files a/Source/Modulos/Lib/Empresas_controller.dcp and b/Source/Modulos/Lib/Empresas_controller.dcp differ diff --git a/Source/Modulos/Lib/Empresas_data.dcp b/Source/Modulos/Lib/Empresas_data.dcp index 10916383..f07d93d3 100644 Binary files a/Source/Modulos/Lib/Empresas_data.dcp and b/Source/Modulos/Lib/Empresas_data.dcp differ diff --git a/Source/Modulos/Lib/Empresas_model.dcp b/Source/Modulos/Lib/Empresas_model.dcp index a6b28357..c0713d0e 100644 Binary files a/Source/Modulos/Lib/Empresas_model.dcp and b/Source/Modulos/Lib/Empresas_model.dcp differ diff --git a/Source/Modulos/Lib/Empresas_plugin.dcp b/Source/Modulos/Lib/Empresas_plugin.dcp index cfd20922..58e1ccfd 100644 Binary files a/Source/Modulos/Lib/Empresas_plugin.dcp and b/Source/Modulos/Lib/Empresas_plugin.dcp differ diff --git a/Source/Modulos/Lib/Empresas_view.dcp b/Source/Modulos/Lib/Empresas_view.dcp index bd88ec59..5913a163 100644 Binary files a/Source/Modulos/Lib/Empresas_view.dcp and b/Source/Modulos/Lib/Empresas_view.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_controller.dcp b/Source/Modulos/Lib/FacturasCliente_controller.dcp index db7c16e3..b2f52172 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_controller.dcp and b/Source/Modulos/Lib/FacturasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_data.dcp b/Source/Modulos/Lib/FacturasCliente_data.dcp index 2a5e5c3f..8a0a26c2 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_data.dcp and b/Source/Modulos/Lib/FacturasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_model.dcp b/Source/Modulos/Lib/FacturasCliente_model.dcp index b2fcdf65..0a9c3cf7 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_model.dcp and b/Source/Modulos/Lib/FacturasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_plugin.dcp b/Source/Modulos/Lib/FacturasCliente_plugin.dcp index 6571b94f..3a01b455 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_plugin.dcp and b/Source/Modulos/Lib/FacturasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_view.dcp b/Source/Modulos/Lib/FacturasCliente_view.dcp index 5dd6ea63..5e001b14 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_view.dcp and b/Source/Modulos/Lib/FacturasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_controller.dcp b/Source/Modulos/Lib/FacturasProveedor_controller.dcp index 614bb8fa..8c52ab6c 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_controller.dcp and b/Source/Modulos/Lib/FacturasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_data.dcp b/Source/Modulos/Lib/FacturasProveedor_data.dcp index b2c909c2..682b2e29 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_data.dcp and b/Source/Modulos/Lib/FacturasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_model.dcp b/Source/Modulos/Lib/FacturasProveedor_model.dcp index 5491d044..17c89f1b 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_model.dcp and b/Source/Modulos/Lib/FacturasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp index df5bb1a5..ff9e6bc5 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp and b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_view.dcp b/Source/Modulos/Lib/FacturasProveedor_view.dcp index f736eee5..d6e65d60 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_view.dcp and b/Source/Modulos/Lib/FacturasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Familias_controller.dcp b/Source/Modulos/Lib/Familias_controller.dcp index ac2f6419..d74eaa67 100644 Binary files a/Source/Modulos/Lib/Familias_controller.dcp and b/Source/Modulos/Lib/Familias_controller.dcp differ diff --git a/Source/Modulos/Lib/Familias_data.dcp b/Source/Modulos/Lib/Familias_data.dcp index 2c6d8e61..d4994313 100644 Binary files a/Source/Modulos/Lib/Familias_data.dcp and b/Source/Modulos/Lib/Familias_data.dcp differ diff --git a/Source/Modulos/Lib/Familias_model.dcp b/Source/Modulos/Lib/Familias_model.dcp index 6ad8e3f2..4a602395 100644 Binary files a/Source/Modulos/Lib/Familias_model.dcp and b/Source/Modulos/Lib/Familias_model.dcp differ diff --git a/Source/Modulos/Lib/Familias_plugin.dcp b/Source/Modulos/Lib/Familias_plugin.dcp index 9206fd37..87921606 100644 Binary files a/Source/Modulos/Lib/Familias_plugin.dcp and b/Source/Modulos/Lib/Familias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Familias_view.dcp b/Source/Modulos/Lib/Familias_view.dcp index 744e7948..d0406223 100644 Binary files a/Source/Modulos/Lib/Familias_view.dcp and b/Source/Modulos/Lib/Familias_view.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_controller.dcp b/Source/Modulos/Lib/FormasPago_controller.dcp index 5f269ec8..5d6e166a 100644 Binary files a/Source/Modulos/Lib/FormasPago_controller.dcp and b/Source/Modulos/Lib/FormasPago_controller.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_data.dcp b/Source/Modulos/Lib/FormasPago_data.dcp index 98ce73a9..e3a14a71 100644 Binary files a/Source/Modulos/Lib/FormasPago_data.dcp and b/Source/Modulos/Lib/FormasPago_data.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_model.dcp b/Source/Modulos/Lib/FormasPago_model.dcp index 231bbedc..ae30aadb 100644 Binary files a/Source/Modulos/Lib/FormasPago_model.dcp and b/Source/Modulos/Lib/FormasPago_model.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_plugin.dcp b/Source/Modulos/Lib/FormasPago_plugin.dcp index 6d60beab..f03655e4 100644 Binary files a/Source/Modulos/Lib/FormasPago_plugin.dcp and b/Source/Modulos/Lib/FormasPago_plugin.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_view.dcp b/Source/Modulos/Lib/FormasPago_view.dcp index 8a1407bb..44a5194e 100644 Binary files a/Source/Modulos/Lib/FormasPago_view.dcp and b/Source/Modulos/Lib/FormasPago_view.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp index 112a7053..6c759156 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp index 5ee9bf79..0f0689a2 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp index 004106b3..2aa6a91c 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp index 2dd7423b..dc07859a 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp index 7710b7ea..2228159b 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp differ diff --git a/Source/Modulos/Lib/InfVentasArticulo_controller.dcp b/Source/Modulos/Lib/InfVentasArticulo_controller.dcp index 4e9d5d04..d1116e54 100644 Binary files a/Source/Modulos/Lib/InfVentasArticulo_controller.dcp and b/Source/Modulos/Lib/InfVentasArticulo_controller.dcp differ diff --git a/Source/Modulos/Lib/InfVentasArticulo_data.dcp b/Source/Modulos/Lib/InfVentasArticulo_data.dcp index da767430..f0ee56ba 100644 Binary files a/Source/Modulos/Lib/InfVentasArticulo_data.dcp and b/Source/Modulos/Lib/InfVentasArticulo_data.dcp differ diff --git a/Source/Modulos/Lib/InfVentasArticulo_model.dcp b/Source/Modulos/Lib/InfVentasArticulo_model.dcp index 27b23080..0579ece2 100644 Binary files a/Source/Modulos/Lib/InfVentasArticulo_model.dcp and b/Source/Modulos/Lib/InfVentasArticulo_model.dcp differ diff --git a/Source/Modulos/Lib/InfVentasArticulo_plugin.dcp b/Source/Modulos/Lib/InfVentasArticulo_plugin.dcp index 0a1a1542..b98f4395 100644 Binary files a/Source/Modulos/Lib/InfVentasArticulo_plugin.dcp and b/Source/Modulos/Lib/InfVentasArticulo_plugin.dcp differ diff --git a/Source/Modulos/Lib/InfVentasArticulo_view.dcp b/Source/Modulos/Lib/InfVentasArticulo_view.dcp index 857c8b7a..ba6b6109 100644 Binary files a/Source/Modulos/Lib/InfVentasArticulo_view.dcp and b/Source/Modulos/Lib/InfVentasArticulo_view.dcp differ diff --git a/Source/Modulos/Lib/InformesBase_controller.dcp b/Source/Modulos/Lib/InformesBase_controller.dcp index c993bb89..f0a2b0e6 100644 Binary files a/Source/Modulos/Lib/InformesBase_controller.dcp and b/Source/Modulos/Lib/InformesBase_controller.dcp differ diff --git a/Source/Modulos/Lib/InformesBase_view.dcp b/Source/Modulos/Lib/InformesBase_view.dcp index 11c2f6b0..a4fba43d 100644 Binary files a/Source/Modulos/Lib/InformesBase_view.dcp and b/Source/Modulos/Lib/InformesBase_view.dcp differ diff --git a/Source/Modulos/Lib/Informes_controller.dcp b/Source/Modulos/Lib/Informes_controller.dcp index 0b511962..ac400367 100644 Binary files a/Source/Modulos/Lib/Informes_controller.dcp and b/Source/Modulos/Lib/Informes_controller.dcp differ diff --git a/Source/Modulos/Lib/Informes_data.dcp b/Source/Modulos/Lib/Informes_data.dcp index 3b4a7224..ae28f865 100644 Binary files a/Source/Modulos/Lib/Informes_data.dcp and b/Source/Modulos/Lib/Informes_data.dcp differ diff --git a/Source/Modulos/Lib/Informes_model.dcp b/Source/Modulos/Lib/Informes_model.dcp index c5d29ce2..ca69b0d8 100644 Binary files a/Source/Modulos/Lib/Informes_model.dcp and b/Source/Modulos/Lib/Informes_model.dcp differ diff --git a/Source/Modulos/Lib/Informes_plugin.dcp b/Source/Modulos/Lib/Informes_plugin.dcp index e49437f1..e16b4c59 100644 Binary files a/Source/Modulos/Lib/Informes_plugin.dcp and b/Source/Modulos/Lib/Informes_plugin.dcp differ diff --git a/Source/Modulos/Lib/Informes_view.dcp b/Source/Modulos/Lib/Informes_view.dcp index 9f7285bb..94366135 100644 Binary files a/Source/Modulos/Lib/Informes_view.dcp and b/Source/Modulos/Lib/Informes_view.dcp differ diff --git a/Source/Modulos/Lib/Inventario_controller.dcp b/Source/Modulos/Lib/Inventario_controller.dcp index 13f3d1b3..8c8dd621 100644 Binary files a/Source/Modulos/Lib/Inventario_controller.dcp and b/Source/Modulos/Lib/Inventario_controller.dcp differ diff --git a/Source/Modulos/Lib/Inventario_data.dcp b/Source/Modulos/Lib/Inventario_data.dcp index 896a7743..b5179323 100644 Binary files a/Source/Modulos/Lib/Inventario_data.dcp and b/Source/Modulos/Lib/Inventario_data.dcp differ diff --git a/Source/Modulos/Lib/Inventario_model.dcp b/Source/Modulos/Lib/Inventario_model.dcp index bbaed536..6f3c0d36 100644 Binary files a/Source/Modulos/Lib/Inventario_model.dcp and b/Source/Modulos/Lib/Inventario_model.dcp differ diff --git a/Source/Modulos/Lib/Inventario_plugin.dcp b/Source/Modulos/Lib/Inventario_plugin.dcp index 954e7f97..d659d196 100644 Binary files a/Source/Modulos/Lib/Inventario_plugin.dcp and b/Source/Modulos/Lib/Inventario_plugin.dcp differ diff --git a/Source/Modulos/Lib/Inventario_view.dcp b/Source/Modulos/Lib/Inventario_view.dcp index e5142b9a..69d963a8 100644 Binary files a/Source/Modulos/Lib/Inventario_view.dcp and b/Source/Modulos/Lib/Inventario_view.dcp differ diff --git a/Source/Modulos/Lib/PedCli_AlbCli_relation.dcp b/Source/Modulos/Lib/PedCli_AlbCli_relation.dcp index dfd43dfd..f6e574f2 100644 Binary files a/Source/Modulos/Lib/PedCli_AlbCli_relation.dcp and b/Source/Modulos/Lib/PedCli_AlbCli_relation.dcp differ diff --git a/Source/Modulos/Lib/PedCli_PedProv_relation.dcp b/Source/Modulos/Lib/PedCli_PedProv_relation.dcp index 8f027fe4..ffc1b27f 100644 Binary files a/Source/Modulos/Lib/PedCli_PedProv_relation.dcp and b/Source/Modulos/Lib/PedCli_PedProv_relation.dcp differ diff --git a/Source/Modulos/Lib/PedProv_AlbProv_relation.dcp b/Source/Modulos/Lib/PedProv_AlbProv_relation.dcp index df0e4226..15018616 100644 Binary files a/Source/Modulos/Lib/PedProv_AlbProv_relation.dcp and b/Source/Modulos/Lib/PedProv_AlbProv_relation.dcp differ diff --git a/Source/Modulos/Lib/PedProv_FacProv_relation.dcp b/Source/Modulos/Lib/PedProv_FacProv_relation.dcp index e84d549b..2d6dcffa 100644 Binary files a/Source/Modulos/Lib/PedProv_FacProv_relation.dcp and b/Source/Modulos/Lib/PedProv_FacProv_relation.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_controller.dcp b/Source/Modulos/Lib/PedidosCliente_controller.dcp index c5c8e281..cb8cb255 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_controller.dcp and b/Source/Modulos/Lib/PedidosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_data.dcp b/Source/Modulos/Lib/PedidosCliente_data.dcp index 77a82cda..afa40aa7 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_data.dcp and b/Source/Modulos/Lib/PedidosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_model.dcp b/Source/Modulos/Lib/PedidosCliente_model.dcp index ecba2938..19bff3c4 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_model.dcp and b/Source/Modulos/Lib/PedidosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_plugin.dcp b/Source/Modulos/Lib/PedidosCliente_plugin.dcp index 552c0911..8a94bc71 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_plugin.dcp and b/Source/Modulos/Lib/PedidosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/PedidosCliente_view.dcp b/Source/Modulos/Lib/PedidosCliente_view.dcp index eb27cfe6..45968efd 100644 Binary files a/Source/Modulos/Lib/PedidosCliente_view.dcp and b/Source/Modulos/Lib/PedidosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_controller.dcp b/Source/Modulos/Lib/PedidosProveedor_controller.dcp index f4fd40cc..63ce9dfe 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_controller.dcp and b/Source/Modulos/Lib/PedidosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_data.dcp b/Source/Modulos/Lib/PedidosProveedor_data.dcp index ce66585d..a5078f71 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_data.dcp and b/Source/Modulos/Lib/PedidosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_model.dcp b/Source/Modulos/Lib/PedidosProveedor_model.dcp index 885286e2..ce1dba3f 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_model.dcp and b/Source/Modulos/Lib/PedidosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp index ff768caa..7848c739 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp and b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_view.dcp b/Source/Modulos/Lib/PedidosProveedor_view.dcp index 919e0494..88f773f0 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_view.dcp and b/Source/Modulos/Lib/PedidosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_controller.dcp b/Source/Modulos/Lib/RecibosCliente_controller.dcp index 7c73725c..bc7166b9 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_controller.dcp and b/Source/Modulos/Lib/RecibosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_data.dcp b/Source/Modulos/Lib/RecibosCliente_data.dcp index 6c05fe4b..f3ff831e 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_data.dcp and b/Source/Modulos/Lib/RecibosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_model.dcp b/Source/Modulos/Lib/RecibosCliente_model.dcp index bf186cc7..af0dd391 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_model.dcp and b/Source/Modulos/Lib/RecibosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_plugin.dcp b/Source/Modulos/Lib/RecibosCliente_plugin.dcp index cd8ec073..6b955a81 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_plugin.dcp and b/Source/Modulos/Lib/RecibosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_view.dcp b/Source/Modulos/Lib/RecibosCliente_view.dcp index bfa23117..e26a5ebf 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_view.dcp and b/Source/Modulos/Lib/RecibosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_controller.dcp b/Source/Modulos/Lib/RecibosProveedor_controller.dcp index d16fbbd0..32c5e457 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_controller.dcp and b/Source/Modulos/Lib/RecibosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_data.dcp b/Source/Modulos/Lib/RecibosProveedor_data.dcp index 2d73e1b3..0e92c479 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_data.dcp and b/Source/Modulos/Lib/RecibosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_model.dcp b/Source/Modulos/Lib/RecibosProveedor_model.dcp index 9e963d14..72343080 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_model.dcp and b/Source/Modulos/Lib/RecibosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp index 1ad3d646..7c43f509 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp and b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_view.dcp b/Source/Modulos/Lib/RecibosProveedor_view.dcp index f65e991d..87ee5325 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_view.dcp and b/Source/Modulos/Lib/RecibosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Referencias_controller.dcp b/Source/Modulos/Lib/Referencias_controller.dcp index aeafce63..e3b182b3 100644 Binary files a/Source/Modulos/Lib/Referencias_controller.dcp and b/Source/Modulos/Lib/Referencias_controller.dcp differ diff --git a/Source/Modulos/Lib/Referencias_data.dcp b/Source/Modulos/Lib/Referencias_data.dcp index 5385845f..3676c48b 100644 Binary files a/Source/Modulos/Lib/Referencias_data.dcp and b/Source/Modulos/Lib/Referencias_data.dcp differ diff --git a/Source/Modulos/Lib/Referencias_model.dcp b/Source/Modulos/Lib/Referencias_model.dcp index 3c221434..9fcc1695 100644 Binary files a/Source/Modulos/Lib/Referencias_model.dcp and b/Source/Modulos/Lib/Referencias_model.dcp differ diff --git a/Source/Modulos/Lib/Referencias_plugin.dcp b/Source/Modulos/Lib/Referencias_plugin.dcp index 3396486d..42ae35b6 100644 Binary files a/Source/Modulos/Lib/Referencias_plugin.dcp and b/Source/Modulos/Lib/Referencias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Referencias_view.dcp b/Source/Modulos/Lib/Referencias_view.dcp index 678a2364..eb3f145d 100644 Binary files a/Source/Modulos/Lib/Referencias_view.dcp and b/Source/Modulos/Lib/Referencias_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_controller.dcp b/Source/Modulos/Lib/RemesasCliente_controller.dcp index dc06d726..e1f80905 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_controller.dcp and b/Source/Modulos/Lib/RemesasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_data.dcp b/Source/Modulos/Lib/RemesasCliente_data.dcp index 546a4ae9..61742d04 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_data.dcp and b/Source/Modulos/Lib/RemesasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_model.dcp b/Source/Modulos/Lib/RemesasCliente_model.dcp index 52e3f26a..38ed69af 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_model.dcp and b/Source/Modulos/Lib/RemesasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_plugin.dcp b/Source/Modulos/Lib/RemesasCliente_plugin.dcp index 729a4c80..39163fcb 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_plugin.dcp and b/Source/Modulos/Lib/RemesasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_view.dcp b/Source/Modulos/Lib/RemesasCliente_view.dcp index 24a61b53..e11be868 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_view.dcp and b/Source/Modulos/Lib/RemesasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_controller.dcp b/Source/Modulos/Lib/RemesasProveedor_controller.dcp index 1684828c..b62b53a3 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_controller.dcp and b/Source/Modulos/Lib/RemesasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_data.dcp b/Source/Modulos/Lib/RemesasProveedor_data.dcp index b682eb89..7de10c04 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_data.dcp and b/Source/Modulos/Lib/RemesasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_model.dcp b/Source/Modulos/Lib/RemesasProveedor_model.dcp index c056eabe..b6f50e84 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_model.dcp and b/Source/Modulos/Lib/RemesasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp index 8529697b..cee33952 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp and b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_view.dcp b/Source/Modulos/Lib/RemesasProveedor_view.dcp index f350c0e5..7fd7cd84 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_view.dcp and b/Source/Modulos/Lib/RemesasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/TiendaWeb_controller.dcp b/Source/Modulos/Lib/TiendaWeb_controller.dcp index 5659a4b8..c0028544 100644 Binary files a/Source/Modulos/Lib/TiendaWeb_controller.dcp and b/Source/Modulos/Lib/TiendaWeb_controller.dcp differ diff --git a/Source/Modulos/Lib/TiendaWeb_data.dcp b/Source/Modulos/Lib/TiendaWeb_data.dcp index 14ea4477..575fd371 100644 Binary files a/Source/Modulos/Lib/TiendaWeb_data.dcp and b/Source/Modulos/Lib/TiendaWeb_data.dcp differ diff --git a/Source/Modulos/Lib/TiendaWeb_model.dcp b/Source/Modulos/Lib/TiendaWeb_model.dcp index f01e8bc7..24785d67 100644 Binary files a/Source/Modulos/Lib/TiendaWeb_model.dcp and b/Source/Modulos/Lib/TiendaWeb_model.dcp differ diff --git a/Source/Modulos/Lib/TiendaWeb_plugin.dcp b/Source/Modulos/Lib/TiendaWeb_plugin.dcp index b4e0c42e..197b5807 100644 Binary files a/Source/Modulos/Lib/TiendaWeb_plugin.dcp and b/Source/Modulos/Lib/TiendaWeb_plugin.dcp differ diff --git a/Source/Modulos/Lib/TiendaWeb_view.dcp b/Source/Modulos/Lib/TiendaWeb_view.dcp index a76198b5..0cec9ed1 100644 Binary files a/Source/Modulos/Lib/TiendaWeb_view.dcp and b/Source/Modulos/Lib/TiendaWeb_view.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_controller.dcp b/Source/Modulos/Lib/TiposIVA_controller.dcp index 6bd2bfef..42880d12 100644 Binary files a/Source/Modulos/Lib/TiposIVA_controller.dcp and b/Source/Modulos/Lib/TiposIVA_controller.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_data.dcp b/Source/Modulos/Lib/TiposIVA_data.dcp index baccce65..17316469 100644 Binary files a/Source/Modulos/Lib/TiposIVA_data.dcp and b/Source/Modulos/Lib/TiposIVA_data.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_model.dcp b/Source/Modulos/Lib/TiposIVA_model.dcp index 9f1d0af2..bf89c693 100644 Binary files a/Source/Modulos/Lib/TiposIVA_model.dcp and b/Source/Modulos/Lib/TiposIVA_model.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_plugin.dcp b/Source/Modulos/Lib/TiposIVA_plugin.dcp index 571454d3..3c965832 100644 Binary files a/Source/Modulos/Lib/TiposIVA_plugin.dcp and b/Source/Modulos/Lib/TiposIVA_plugin.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_view.dcp b/Source/Modulos/Lib/TiposIVA_view.dcp index 61cbe766..22bbce14 100644 Binary files a/Source/Modulos/Lib/TiposIVA_view.dcp and b/Source/Modulos/Lib/TiposIVA_view.dcp differ diff --git a/Source/Modulos/Lib/Usuarios.dcp b/Source/Modulos/Lib/Usuarios.dcp index 1d329ecf..f9258e01 100644 Binary files a/Source/Modulos/Lib/Usuarios.dcp and b/Source/Modulos/Lib/Usuarios.dcp differ diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm index c122b3d7..8c887f39 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm @@ -8,7 +8,7 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 700 + Width = 700 Caption = 'Lista de pedidos a proveedor' ExplicitWidth = 700 inherited Image1: TImage @@ -111,36 +111,32 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 700 ExplicitWidth = 700 - inherited TBXDock1: TTBXDock - Width = 700 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 700 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 700 ExplicitWidth = 700 - inherited dxLayoutControl1: TdxLayoutControl - Width = 696 - ExplicitWidth = 696 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 483 - ExplicitLeft = 483 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 696 - ExplicitWidth = 696 - inherited tbxBotones: TTBXToolbar - Width = 686 - ExplicitWidth = 686 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 292 + ExplicitLeft = 292 + ExplicitWidth = 294 + Width = 294 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 700 + ExplicitWidth = 700 + inherited tbxBotones: TTBXToolbar + Width = 690 + ExplicitWidth = 690 end end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewElegirArticulosPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewElegirArticulosPedidosProveedor.dfm index 97fb2d44..3e19a578 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewElegirArticulosPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewElegirArticulosPedidosProveedor.dfm @@ -9,6 +9,8 @@ inherited frViewElegirArticulosPedidosProveedor: TfrViewElegirArticulosPedidosPr Height = 279 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged + ExplicitWidth = 565 + ExplicitHeight = 279 inherited cxGridView: TcxGridDBTableView object cxGridViewID_PROVEEDOR: TcxGridDBColumn DataBinding.FieldName = 'ID_PROVEEDOR' @@ -21,42 +23,43 @@ inherited frViewElegirArticulosPedidosProveedor: TfrViewElegirArticulosPedidosPr end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 565 - inherited TBXDock1: TTBXDock - Width = 565 - inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 565 + inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 565 + inherited dxLayoutControl1: TdxLayoutControl + Width = 565 ExplicitWidth = 565 - inherited dxLayoutControl1: TdxLayoutControl - Width = 561 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 348 - ExplicitLeft = 348 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 561 - inherited tbxBotones: TTBXToolbar - Width = 551 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 205 + Width = 205 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 565 + inherited tbxBotones: TTBXToolbar + Width = 555 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 381 + ExplicitTop = 381 + ExplicitWidth = 565 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 565 + ExplicitWidth = 565 inherited TBXToolbar1: TTBXToolbar Width = 555 + ExplicitWidth = 555 end end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index f4791c28..fff85559 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -6,7 +6,7 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor inherited cxGrid: TcxGrid Width = 596 Height = 351 - RootLevelOptions.DetailTabsPosition = dtpTop + RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 @@ -155,46 +155,21 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 596 ExplicitWidth = 596 - inherited TBXDock1: TTBXDock - Width = 596 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 596 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 596 ExplicitWidth = 596 - inherited dxLayoutControl1: TdxLayoutControl - Width = 592 - inherited txtFiltroTodo: TcxTextEdit - Left = 170 - ExplicitLeft = 170 - ExplicitWidth = 412 - Width = 412 - end - inherited edtFechaIniFiltro: TcxDateEdit - Left = 170 - ExplicitLeft = 170 - ExplicitWidth = 225 - Width = 225 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 391 - ExplicitLeft = 391 - ExplicitWidth = 203 - Width = 203 - end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Fecha del pedido entre la fecha:' - end - end - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 294 + Width = 294 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 592 - ExplicitWidth = 592 - inherited tbxBotones: TTBXToolbar - Width = 582 - ExplicitWidth = 582 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 596 + ExplicitWidth = 596 + inherited tbxBotones: TTBXToolbar + Width = 586 end end end diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm index 9cb3ea70..7bb57082 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm @@ -10,7 +10,7 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 596 ExplicitHeight = 351 - inherited cxGridView: TcxGridDBTableView + inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -156,36 +156,21 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente inherited frViewFiltroBase1: TfrViewFiltroBase Width = 596 ExplicitWidth = 596 - inherited TBXDock1: TTBXDock - Width = 596 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 596 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 596 ExplicitWidth = 596 - inherited dxLayoutControl1: TdxLayoutControl - Width = 592 - ExplicitWidth = 592 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 367 - ExplicitLeft = 367 - ExplicitWidth = 121 - Width = 121 - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 294 + Width = 294 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 592 - ExplicitWidth = 592 - inherited tbxBotones: TTBXToolbar - Width = 582 - ExplicitWidth = 582 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 596 + ExplicitWidth = 596 + inherited tbxBotones: TTBXToolbar + Width = 586 end end end diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm index e65c9b9e..2f368c02 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm @@ -8,7 +8,7 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 645 - Caption = 'Lista de recibos de cliente' + Caption = 'Lista de recibos de cliente' ExplicitWidth = 645 inherited Image1: TImage Left = 618 @@ -109,32 +109,32 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente inherited frViewFiltroBase1: TfrViewFiltroBase Width = 645 ExplicitWidth = 645 - inherited TBXDock1: TTBXDock - Width = 645 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 645 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 645 ExplicitWidth = 645 - inherited dxLayoutControl1: TdxLayoutControl - Width = 641 - ExplicitWidth = 641 - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 223 - Width = 223 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 415 - ExplicitLeft = 415 - ExplicitWidth = 199 - Width = 199 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 641 - ExplicitWidth = 641 - inherited tbxBotones: TTBXToolbar - Width = 631 - ExplicitWidth = 631 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 298 + ExplicitLeft = 298 + ExplicitWidth = 244 + Width = 244 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 645 + ExplicitWidth = 645 + inherited tbxBotones: TTBXToolbar + Width = 635 + ExplicitWidth = 635 end end end diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index c75fed32..0be9be07 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -10,7 +10,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 531 ExplicitHeight = 259 - inherited cxGridView: TcxGridDBTableView + inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] DataController.Summary.DefaultGroupSummaryItems = < @@ -152,47 +152,21 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente inherited frViewFiltroBase1: TfrViewFiltroBase Width = 531 ExplicitWidth = 531 - inherited TBXDock1: TTBXDock - Width = 531 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 531 ExplicitWidth = 531 - inherited dxLayoutControl1: TdxLayoutControl - Width = 527 - ExplicitWidth = 527 - inherited txtFiltroTodo: TcxTextEdit - Left = 146 - ExplicitLeft = 146 - ExplicitWidth = 393 - Width = 393 - end - inherited edtFechaIniFiltro: TcxDateEdit - Left = 146 - ExplicitLeft = 146 - ExplicitWidth = 199 - Width = 199 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 386 - ExplicitLeft = 386 - ExplicitWidth = 121 - Width = 121 - end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Vencimiento entre la fecha:' - end - end - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 244 + Width = 244 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 527 - ExplicitWidth = 527 - inherited tbxBotones: TTBXToolbar - Width = 517 - ExplicitWidth = 517 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + ExplicitWidth = 531 + inherited tbxBotones: TTBXToolbar + Width = 521 end end end diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas index 30765e93..a7a0794e 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas @@ -215,7 +215,7 @@ begin if (ImporteTotal <> -1) then begin - AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteTotal)); + AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteTotal)); ARecord.Values[cxGridViewIMPORTE_TOTAL.Index] := ImporteTotal; cxGridViewIMPORTE_TOTAL.EditValue := ImporteTotal; diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm index 24ece8e7..823ebc1b 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm @@ -12,7 +12,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor ExplicitWidth = 638 inherited Image1: TImage Left = 611 - Picture.Data = { + Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 520000000467414D410000B18E7CFB51930000022E4944415478DA63FCFFFF3F @@ -76,41 +76,65 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor ExplicitWidth = 638 ExplicitHeight = 415 inherited cxGridView: TcxGridDBTableView + DataController.Summary.DefaultGroupSummaryItems = < + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Position = spFooter + Column = frViewRecibosProveedor1.cxGridViewIMPORTE_TOTAL + end> + DataController.Summary.FooterSummaryItems = < + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Column = frViewRecibosProveedor1.cxGridViewIMPORTE_TOTAL + end + item + Format = '0 recibos' + Kind = skCount + Column = frViewRecibosProveedor1.cxGridViewREFERENCIA + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Column = frViewRecibosProveedor1.cxGridViewIMPORTE + end + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Column = frViewRecibosProveedor1.cxGridViewOTROS_GASTOS + end> end end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 638 ExplicitWidth = 638 - inherited TBXDock1: TTBXDock - Width = 638 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 638 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 638 ExplicitWidth = 638 - inherited dxLayoutControl1: TdxLayoutControl - Width = 634 - ExplicitWidth = 634 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 478 - Width = 478 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 266 - Width = 266 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 485 - ExplicitLeft = 485 - ExplicitWidth = 121 - Width = 121 - end + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 634 - ExplicitWidth = 634 - inherited tbxBotones: TTBXToolbar - Width = 624 - ExplicitWidth = 624 - end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 294 + ExplicitLeft = 294 + ExplicitWidth = 244 + Width = 244 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 638 + ExplicitWidth = 638 + inherited tbxBotones: TTBXToolbar + Width = 628 + ExplicitWidth = 628 end end end diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm index fa9e5d4a..1661b7bb 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm @@ -18,7 +18,7 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter - Column = cxGridViewIMPORTE_TOTAL + Column = cxGridViewIMPORTE_TOTAL end> DataController.Summary.FooterSummaryItems = < item @@ -155,44 +155,21 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor inherited frViewFiltroBase1: TfrViewFiltroBase Width = 531 ExplicitWidth = 531 - inherited TBXDock1: TTBXDock - Width = 531 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 531 ExplicitWidth = 531 - inherited dxLayoutControl1: TdxLayoutControl - Width = 527 - inherited txtFiltroTodo: TcxTextEdit - Left = 146 - ExplicitLeft = 146 - ExplicitWidth = 371 - Width = 371 - end - inherited edtFechaIniFiltro: TcxDateEdit - Left = 146 - ExplicitLeft = 146 - ExplicitWidth = 185 - Width = 185 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 330 - ExplicitLeft = 330 - end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Vencimiento entre la fecha:' - end - end - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 244 + Width = 244 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 527 - ExplicitWidth = 527 - inherited tbxBotones: TTBXToolbar - Width = 517 - ExplicitWidth = 517 - end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + ExplicitWidth = 531 + inherited tbxBotones: TTBXToolbar + Width = 521 end end end diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas index 96dd73be..eba6572b 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas @@ -217,7 +217,7 @@ begin if (ImporteTotal <> -1) then begin - AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteTotal)); + AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteTotal)); ARecord.Values[cxGridViewIMPORTE_TOTAL.Index] := ImporteTotal; cxGridViewIMPORTE_TOTAL.EditValue := ImporteTotal; diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente_2.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente_2.dfm index a8a129c6..ef7ed067 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente_2.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente_2.dfm @@ -7,9 +7,9 @@ inherited frViewRecibosRemesaCliente2: TfrViewRecibosRemesaCliente2 Top = 131 Width = 531 Height = 182 - ExplicitTop = 29 - ExplicitWidth = 531 - ExplicitHeight = 339 + ExplicitTop = 131 + ExplicitWidth = 531 + ExplicitHeight = 182 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding] @@ -137,8 +137,6 @@ inherited frViewRecibosRemesaCliente2: TfrViewRecibosRemesaCliente2 Caption = 'ToolBar1' ShowCaptions = True TabOrder = 3 - ExplicitLeft = -137 - ExplicitWidth = 668 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -153,34 +151,31 @@ inherited frViewRecibosRemesaCliente2: TfrViewRecibosRemesaCliente2 Width = 531 ExplicitTop = 29 ExplicitWidth = 531 - inherited TBXDock1: TTBXDock - Width = 531 + inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 - inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + Width = 531 ExplicitWidth = 531 - inherited dxLayoutControl1: TdxLayoutControl - Width = 527 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 189 - Width = 189 - end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 244 + Width = 244 end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 527 + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + inherited tbxBotones: TTBXToolbar + Width = 521 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 313 + ExplicitTop = 313 + ExplicitWidth = 531 + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 531 + end end inherited dsDataSource: TDADataSource Left = 232 diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm index 58c14950..042d6cca 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm @@ -3,13 +3,14 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente ExplicitHeight = 420 inherited cxGrid: TcxGrid Height = 292 + ExplicitHeight = 292 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'RecID' DataController.Summary.DefaultGroupSummaryItems = < item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum - Position = spFooter + Position = spFooter Column = cxGridViewIMPORTE_TOTAL end> DataController.Summary.FooterSummaryItems = < @@ -85,29 +86,26 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 394 - ExplicitWidth = 554 + ExplicitTop = 394 end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm index 4c0477dc..a6b16708 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm @@ -3,6 +3,7 @@ inherited frViewRemesasProveedor: TfrViewRemesasProveedor ExplicitHeight = 397 inherited cxGrid: TcxGrid Height = 269 + ExplicitHeight = 269 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'RecID' DataController.Summary.DefaultGroupSummaryItems = < @@ -86,29 +87,26 @@ inherited frViewRemesasProveedor: TfrViewRemesasProveedor end end inherited frViewFiltroBase1: TfrViewFiltroBase - inherited TBXDock1: TTBXDock - inherited TBXDockablePanel1: TTBXDockablePanel - inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 550 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end - inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end + inherited TBXDockablePanel1: TTBXDockablePanel + inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 371 - ExplicitWidth = 554 + ExplicitTop = 371 end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index d0de0e0d..e446c502 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -108,8 +108,6 @@ uses schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', srvInformes_Impl in '..\Modulos\Informes base\Servidor\srvInformes_Impl.pas' {srvInformes: TDARemoteService}, srvInfVentasArticulo_Impl in '..\Modulos\Informe ventas por articulo\Servidor\srvInfVentasArticulo_Impl.pas' {srvInfVentasArticulo: TDARemoteService}, - schInfVentasArticuloClient_Intf in '..\Modulos\Informe ventas por articulo\Model\schInfVentasArticuloClient_Intf.pas', - schInfVentasArticuloServer_Intf in '..\Modulos\Informe ventas por articulo\Model\schInfVentasArticuloServer_Intf.pas', uSchemaUtilsServer in 'Utiles\uSchemaUtilsServer.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', @@ -127,7 +125,11 @@ uses schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas', schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', - srvInfMargenArticulo_Impl in '..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas' {srvInfMargenArticulo: TDARemoteService}; + srvInfMargenArticulo_Impl in '..\Modulos\Informe margen por articulo\Servidor\srvInfMargenArticulo_Impl.pas' {srvInfMargenArticulo: TDARemoteService}, + schInfMargenArticuloClient_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloClient_Intf.pas', + schInfMargenArticuloServer_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloServer_Intf.pas', + schInfVentasArticuloClient_Intf in '..\Modulos\Informe ventas por articulo\Model\schInfVentasArticuloClient_Intf.pas', + schInfVentasArticuloServer_Intf in '..\Modulos\Informe ventas por articulo\Model\schInfVentasArticuloServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 188004c2..bc810a5a 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "2.2.0.0\0" VALUE "ProductVersion", "2.2.0.0\0" - VALUE "CompileDate", "miércoles, 01 de agosto de 2007 19:23\0" + VALUE "CompileDate", "jueves, 02 de agosto de 2007 19:49\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 51f36219..db04e568 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ diff --git a/Source/Servidor/Utiles/uSchemaUtilsServer.pas b/Source/Servidor/Utiles/uSchemaUtilsServer.pas index 1919325d..191e3933 100644 --- a/Source/Servidor/Utiles/uSchemaUtilsServer.pas +++ b/Source/Servidor/Utiles/uSchemaUtilsServer.pas @@ -17,6 +17,7 @@ type Service : TDARemoteService; Columnas : String; ColumnasQueSuman : String; + ColumnasQueAVG : String; SourceDataSetName : String; function GetNewDataSet : IDADataset; end; @@ -95,6 +96,11 @@ begin Strings[1] := Strings[1] + Separador + 'SUM(' + GetTrueFieldName(AColumnList[i], False) + ') AS ' + AColumnList[i]; bHayAgrupacion := True; end + else if Pos('#'+AColumnList[i]+'#', ColumnasQueAVG) > 0 then + begin + Strings[1] := Strings[1] + Separador + 'AVG(' + GetTrueFieldName(AColumnList[i], False) + ') AS ' + AColumnList[i]; + bHayAgrupacion := True; + end else begin Strings[1] := Strings[1] + Separador + GetTrueFieldName(AColumnList[i]); if Length(Strings[3]) = 0 then