diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index e9d9a90f..1be08996 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj index 30d4ab6a..ae617426 100644 --- a/Source/Cliente/FactuGES.bdsproj +++ b/Source/Cliente/FactuGES.bdsproj @@ -149,7 +149,7 @@ False 3 3 - 1 + 2 0 False False @@ -162,13 +162,13 @@ Rodax Software S.L. - 3.3.1.0 + 3.3.2.0 FactuGES - 3.3.1.0 + 3.3.2.0 Muststang Peak EasyListview Runtime Package diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index f9017746..22a224d2 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 3,3,0,0 -PRODUCTVERSION 3,3,0,0 +FILEVERSION 3,3,1,0 +PRODUCTVERSION 3,3,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,9 +13,9 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "3.3.0.0\0" + VALUE "FileVersion", "3.3.1.0\0" VALUE "InternalName", "FactuGES\0" - VALUE "ProductVersion", "3.3.0.0\0" + VALUE "ProductVersion", "3.3.1.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 0b43329f..5b270951 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm index df1597f4..c317dda1 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm @@ -52,6 +52,9 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente ExplicitTop = 87 ExplicitWidth = 790 inherited tbxMain: TTBXToolbar + Left = 367 + DockPos = 367 + ExplicitLeft = 367 ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False @@ -100,13 +103,13 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente end end inherited tbxFiltro: TTBXToolbar - Left = 126 + Left = 3 Top = 23 - DockPos = 104 + DockPos = 3 DockRow = 1 - ExplicitLeft = 126 + ExplicitLeft = 3 ExplicitTop = 23 - ExplicitWidth = 269 + ExplicitWidth = 363 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm index 999e4a30..aa806899 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm @@ -3,4 +3,16 @@ inherited fEditorElegirArticulosAlbaranCliente: TfEditorElegirArticulosAlbaranCl ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 + inherited TBXDock: TTBXDock + inherited tbxMain: TTBXToolbar + Left = 275 + DockPos = 275 + ExplicitLeft = 275 + end + inherited tbxFiltro: TTBXToolbar + Left = 3 + DockPos = 3 + ExplicitLeft = 3 + end + end end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm index 9abc0bd2..495f212c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm @@ -3,7 +3,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente ClientWidth = 654 ExplicitWidth = 662 PixelsPerInch = 96 - TextHeight = 13 + TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] Left = 0 Top = 0 @@ -57,6 +57,8 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente ExplicitTop = 87 ExplicitWidth = 654 inherited tbxMain: TTBXToolbar + Left = 101 + ExplicitLeft = 101 ExplicitWidth = 126 inherited TBXSubmenuItem2: TTBXSubmenuItem Visible = False @@ -72,15 +74,22 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente end end inherited tbxFiltro: TTBXToolbar - Left = 126 Top = 23 - DockPos = 104 DockRow = 1 - Visible = False - ExplicitLeft = 126 ExplicitTop = 23 + ExplicitWidth = 101 + inherited TBXLabelItem1: TTBXLabelItem + Visible = False + end + inherited tbxEditFiltro: TTBXEditItem + Visible = False + end inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 + Visible = False + end + inherited TBXItem37: TTBXItem + Visible = False end end inherited tbxMenu: TTBXToolbar @@ -92,12 +101,14 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente end end inherited StatusBar: TJvStatusBar + Top = 520 Width = 654 + ExplicitTop = 520 ExplicitWidth = 654 end inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4] Left = 0 - Top = 611 + Top = 539 Width = 654 Height = 36 Align = alBottom @@ -109,7 +120,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 611 + ExplicitTop = 539 ExplicitWidth = 654 ExplicitHeight = 36 inherited JvFooter1: TJvFooter @@ -143,16 +154,16 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente inherited frViewFacturasCliente1: TfrViewFacturasCliente [5] Top = 162 Width = 654 - Height = 449 + Height = 358 ExplicitTop = 162 ExplicitWidth = 654 - ExplicitHeight = 449 + ExplicitHeight = 358 inherited cxGrid: TcxGrid Width = 654 - Height = 321 + Height = 230 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 654 - ExplicitHeight = 321 + ExplicitHeight = 230 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -172,6 +183,9 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente Kind = skCount Column = frViewFacturasCliente1.cxGridViewTIPO end> + inherited cxGridViewNUM_COPIAS: TcxGridDBColumn + IsCaptionAssigned = True + end end end inherited frViewFiltroBase1: TfrViewFiltroBase @@ -192,21 +206,25 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 252 + ExplicitLeft = 252 ExplicitWidth = 343 Width = 343 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 + ExplicitWidth = 654 inherited tbxBotones: TTBXToolbar Width = 644 + ExplicitWidth = 644 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 423 - ExplicitTop = 423 + Top = 332 + ExplicitTop = 332 ExplicitWidth = 654 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 @@ -254,6 +272,10 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente inherited actDuplicar: TAction Visible = False end + inherited actEnviarEMail: TAction + Enabled = False + Visible = False + end end inherited dsDataTable: TDADataSource Left = 8 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas index 74268417..efc48e03 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas @@ -1,4 +1,4 @@ -{ +{ =============================================================================== Copyright (©) 2007. Rodax Software. =============================================================================== diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm index 498bb732..ef712897 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorElegirPedidosCliente.dfm @@ -52,6 +52,9 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente ExplicitTop = 87 ExplicitWidth = 656 inherited tbxMain: TTBXToolbar + Left = 438 + DockPos = 431 + ExplicitLeft = 438 ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False @@ -76,11 +79,11 @@ inherited fEditorElegirPedidosCliente: TfEditorElegirPedidosCliente end end inherited tbxFiltro: TTBXToolbar - Left = 126 + Left = 3 Top = 23 - DockPos = 104 + DockPos = 3 DockRow = 1 - ExplicitLeft = 126 + ExplicitLeft = 3 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm index c8faa588..8f090972 100644 Binary files a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm and b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm differ diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm index 491a46be..9c516a20 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm @@ -54,6 +54,8 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor ExplicitTop = 171 ExplicitWidth = 654 inherited tbxMain: TTBXToolbar + Left = 101 + ExplicitLeft = 101 ExplicitWidth = 126 inherited TBXItem5: TTBXItem Visible = False @@ -66,15 +68,25 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end inherited tbxFiltro: TTBXToolbar - Left = 126 Top = 23 - DockPos = 104 DockRow = 1 - Visible = False - ExplicitLeft = 126 ExplicitTop = 23 + ExplicitWidth = 101 + inherited sepAno: TTBXSeparatorItem + Visible = False + end + inherited TBXLabelItem1: TTBXLabelItem + Visible = False + end + inherited tbxEditFiltro: TTBXEditItem + Visible = False + end inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 + Visible = False + end + inherited TBXItem37: TTBXItem + Visible = False end end inherited tbxMenu: TTBXToolbar @@ -186,14 +198,18 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 252 + ExplicitLeft = 252 ExplicitWidth = 343 Width = 343 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 + ExplicitWidth = 654 inherited tbxBotones: TTBXToolbar Width = 644 + ExplicitWidth = 644 end end end diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas index e8a727e3..8fd97368 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas @@ -1,4 +1,4 @@ -{ +{ =============================================================================== Copyright (©) 2007. Rodax Software. =============================================================================== diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj index 23161e39..9efcccad 100644 --- a/Source/Servidor/FactuGES_Server.bdsproj +++ b/Source/Servidor/FactuGES_Server.bdsproj @@ -1,4 +1,4 @@ - +