diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339..8b251f3 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 4d40a64..98e844d 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Noviseda\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,0,0,0 -PRODUCTVERSION 2,0,0,0 +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,9 +13,9 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.0.0.0\0" + VALUE "FileVersion", "1.0.0.0\0" VALUE "InternalName", "FactuGES\0" - VALUE "ProductName", "FactuGES\0" + VALUE "ProductName", "1.0.0.0\0" VALUE "ProductVersion", "2.0.0.0\0" END END diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index ea23f58..808c1e5 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/uEditorColores.dfm b/Source/GUIBase/uEditorColores.dfm index dff71ae..69027db 100644 --- a/Source/GUIBase/uEditorColores.dfm +++ b/Source/GUIBase/uEditorColores.dfm @@ -1,8 +1,8 @@ object frEditorColores: TfrEditorColores Left = 0 Top = 0 - Caption = 'fEditorColores' - ClientHeight = 128 + Caption = 'Unidades de cada color del art'#237'culo' + ClientHeight = 183 ClientWidth = 771 Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -11,19 +11,21 @@ object frEditorColores: TfrEditorColores Font.Name = 'Tahoma' Font.Style = [] OldCreateOrder = False + Position = poDesktopCenter PixelsPerInch = 96 TextHeight = 13 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 771 - Height = 128 + Height = 183 Align = alClient TabOrder = 0 TabStop = False + ExplicitHeight = 128 object eColor1: TcxDBTextEdit Left = 22 - Top = 46 + Top = 105 DataBinding.DataField = 'COLOR1' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame @@ -41,36 +43,13 @@ object frEditorColores: TfrEditorColores StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 0 - Width = 55 - end - object eColor2: TcxDBTextEdit - Left = 83 - Top = 46 - DataBinding.DataField = 'COLOR2' - DataBinding.DataSource = dsDataTable - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 55 end - object eColor3: TcxDBTextEdit - Left = 144 - Top = 46 - DataBinding.DataField = 'COLOR3' + object eColor2: TcxDBTextEdit + Left = 83 + Top = 105 + DataBinding.DataField = 'COLOR2' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -90,10 +69,10 @@ object frEditorColores: TfrEditorColores TabOrder = 2 Width = 55 end - object eColor4: TcxDBTextEdit - Left = 205 - Top = 46 - DataBinding.DataField = 'COLOR4' + object eColor3: TcxDBTextEdit + Left = 144 + Top = 105 + DataBinding.DataField = 'COLOR3' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -113,10 +92,10 @@ object frEditorColores: TfrEditorColores TabOrder = 3 Width = 55 end - object eColor5: TcxDBTextEdit - Left = 266 - Top = 46 - DataBinding.DataField = 'COLOR5' + object eColor4: TcxDBTextEdit + Left = 205 + Top = 105 + DataBinding.DataField = 'COLOR4' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -136,10 +115,10 @@ object frEditorColores: TfrEditorColores TabOrder = 4 Width = 55 end - object eColor6: TcxDBTextEdit - Left = 327 - Top = 46 - DataBinding.DataField = 'COLOR6' + object eColor5: TcxDBTextEdit + Left = 266 + Top = 105 + DataBinding.DataField = 'COLOR5' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -159,10 +138,10 @@ object frEditorColores: TfrEditorColores TabOrder = 5 Width = 55 end - object eColor7: TcxDBTextEdit - Left = 388 - Top = 46 - DataBinding.DataField = 'COLOR7' + object eColor6: TcxDBTextEdit + Left = 327 + Top = 105 + DataBinding.DataField = 'COLOR6' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -182,10 +161,10 @@ object frEditorColores: TfrEditorColores TabOrder = 6 Width = 55 end - object eColor8: TcxDBTextEdit - Left = 449 - Top = 46 - DataBinding.DataField = 'COLOR8' + object eColor7: TcxDBTextEdit + Left = 388 + Top = 105 + DataBinding.DataField = 'COLOR7' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -205,10 +184,10 @@ object frEditorColores: TfrEditorColores TabOrder = 7 Width = 55 end - object eColor9: TcxDBTextEdit - Left = 510 - Top = 46 - DataBinding.DataField = 'COLOR9' + object eColor8: TcxDBTextEdit + Left = 449 + Top = 105 + DataBinding.DataField = 'COLOR8' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -228,10 +207,10 @@ object frEditorColores: TfrEditorColores TabOrder = 8 Width = 55 end - object eColor10: TcxDBTextEdit - Left = 571 - Top = 46 - DataBinding.DataField = 'COLOR10' + object eColor9: TcxDBTextEdit + Left = 510 + Top = 105 + DataBinding.DataField = 'COLOR9' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -251,10 +230,10 @@ object frEditorColores: TfrEditorColores TabOrder = 9 Width = 55 end - object eColor11: TcxDBTextEdit - Left = 632 - Top = 46 - DataBinding.DataField = 'COLOR11' + object eColor10: TcxDBTextEdit + Left = 571 + Top = 105 + DataBinding.DataField = 'COLOR10' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -274,10 +253,10 @@ object frEditorColores: TfrEditorColores TabOrder = 10 Width = 55 end - object eColor12: TcxDBTextEdit - Left = 693 - Top = 46 - DataBinding.DataField = 'COLOR12' + object eColor11: TcxDBTextEdit + Left = 632 + Top = 105 + DataBinding.DataField = 'COLOR11' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -297,31 +276,83 @@ object frEditorColores: TfrEditorColores TabOrder = 11 Width = 55 end + object eColor12: TcxDBTextEdit + Left = 693 + Top = 105 + DataBinding.DataField = 'COLOR12' + DataBinding.DataSource = dsDataTable + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 12 + Width = 55 + end object bAceptar: TButton Left = 604 - Top = 85 + Top = 144 Width = 75 Height = 25 Align = alRight Caption = 'Aceptar' ModalResult = 1 - TabOrder = 12 + TabOrder = 13 end object bCancelar: TButton Left = 685 - Top = 85 + Top = 144 Width = 75 Height = 25 Align = alRight Cancel = True Caption = 'Cancelar' ModalResult = 2 - TabOrder = 13 + TabOrder = 14 + end + object edtDescripcion: TcxMemo + Left = 10 + Top = 10 + Enabled = False + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 0 + Height = 53 + Width = 544 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True ShowBorder = False + object dxLayoutControl1Item15: TdxLayoutItem + Enabled = False + Control = edtDescripcion + ControlOptions.ShowBorder = False + end object dxLayoutControl1Group1: TdxLayoutGroup Caption = 'Colores' LayoutDirection = ldHorizontal diff --git a/Source/GUIBase/uEditorColores.pas b/Source/GUIBase/uEditorColores.pas index e799866..1b29a2d 100644 --- a/Source/GUIBase/uEditorColores.pas +++ b/Source/GUIBase/uEditorColores.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, dxLayoutControl, cxControls, DB, uDAInterfaces, uDADataTable, - cxContainer, cxEdit, cxTextEdit, cxDBEdit, StdCtrls; + cxContainer, cxEdit, cxTextEdit, cxDBEdit, StdCtrls, cxMemo; type TfrEditorColores = class(TForm) @@ -42,6 +42,8 @@ type bCancelar: TButton; dxLayoutControl1Item14: TdxLayoutItem; dxLayoutControl1Group2: TdxLayoutGroup; + dxLayoutControl1Item15: TdxLayoutItem; + edtDescripcion: TcxMemo; private { Private declarations } public diff --git a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas index 543089e..0349e82 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas @@ -148,12 +148,20 @@ begin with TfrEditorColores.Create(NIL) do begin dsDataTable.DataTable := ADetallesAux.DetalleColores.DataTable; + edtDescripcion.Lines.Clear; + edtDescripcion.Lines.Add(ADetallesAux.REFERENCIA); + edtDescripcion.Lines.Add(ADetallesAux.CONCEPTO); if (showModal = mrOK) then begin - ADetallesAux.DetalleColores.DataTable.Post; - ADetallesAux.DataTable.Edit; + if ADetallesAux.DetalleColores.DataTable.Editing then + ADetallesAux.DetalleColores.DataTable.Post; + + if not ADetallesAux.DataTable.Editing then + ADetallesAux.DataTable.Edit; ADetallesAux.CANTIDAD := GetTotal; - ADetallesAux.DataTable.post; + if ADetallesAux.DataTable.Editing then + ADetallesAux.DataTable.post; + ActualizarTotales(ADetalles); end else @@ -166,11 +174,9 @@ end; procedure TDetallesAlbaranClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); begin -//En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP -// if Assigned(AArticulos) then -// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO -// else -// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; +//Solo para albaranes que es donde se distingue entre colores para tema de stock + if Assigned(AArticulos) then + ModificarCantidadColores(ADetalles); end; procedure TDetallesAlbaranClienteController.ValidarCampos(DataTable: TDADataTable); diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm index bc3845a..cfa95ce 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm @@ -23,9 +23,9 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente end inherited FontSize: TEdit Top = 22 - Width = 90 + Width = 106 ExplicitTop = 22 - ExplicitWidth = 90 + ExplicitWidth = 106 end inherited ToolButton13: TToolButton [7] Left = 0 @@ -125,6 +125,7 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente ExplicitTop = 100 inherited TBXToolbar1: TTBXToolbar DockPos = 0 + ExplicitWidth = 447 inherited TBXSubmenuItem1: TTBXSubmenuItem Visible = False end @@ -135,11 +136,43 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente end end inherited ActionListContenido: TActionList + inherited RichEditBold1: TRichEditBold + Enabled = False + Visible = False + end + inherited RichEditItalic1: TRichEditItalic + Enabled = False + Visible = False + end + inherited RichEditUnderline1: TRichEditUnderline + Enabled = False + Visible = False + end + inherited RichEditAlignLeft1: TRichEditAlignLeft + Enabled = False + Visible = False + end + inherited RichEditAlignCenter1: TRichEditAlignCenter + Enabled = False + Visible = False + end + inherited RichEditAlignRight1: TRichEditAlignRight + Enabled = False + Visible = False + end + inherited FontEdit1: TFontEdit + Enabled = False + Visible = False + end inherited actAnadirArticulos: TAction Caption = 'A'#241'adir art'#237'culos...' Enabled = False Visible = False end + inherited actExportar: TAction + Enabled = False + Visible = False + end end inherited GridGeneralPopupMenu: TPopupMenu object Aadirartculos1: TMenuItem [4] diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas index bd22bb7..d940c1a 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas @@ -58,8 +58,6 @@ begin Result := (Controller as IDetallesAlbaranClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Albaran.Cliente.ID, -1) else Result := (Controller as IDetallesAlbaranClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Albaran.Cliente.ID, 0); - - (Controller as IDetallesAlbaranClienteController).ModificarCantidadColores(Detalles); end; procedure TfrViewDetallesAlbaranCliente.AnadirArticulosInterno; @@ -88,8 +86,6 @@ begin (Controller as IDetallesAlbaranClienteController).AnadirArticulos(Detalles, Albaran.Cliente, False, -1) else (Controller as IDetallesAlbaranClienteController).AnadirArticulos(Detalles, Albaran.Cliente, False, 0); - - (Controller as IDetallesAlbaranClienteController).ModificarCantidadColores(Detalles); end; procedure TfrViewDetallesAlbaranCliente.SetAlbaran(const Value: IBizAlbaranCliente); diff --git a/Source/Modulos/Articulos/Controller/Articulos_controller.identcache b/Source/Modulos/Articulos/Controller/Articulos_controller.identcache index 5398ede..0386652 100644 Binary files a/Source/Modulos/Articulos/Controller/Articulos_controller.identcache and b/Source/Modulos/Articulos/Controller/Articulos_controller.identcache differ diff --git a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas index 7f2ab44..61727ae 100644 --- a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas @@ -360,7 +360,8 @@ begin RellenarImportes(ADetalles, AArticulos); RellenarOtros(ADetalles, AArticulos); - ADetalles.DataTable.Post; + if ADetalles.DataTable.Editing then + ADetalles.DataTable.Post; finally EndUpdate(ADetalles); end; diff --git a/Source/Modulos/Contactos/Views/uViewVendedores.dfm b/Source/Modulos/Contactos/Views/uViewVendedores.dfm index 60b3ab0..ca87820 100644 --- a/Source/Modulos/Contactos/Views/uViewVendedores.dfm +++ b/Source/Modulos/Contactos/Views/uViewVendedores.dfm @@ -163,30 +163,26 @@ inherited frViewVendedores: TfrViewVendedores item PngImage.Data = { 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF - 61000000097048597300000AC400000AC401666D82D4000002B84944415478DA - 7DD25B4814511807F06FD61DC79DBDB8177577D9B23B4B2E3D84F6500F3D2542 - D20DE902F910FA105D84209F0C45A82048082A562C4DA3A4B21E7C0B12332168 - 438D7523D128D745DDCBAC7B9B9DD9B9CF342B289AAC7F989773BEEFC739F31D - 445114C807411058CBCCDBA64600E9762A4D56C4E2197FE06FF46EE7C08C0F36 - 64BDEF7F60FAE5E56687C3F22C976335C954065692698827C8DC989F38DBF731 - 38B22DF0A6A546E7AEDE17C2755839C70B90CDD21026D2200A3C8457D8D9D61E - FF11B5942A0CB41FAB7539AC9F8A3445C0B0022C1234386C2630EA00E61608E5 - DEE0AFBA60981A29088C3FAE6F4E64F95E4144C06A31817BA7191059049E6381 - 6618783838D5F4EAF3527F41C0E7AD6FD8E1B47FD0A2E8EA9A248A20A8C71738 - 0E588E55DA9F4F340FFB228581A1CEA3CE6AF7EE105A5CBC2AC8B2ACDE5F5845 - 489216CF748CD54653FC976DA730D973FA9DD9885F582DCA0352FE14027C9B5E - 9EBDFAE4C7717539BE2DD0D752E33AE4B14F1A30D421AB7BF96B24D314DFDAEB - BF35F53BD35D708CF9E8DA5ED88CA4CB8BEF92CF77C9FD8811D4374023D026D5 - 294CE2800FA102D788D777A6373EA875C0D4D167290D5ABE32065755AECC0937 - ABE6A1D16381813F08780336D027A250925ECE2AECF773E1F7F747B700FB2FF5 - 3E15A5F21B94D50E399B034AAC18347810E89F33813699528108E02A82318B8B - 11DF83C3742C94D8041C3CE90D7158792563B3036D2A03CE640111D783866501 - A349C05304E049F54BC5202E8F5E8C8F0D0D6D023C271ECD8BA8654FAE34DF6C - 05DE6804495B0C1AF527A25416302A05783A01BA4C1C086EFC7A7462B87B13E0 - 3ED57E45614ABB6483DDCA636644D0E901B45A005E02AD40032690A0A5E33C9F - 9909ACCC0D379189D8CF2D53309BCD658273AF1BAD705582466F4064492329AC - 20F15C0E2882449716226A5930AD66ADE71FDF3497F05E932988000000004945 - 4E44AE426082} + 610000000970485973000017120000171201679FD252000002444944415478DA + A5D25F4853711407F0EFFDB3CDEB9DE6367391418B98521ABEA4988619C508F6 + 30A9142A8C281B6188088DA850090A2A288408C47A721404816325E120514C61 + 8159F6070D7CB04599CB66CEFB77D7FBEBF61ABB3ED4F7F5C0E79CC339142104 + FF13EA6F405C5E1A9879DAD7303F3A00411090E61C283DD0800A5F335C1BDDD4 + BA80AA8853D3FD37E7F578349012252CAEAE624992911424541D0F62EFB1CECF + 2E9773AB29F07E344A120F2E835254A46405CB14015B988FE4C222922B32DA7B + 63F0945553A6C0506F17597AF1102A4D83D96087DB5B8C126F11523F7E2232F0 + 12FEE0555405CE9B03915B6D44FB350D6F9907CEBC5CF01C0D312DC042130C8F + 4C6173CD59EC6B6C3307C29DCDA4D0FA05B575E550041992B1BF6AACC3D2402C + F60A9E4321F89A5ACD81DB67EA09A439F803D5E02D399045058CD15D90D278F4 + 780C9547BB703878711D20D44C66C79FC357BF0B153B9DC8A819A87A06F1C904 + 26C667E1EFBE8BA623E7CC8189A1E1F677DDF77B1CBC0C6E4F0A8C434172CE18 + 2A5E004AE7B0BDAF237CB0B2EEA4293018BCD3E39AFCDA2E6969C8FB1790BF3B + 0369300FFC073708CDE263ADF57BCBBD1B9B4C8168E96952906B03A3D0203512 + F2CB09A8213BC46FC614D020ACA8F8D4EA45C7854B5456E049C92962CFB180A7 + 5810BB0EC606B0AB2C94CC1A044D03240AAFB7C8B83212CE0EF46F3B418A381E + 1CCBC04A33A0414137BE5159D3201A88A86A78B3C3866BCF7AB303D1FEC85822 + FE764649A55B605C40FF536268E88C01D9AC608A5D085D0F995FE15FF21B1558 + 1FF02CF09AE30000000049454E44AE426082} Name = 'PngImage1' Background = clWindow end> diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index 7ef297a..da20091 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -79,7 +79,6 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end inherited TBXTMain2: TTBXToolbar Left = 427 - Visible = True ExplicitLeft = 427 object TBXItem41: TTBXItem Action = actInformes diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 9c5e0a0..e8dd944 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 510c2cd..4c7f5c0 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,339 +1,335 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - -FalseTrueFalse/standaloneTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0viernes, 15 de enero de 2010 17:13 - - - - - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService -
- -
srvProvinciasPoblaciones_Impl
- TDataModule -
- - - -
srvUsuarios
- TDataAbstractService -
- - - - - - - -
RptAlbaranesCliente
- TDataModule -
- -
RptWordAlbaranCliente
- TDataModule -
- -
srvAlbaranesCliente
- TDataAbstractService -
- - - - -
RptAlbaranesProveedor
- TDataModule -
- -
RptWordAlbaranProveedor
- TDataModule -
- -
srvAlbaranesProveedor
- TDataAbstractService -
- - - -
srvAlmacenes
- TDARemoteService -
- - - - -
srvArticulos
- TDARemoteService -
- - - - - - - - -
RptEtiquetasContacto
- TDataModule -
- -
RptFichasEmpleado
- TDataModule -
- -
srvContactos
- TDARemoteService -
- - - -
srvFabricantes
- TDataAbstractService -
- - - - -
RptFacturasCliente
- TDataModule -
- -
RptWordFacturaCliente
- TDataModule -
- -
srvFacturasCliente
- TDataAbstractService -
- - - - -
RptFacturasProveedor
- TDataModule -
- -
srvFacturasProveedor
- TDataAbstractService -
- - - -
srvFamilias
- TDataAbstractService -
- - - -
srvFormasPago
- TDataAbstractService -
- -
srvGestorDocumentos
- TDataAbstractService -
- -
srvGestorInformes
- TDataAbstractService -
- - - -
srvHistoricoMovimientos
- TDataAbstractService -
- - - -
srvInventario
- TDataAbstractService -
- - - - -
srvObras
- TDataAbstractService -
- - - - -
RptPedidosProveedor
- TDataModule -
- -
RptWordPedidoProveedor
- TDataModule -
- -
srvPedidosProveedor
- TDataAbstractService -
- - - - -
RptPresupuestosCliente
- TDataModule -
- -
RptWordCertificadoTrabajo
- TDataModule -
- -
RptWordPresupuestoCliente
- TDataModule -
- -
srvPresupuestosCliente
- TDataAbstractService -
- - - -
RptRecibosCliente
- TDataModule -
- -
srvRecibosCliente
- TDataAbstractService -
- - - -
RptRecibosProveedor
- TDataModule -
- -
srvRecibosProveedor
- TDataAbstractService -
- - - -
srvReferencias
- TDataAbstractService -
- - - - -
srvRemesasCliente
- TDataAbstractService -
- - - - -
srvRemesasProveedor
- TDataAbstractService -
- - - -
srvTiposIVA
- TDataAbstractService -
- - - -
srvUnidadesMedida
- TDataAbstractService -
- - - -
srvConfiguracion
- TDataAbstractService -
- -
frConexionBD
- TFrame -
- -
frConfGeneral
- TFrame -
- -
fConfiguracion
- TForm -
- -
FrameConfiguracion
- TFrame -
- -
srvLogin
- TDARemoteService -
- -
fAcercaDe
-
- -
dmServer
- TDataModule -
- -
fServerForm
-
- - - - - - - - - - -
+ + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + + FalseTrueFalse/standaloneTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0viernes, 15 de enero de 2010 17:13 + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService +
+ +
srvProvinciasPoblaciones_Impl
+ TDataModule +
+ + + +
srvUsuarios
+ TDataAbstractService +
+ + + + + + + +
RptAlbaranesCliente
+ TDataModule +
+ +
RptWordAlbaranCliente
+ TDataModule +
+ +
srvAlbaranesCliente
+ TDataAbstractService +
+ + + + +
RptAlbaranesProveedor
+ TDataModule +
+ +
RptWordAlbaranProveedor
+ TDataModule +
+ +
srvAlbaranesProveedor
+ TDataAbstractService +
+ + + +
srvAlmacenes
+ TDARemoteService +
+ + + + +
srvArticulos
+ TDARemoteService +
+ + + + + + + + +
RptEtiquetasContacto
+ TDataModule +
+ +
RptFichasEmpleado
+ TDataModule +
+ +
srvContactos
+ TDARemoteService +
+ + + +
srvFabricantes
+ TDataAbstractService +
+ + + + +
RptFacturasCliente
+ TDataModule +
+ +
RptWordFacturaCliente
+ TDataModule +
+ +
srvFacturasCliente
+ TDataAbstractService +
+ + + + +
RptFacturasProveedor
+ TDataModule +
+ +
srvFacturasProveedor
+ TDataAbstractService +
+ + + +
srvFamilias
+ TDataAbstractService +
+ + + +
srvFormasPago
+ TDataAbstractService +
+ +
srvGestorDocumentos
+ TDataAbstractService +
+ +
srvGestorInformes
+ TDataAbstractService +
+ + + +
srvHistoricoMovimientos
+ TDataAbstractService +
+ + + +
srvInventario
+ TDataAbstractService +
+ + + + +
srvObras
+ TDataAbstractService +
+ + + + +
RptPedidosProveedor
+ TDataModule +
+ +
RptWordPedidoProveedor
+ TDataModule +
+ +
srvPedidosProveedor
+ TDataAbstractService +
+ + + + +
RptPresupuestosCliente
+ TDataModule +
+ +
RptWordCertificadoTrabajo
+ TDataModule +
+ +
RptWordPresupuestoCliente
+ TDataModule +
+ +
srvPresupuestosCliente
+ TDataAbstractService +
+ + + +
RptRecibosCliente
+ TDataModule +
+ +
srvRecibosCliente
+ TDataAbstractService +
+ + + +
RptRecibosProveedor
+ TDataModule +
+ +
srvRecibosProveedor
+ TDataAbstractService +
+ + + +
srvReferencias
+ TDataAbstractService +
+ + + + +
srvRemesasCliente
+ TDataAbstractService +
+ + + + +
srvRemesasProveedor
+ TDataAbstractService +
+ + + +
srvTiposIVA
+ TDataAbstractService +
+ + + +
srvUnidadesMedida
+ TDataAbstractService +
+ + + +
srvConfiguracion
+ TDataAbstractService +
+ +
frConexionBD
+ TFrame +
+ +
frConfGeneral
+ TFrame +
+ +
fConfiguracion
+ TForm +
+ +
FrameConfiguracion
+ TFrame +
+ +
srvLogin
+ TDARemoteService +
+ +
fAcercaDe
+
+ +
dmServer
+ TDataModule +
+ +
fServerForm
+
+ + + + + + + + + + +