From 65d9717de36b89113c11ae33838f4e83708af773 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 19 Sep 2024 19:17:21 +0000 Subject: [PATCH] Version Firma digital, plantillas, agrupacion por vendedor, arreglo duplicar presupupuesto fecha vencimiento recalculada, informe de pedido cambiar referencia segun indicaciones joseluis git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@691 f4e31baf-9722-1c47-927c-6f952f962d4b --- .../16x16/Invoice-orange.jpg | Bin 0 -> 617 bytes .../Facturas de cliente/16x16/Invoice-red.jpg | Bin 0 -> 651 bytes Source/Base/Base.res | Bin 4748 -> 384 bytes Source/GUIBase/GUIBase.dproj | 56 +- Source/GUIBase/uEditorBase.dfm | 7 +- Source/GUIBase/uEditorBase.pas | 17 +- Source/GUIBase/uEditorDBItem.dfm | 33 + Source/GUIBase/uEditorDBItem.pas | 25 +- Source/GUIBase/uViewBase.pas | 20 +- Source/Informes/5/3/InfPedidoProveedor.fr3 | 4 +- Source/Informes/InfPedidoProveedor.fr3 | 4 +- .../Views/uViewContratosCliente.dfm | 10 + .../Views/uViewContratosCliente.pas | 26 + .../Views/uEditorFacturaCliente.dfm | 43 +- .../Views/uEditorFacturaCliente.pas | 2 +- .../uPresupuestosClienteController.pas | 5 +- .../Views/uEditorPresupuestoCliente.dfm | 52 +- .../Views/uViewPresupuestoCliente.dfm | 12 - Source/Servidor/FactuGES_Server.dproj | 589 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- Source/Servidor/FactuGES_Server.res | Bin 23348 -> 23356 bytes 21 files changed, 496 insertions(+), 411 deletions(-) create mode 100644 Resources/Iconos/Facturas de cliente/16x16/Invoice-orange.jpg create mode 100644 Resources/Iconos/Facturas de cliente/16x16/Invoice-red.jpg diff --git a/Resources/Iconos/Facturas de cliente/16x16/Invoice-orange.jpg b/Resources/Iconos/Facturas de cliente/16x16/Invoice-orange.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d6e7dbf843178f9346fb9e61f34d736c4bff8d5a GIT binary patch literal 617 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%2nfSFN{fk}{&S&;Gn5r%vQ z24+T}BN2d!m5rSdU67H9nN@&+iHV7k1)-dYnUO`1Rfxe+m`%~pSp;Y*BQrBIE8I9n zCP7CbW(Gx;L?c$iKqaT3=|x9TXc7$y{xH4+hNW-2aDNtcc-}V zB`sa%@X$hOvP8%6>ydl*xh2lgGfH5&RrWLXZSM(r*)uDywTts9w`^`y+4gbY#lHgK zi7YSmUVfPV`eEqwz}`DqDyi8Fir)DilaAHTTHU68yz}Xt{u-ZW_ss2l`W`;t_JCLI z;fp}&*OAMXo1t*m(jsq%GPc@W2RH9 S%Ir?#D;ldUe_eU~|0V#<|E|se literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Facturas de cliente/16x16/Invoice-red.jpg b/Resources/Iconos/Facturas de cliente/16x16/Invoice-red.jpg new file mode 100644 index 0000000000000000000000000000000000000000..540620b2bfc978359b3e6801147357b067e9afd0 GIT binary patch literal 651 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%2nfSFN{fk}{&S&;Gn5r#4b z24+T}BN2d^m5rT|fr%L*0%QTXjI07+ikSs2#l+0W!Yarh#HMKIC@f+k3N)9Ik)4@| z9j2F&iCK^VC@I9k8mMH{n6z-CQ_v=1<^Q)Bc!0Jt2?Ay98LpMM-L{z&>bJm7q~rfnjA#th(C_ce0e3hy8qVOb655(2-z~l zWKSk%Yg(`8`?s+=zCXIxES+UmZ?{7_ZM~$u zKTfSO?UH-at<{g?=Wq3kyeYHqlEmVkqyB0^ZmCXESG=|6>o51^b+r;cZMr9G-E5uu zyjA8}(Ly?>C&x@Q40k%*g8^S6I%)=$89y&IhAPTQ#hq*^`)4) z^BeRZ&wTOic6xtc0(-8#^0yV|mo7Iv>AHhUV6$w_@c?DfUI)=hVRn++%475Y-vj_& CUb+qd literal 0 HcmV?d00001 diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 0edfe477..4cf8df42 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm index c6775f46..ea793f33 100644 --- a/Source/GUIBase/uEditorBase.dfm +++ b/Source/GUIBase/uEditorBase.dfm @@ -19,7 +19,7 @@ object fEditorBase: TfEditorBase TextHeight = 13 object JvNavPanelHeader: TJvNavPanelHeader Left = 0 - Top = 58 + Top = 49 Width = 946 Align = alTop Caption = 'Editor' @@ -34,6 +34,7 @@ object fEditorBase: TfEditorBase ImageIndex = 0 StyleManager = dmBase.StyleManager ParentStyleManager = False + ExplicitTop = 58 object Image1: TImage Left = 919 Top = 0 @@ -68,10 +69,10 @@ object fEditorBase: TfEditorBase Left = 0 Top = 0 Width = 946 - Height = 58 + Height = 49 object tbxMain: TTBXToolbar Left = 0 - Top = 29 + Top = 23 Caption = 'tbxMain' ChevronHint = 'M'#225's botones|' DockMode = dmCannotFloatOrChangeDocks diff --git a/Source/GUIBase/uEditorBase.pas b/Source/GUIBase/uEditorBase.pas index 2f57eb35..63a58694 100644 --- a/Source/GUIBase/uEditorBase.pas +++ b/Source/GUIBase/uEditorBase.pas @@ -477,7 +477,7 @@ begin AWindowText := ATitulo; end; - if ReadOnly then + if Self.ReadOnly then begin AHeaderText := AHeaderText + ' (NO MODIFICABLE)'; AWindowText := AWindowText + ' (NO MODIFICABLE)'; @@ -507,13 +507,14 @@ var i: integer; begin inherited; - - if ReadOnly then - for i:=0 to Self.ComponentCount-1 do - begin - If Self.Components[i] Is TfrViewBase then - (Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly - end; + if (csLoading in Self.ComponentState) then + Exit; + + for i:=0 to Self.ComponentCount-1 do + begin + if Self.Components[i] is TfrViewBase then + (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly + end end; procedure TfEditorBase.SetWindowCaption(const Value: String); diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 15294aa7..8a577729 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -10,12 +10,45 @@ inherited fEditorDBItem: TfEditorDBItem TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 650 + ExplicitTop = 49 ExplicitWidth = 650 inherited Image1: TImage Left = 623 ExplicitLeft = 627 ExplicitHeight = 19 end + object lblDesbloquear: TcxLabel + AlignWithMargins = True + Left = 525 + Top = 0 + Margins.Left = 8 + Margins.Top = 0 + Margins.Right = 8 + Margins.Bottom = 0 + Align = alRight + AutoSize = False + Caption = 'Desbloquear' + Enabled = False + ParentFont = False + Style.HotTrack = True + Style.LookAndFeel.NativeStyle = False + Style.TextColor = clWindow + StyleDisabled.LookAndFeel.NativeStyle = False + StyleFocused.BorderStyle = ebsNone + StyleFocused.LookAndFeel.NativeStyle = False + StyleHot.BorderStyle = ebsNone + StyleHot.LookAndFeel.NativeStyle = False + StyleHot.TextStyle = [fsUnderline] + Properties.Alignment.Horz = taCenter + Properties.Alignment.Vert = taVCenter + Transparent = True + Visible = False + OnClick = lblDesbloquearClick + Height = 27 + Width = 90 + AnchorX = 570 + AnchorY = 14 + end end inherited TBXDock: TTBXDock Width = 650 diff --git a/Source/GUIBase/uEditorDBItem.pas b/Source/GUIBase/uEditorDBItem.pas index 9e344841..e3b3cd54 100644 --- a/Source/GUIBase/uEditorDBItem.pas +++ b/Source/GUIBase/uEditorDBItem.pas @@ -9,7 +9,8 @@ uses JvNavigationPane, DB, uDADataTable, uEditorDBBase, JvFormAutoSize, StdCtrls, uDAScriptingProvider, uDACDSDataTable, AppEvnts, uCustomView, uViewBase, JvAppStorage, JvAppRegistryStorage, ExtCtrls, uDAInterfaces, - JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage; + JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage, + cxControls, cxContainer, cxEdit, cxLabel; type IEditorDBItem = interface(IEditorDBBase) @@ -25,6 +26,8 @@ type imgStatus: TImage; PnlComentario: TPanel; lbComentario: TLabel; + lblDesbloquear: TcxLabel; + procedure lblDesbloquearClick(Sender: TObject); protected FComentario: Variant; @@ -42,7 +45,7 @@ type implementation uses - uEditorBase, uDialogUtils; + uEditorBase, uDialogUtils, uDataTableUtils; {$R *.dfm} @@ -51,6 +54,9 @@ begin inherited; if HayDatos then begin + if lblDesbloquear.Enabled then + lblDesbloquear.Visible := ReadOnly; + if (Self.Modified) and (dsDataTable.DataTable.State <> dsInsert) then begin StatusBar.Panels[0].Text := ' Se han producido cambios'; @@ -80,6 +86,21 @@ begin Result := FComentario; end; +procedure TfEditorDBItem.lblDesbloquearClick(Sender: TObject); +begin + inherited; + + if (ShowConfirmMessage('¿Desbloquear los datos para permitir cambios?', 'Actualmente, los datos de esta pantalla no se pueden modificar.' + #13#10 + + 'Temporalmente puede desbloquear la ficha para realizar cambios puntuales. ¿Desea continuar?') = IDYES) then + begin + lblDesbloquear.Visible := False; + lblDesbloquear.Enabled := False; + SetDataTableReadOnly(dsDataTable.DataTable, False); + Self.ReadOnly := False; + ActualizarEstadoEditor; + end; +end; + procedure TfEditorDBItem.SetComentario(const Value: Variant); begin FComentario := Value; diff --git a/Source/GUIBase/uViewBase.pas b/Source/GUIBase/uViewBase.pas index a438e24f..f3ea698a 100644 --- a/Source/GUIBase/uViewBase.pas +++ b/Source/GUIBase/uViewBase.pas @@ -41,16 +41,18 @@ var begin inherited; - if ReadOnly then - for i:=0 to Self.ComponentCount-1 do - begin - If (Self.Components[i] Is TfrViewBase) then - (Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly; + if (csLoading in Self.ComponentState) then + Exit; - If (Self.Components[i] Is TcxControl) - and (not (Self.Components[i] Is TdxLayoutControl)) then - (Self.Components[i] as TcxControl).Enabled := not ReadOnly; - end; + for i:=0 to Self.ComponentCount-1 do + begin + if (Self.Components[i] is TfrViewBase) then + (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly; + + if (Self.Components[i] is TcxControl) + and (not (Self.Components[i] Is TdxLayoutControl)) then + (Self.Components[i] as TcxControl).Enabled := not Self.ReadOnly; + end; end; end. diff --git a/Source/Informes/5/3/InfPedidoProveedor.fr3 b/Source/Informes/5/3/InfPedidoProveedor.fr3 index 91ecbda3..46f0b825 100644 --- a/Source/Informes/5/3/InfPedidoProveedor.fr3 +++ b/Source/Informes/5/3/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/Source/Informes/InfPedidoProveedor.fr3 b/Source/Informes/InfPedidoProveedor.fr3 index 91ecbda3..7c7e376a 100644 --- a/Source/Informes/InfPedidoProveedor.fr3 +++ b/Source/Informes/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index fedc6216..d990107e 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -284,6 +284,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente object TBXItem2: TTBXItem Action = actTienda end + object TBXSeparatorItem3: TTBXSeparatorItem + end + object TBXItem4: TTBXItem + Action = actVendedor + end end end end @@ -314,6 +319,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente OnExecute = actTiendaExecute OnUpdate = actTiendaUpdate end + object actVendedor: TAction + Caption = 'Vendedor' + OnExecute = actVendedorExecute + OnUpdate = actVendedorUpdate + end end inherited GridPNGImageList: TPngImageList PngImages = < diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index 15b6b648..15aa98fe 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -54,6 +54,9 @@ type TBXItem2: TTBXItem; TBXSeparatorItem1: TTBXSeparatorItem; cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn; + actVendedor: TAction; + TBXSeparatorItem3: TTBXSeparatorItem; + TBXItem4: TTBXItem; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; @@ -75,6 +78,8 @@ type procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); procedure actTiendaExecute(Sender: TObject); procedure actTiendaUpdate(Sender: TObject); + procedure actVendedorExecute(Sender: TObject); + procedure actVendedorUpdate(Sender: TObject); private //Filtros relativos a la vista @@ -141,6 +146,27 @@ begin (Sender as TAction).Checked := not (cxGridViewTIENDA.GroupIndex < 0); end; +procedure TfrViewContratosCliente.actVendedorExecute(Sender: TObject); +begin + inherited; + if (cxGridViewVENDEDOR.GroupIndex < 0) then + begin + cxGridViewVENDEDOR.GroupIndex := cxGridView.GroupedColumnCount; + cxGridViewVENDEDOR.Visible := False; + end + else + begin + cxGridViewVENDEDOR.GroupIndex := -1; + cxGridViewVENDEDOR.Visible := True; + end; +end; + +procedure TfrViewContratosCliente.actVendedorUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Checked := not (cxGridViewVENDEDOR.GroupIndex < 0); +end; + procedure TfrViewContratosCliente.AnadirFiltroFechas; var Columna: TcxGridDBColumn; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 44abfc99..7d02e26d 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -13,7 +13,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited JvNavPanelHeader: TJvNavPanelHeader Width = 860 Caption = 'Nueva factura de cliente' - ExplicitTop = 49 ExplicitWidth = 860 inherited Image1: TImage Left = 833 @@ -38,6 +37,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente 454E44AE426082} ExplicitLeft = 742 end + inherited lblDesbloquear: TcxLabel + Left = 735 + ExplicitLeft = 735 + AnchorX = 780 + AnchorY = 14 + end end inherited TBXDock: TTBXDock Width = 860 @@ -256,57 +261,57 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 570 + Left = 586 Top = 0 - ExplicitLeft = 570 + ExplicitLeft = 586 ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 587 + Left = 603 Top = 0 - ExplicitLeft = 587 + ExplicitLeft = 603 ExplicitTop = 0 end inherited ToolButton6: TToolButton - Left = 595 + Left = 611 Top = 0 - ExplicitLeft = 595 + ExplicitLeft = 611 ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 629 + Left = 645 Top = 0 - ExplicitLeft = 629 + ExplicitLeft = 645 ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 663 + Left = 679 Top = 0 - ExplicitLeft = 663 + ExplicitLeft = 679 ExplicitTop = 0 end inherited ToolButton12: TToolButton - Left = 697 + Left = 713 Top = 0 - ExplicitLeft = 697 + ExplicitLeft = 713 ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 705 + Left = 721 Top = 0 - ExplicitLeft = 705 + ExplicitLeft = 721 ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 739 + Left = 755 Top = 0 - ExplicitLeft = 739 + ExplicitLeft = 755 ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 773 + Left = 789 Top = 0 - ExplicitLeft = 773 + ExplicitLeft = 789 ExplicitTop = 0 end end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index 545e1cea..bda79f4b 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -17,7 +17,7 @@ uses uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids, - cxCheckBox, uViewListaSubCuentas; + cxCheckBox, uViewListaSubCuentas, cxLabel; type diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas index 42e29075..7b715c10 100644 --- a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas +++ b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas @@ -475,7 +475,9 @@ begin USUARIO := AppFactuGES.UsuarioActivo.UserName; ID_TIENDA := AppFactuGES.TiendaActiva.ID; TIENDA := AppFactuGES.TiendaActiva.NOMBRE; - FECHA_PRESUPUESTO := DateOf(Now); + FECHA_PRESUPUESTO := DateOf(Date); + FECHA_VIGENCIA := IncMonth(Date, AppFactuGES.EmpresaActiva.VALIDEZ_PRESUPUESTOS); + FECHA_ULT_PRESENTACION_CLIENTE := DateOf(Date); INCIDENCIAS_ACTIVAS := 0; INCIDENCIASIsNull := True; ID_CONTRATOIsNull := True; @@ -565,6 +567,7 @@ begin //MODO CONSULTAR (Se deja la tabla como estaba) if AEditor.ReadOnly then SetDataTableReadOnly(APresupuesto.DataTable, False); + finally AEditor.Release; AEditor := NIL; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 2939e4b2..916ee17a 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -12,7 +12,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente inherited JvNavPanelHeader: TJvNavPanelHeader Width = 848 Caption = 'Nuevo presupuesto de cliente' - ExplicitTop = 49 ExplicitWidth = 848 inherited Image1: TImage Left = 821 @@ -125,6 +124,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente 960000000049454E44AE426082} ExplicitLeft = 735 end + inherited lblDesbloquear: TcxLabel + Left = 723 + Enabled = True + Visible = True + ExplicitLeft = 723 + AnchorX = 768 + AnchorY = 14 + end end inherited TBXDock: TTBXDock Width = 848 @@ -183,8 +190,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 842 ExplicitHeight = 442 inherited pagGeneral: TTabSheet - ExplicitLeft = 4 - ExplicitTop = 24 ExplicitWidth = 834 ExplicitHeight = 414 inline frViewPresupuestoCliente1: TfrViewPresupuestoCliente @@ -218,7 +223,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 403 ExplicitLeft = 403 inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 320 inherited edtNIFCIF: TcxDBTextEdit Left = 279 ExplicitLeft = 279 @@ -273,30 +277,21 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 834 Height = 24 ExplicitWidth = 834 - inherited ToolButton14: TToolButton [1] - Left = 109 - Top = 0 - Enabled = True - ExplicitLeft = 109 - ExplicitTop = 0 - end - inherited ToolButton2: TToolButton [2] - Left = 143 - end - inherited FontName: TJvFontComboBox [3] - Left = 257 - Top = 0 - ExplicitLeft = 257 - ExplicitTop = 0 - end - inherited ToolButton3: TToolButton [4] - Left = 402 - ExplicitLeft = 402 - end - inherited ToolButton4: TToolButton [5] - Left = 457 + ExplicitHeight = 24 + inherited ToolButton4: TToolButton Wrap = False - ExplicitLeft = 457 + end + inherited ToolButton14: TToolButton + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox + Left = 368 + Top = 0 + ExplicitLeft = 368 + ExplicitTop = 0 end inherited FontSize: TEdit Left = 513 @@ -365,12 +360,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Top = 50 Width = 834 Height = 364 + ExplicitTop = 50 ExplicitWidth = 834 ExplicitHeight = 364 end inherited TBXDock1: TTBXDock Top = 24 Width = 834 + ExplicitTop = 24 ExplicitWidth = 834 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 665 @@ -516,7 +513,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 848 inherited lbComentario: TLabel Width = 838 - Height = 25 end end inline frViewTotales1: TfrViewTotalesPresupuesto [5] diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm index bbbd74ea..1bac24d3 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm @@ -232,10 +232,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Height = 224 ExplicitWidth = 320 ExplicitHeight = 224 - inherited edtlNombre: TcxDBTextEdit - ExplicitWidth = 224 - Width = 224 - end inherited edtNIFCIF: TcxDBTextEdit Left = 320 ExplicitLeft = 320 @@ -244,10 +240,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Left = 231 ExplicitLeft = 231 end - inherited edtPersonaContacto: TcxDBTextEdit - ExplicitWidth = 283 - Width = 283 - end inherited edtDireccion: TcxMemo ExplicitWidth = 121 Width = 121 @@ -260,10 +252,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Left = 400 ExplicitLeft = 400 end - inherited edtTelefonos: TcxTextEdit - ExplicitWidth = 363 - Width = 363 - end end end object memFormaPago: TcxDBMemo diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index e75e1b01..992b728d 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,299 +1,298 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG;_VER6; - True - - - Delphi.Personality - - -FalseTrueFalseTrueFalse4000FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.0.0FactuGES (Servidor)4.0.0.0jueves, 01 de agosto de 2024 15:42 - - File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEjercicios
- TDataAbstractService - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones
- TRORemoteDataModule - - - - - - - - - - - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - - -
RptComisiones
- TDataModule - - -
srvComisiones
- TDataAbstractService - - - - - -
srvContabilidad
- TDataAbstractService - - - - - - - - -
RptListadosContactos
- TDataModule - - -
srvContactos
- TDARemoteService - - - - - -
RptContratosCliente
- - -
srvContratosCliente
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
srvPresupuestosCliente
- TDataAbstractService - - - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- 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 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG;_VER6; + True + + + Delphi.Personality + + + FalseTrueFalseTrueFalse4000FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.0.0FactuGES (Servidor)4.0.0.0jueves, 01 de agosto de 2024 15:42 + File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEjercicios
+ TDataAbstractService + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones
+ TRORemoteDataModule + + + + + + + + + + + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + + +
RptComisiones
+ TDataModule + + +
srvComisiones
+ TDataAbstractService + + + + + +
srvContabilidad
+ TDataAbstractService + + + + + + + + +
RptListadosContactos
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + + +
RptContratosCliente
+ + +
srvContratosCliente
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
srvPresupuestosCliente
+ TDataAbstractService + + + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + +