diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 1641339..8b251f3 100644 Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index c71472d..c2764ef 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -16,13 +16,15 @@ inherited fEditorEmpresa: TfEditorEmpresa Caption = 'Empresa' ExplicitWidth = 674 inherited Image1: TImage - Left = 541 - ExplicitLeft = 607 + Left = 647 + ExplicitLeft = 644 + ExplicitTop = -3 + ExplicitHeight = 27 end inherited lblDesbloquear: TcxLabel - Left = 576 - ExplicitLeft = 576 - AnchorX = 621 + Left = 549 + ExplicitLeft = 549 + AnchorX = 594 AnchorY = 14 end end @@ -86,8 +88,6 @@ inherited fEditorEmpresa: TfEditorEmpresa ExplicitWidth = 668 ExplicitHeight = 453 inherited pagGeneral: TTabSheet - ExplicitLeft = 4 - ExplicitTop = 24 ExplicitWidth = 660 ExplicitHeight = 425 inline frViewEmpresa1: TfrViewEmpresa @@ -109,84 +109,67 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited dxLayoutControl1: TdxLayoutControl Width = 660 Height = 425 - LayoutLookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 660 ExplicitHeight = 425 inherited PngSpeedButton1: TPngSpeedButton Left = 598 - Top = 295 ExplicitLeft = 598 - ExplicitTop = 295 end inherited PngSpeedButton2: TPngSpeedButton Left = 598 - Top = 267 ExplicitLeft = 598 - ExplicitTop = 267 end inherited eCalle: TcxDBTextEdit - Top = 331 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 331 ExplicitWidth = 234 Width = 234 end inherited eCodigoPostal: TcxDBTextEdit - Left = 283 - Top = 358 + Left = 281 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 283 - ExplicitTop = 358 + ExplicitLeft = 281 end inherited ePaginaWeb: TcxDBTextEdit Left = 479 - Top = 216 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 216 ExplicitWidth = 164 Width = 164 end inherited eMailParticular: TcxDBTextEdit Left = 479 - Top = 189 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 189 ExplicitWidth = 164 Width = 164 end inherited eMailTrabajo: TcxDBTextEdit Left = 479 - Top = 162 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 162 ExplicitWidth = 164 Width = 164 end inherited cxDBMemo1: TcxDBMemo - Top = 436 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 436 ExplicitWidth = 329 ExplicitHeight = 64 Height = 64 @@ -194,156 +177,132 @@ inherited fEditorEmpresa: TfEditorEmpresa end inherited eTlfParticular: TcxDBTextEdit Left = 479 - Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 57 ExplicitWidth = 164 Width = 164 end inherited eTlfTrabajo: TcxDBTextEdit Left = 479 - Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 30 ExplicitWidth = 164 Width = 164 end inherited eTlfMovil: TcxDBTextEdit Left = 479 - Top = 84 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 84 ExplicitWidth = 164 Width = 164 end inherited eFax: TcxDBTextEdit Left = 479 - Top = 111 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 479 - ExplicitTop = 111 ExplicitWidth = 164 Width = 164 end inherited eNombre: TcxDBTextEdit - Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 30 ExplicitWidth = 234 Width = 234 end inherited eNIFCIF: TcxDBTextEdit - Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 57 ExplicitWidth = 234 Width = 234 end inherited memRegistroMercantil: TcxDBMemo - Top = 84 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 84 ExplicitWidth = 234 Width = 234 end inherited cxDBImage1: TcxDBImage Left = 384 - Top = 267 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 - ExplicitTop = 267 ExplicitWidth = 230 ExplicitHeight = 142 Height = 142 Width = 230 end inherited eParamMargen: TcxDBSpinEdit - Top = 280 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 280 end inherited eParamTiempo: TcxDBCurrencyEdit - Top = 280 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 280 end inherited cbProvincia: TcxDBComboBox - Top = 358 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 358 ExplicitWidth = 91 Width = 91 end inherited cbPoblacion: TcxDBComboBox - Top = 385 Properties.OnInitPopup = nil Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 385 ExplicitWidth = 234 Width = 234 end inherited cbFormaPago: TcxComboBox - Top = 229 + Top = 457 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 229 + ExplicitTop = 457 ExplicitWidth = 202 Width = 202 end inherited cbTipoIVA: TcxComboBox - Top = 202 + Top = 430 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 202 + ExplicitTop = 430 ExplicitWidth = 202 Width = 202 end inherited cbPrioridad: TcxCheckBox - Top = 162 - ExplicitTop = 162 + Top = 390 + ExplicitTop = 390 ExplicitWidth = 363 Width = 363 end @@ -378,18 +337,6 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited ToolBar1: TToolBar Width = 660 ExplicitWidth = 660 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end end end end @@ -427,17 +374,4 @@ inherited fEditorEmpresa: TfEditorEmpresa Left = 440 Top = 208 end - object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList - Left = 248 - Top = 168 - object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel - GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET - GroupOptions.CaptionOptions.Font.Color = clWindowText - GroupOptions.CaptionOptions.Font.Height = -11 - GroupOptions.CaptionOptions.Font.Name = 'Tahoma' - GroupOptions.CaptionOptions.Font.Style = [fsBold] - GroupOptions.CaptionOptions.TextColor = clHighlight - GroupOptions.CaptionOptions.UseDefaultFont = False - end - end end diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas index 9ef8c20..05c852c 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas @@ -19,8 +19,6 @@ uses type TfEditorEmpresa = class(TfEditorDBItem, IEditorEmpresa) frViewEmpresa1: TfrViewEmpresa; - dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; - dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; TabSheet1: TTabSheet; frViewDatosBancarios1: TfrViewDatosBancarios; procedure FormShow(Sender: TObject); diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm index b93944e..9b4769b 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm @@ -1,23 +1,25 @@ inherited frViewEmpresa: TfrViewEmpresa - Width = 734 + Width = 803 Height = 548 OnShow = CustomViewShow - ExplicitWidth = 734 + ExplicitWidth = 803 ExplicitHeight = 548 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 734 + Width = 803 Height = 548 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False + LayoutLookAndFeel = dmBase.dxLayoutSkinLookAndFeel + ExplicitWidth = 734 DesignSize = ( - 734 + 803 548) object PngSpeedButton1: TPngSpeedButton - Left = 689 + Left = 758 Top = 305 Width = 23 Height = 22 @@ -26,7 +28,7 @@ inherited frViewEmpresa: TfrViewEmpresa PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object PngSpeedButton2: TPngSpeedButton - Left = 689 + Left = 758 Top = 277 Width = 23 Height = 22 @@ -36,11 +38,9 @@ inherited frViewEmpresa: TfrViewEmpresa end object eCalle: TcxDBTextEdit Left = 117 - Top = 347 + Top = 223 DataBinding.DataField = 'CALLE' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -53,16 +53,14 @@ inherited frViewEmpresa: TfrViewEmpresa StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 + TabOrder = 5 Width = 223 end object eCodigoPostal: TcxDBTextEdit - Left = 289 - Top = 374 + Left = 324 + Top = 250 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -75,16 +73,14 @@ inherited frViewEmpresa: TfrViewEmpresa StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 + TabOrder = 7 Width = 73 end object ePaginaWeb: TcxDBTextEdit - Left = 487 + Left = 522 Top = 220 DataBinding.DataField = 'PAGINA_WEB' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -101,12 +97,10 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 247 end object eMailParticular: TcxDBTextEdit - Left = 487 + Left = 522 Top = 193 DataBinding.DataField = 'EMAIL_2' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -123,12 +117,10 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 247 end object eMailTrabajo: TcxDBTextEdit - Left = 487 + Left = 522 Top = 166 DataBinding.DataField = 'EMAIL_1' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -146,12 +138,10 @@ inherited frViewEmpresa: TfrViewEmpresa end object cxDBMemo1: TcxDBMemo Left = 22 - Top = 458 + Top = 334 DataBinding.DataField = 'NOTAS' DataBinding.DataSource = DADataSource Enabled = False - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -164,17 +154,15 @@ inherited frViewEmpresa: TfrViewEmpresa StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 + TabOrder = 9 Height = 75 Width = 318 end object eTlfParticular: TcxDBTextEdit - Left = 487 + Left = 522 Top = 55 DataBinding.DataField = 'TELEFONO_2' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -191,12 +179,10 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 247 end object eTlfTrabajo: TcxDBTextEdit - Left = 487 + Left = 522 Top = 28 DataBinding.DataField = 'TELEFONO_1' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -213,12 +199,10 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 247 end object eTlfMovil: TcxDBTextEdit - Left = 487 + Left = 522 Top = 82 DataBinding.DataField = 'MOVIL_1' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -235,12 +219,10 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 247 end object eFax: TcxDBTextEdit - Left = 487 + Left = 522 Top = 109 DataBinding.DataField = 'FAX' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -261,8 +243,6 @@ inherited frViewEmpresa: TfrViewEmpresa Top = 28 DataBinding.DataField = 'NOMBRE' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -284,8 +264,6 @@ inherited frViewEmpresa: TfrViewEmpresa Top = 55 DataBinding.DataField = 'NIF_CIF' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -307,8 +285,6 @@ inherited frViewEmpresa: TfrViewEmpresa Top = 82 DataBinding.DataField = 'REGISTRO_MERCANTIL' DataBinding.DataSource = DADataSource - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -327,14 +303,12 @@ inherited frViewEmpresa: TfrViewEmpresa Width = 223 end object cxDBImage1: TcxDBImage - Left = 392 + Left = 427 Top = 277 DataBinding.DataField = 'LOGOTIPO' DataBinding.DataSource = DADataSource Enabled = False Properties.Stretch = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -350,18 +324,15 @@ inherited frViewEmpresa: TfrViewEmpresa end object eParamMargen: TcxDBSpinEdit Left = 117 - Top = 290 + Top = 166 DataBinding.DataField = 'PARAM_MARGEN' DataBinding.DataSource = DADataSource Enabled = False Properties.OnValidate = eParamMargenPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -371,19 +342,17 @@ inherited frViewEmpresa: TfrViewEmpresa StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 6 + TabOrder = 3 Width = 60 end object eParamTiempo: TcxDBCurrencyEdit Left = 240 - Top = 290 + Top = 166 DataBinding.DataField = 'PARAM_TIEMPO' DataBinding.DataSource = DADataSource Enabled = False Properties.Alignment.Horz = taRightJustify Properties.OnValidate = eParamTiempoPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -397,137 +366,119 @@ inherited frViewEmpresa: TfrViewEmpresa StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 7 - Width = 100 - end - object cbProvincia: TcxDBComboBox - Left = 117 - Top = 374 - DataBinding.DataField = 'PROVINCIA' - DataBinding.DataSource = DADataSource - Properties.ImmediatePost = True - Properties.ImmediateUpdateText = True - Properties.PostPopupValueOnTab = True - Properties.OnInitPopup = cbProvinciaPropertiesInitPopup - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - 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 = 9 - Width = 80 - end - object cbPoblacion: TcxDBComboBox - Left = 117 - Top = 401 - DataBinding.DataField = 'POBLACION' - DataBinding.DataSource = DADataSource - Properties.ImmediatePost = True - Properties.ImmediateUpdateText = True - Properties.PostPopupValueOnTab = True - Properties.OnInitPopup = cbPoblacionPropertiesInitPopup - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - 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 = 11 - Width = 223 - end - object cbFormaPago: TcxComboBox - Left = 182 - Top = 233 - Anchors = [akLeft, akTop, akRight] - Properties.DropDownListStyle = lsEditFixedList - Properties.DropDownRows = 25 - Properties.ImmediatePost = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - 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 = 5 - Width = 202 - end - object cbTipoIVA: TcxComboBox - Left = 182 - Top = 206 - Anchors = [akLeft, akTop, akRight] - Properties.DropDownListStyle = lsEditFixedList - Properties.DropDownRows = 25 - Properties.ImmediatePost = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D - 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 = 4 + Width = 100 + end + object cbProvincia: TcxDBComboBox + Left = 117 + Top = 250 + DataBinding.DataField = 'PROVINCIA' + DataBinding.DataSource = DADataSource + Properties.ImmediatePost = True + Properties.ImmediateUpdateText = True + Properties.PostPopupValueOnTab = True + Properties.OnInitPopup = cbProvinciaPropertiesInitPopup + 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 = 6 + Width = 80 + end + object cbPoblacion: TcxDBComboBox + Left = 117 + Top = 277 + DataBinding.DataField = 'POBLACION' + DataBinding.DataSource = DADataSource + Properties.ImmediatePost = True + Properties.ImmediateUpdateText = True + Properties.PostPopupValueOnTab = True + Properties.OnInitPopup = cbPoblacionPropertiesInitPopup + 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 = 8 + Width = 223 + end + object cbFormaPago: TcxComboBox + Left = 182 + Top = 505 + Anchors = [akLeft, akTop, akRight] + Properties.DropDownListStyle = lsEditFixedList + Properties.DropDownRows = 25 + Properties.ImmediatePost = True + 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 = 202 + end + object cbTipoIVA: TcxComboBox + Left = 182 + Top = 478 + Anchors = [akLeft, akTop, akRight] + Properties.DropDownListStyle = lsEditFixedList + Properties.DropDownRows = 25 + Properties.ImmediatePost = True + 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 = 11 Width = 202 end object cbPrioridad: TcxCheckBox Left = 22 - Top = 166 + Top = 438 Caption = 'Dar prioridad de datos comerciales a la empresa respecto a clien' + 'te, con el I.V.A y forma de pago siguiente:' Properties.MultiLine = True Properties.NullStyle = nssInactive - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 3 + TabOrder = 10 Transparent = True Width = 363 end @@ -567,28 +518,6 @@ inherited frViewEmpresa: TfrViewEmpresa ControlOptions.ShowBorder = False end end - object dxLayoutControl1Group14: TdxLayoutGroup - CaptionOptions.Text = 'Datos comerciales' - ButtonOptions.Buttons = <> - object dxLayoutControl1Item24: TdxLayoutItem - CaptionOptions.Text = 'New Item' - CaptionOptions.Visible = False - Control = cbPrioridad - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item16: TdxLayoutItem - CaptionOptions.Text = 'IVA por defecto:' - Offsets.Left = 20 - Control = cbTipoIVA - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item2: TdxLayoutItem - CaptionOptions.Text = 'Forma de pago por defecto:' - Offsets.Left = 20 - Control = cbFormaPago - ControlOptions.ShowBorder = False - end - end object dxLayoutControl1Group13: TdxLayoutGroup CaptionOptions.Text = 'Datos cat'#225'logo art'#237'culos' Enabled = False @@ -665,6 +594,28 @@ inherited frViewEmpresa: TfrViewEmpresa ControlOptions.ShowBorder = False end end + object dxLayoutControl1Group14: TdxLayoutGroup + CaptionOptions.Text = 'Datos comerciales' + ButtonOptions.Buttons = <> + object dxLayoutControl1Item24: TdxLayoutItem + CaptionOptions.Text = 'New Item' + CaptionOptions.Visible = False + Control = cbPrioridad + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item16: TdxLayoutItem + CaptionOptions.Text = 'IVA por defecto:' + Offsets.Left = 20 + Control = cbTipoIVA + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + CaptionOptions.Text = 'Forma de pago por defecto:' + Offsets.Left = 20 + Control = cbFormaPago + ControlOptions.ShowBorder = False + end + end end object dxLayoutControl1Group6: TdxLayoutGroup AlignHorz = ahClient @@ -837,7 +788,7 @@ inherited frViewEmpresa: TfrViewEmpresa Bitmap = {} end object OpenDialog1: TOpenDialog - Left = 384 - Top = 256 + Left = 424 + Top = 208 end end diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas index e247bd5..33f8d97 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas @@ -4,7 +4,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, uViewBase, ExtCtrls, StdCtrls, Buttons, DB, uDADataTable, + Dialogs, uViewBase, ExtCtrls, StdCtrls, Buttons, DB, uDADataTable, uDMBase, DBCtrls, Grids, DBGrids, uBizEmpresas, Mask, ComCtrls, uCustomView, JvComponent, JvFormAutoSize, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxMaskEdit, 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/GUIBase/GUIBase.dpk b/Source/GUIBase/GUIBase.dpk index 9d2b46d..96de60c 100644 --- a/Source/GUIBase/GUIBase.dpk +++ b/Source/GUIBase/GUIBase.dpk @@ -79,6 +79,6 @@ contains uViewRichEditor in 'uViewRichEditor.pas' {frViewRichEditor: TCustomView}, uDialogElegirEMail in 'uDialogElegirEMail.pas' {fDialogElegirEMail}, uViewDocumentos in 'uViewDocumentos.pas' {frViewDocumentos: TCustomView}, - uEditorColores in 'uEditorColores.pas' {frEditorColores}; + uEditorColores in 'uEditorColores.pas' {fEditorColores}; end. diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 23e1da5..bc923d2 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,32 +59,32 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 @@ -99,6 +99,9 @@
fEditorBasico
 +
fEditorColores
+ +
frEditorColores
 diff --git a/Source/GUIBase/uDialogElegirEMail.dfm b/Source/GUIBase/uDialogElegirEMail.dfm index 6fb6673..a876cc8 100644 --- a/Source/GUIBase/uDialogElegirEMail.dfm +++ b/Source/GUIBase/uDialogElegirEMail.dfm @@ -105,7 +105,7 @@ inherited fDialogElegirEMail: TfDialogElegirEMail Tag = 2 Left = 49 Top = 81 - Width = 202 + Width = 195 Height = 17 Caption = 'Usar la siguiente direcci'#243'n de correo:' TabOrder = 3 diff --git a/Source/GUIBase/uEditorColores.dfm b/Source/GUIBase/uEditorColores.dfm index a631983..bcdb7f9 100644 --- a/Source/GUIBase/uEditorColores.dfm +++ b/Source/GUIBase/uEditorColores.dfm @@ -1,30 +1,144 @@ -object frEditorColores: TfrEditorColores - Left = 0 - Top = 0 - Caption = 'Unidades de cada color del art'#237'culo' - ClientHeight = 183 - ClientWidth = 771 - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - OldCreateOrder = False - Position = poDesktopCenter +inherited fEditorColores: TfEditorColores + Caption = 'Edici'#243'n de cantidades por colores del art'#237'culo' + ClientHeight = 221 + ClientWidth = 767 + ExplicitWidth = 773 + ExplicitHeight = 253 PixelsPerInch = 96 TextHeight = 13 - object dxLayoutControl1: TdxLayoutControl - Left = 0 - Top = 0 - Width = 771 - Height = 183 - Align = alClient - TabOrder = 0 - TabStop = False + inherited Bevel2: TBevel + Width = 767 + ExplicitWidth = 767 + end + inherited Bevel3: TBevel + Top = 177 + Width = 767 + ExplicitTop = 177 + ExplicitWidth = 767 + end + inherited pnlBotones: TPanel + Top = 179 + Width = 767 + ExplicitTop = 179 + ExplicitWidth = 767 + inherited btnAceptar: TButton + Left = 595 + Top = 6 + ExplicitLeft = 595 + ExplicitTop = 6 + end + inherited btnCancelar: TButton + Left = 674 + Top = 6 + ExplicitLeft = 674 + ExplicitTop = 6 + end + end + inherited pnlHeader: TPanel + Width = 767 + ExplicitWidth = 767 + inherited lblInstruccion: TLabel + Width = 717 + Caption = 'Indique las cantidades por colores' + ExplicitWidth = 193 + end + inherited Label2: TLabel + Width = 692 + Height = 27 + end + end + inherited pnlCuerpo: TPanel + Width = 767 + Height = 111 + ExplicitWidth = 767 + ExplicitHeight = 111 + object Label1: TLabel + Left = 151 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 3:' + end + object Label3: TLabel + Left = 90 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 2:' + end + object Label6: TLabel + Left = 273 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 5:' + end + object Label7: TLabel + Left = 212 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 4:' + end + object Label8: TLabel + Left = 395 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 7:' + end + object Label9: TLabel + Left = 334 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 6:' + end + object Label4: TLabel + Left = 517 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 9:' + end + object Label5: TLabel + Left = 456 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 8:' + end + object Label10: TLabel + Left = 29 + Top = 20 + Width = 38 + Height = 13 + Caption = 'Color 1:' + end + object Label11: TLabel + Left = 575 + Top = 20 + Width = 44 + Height = 13 + Caption = 'Color 10:' + end + object Label12: TLabel + Left = 636 + Top = 20 + Width = 44 + Height = 13 + Caption = 'Color 11:' + end + object Label13: TLabel + Left = 697 + Top = 20 + Width = 44 + Height = 13 + Caption = 'Color 12:' + end object eColor1: TcxDBTextEdit - Left = 22 - Top = 105 + Left = 21 + Top = 39 DataBinding.DataField = 'COLOR1' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame @@ -42,174 +156,13 @@ object frEditorColores: TfrEditorColores StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 1 + TabOrder = 0 Width = 55 end - object eColor2: TcxDBTextEdit - Left = 83 - Top = 105 - 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 = 2 - Width = 55 - end - object eColor3: TcxDBTextEdit - Left = 144 - Top = 105 - DataBinding.DataField = 'COLOR3' - 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 = 3 - Width = 55 - end - object eColor4: TcxDBTextEdit - Left = 205 - Top = 105 - DataBinding.DataField = 'COLOR4' - 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 = 4 - Width = 55 - end - object eColor5: TcxDBTextEdit - Left = 266 - Top = 105 - DataBinding.DataField = 'COLOR5' - 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 = 5 - Width = 55 - end - object eColor6: TcxDBTextEdit - Left = 327 - Top = 105 - DataBinding.DataField = 'COLOR6' - 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 = 6 - Width = 55 - end - object eColor7: TcxDBTextEdit - Left = 388 - Top = 105 - DataBinding.DataField = 'COLOR7' - 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 = 7 - Width = 55 - end - object eColor8: TcxDBTextEdit - Left = 449 - Top = 105 - DataBinding.DataField = 'COLOR8' - 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 = 8 - Width = 55 - end - object eColor9: TcxDBTextEdit - Left = 510 - Top = 105 - DataBinding.DataField = 'COLOR9' + object eColor10: TcxDBTextEdit + Left = 570 + Top = 39 + DataBinding.DataField = 'COLOR10' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -229,10 +182,10 @@ object frEditorColores: TfrEditorColores TabOrder = 9 Width = 55 end - object eColor10: TcxDBTextEdit - Left = 571 - Top = 105 - DataBinding.DataField = 'COLOR10' + object eColor11: TcxDBTextEdit + Left = 631 + Top = 39 + DataBinding.DataField = 'COLOR11' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -252,10 +205,10 @@ object frEditorColores: TfrEditorColores TabOrder = 10 Width = 55 end - object eColor11: TcxDBTextEdit - Left = 632 - Top = 105 - DataBinding.DataField = 'COLOR11' + object eColor12: TcxDBTextEdit + Left = 692 + Top = 39 + DataBinding.DataField = 'COLOR12' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -275,10 +228,10 @@ object frEditorColores: TfrEditorColores TabOrder = 11 Width = 55 end - object eColor12: TcxDBTextEdit - Left = 693 - Top = 105 - DataBinding.DataField = 'COLOR12' + object eColor2: TcxDBTextEdit + Left = 82 + Top = 39 + DataBinding.DataField = 'COLOR2' DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -295,34 +248,14 @@ object frEditorColores: TfrEditorColores StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 + TabOrder = 1 Width = 55 end - object bAceptar: TButton - Left = 604 - Top = 144 - Width = 75 - Height = 25 - Align = alRight - Caption = 'Aceptar' - ModalResult = 1 - TabOrder = 13 - end - object bCancelar: TButton - Left = 685 - Top = 144 - Width = 75 - Height = 25 - Align = alRight - Cancel = True - Caption = 'Cancelar' - ModalResult = 2 - TabOrder = 14 - end - object edtDescripcion: TcxMemo - Left = 10 - Top = 10 - Enabled = False + object eColor3: TcxDBTextEdit + Left = 143 + Top = 39 + DataBinding.DataField = 'COLOR3' + DataBinding.DataSource = dsDataTable Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False @@ -332,141 +265,165 @@ object frEditorColores: TfrEditorColores 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 + TabOrder = 2 + Width = 55 end - object dxLayoutControl1Group_Root: TdxLayoutGroup - AlignHorz = ahLeft - AlignVert = avTop - CaptionOptions.Visible = False - ButtonOptions.Buttons = <> - Hidden = True - ShowBorder = False - object dxLayoutControl1Item15: TdxLayoutItem - Enabled = False - Control = edtDescripcion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group1: TdxLayoutGroup - CaptionOptions.Text = 'Colores' - ButtonOptions.Buttons = <> - LayoutDirection = ldHorizontal - object dxLayoutControl1Item1: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 1' - CaptionOptions.Layout = clTop - Control = eColor1 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item2: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 2' - CaptionOptions.Layout = clTop - Control = eColor2 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item3: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 3' - CaptionOptions.Layout = clTop - Control = eColor3 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item4: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 4' - CaptionOptions.Layout = clTop - Control = eColor4 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item5: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 5' - CaptionOptions.Layout = clTop - Control = eColor5 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item6: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 6' - CaptionOptions.Layout = clTop - Control = eColor6 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item7: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 7' - CaptionOptions.Layout = clTop - Control = eColor7 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item8: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 8' - CaptionOptions.Layout = clTop - Control = eColor8 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item9: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 9' - CaptionOptions.Layout = clTop - Control = eColor9 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item10: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 10' - CaptionOptions.Layout = clTop - Control = eColor10 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item11: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 11' - CaptionOptions.Layout = clTop - Control = eColor11 - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item12: TdxLayoutItem - CaptionOptions.AlignHorz = taCenter - CaptionOptions.Text = 'Color 12' - CaptionOptions.Layout = clTop - Control = eColor12 - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Group2: TdxLayoutGroup - CaptionOptions.Visible = False - ButtonOptions.Buttons = <> - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item13: TdxLayoutItem - AlignHorz = ahRight - CaptionOptions.Text = 'Button1' - CaptionOptions.Visible = False - Control = bAceptar - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item14: TdxLayoutItem - AlignHorz = ahRight - CaptionOptions.Text = 'Button2' - CaptionOptions.Visible = False - Control = bCancelar - ControlOptions.ShowBorder = False - end - end + object eColor4: TcxDBTextEdit + Left = 204 + Top = 39 + DataBinding.DataField = 'COLOR4' + 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 = 3 + Width = 55 + end + object eColor5: TcxDBTextEdit + Left = 265 + Top = 39 + DataBinding.DataField = 'COLOR5' + 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 = 4 + Width = 55 + end + object eColor6: TcxDBTextEdit + Left = 326 + Top = 39 + DataBinding.DataField = 'COLOR6' + 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 = 5 + Width = 55 + end + object eColor7: TcxDBTextEdit + Left = 387 + Top = 39 + DataBinding.DataField = 'COLOR7' + 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 = 6 + Width = 55 + end + object eColor8: TcxDBTextEdit + Left = 448 + Top = 39 + DataBinding.DataField = 'COLOR8' + 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 = 7 + Width = 55 + end + object eColor9: TcxDBTextEdit + Left = 509 + Top = 39 + DataBinding.DataField = 'COLOR9' + 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 = 8 + Width = 55 + end + end + inherited ActionList1: TActionList + Left = 104 + Top = 0 + inherited actAceptar: TAction + OnExecute = actAceptarExecute + end + inherited actCancelar: TAction + OnExecute = actCancelarExecute end end object dsDataTable: TDADataSource + Left = 136 end end diff --git a/Source/GUIBase/uEditorColores.pas b/Source/GUIBase/uEditorColores.pas index c470d27..94b1242 100644 --- a/Source/GUIBase/uEditorColores.pas +++ b/Source/GUIBase/uEditorColores.pas @@ -4,104 +4,130 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, dxLayoutControl, cxControls, DB, uDAInterfaces, uDADataTable, - cxContainer, cxEdit, cxTextEdit, cxDBEdit, StdCtrls, cxMemo, cxGraphics, - cxLookAndFeels, cxLookAndFeelPainters, dxLayoutcxEditAdapters; + Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls, cxGraphics, cxControls, + cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit, cxTextEdit, + cxDBEdit, DB, uDAInterfaces, uDADataTable; type - TfrEditorColores = class(TForm) - dxLayoutControl1Group_Root: TdxLayoutGroup; - dxLayoutControl1: TdxLayoutControl; - dxLayoutControl1Item1: TdxLayoutItem; + TfEditorColores = class(TfDialogBase) eColor1: TcxDBTextEdit; - dsDataTable: TDADataSource; - dxLayoutControl1Group1: TdxLayoutGroup; - dxLayoutControl1Item2: TdxLayoutItem; eColor2: TcxDBTextEdit; - dxLayoutControl1Item3: TdxLayoutItem; eColor3: TcxDBTextEdit; - dxLayoutControl1Item4: TdxLayoutItem; eColor4: TcxDBTextEdit; - dxLayoutControl1Item5: TdxLayoutItem; eColor5: TcxDBTextEdit; - dxLayoutControl1Item6: TdxLayoutItem; eColor6: TcxDBTextEdit; - dxLayoutControl1Item7: TdxLayoutItem; eColor7: TcxDBTextEdit; - dxLayoutControl1Item8: TdxLayoutItem; eColor8: TcxDBTextEdit; - dxLayoutControl1Item9: TdxLayoutItem; eColor9: TcxDBTextEdit; - dxLayoutControl1Item10: TdxLayoutItem; eColor10: TcxDBTextEdit; - dxLayoutControl1Item11: TdxLayoutItem; eColor11: TcxDBTextEdit; - dxLayoutControl1Item12: TdxLayoutItem; eColor12: TcxDBTextEdit; - bAceptar: TButton; - dxLayoutControl1Item13: TdxLayoutItem; - bCancelar: TButton; - dxLayoutControl1Item14: TdxLayoutItem; - dxLayoutControl1Group2: TdxLayoutGroup; - dxLayoutControl1Item15: TdxLayoutItem; - edtDescripcion: TcxMemo; + dsDataTable: TDADataSource; + Label1: TLabel; + Label3: TLabel; + Label4: TLabel; + Label5: TLabel; + Label6: TLabel; + Label7: TLabel; + Label8: TLabel; + Label9: TLabel; + Label10: TLabel; + Label11: TLabel; + Label12: TLabel; + Label13: TLabel; + procedure actAceptarExecute(Sender: TObject); + procedure actCancelarExecute(Sender: TObject); private - { Private declarations } + FReferencia : String; + FDescripcion : String; + function GetTotal: Double; + procedure SetDescripcion(const Value: String); + procedure SetReferencia(const Value: String); + procedure PonerTituloArticulo; public - function GetTotal: Double; + property Total : Double read GetTotal; + property Referencia : String read FReferencia write SetReferencia; + property Descripcion : String read FDescripcion write SetDescripcion; end; -var - frEditorColores: TfrEditorColores; - implementation {$R *.dfm} -{ TfrEditorColores } +{ TfEditorColores } -function TfrEditorColores.GetTotal: Double; -var - Total: Double; +procedure TfEditorColores.actAceptarExecute(Sender: TObject); begin - Total := 0; + inherited; + ModalResult := mrOk; +end; + +procedure TfEditorColores.actCancelarExecute(Sender: TObject); +begin + inherited; + ModalResult := mrCancel; +end; + +function TfEditorColores.GetTotal: Double; +var + ATotal: Double; +begin + ATotal := 0; if not VarIsNull(eColor1.EditValue) then - Total := Total + eColor1.EditValue; + ATotal := ATotal + eColor1.EditValue; if not VarIsNull(eColor2.EditValue) then - Total := Total + eColor2.EditValue; + ATotal := ATotal + eColor2.EditValue; if not VarIsNull(eColor3.EditValue) then - Total := Total + eColor3.EditValue; + ATotal := ATotal + eColor3.EditValue; if not VarIsNull(eColor4.EditValue) then - Total := Total + eColor4.EditValue; + ATotal := ATotal + eColor4.EditValue; if not VarIsNull(eColor5.EditValue) then - Total := Total + eColor5.EditValue; + ATotal := ATotal + eColor5.EditValue; if not VarIsNull(eColor6.EditValue) then - Total := Total + eColor6.EditValue; + ATotal := ATotal + eColor6.EditValue; if not VarIsNull(eColor7.EditValue) then - Total := Total + eColor7.EditValue; + ATotal := ATotal + eColor7.EditValue; if not VarIsNull(eColor8.EditValue) then - Total := Total + eColor8.EditValue; + ATotal := ATotal + eColor8.EditValue; if not VarIsNull(eColor9.EditValue) then - Total := Total + eColor9.EditValue; + ATotal := ATotal + eColor9.EditValue; if not VarIsNull(eColor10.EditValue) then - Total := Total + eColor10.EditValue; + ATotal := ATotal + eColor10.EditValue; if not VarIsNull(eColor11.EditValue) then - Total := Total + eColor11.EditValue; + ATotal := ATotal + eColor11.EditValue; if not VarIsNull(eColor12.EditValue) then - Total := Total + eColor12.EditValue; + ATotal := ATotal + eColor12.EditValue; - Result := Total; + Result := ATotal; +end; + + +procedure TfEditorColores.PonerTituloArticulo; +begin + Label2.Caption := FReferencia + ' ' + FDescripcion; +end; + +procedure TfEditorColores.SetDescripcion(const Value: String); +begin + FDescripcion := Value; + PonerTituloArticulo; +end; + +procedure TfEditorColores.SetReferencia(const Value: String); +begin + FReferencia := Value; + PonerTituloArticulo; end; end. diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 48bbe6f..3c5ed1a 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -77,10 +77,6 @@ inherited fEditorDBItem: TfEditorDBItem TabOrder = 2 object pagGeneral: TTabSheet Caption = 'General' - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res and b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res differ diff --git a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas index e2ac039..9ebdabe 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas @@ -145,30 +145,30 @@ begin if Assigned(ADetalles) then begin ADetallesAux := (ADetalles as IBizDEtallesAlbaranCliente); - 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 - if ADetallesAux.DetalleColores.DataTable.Editing then - ADetallesAux.DetalleColores.DataTable.Post; + with TfEditorColores.Create(NIL) do + try + dsDataTable.DataTable := ADetallesAux.DetalleColores.DataTable; + Referencia := ADetallesAux.REFERENCIA; + Descripcion := ADetallesAux.CONCEPTO; - if not ADetallesAux.DataTable.Editing then - ADetallesAux.DataTable.Edit; - ADetallesAux.CANTIDAD := GetTotal; - if ADetallesAux.DataTable.Editing then - ADetallesAux.DataTable.post; - - ActualizarTotales(ADetalles); - end - else - ADetallesAux.DetalleColores.DataTable.Cancel; + if (ShowModal = mrOK) then + begin + if ADetallesAux.DetalleColores.DataTable.Editing then + ADetallesAux.DetalleColores.DataTable.Post; - Free; - end; + if not ADetallesAux.DataTable.Editing then + ADetallesAux.DataTable.Edit; + ADetallesAux.CANTIDAD := Total; + if ADetallesAux.DataTable.Editing then + ADetallesAux.DataTable.post; + + ActualizarTotales(ADetalles); + end + else + ADetallesAux.DetalleColores.DataTable.Cancel; + finally + Release; + end; end; end; diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res and b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.res differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 3c5dea6..22f34ab 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -19,7 +19,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente 542) object Label1: TLabel Left = 22 - Top = 507 + Top = 443 Width = 299 Height = 26 Caption = @@ -30,7 +30,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object edtFechaAlbaran: TcxDBDateEdit Left = 116 - Top = 82 + Top = 18 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ALBARAN' DataBinding.DataSource = DADataSource @@ -59,8 +59,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Width = 336 end object memObservaciones: TcxDBMemo - Left = 470 - Top = 356 + Left = 22 + Top = 510 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -82,7 +82,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eReferencia: TcxDBTextEdit Left = 116 - Top = 28 + Top = -36 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = DADataSource @@ -111,7 +111,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eCalle: TcxDBTextEdit Left = 116 - Top = 281 + Top = 217 DataBinding.DataField = 'CALLE' DataBinding.DataSource = DADataSource Enabled = False @@ -135,7 +135,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eCodigoPostal: TcxDBTextEdit Left = 375 - Top = 308 + Top = 244 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = DADataSource Enabled = False @@ -159,7 +159,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object ePersonaContacto: TcxDBTextEdit Left = 116 - Top = 362 + Top = 298 DataBinding.DataField = 'PERSONA_CONTACTO' DataBinding.DataSource = DADataSource Enabled = False @@ -184,7 +184,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eTlfTrabajo: TcxDBTextEdit Left = 116 - Top = 389 + Top = 325 DataBinding.DataField = 'TELEFONO' DataBinding.DataSource = DADataSource Enabled = False @@ -208,7 +208,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object bElegirDireccion: TBitBtn Left = 268 - Top = 416 + Top = 352 Width = 172 Height = 23 Action = actElegirDireccion @@ -218,7 +218,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object Button1: TButton Left = 308 - Top = 109 + Top = 45 Width = 132 Height = 23 Action = actVerPedidoCli @@ -227,7 +227,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eReferenciaPedidoCli: TcxTextEdit Left = 116 - Top = 109 + Top = 45 Anchors = [akLeft, akTop, akRight] Enabled = False Properties.ReadOnly = False @@ -254,7 +254,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbFormaPago: TcxDBLookupComboBox Left = 116 - Top = 168 + Top = 104 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource Properties.KeyFieldNames = 'ID' @@ -288,7 +288,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object bFormasPago: TButton Left = 308 - Top = 168 + Top = 104 Width = 132 Height = 23 Caption = 'Ver las formas de pago...' @@ -297,7 +297,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eFechaRecepcion: TcxDBDateEdit Left = 604 - Top = 299 + Top = 235 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_RECEPCION' DataBinding.DataSource = DADataSource @@ -327,7 +327,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbConAlmacen: TCheckBox Left = 32 - Top = 475 + Top = 411 Width = 179 Height = 21 Caption = 'Asociar este albar'#225'n al almac'#233'n:' @@ -337,7 +337,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbAlmacen: TcxDBLookupComboBox Left = 217 - Top = 475 + Top = 411 DataBinding.DataField = 'ID_ALMACEN' DataBinding.DataSource = DADataSource Enabled = False @@ -372,7 +372,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eRefFacturaCli: TcxDBTextEdit Left = 116 - Top = 224 + Top = 160 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REF_FACTURA' DataBinding.DataSource = DADataSource @@ -401,7 +401,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eFechaPrevista: TcxDBDateEdit Left = 604 - Top = 245 + Top = 181 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_PREVISTA_ENVIO' DataBinding.DataSource = DADataSource @@ -433,7 +433,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eRefCliente: TcxDBTextEdit Left = 116 - Top = 55 + Top = -9 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_CLIENTE' DataBinding.DataSource = DADataSource @@ -463,7 +463,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object eFechaEnvio: TcxDBDateEdit Left = 604 - Top = 272 + Top = 208 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ENVIO' DataBinding.DataSource = DADataSource @@ -493,7 +493,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbProvincia: TcxDBComboBox Left = 116 - Top = 308 + Top = 244 DataBinding.DataField = 'PROVINCIA' DataBinding.DataSource = DADataSource Enabled = False @@ -523,7 +523,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbPoblacion: TcxDBComboBox Left = 116 - Top = 335 + Top = 271 DataBinding.DataField = 'POBLACION' DataBinding.DataSource = DADataSource Enabled = False @@ -553,7 +553,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end inline frViewDatosYSeleccionClienteAlbaran1: TfrViewDatosYSeleccionClienteAlbaran Left = 470 - Top = 28 + Top = -36 Width = 406 Height = 181 Font.Charset = DEFAULT_CHARSET @@ -565,7 +565,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente TabOrder = 18 ReadOnly = False ExplicitLeft = 470 - ExplicitTop = 28 + ExplicitTop = -36 ExplicitWidth = 406 ExplicitHeight = 181 inherited dxLayoutControl1: TdxLayoutControl @@ -645,7 +645,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object cbCuentaBancaria: TcxDBComboBox Left = 116 - Top = 197 + Top = 133 DataBinding.DataField = 'DATOS_BANCARIOS' DataBinding.DataSource = DADataSource Properties.DropDownListStyle = lsFixedList @@ -671,256 +671,262 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente CaptionOptions.Visible = False ButtonOptions.Buttons = <> Hidden = True - LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group6: TdxLayoutGroup - AlignHorz = ahClient - CaptionOptions.Visible = False + object dxLayoutControl1Group14: TdxLayoutGroup + CaptionOptions.Text = 'Hidden Group' ButtonOptions.Buttons = <> Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group1: TdxLayoutGroup + object dxLayoutControl1Group6: TdxLayoutGroup AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = 'Datos del albar'#225'n' + CaptionOptions.Visible = False ButtonOptions.Buttons = <> - object dxLayoutControl1Item3: TdxLayoutItem - CaptionOptions.Text = 'Referencia:' - Control = eReferencia - ControlOptions.ShowBorder = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group1: TdxLayoutGroup + AlignHorz = ahClient + AlignVert = avTop + CaptionOptions.Text = 'Datos del albar'#225'n' + ButtonOptions.Buttons = <> + object dxLayoutControl1Item3: TdxLayoutItem + CaptionOptions.Text = 'Referencia:' + Control = eReferencia + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item23: TdxLayoutItem + CaptionOptions.Text = 'Ref. cliente:' + Enabled = False + Visible = False + Control = eRefCliente + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + CaptionOptions.Text = 'Fecha del albar'#225'n:' + Control = edtFechaAlbaran + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group5: TdxLayoutGroup + CaptionOptions.Visible = False + Enabled = False + Visible = False + ButtonOptions.Buttons = <> + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item7: TdxLayoutItem + AlignHorz = ahClient + CaptionOptions.Text = 'Ref. del pedido:' + Enabled = False + Control = eReferenciaPedidoCli + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + AlignHorz = ahRight + CaptionOptions.Text = 'Button1' + CaptionOptions.Visible = False + Enabled = False + Control = Button1 + ControlOptions.ShowBorder = False + end + end end - object dxLayoutControl1Item23: TdxLayoutItem - CaptionOptions.Text = 'Ref. cliente:' - Enabled = False - Visible = False - Control = eRefCliente - ControlOptions.ShowBorder = False + object dxLayoutControl1Group16: TdxLayoutGroup + CaptionOptions.Text = 'Forma de pago' + ButtonOptions.Buttons = <> + object dxLayoutControl1Group13: TdxLayoutGroup + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item4: TdxLayoutItem + AlignHorz = ahClient + CaptionOptions.Text = 'Forma de pago' + Control = cbFormaPago + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item15: TdxLayoutItem + AlignHorz = ahRight + CaptionOptions.Visible = False + Control = bFormasPago + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Item17: TdxLayoutItem + CaptionOptions.Text = 'Cuenta bancaria:' + Control = cbCuentaBancaria + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item22: TdxLayoutItem + CaptionOptions.Text = 'Ref. factura:' + Control = eRefFacturaCli + ControlOptions.ShowBorder = False + end end - object dxLayoutControl1Item2: TdxLayoutItem - CaptionOptions.Text = 'Fecha del albar'#225'n:' - Control = edtFechaAlbaran - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group5: TdxLayoutGroup - CaptionOptions.Visible = False + object dxLayoutControl1Group8: TdxLayoutGroup + AlignHorz = ahClient + AlignVert = avTop + CaptionOptions.Text = 'Direcci'#243'n de entrega' Enabled = False Visible = False ButtonOptions.Buttons = <> - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item7: TdxLayoutItem - AlignHorz = ahClient - CaptionOptions.Text = 'Ref. del pedido:' + object dxLayoutControl1Item8: TdxLayoutItem + CaptionOptions.Text = 'Calle:' Enabled = False - Control = eReferenciaPedidoCli + Control = eCalle ControlOptions.ShowBorder = False end - object dxLayoutControl1Item5: TdxLayoutItem - AlignHorz = ahRight - CaptionOptions.Text = 'Button1' + object dxLayoutControl1Group4: TdxLayoutGroup CaptionOptions.Visible = False Enabled = False - Control = Button1 - ControlOptions.ShowBorder = False + ButtonOptions.Buttons = <> + Hidden = True + ShowBorder = False + object dxLayoutControl1Group9: TdxLayoutGroup + CaptionOptions.Visible = False + Enabled = False + ButtonOptions.Buttons = <> + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item9: TdxLayoutItem + AlignHorz = ahClient + CaptionOptions.Text = 'Provincia:' + Enabled = False + Control = cbProvincia + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item10: TdxLayoutItem + AlignHorz = ahRight + CaptionOptions.Text = 'C.P.:' + Enabled = False + Control = eCodigoPostal + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Item11: TdxLayoutItem + CaptionOptions.Text = 'Poblaci'#243'n:' + Enabled = False + Control = cbPoblacion + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item12: TdxLayoutItem + CaptionOptions.Text = 'Pers. de contacto:' + Enabled = False + Control = ePersonaContacto + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item13: TdxLayoutItem + CaptionOptions.Text = 'Tel'#233'fono:' + Enabled = False + Control = eTlfTrabajo + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item14: TdxLayoutItem + AlignHorz = ahRight + CaptionOptions.Visible = False + Enabled = False + Control = bElegirDireccion + ControlOptions.ShowBorder = False + end end end - end - object dxLayoutControl1Group16: TdxLayoutGroup - CaptionOptions.Text = 'Forma de pago' - ButtonOptions.Buttons = <> - object dxLayoutControl1Group13: TdxLayoutGroup - CaptionOptions.Visible = False - ButtonOptions.Buttons = <> - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item4: TdxLayoutItem - AlignHorz = ahClient - CaptionOptions.Text = 'Forma de pago' - Control = cbFormaPago - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item15: TdxLayoutItem - AlignHorz = ahRight - CaptionOptions.Visible = False - Control = bFormasPago - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Item17: TdxLayoutItem - CaptionOptions.Text = 'Cuenta bancaria:' - Control = cbCuentaBancaria - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item22: TdxLayoutItem - CaptionOptions.Text = 'Ref. factura:' - Control = eRefFacturaCli - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Group8: TdxLayoutGroup - AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = 'Direcci'#243'n de entrega' - Enabled = False - Visible = False - ButtonOptions.Buttons = <> - object dxLayoutControl1Item8: TdxLayoutItem - CaptionOptions.Text = 'Calle:' - Enabled = False - Control = eCalle - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group4: TdxLayoutGroup - CaptionOptions.Visible = False + object dxLayoutControl1Group11: TdxLayoutGroup + CaptionOptions.Text = 'Almac'#233'n de origen' Enabled = False + Visible = False ButtonOptions.Buttons = <> - Hidden = True - ShowBorder = False - object dxLayoutControl1Group9: TdxLayoutGroup + object dxLayoutControl1Group10: TdxLayoutGroup CaptionOptions.Visible = False Enabled = False ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item9: TdxLayoutItem + object dxLayoutControl1Item19: TdxLayoutItem + CaptionOptions.Visible = False + Enabled = False + Offsets.Left = 10 + Control = cbConAlmacen + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item20: TdxLayoutItem AlignHorz = ahClient - CaptionOptions.Text = 'Provincia:' Enabled = False - Control = cbProvincia - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item10: TdxLayoutItem - AlignHorz = ahRight - CaptionOptions.Text = 'C.P.:' - Enabled = False - Control = eCodigoPostal + Control = cbAlmacen ControlOptions.ShowBorder = False end end - object dxLayoutControl1Item11: TdxLayoutItem - CaptionOptions.Text = 'Poblaci'#243'n:' - Enabled = False - Control = cbPoblacion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item12: TdxLayoutItem - CaptionOptions.Text = 'Pers. de contacto:' - Enabled = False - Control = ePersonaContacto - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item13: TdxLayoutItem - CaptionOptions.Text = 'Tel'#233'fono:' - Enabled = False - Control = eTlfTrabajo - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item14: TdxLayoutItem - AlignHorz = ahRight + object dxLayoutControl1Item18: TdxLayoutItem CaptionOptions.Visible = False Enabled = False - Control = bElegirDireccion - ControlOptions.ShowBorder = False - end - end - end - object dxLayoutControl1Group11: TdxLayoutGroup - CaptionOptions.Text = 'Almac'#233'n de origen' - Enabled = False - Visible = False - ButtonOptions.Buttons = <> - object dxLayoutControl1Group10: TdxLayoutGroup - CaptionOptions.Visible = False - Enabled = False - ButtonOptions.Buttons = <> - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item19: TdxLayoutItem - CaptionOptions.Visible = False - Enabled = False - Offsets.Left = 10 - Control = cbConAlmacen + Offsets.Bottom = 5 + Offsets.Top = 5 + Control = Label1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end - object dxLayoutControl1Item20: TdxLayoutItem - AlignHorz = ahClient - Enabled = False - Control = cbAlmacen + end + end + object dxLayoutControl1Group3: TdxLayoutGroup + AlignHorz = ahClient + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> + Hidden = True + ShowBorder = False + object dxLayoutControl1Group2: TdxLayoutGroup + CaptionOptions.Text = 'Datos del cliente' + ButtonOptions.Buttons = <> + object dxLayoutControl1Item1: TdxLayoutItem + CaptionOptions.Text = 'New Item' + CaptionOptions.Visible = False + Control = frViewDatosYSeleccionClienteAlbaran1 + ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end end - object dxLayoutControl1Item18: TdxLayoutItem - CaptionOptions.Visible = False + object dxLayoutControl1Group12: TdxLayoutGroup + CaptionOptions.Text = 'Fechas de envio y recepci'#243'n' Enabled = False - Offsets.Bottom = 5 - Offsets.Top = 5 - Control = Label1 - ControlOptions.AutoColor = True - ControlOptions.ShowBorder = False + Visible = False + ButtonOptions.Buttons = <> + object dxLayoutControl1Item24: TdxLayoutItem + AlignHorz = ahClient + CaptionOptions.Text = 'Fecha prevista de envio:' + Enabled = False + Offsets.Left = 10 + Control = eFechaPrevista + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item21: TdxLayoutItem + CaptionOptions.Text = 'Fecha de envio:' + Enabled = False + Offsets.Left = 10 + Control = eFechaEnvio + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item16: TdxLayoutItem + AlignHorz = ahClient + AlignVert = avTop + CaptionOptions.Text = 'Fecha de recepci'#243'n:' + Enabled = False + Offsets.Left = 10 + Control = eFechaRecepcion + ControlOptions.ShowBorder = False + end end end end - object dxLayoutControl1Group3: TdxLayoutGroup - AlignHorz = ahClient - CaptionOptions.Visible = False + object dxLayoutControl1Group7: TdxLayoutGroup + AlignVert = avClient + CaptionOptions.Text = 'Observaciones' ButtonOptions.Buttons = <> - Hidden = True - ShowBorder = False - object dxLayoutControl1Group2: TdxLayoutGroup - CaptionOptions.Text = 'Datos del cliente' - ButtonOptions.Buttons = <> - object dxLayoutControl1Item1: TdxLayoutItem - CaptionOptions.Text = 'New Item' - CaptionOptions.Visible = False - Control = frViewDatosYSeleccionClienteAlbaran1 - ControlOptions.AutoColor = True - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Group12: TdxLayoutGroup - CaptionOptions.Text = 'Fechas de envio y recepci'#243'n' - Enabled = False - Visible = False - ButtonOptions.Buttons = <> - object dxLayoutControl1Item24: TdxLayoutItem - AlignHorz = ahClient - CaptionOptions.Text = 'Fecha prevista de envio:' - Enabled = False - Offsets.Left = 10 - Control = eFechaPrevista - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item21: TdxLayoutItem - CaptionOptions.Text = 'Fecha de envio:' - Enabled = False - Offsets.Left = 10 - Control = eFechaEnvio - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item16: TdxLayoutItem - AlignHorz = ahClient - AlignVert = avTop - CaptionOptions.Text = 'Fecha de recepci'#243'n:' - Enabled = False - Offsets.Left = 10 - Control = eFechaRecepcion - ControlOptions.ShowBorder = False - end - end - object dxLayoutControl1Group7: TdxLayoutGroup + object dxLayoutControl1Item6: TdxLayoutItem AlignVert = avClient - CaptionOptions.Text = 'Observaciones' - ButtonOptions.Buttons = <> - object dxLayoutControl1Item6: TdxLayoutItem - AlignVert = avClient - Control = memObservaciones - ControlOptions.ShowBorder = False - end + Control = memObservaciones + ControlOptions.ShowBorder = False end end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas index 249a51f..889680c 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas @@ -106,6 +106,7 @@ type dxLayoutControl1Group13: TdxLayoutGroup; dxLayoutControl1Item17: TdxLayoutItem; cbCuentaBancaria: TcxDBComboBox; + dxLayoutControl1Group14: TdxLayoutGroup; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure actElegirDireccionExecute(Sender: TObject); diff --git a/Source/Modulos/Articulos/Controller/Articulos_controller.res b/Source/Modulos/Articulos/Controller/Articulos_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Articulos/Controller/Articulos_controller.res and b/Source/Modulos/Articulos/Controller/Articulos_controller.res differ diff --git a/Source/Modulos/Articulos/Data/Articulos_data.res b/Source/Modulos/Articulos/Data/Articulos_data.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Articulos/Data/Articulos_data.res and b/Source/Modulos/Articulos/Data/Articulos_data.res differ diff --git a/Source/Modulos/Articulos/Model/Articulos_model.res b/Source/Modulos/Articulos/Model/Articulos_model.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Articulos/Model/Articulos_model.res and b/Source/Modulos/Articulos/Model/Articulos_model.res differ diff --git a/Source/Modulos/Articulos/Views/Articulos_view.res b/Source/Modulos/Articulos/Views/Articulos_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Articulos/Views/Articulos_view.res and b/Source/Modulos/Articulos/Views/Articulos_view.res differ diff --git a/Source/Modulos/Contactos/Controller/Contactos_controller.res b/Source/Modulos/Contactos/Controller/Contactos_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Contactos/Controller/Contactos_controller.res and b/Source/Modulos/Contactos/Controller/Contactos_controller.res differ diff --git a/Source/Modulos/Contactos/Data/Contactos_data.res b/Source/Modulos/Contactos/Data/Contactos_data.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Contactos/Data/Contactos_data.res and b/Source/Modulos/Contactos/Data/Contactos_data.res differ diff --git a/Source/Modulos/Contactos/Model/Contactos_model.res b/Source/Modulos/Contactos/Model/Contactos_model.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Contactos/Model/Contactos_model.res and b/Source/Modulos/Contactos/Model/Contactos_model.res differ diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ diff --git a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.res b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.res and b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.res differ diff --git a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.res b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.res and b/Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.res differ diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res and b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res differ diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res and b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res differ diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res and b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res differ diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res and b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res differ diff --git a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.res b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.res and b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.res differ diff --git a/Source/Modulos/Gestor de informes/Model/GestorInformes_model.res b/Source/Modulos/Gestor de informes/Model/GestorInformes_model.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Gestor de informes/Model/GestorInformes_model.res and b/Source/Modulos/Gestor de informes/Model/GestorInformes_model.res differ diff --git a/Source/Modulos/Gestor de informes/Plugin/GestorInformes_plugin.res b/Source/Modulos/Gestor de informes/Plugin/GestorInformes_plugin.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Gestor de informes/Plugin/GestorInformes_plugin.res and b/Source/Modulos/Gestor de informes/Plugin/GestorInformes_plugin.res differ diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res and b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res differ diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res and b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res differ diff --git a/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.res b/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.res and b/Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.res differ diff --git a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.res b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.res and b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.res differ diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res and b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.res differ diff --git a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.res b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.res and b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.res differ diff --git a/Source/Modulos/Relaciones/Presupuestos de cliente - Facturas de cliente/PreCli_FacCli_relation.res b/Source/Modulos/Relaciones/Presupuestos de cliente - Facturas de cliente/PreCli_FacCli_relation.res index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Relaciones/Presupuestos de cliente - Facturas de cliente/PreCli_FacCli_relation.res and b/Source/Modulos/Relaciones/Presupuestos de cliente - Facturas de cliente/PreCli_FacCli_relation.res differ