diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index 088ee318..49065bca 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -14,8 +14,8 @@ - 00:03:53 - 16/05/2013 15:44:27 + 00:03:12 + 24/11/2014 13:58:59 True diff --git a/Build/Build.fbz6 b/Build/Build.fbz6 index c7d95488..63e6e293 100644 Binary files a/Build/Build.fbz6 and b/Build/Build.fbz6 differ diff --git a/Source/FactuGES.inc b/Source/FactuGES.inc index 72603a0d..f533eaec 100644 --- a/Source/FactuGES.inc +++ b/Source/FactuGES.inc @@ -1,4 +1,4 @@ {$DEFINE MULTIEMPRESA} -{DEFINE ALMACEN} -{DEFINE PEDIDOSPROVEEDOR} +{$DEFINE ALMACEN} +{$DEFINE PEDIDOSPROVEEDOR} {$DEFINE CONTABILIDAD} \ No newline at end of file diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 958a997a..21c4e575 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f31..1641339f 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/Informes/1/3/InfFacturaCliente.fr3 b/Source/Informes/1/3/InfFacturaCliente.fr3 deleted file mode 100644 index b9b3d4f4..00000000 --- a/Source/Informes/1/3/InfFacturaCliente.fr3 +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/3/3/InfFacturaCliente.fr3 b/Source/Informes/3/3/InfFacturaCliente.fr3 deleted file mode 100644 index b9b3d4f4..00000000 --- a/Source/Informes/3/3/InfFacturaCliente.fr3 +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.rc b/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.rc +++ b/Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm index 65e02d6c..2ae38f71 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm @@ -77,7 +77,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ActivePage = pagContenido TabOrder = 1 OnChanging = pgPaginasChanging - ExplicitTop = 109 ExplicitWidth = 759 ExplicitHeight = 440 inherited pagGeneral: TTabSheet @@ -163,10 +162,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitWidth = 751 ExplicitHeight = 384 inherited eIncidencias: TcxDBMemo - ExplicitWidth = 734 - ExplicitHeight = 387 - Height = 387 - Width = 734 + ExplicitWidth = 747 + ExplicitHeight = 367 + Height = 367 + Width = 747 end end end @@ -416,6 +415,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end inherited PnlComentario: TPanel [5] Width = 765 + ExplicitWidth = 765 inherited lbComentario: TLabel Width = 755 Height = 25 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index 7aa62d49..9365c85f 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -166,15 +166,27 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor Width = 596 ExplicitWidth = 596 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 251 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 251 ExplicitWidth = 294 Width = 294 @@ -220,19 +232,6 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor BuiltInReportLink = True end end - inherited cxStyleRepository1: TcxStyleRepository - Left = 248 - object cxStylePendientes: TcxStyle - AssignedValues = [svTextColor] - TextColor = clGreen - end - object cxStyleParciales: TcxStyle - AssignedValues = [svTextColor] - TextColor = clBlue - end - object cxStyleRecibidos: TcxStyle - end - end inherited cxViewGridPopupMenu: TcxGridPopupMenu Left = 288 end @@ -250,10 +249,23 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor OnUpdate = actAlmacenUpdate end end - inherited PngImageList10: TPngImageList + inherited GridPNGImageList: TPngImageList Left = 360 Top = 440 end + inherited cxStyleRepository1: TcxStyleRepository + Left = 248 + object cxStylePendientes: TcxStyle + AssignedValues = [svTextColor] + TextColor = clGreen + end + object cxStyleParciales: TcxStyle + AssignedValues = [svTextColor] + TextColor = clBlue + end + object cxStyleRecibidos: TcxStyle + end + end object PngImageList: TPngImageList PngImages = < item diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index 8bd01efc..fc4e0d61 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -12,7 +12,8 @@ uses uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, - TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, + uCustomView, uViewBase; type IViewPedidosProveedor = interface(IViewGrid) diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 8cc7a1d1..5eb952d5 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "2.6.0.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductVersion", "2.6.0.0\0" - VALUE "CompileDate", "lunes, 24 de noviembre de 2014 13:06\0" + VALUE "CompileDate", "lunes, 24 de noviembre de 2014 13:59\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index e792fc90..d5cc705e 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ