diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 29038a79..098c7b50 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Output/Debug/Cliente/FactuGES.exe b/Output/Debug/Cliente/FactuGES.exe index b7c2c13b..69878f20 100644 Binary files a/Output/Debug/Cliente/FactuGES.exe and b/Output/Debug/Cliente/FactuGES.exe differ diff --git a/Output/Debug/Servidor/FactuGES_Server.exe b/Output/Debug/Servidor/FactuGES_Server.exe index 6de26f7a..7fbd7d8e 100644 Binary files a/Output/Debug/Servidor/FactuGES_Server.exe and b/Output/Debug/Servidor/FactuGES_Server.exe differ diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Base/GUIBase/uEditorBase.dfm b/Source/Base/GUIBase/uEditorBase.dfm index c8e82697..ed31de54 100644 --- a/Source/Base/GUIBase/uEditorBase.dfm +++ b/Source/Base/GUIBase/uEditorBase.dfm @@ -3,7 +3,7 @@ object fEditorBase: TfEditorBase Top = 127 Caption = 'EditorBase' ClientHeight = 458 - ClientWidth = 650 + ClientWidth = 795 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -23,7 +23,7 @@ object fEditorBase: TfEditorBase object JvNavPanelHeader: TJvNavPanelHeader Left = 0 Top = 49 - Width = 650 + Width = 795 Align = alTop Caption = 'Editor' Font.Charset = DEFAULT_CHARSET @@ -37,9 +37,8 @@ object fEditorBase: TfEditorBase ImageIndex = 0 StyleManager = dmBase.StyleManager ParentStyleManager = False - ExplicitWidth = 652 object Image1: TImage - Left = 625 + Left = 768 Top = 0 Width = 27 Height = 27 @@ -71,9 +70,8 @@ object fEditorBase: TfEditorBase object TBXDock: TTBXDock Left = 0 Top = 0 - Width = 650 + Width = 795 Height = 49 - AllowDrag = False object tbxMain: TTBXToolbar Left = 0 Top = 23 @@ -82,7 +80,6 @@ object fEditorBase: TfEditorBase DockMode = dmCannotFloatOrChangeDocks DockPos = -23 DockRow = 1 - DragHandleStyle = dhNone Images = SmallImages ParentShowHint = False ShowHint = True @@ -248,11 +245,9 @@ object fEditorBase: TfEditorBase object StatusBar: TJvStatusBar Left = 0 Top = 439 - Width = 650 + Width = 795 Height = 19 Panels = <> - ExplicitTop = 441 - ExplicitWidth = 652 end object EditorActionList: TActionList Images = SmallImages diff --git a/Source/Base/GUIBase/uEditorDBBase.dfm b/Source/Base/GUIBase/uEditorDBBase.dfm index c08b7b14..723646c1 100644 --- a/Source/Base/GUIBase/uEditorDBBase.dfm +++ b/Source/Base/GUIBase/uEditorDBBase.dfm @@ -19,6 +19,9 @@ inherited fEditorDBBase: TfEditorDBBase inherited TBXDock: TTBXDock Width = 648 ExplicitWidth = 648 + inherited tbxMain: TTBXToolbar + ExplicitWidth = 648 + end inherited tbxMenu: TTBXToolbar ExplicitWidth = 648 end diff --git a/Source/Base/GUIBase/uEditorDBItem.dfm b/Source/Base/GUIBase/uEditorDBItem.dfm index d1144eda..1b4fa877 100644 --- a/Source/Base/GUIBase/uEditorDBItem.dfm +++ b/Source/Base/GUIBase/uEditorDBItem.dfm @@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem Width = 652 ExplicitWidth = 652 inherited tbxMain: TTBXToolbar - ExplicitWidth = 599 + ExplicitWidth = 605 inherited TBXItem26: TTBXItem Visible = False end diff --git a/Source/Base/GUIBase/uEditorGridBase.dfm b/Source/Base/GUIBase/uEditorGridBase.dfm index 9c2bb7d4..23d50433 100644 --- a/Source/Base/GUIBase/uEditorGridBase.dfm +++ b/Source/Base/GUIBase/uEditorGridBase.dfm @@ -27,8 +27,9 @@ inherited fEditorGridBase: TfEditorGridBase ExplicitHeight = 75 inherited tbxMain: TTBXToolbar DockPos = 0 + DragHandleStyle = dhDouble TabOrder = 1 - ExplicitWidth = 448 + ExplicitWidth = 457 inherited TBXItem29: TTBXItem Visible = False end @@ -76,7 +77,7 @@ inherited fEditorGridBase: TfEditorGridBase DockMode = dmCannotFloatOrChangeDocks DockPos = 0 DockRow = 2 - DragHandleStyle = dhNone + DragHandleStyle = dhDouble Images = SmallImages ParentShowHint = False Resizable = False @@ -144,6 +145,21 @@ inherited fEditorGridBase: TfEditorGridBase end end end + object TBXTMain2: TTBXToolbar + Left = 337 + Top = 49 + Caption = 'tbxMain' + ChevronHint = 'M'#225's botones|' + DockMode = dmCannotFloatOrChangeDocks + DockPos = 334 + DockRow = 2 + DragHandleStyle = dhDouble + Images = SmallImages + ParentShowHint = False + ShowHint = True + TabOrder = 3 + Visible = False + end end inherited StatusBar: TJvStatusBar Top = 425 diff --git a/Source/Base/GUIBase/uEditorGridBase.pas b/Source/Base/GUIBase/uEditorGridBase.pas index 2c2c4255..f37b817b 100644 --- a/Source/Base/GUIBase/uEditorGridBase.pas +++ b/Source/Base/GUIBase/uEditorGridBase.pas @@ -52,6 +52,7 @@ type TBXItem7: TTBXItem; actFiltrar: TAction; TBXItem37: TTBXItem; + TBXTMain2: TTBXToolbar; procedure tbxEditFiltroChange(Sender: TObject; const Text: String); procedure FormShow(Sender: TObject); override; procedure actQuitarFiltroExecute(Sender: TObject); diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a2f5e5e3..5d44d4b2 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ -MAINICON ICON "T:\Codigo (Luis Leon)\Source\Iconos\Factuges.ico" +MAINICON ICON "E:\Codigo (Luis León)\Source\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,0,8,0 -PRODUCTVERSION 2,0,8,0 +FILEVERSION 2,1,0,0 +PRODUCTVERSION 2,1,0,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,7 +13,7 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.0.8.0\0" + VALUE "FileVersion", "2.1.0.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" VALUE "ProductVersion", "2.0.6\0" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 7276ccf5..45cac629 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index fece8870..51aad477 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -129,7 +129,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 765 ExplicitWidth = 765 inherited tbxMain: TTBXToolbar - ExplicitWidth = 482 + ExplicitWidth = 488 inherited TBXItem2: TTBXItem Visible = False end @@ -200,6 +200,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm index e01515da..e43afac7 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm @@ -125,28 +125,36 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente ExplicitWidth = 583 inherited tbxMain: TTBXToolbar ExplicitWidth = 583 - object TBXItem38: TTBXItem [9] - Action = actEnviar - DisplayMode = nbdmImageAndText - end - object TBXItem40: TTBXItem [10] - Action = actCancelarEnvio - DisplayMode = nbdmImageAndText - end - object TBXItem41: TTBXItem [11] - Action = actConfirmarRecepcion - DisplayMode = nbdmImageAndText - end - object TBXItem39: TTBXItem [12] - Action = actGenerarFactura - DisplayMode = nbdmImageAndText - end - object TBXSeparatorItem17: TTBXSeparatorItem [14] + object TBXSeparatorItem17: TTBXSeparatorItem [10] end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 583 end + inherited TBXTMain2: TTBXToolbar + Visible = True + ExplicitWidth = 246 + object TBXItem42: TTBXItem + Action = actEnviar + DisplayMode = nbdmImageAndText + end + object TBXItem43: TTBXItem + Action = actCancelarEnvio + DisplayMode = nbdmImageAndText + end + object TBXSeparatorItem18: TTBXSeparatorItem + end + object TBXItem44: TTBXItem + Action = actConfirmarRecepcion + DisplayMode = nbdmImageAndText + end + object TBXSeparatorItem19: TTBXSeparatorItem + end + object TBXItem45: TTBXItem + Action = actGenerarFactura + DisplayMode = nbdmImageAndText + end + end end inherited StatusBar: TJvStatusBar Width = 583 diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas index 76bf8532..518d641d 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas @@ -23,15 +23,17 @@ type TBXSeparatorItem17: TTBXSeparatorItem; actEnviar: TAction; Serviralbarn1: TMenuItem; - TBXItem38: TTBXItem; JsListaFacturasGeneradas: TJSDialog; JsImprimirDialog: TJSDialog; JsPrevisualizarDialog: TJSDialog; - TBXItem39: TTBXItem; actCancelarEnvio: TAction; - TBXItem40: TTBXItem; actConfirmarRecepcion: TAction; - TBXItem41: TTBXItem; + TBXItem42: TTBXItem; + TBXItem43: TTBXItem; + TBXItem44: TTBXItem; + TBXSeparatorItem18: TTBXSeparatorItem; + TBXItem45: TTBXItem; + TBXSeparatorItem19: TTBXSeparatorItem; procedure FormShow(Sender: TObject); procedure actGenerarFacturaUpdate(Sender: TObject); procedure actGenerarFacturaExecute(Sender: TObject); diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm index 57869225..c1983480 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm @@ -125,8 +125,15 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente end end inherited TBXDock: TTBXDock - inherited tbxMain: TTBXToolbar - inherited TBXItem39: TTBXItem + inherited TBXTMain2: TTBXToolbar + ExplicitWidth = 124 + inherited TBXItem43: TTBXItem + Visible = False + end + inherited TBXItem44: TTBXItem + Visible = False + end + inherited TBXItem45: TTBXItem Caption = 'Generar abono...' end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm index 91ec1362..d22ebe02 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm @@ -49,12 +49,10 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente inherited TBXDock: TTBXDock Top = 87 Width = 790 - Height = 49 ExplicitTop = 87 ExplicitWidth = 790 - ExplicitHeight = 49 inherited tbxMain: TTBXToolbar - ExplicitWidth = 117 + ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False end @@ -76,18 +74,12 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente inherited TBXSeparatorItem3: TTBXSeparatorItem Visible = False end - inherited TBXItem38: TTBXItem - Visible = False - end - inherited TBXItem37: TTBXItem + inherited TBXItem23: TTBXItem Visible = False end inherited TBXSeparatorItem17: TTBXSeparatorItem Visible = False end - inherited TBXItem23: TTBXItem - Visible = False - end inherited TBXItem3: TTBXItem Visible = False end @@ -105,19 +97,29 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente end end inherited tbxFiltro: TTBXToolbar - Left = 117 + Left = 126 Top = 23 DockPos = 104 DockRow = 1 - ExplicitLeft = 117 + ExplicitLeft = 126 ExplicitTop = 23 + ExplicitWidth = 269 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 end + inherited TBXItem37: TTBXItem + Visible = False + end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 790 end + inherited TBXTMain2: TTBXToolbar + Left = 320 + Visible = False + ExplicitLeft = 320 + ExplicitWidth = 470 + end end inherited StatusBar: TJvStatusBar Width = 790 @@ -190,6 +192,10 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente end inherited JsNuevoAlbaranDialog: TJSDialog [13] end + inherited JsListaFacturasGeneradas: TJSDialog [14] + end + inherited JsImprimirDialog: TJSDialog [15] + end object EditorSeleccionActionList: TActionList Images = SmallImages Left = 152 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm index eb61dc84..05d4cc44 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm @@ -125,16 +125,18 @@ inherited fEditorAlbaranesProveedor: TfEditorAlbaranesProveedor ExplicitWidth = 606 inherited tbxMain: TTBXToolbar ExplicitWidth = 606 - object TBXSeparatorItem17: TTBXSeparatorItem [8] - end - object TBXItem38: TTBXItem [9] - Action = actGenerarFactura - DisplayMode = nbdmImageAndText - end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 606 end + inherited TBXTMain2: TTBXToolbar + Visible = True + ExplicitWidth = 117 + object TBXItem39: TTBXItem + Action = actGenerarFactura + DisplayMode = nbdmImageAndText + end + end end inherited StatusBar: TJvStatusBar Width = 606 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas index 9665b331..7b1aeaf3 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas @@ -17,11 +17,10 @@ uses type TfEditorAlbaranesProveedor = class(TfEditorGridBase, IEditorAlbaranesProveedor) actGenerarFactura: TAction; - TBXSeparatorItem17: TTBXSeparatorItem; JsNuevoAlbaranDialog: TJSDialog; - TBXItem38: TTBXItem; JsPrevisualizarDialog: TJSDialog; JsImprimirDialog: TJSDialog; + TBXItem39: TTBXItem; procedure FormShow(Sender: TObject); procedure actGenerarFacturaExecute(Sender: TObject); procedure actGenerarFacturaUpdate(Sender: TObject); diff --git a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm index f219ffce..d3d45e4e 100644 --- a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm @@ -30,10 +30,10 @@ inherited fEditorAlmacenes: TfEditorAlmacenes end inherited TBXDock: TTBXDock inherited tbxMain: TTBXToolbar - ExplicitWidth = 465 + ExplicitWidth = 474 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 260 + ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end @@ -41,6 +41,12 @@ inherited fEditorAlmacenes: TfEditorAlmacenes Visible = False end end + inherited TBXTMain2: TTBXToolbar + Left = 275 + DockPos = 275 + Visible = False + ExplicitLeft = 275 + end end inline frViewAlmacenes1: TfrViewAlmacenes [3] Left = 0 @@ -71,6 +77,9 @@ inherited fEditorAlmacenes: TfEditorAlmacenes Kind = skCount Column = frViewAlmacenes1.cxGridViewNOMBRE end> + inherited cxGridViewID: TcxGridDBColumn + IsCaptionAssigned = True + end end end inherited frViewFiltroBase1: TfrViewFiltroBase diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm index a84a36c7..46837db0 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm @@ -29,7 +29,7 @@ inherited fEditorArticulos: TfEditorArticulos ExplicitWidth = 543 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 260 + ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end @@ -37,6 +37,12 @@ inherited fEditorArticulos: TfEditorArticulos Visible = False end end + inherited TBXTMain2: TTBXToolbar + Left = 275 + DockPos = 275 + Visible = False + ExplicitLeft = 275 + end end inherited EditorActionList: TActionList inherited actNuevo: TAction diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm index 46a54e4c..9dc7359d 100644 --- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm @@ -4,7 +4,6 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos Caption = 'Hist'#243'rico de movimientos de art'#237'culos en almac'#233'n' ClientHeight = 540 ClientWidth = 669 - ExplicitLeft = -61 ExplicitWidth = 677 ExplicitHeight = 574 PixelsPerInch = 96 @@ -138,10 +137,10 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos Width = 669 ExplicitWidth = 669 inherited tbxMain: TTBXToolbar - ExplicitWidth = 349 + ExplicitWidth = 358 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 260 + ExplicitWidth = 269 inherited TBXItem37: TTBXItem Visible = False end @@ -149,6 +148,11 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos inherited tbxMenu: TTBXToolbar ExplicitWidth = 669 end + inherited TBXTMain2: TTBXToolbar + Left = 334 + Visible = False + ExplicitLeft = 334 + end end inherited StatusBar: TJvStatusBar Top = 521 diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm index 8ec68931..4733a06f 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm +++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm @@ -43,7 +43,7 @@ inherited fEditorInventario: TfEditorInventario Width = 669 ExplicitWidth = 669 inherited tbxMain: TTBXToolbar - ExplicitWidth = 659 + ExplicitWidth = 668 object TBXSeparatorItem84: TTBXSeparatorItem [6] end object TBXItem54: TTBXItem [7] @@ -66,7 +66,7 @@ inherited fEditorInventario: TfEditorInventario end end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 260 + ExplicitWidth = 269 inherited TBXItem37: TTBXItem Visible = False end @@ -74,6 +74,11 @@ inherited fEditorInventario: TfEditorInventario inherited tbxMenu: TTBXToolbar ExplicitWidth = 669 end + inherited TBXTMain2: TTBXToolbar + Left = 334 + Visible = False + ExplicitLeft = 334 + end end inherited StatusBar: TJvStatusBar Top = 521 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm index d746cd55..4d5b0fc2 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm @@ -2,6 +2,7 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor Caption = 'Seleccionar pedido de cliente' ClientWidth = 656 ExplicitWidth = 664 + ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] @@ -48,13 +49,11 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor inherited TBXDock: TTBXDock Top = 87 Width = 656 - Height = 49 ExplicitTop = 87 ExplicitWidth = 656 - ExplicitHeight = 49 inherited tbxMain: TTBXToolbar Align = alRight - ExplicitWidth = 117 + ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False end @@ -72,11 +71,11 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor end end inherited tbxFiltro: TTBXToolbar - Left = 117 + Left = 126 Top = 23 DockPos = 115 DockRow = 1 - ExplicitLeft = 117 + ExplicitLeft = 126 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -85,6 +84,11 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor inherited tbxMenu: TTBXToolbar ExplicitWidth = 656 end + inherited TBXTMain2: TTBXToolbar + Left = 334 + Visible = False + ExplicitLeft = 334 + end end inherited StatusBar: TJvStatusBar Width = 656 @@ -130,19 +134,26 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor end end inherited frViewPedidosProveedor1: TfrViewPedidosProveedor [5] - Top = 136 + Top = 162 Width = 656 - Height = 240 - ExplicitTop = 136 + Height = 214 + ExplicitTop = 162 ExplicitWidth = 656 - ExplicitHeight = 240 + ExplicitHeight = 214 inherited cxGrid: TcxGrid Width = 656 - Height = 240 + Height = 86 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 656 - ExplicitHeight = 240 + ExplicitHeight = 86 inherited cxGridView: TcxGridDBTableView + DataController.Summary.DefaultGroupSummaryItems = < + item + Format = ',0.00 '#8364';-,0.00 '#8364 + Kind = skSum + Position = spFooter + Column = frViewPedidosProveedor1.cxGridViewIMPORTE_TOTAL + end> DataController.Summary.FooterSummaryItems = < item Format = '0 pedidos' @@ -154,6 +165,56 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor end end end + inherited frViewFiltroBase1: TfrViewFiltroBase + Width = 656 + ExplicitWidth = 656 + inherited TBXDock1: TTBXDock + Width = 656 + ExplicitWidth = 656 + inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 656 + inherited dxLayoutControl1: TdxLayoutControl + Width = 652 + ExplicitWidth = 652 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 453 + ExplicitLeft = 453 + ExplicitWidth = 121 + Width = 121 + end + end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 652 + ExplicitWidth = 652 + inherited tbxBotones: TTBXToolbar + Width = 642 + ExplicitWidth = 642 + end + end + end + end + end + inherited pnlAgrupaciones: TTBXDockablePanel + Top = 188 + ExplicitTop = 188 + ExplicitWidth = 656 + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 656 + ExplicitWidth = 656 + inherited TBXToolbar1: TTBXToolbar + Width = 646 + ExplicitWidth = 646 + end + end + end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink BuiltInReportLink = True @@ -167,6 +228,11 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor Index = 0 end> end + inherited dxPrintStyleManager1: TdxPrintStyleManager + inherited dxPrintStyleManager1Style1: TdxPSPrintStyle + BuiltInStyle = True + end + end end inherited EditorActionList: TActionList [8] Left = 112 @@ -194,6 +260,10 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor Left = 80 Top = 192 end + inherited JsNuevoPedidoProveedorDialog: TJSDialog [14] + end + inherited JsPrevisualizarDialog: TJSDialog [15] + end object EditorSeleccionActionList: TActionList Images = SmallImages Left = 152 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm index df583ad8..bc75663c 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm @@ -44,17 +44,19 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor Width = 700 ExplicitWidth = 700 inherited tbxMain: TTBXToolbar - ExplicitWidth = 700 - object TBXSeparatorItem17: TTBXSeparatorItem [8] - end - object TBXItem38: TTBXItem [9] - Action = actRecibirPedido - DisplayMode = nbdmImageAndText - end + ExplicitWidth = 632 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 700 end + inherited TBXTMain2: TTBXToolbar + Visible = True + ExplicitWidth = 119 + object TBXItem39: TTBXItem + Action = actRecibirPedido + DisplayMode = nbdmImageAndText + end + end end inherited StatusBar: TJvStatusBar Width = 700 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas index ad341d74..4b9d0755 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas @@ -20,11 +20,10 @@ type N4: TMenuItem; Cambiarsituacin1: TMenuItem; actRecibirPedido: TAction; - TBXSeparatorItem17: TTBXSeparatorItem; JsNuevoPedidoProveedorDialog: TJSDialog; JsPrevisualizarDialog: TJSDialog; JsImprimirDialog: TJSDialog; - TBXItem38: TTBXItem; + TBXItem39: TTBXItem; procedure FormShow(Sender: TObject); procedure actCambiarSituacionExecute(Sender: TObject); procedure actRecibirPedidoUpdate(Sender: TObject); diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.res b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.res index 36f26e23..86c94e6a 100644 Binary files a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.res and b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.res differ diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm index 153fdd6f..4f1bd20b 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm @@ -2,6 +2,7 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente Caption = 'Seleccionar pedido de cliente' ClientWidth = 656 ExplicitWidth = 664 + ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] @@ -48,12 +49,10 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente inherited TBXDock: TTBXDock Top = 87 Width = 656 - Height = 49 ExplicitTop = 87 ExplicitWidth = 656 - ExplicitHeight = 49 inherited tbxMain: TTBXToolbar - ExplicitWidth = 117 + ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False end @@ -63,9 +62,6 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente inherited TBXItem4: TTBXItem Visible = False end - inherited TBXItem43: TTBXItem - Visible = False - end inherited TBXSeparatorItem3: TTBXSeparatorItem Visible = False end @@ -77,11 +73,11 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente end end inherited tbxFiltro: TTBXToolbar - Left = 117 + Left = 126 Top = 23 DockPos = 104 DockRow = 1 - ExplicitLeft = 117 + ExplicitLeft = 126 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -90,6 +86,11 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente inherited tbxMenu: TTBXToolbar ExplicitWidth = 656 end + inherited TBXTMain2: TTBXToolbar + Left = 334 + Visible = False + ExplicitLeft = 334 + end end inherited StatusBar: TJvStatusBar Width = 656 @@ -174,6 +175,10 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente Visible = False end end + inherited JsGenerarDialog: TJSDialog [13] + end + inherited JsPrevisualizarDialog: TJSDialog [14] + end object EditorSeleccionActionList: TActionList Images = SmallImages Left = 152 diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.dfm index 7ea195e1..10656798 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.dfm @@ -124,13 +124,7 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente Width = 674 ExplicitWidth = 674 inherited tbxMain: TTBXToolbar - ExplicitWidth = 674 - object TBXSeparatorItem18: TTBXSeparatorItem [8] - end - object TBXItem43: TTBXItem [9] - Action = actGenerar - DisplayMode = nbdmImageAndText - end + ExplicitWidth = 632 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 674 @@ -146,6 +140,14 @@ inherited fEditorPedidosCliente: TfEditorPedidosCliente end end end + inherited TBXTMain2: TTBXToolbar + Visible = True + ExplicitWidth = 91 + object TBXItem40: TTBXItem + Action = actGenerar + DisplayMode = nbdmImageAndText + end + end end inherited StatusBar: TJvStatusBar Width = 674 diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.pas index cdcbbd48..f6f77ed5 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.pas +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidosCliente.pas @@ -24,13 +24,12 @@ type TBXItem38: TTBXItem; TBXItem39: TTBXItem; N4: TMenuItem; - TBXSeparatorItem18: TTBXSeparatorItem; actGenerar: TAction; - TBXItem43: TTBXItem; Generar2: TMenuItem; JsGenerarDialog: TJSDialog; JsPrevisualizarDialog: TJSDialog; JsImprimirDialog: TJSDialog; + TBXItem40: TTBXItem; procedure FormShow(Sender: TObject); procedure actGenerarAlbaranCliExecute(Sender: TObject); procedure actEliminarUpdate(Sender: TObject); diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index ab98fe1a..899444d7 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -97,8 +97,6 @@ uses schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', - schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', - schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas', srvHistoricoMovimientos_Impl in '..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas' {srvHistoricoMovimientos: TDARemoteService}, @@ -109,8 +107,6 @@ uses schRemesasProveedorClient_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas', schRemesasProveedorServer_Intf in '..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas', uBizRemesasProveedorServer in '..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas', - schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', srvReferencias_Impl in '..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas' {srvReferencias: TDARemoteService}, schReferenciasClient_Intf in '..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas', schReferenciasServer_Intf in '..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas', @@ -119,7 +115,11 @@ uses schPedidosClienteClient_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas', schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas', schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas', - schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas'; + schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas', + schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', + schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', + schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 818276f0..58c3de6d 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ -MAINICON ICON "T:\Codigo (Luis Leon)\Source\Iconos\Servidor.ico" +MAINICON ICON "E:\Codigo (Luis León)\Source\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,0,8,0 -PRODUCTVERSION 2,0,8,0 +FILEVERSION 2,1,0,0 +PRODUCTVERSION 2,1,0,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0904E4" BEGIN - VALUE "FileVersion", "2.0.8.0\0" - VALUE "ProductVersion", "2.0.8.0\0" - VALUE "CompileDate", "jueves, 28 de junio de 2007 13:38\0" + VALUE "FileVersion", "2.1.0.0\0" + VALUE "ProductVersion", "2.1.0.0\0" + VALUE "CompileDate", "jueves, 05 de julio de 2007 20:47\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index dcf175e9..72219fb4 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ