diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 3b3f909..c4fdae0 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu b/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu index 82885e4..dfa0dff 100644 Binary files a/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu and b/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu differ diff --git a/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu b/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu index 8cfa141..e3c3ade 100644 Binary files a/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu and b/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu differ diff --git a/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu b/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu index 9732e97..0f9ed52 100644 Binary files a/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu and b/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index db910fd..1263d53 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,13 +44,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,54 +58,54 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index b9adedf..e035a8c 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,16 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4760FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.7.6.0FactuGESFactuGES4.7.6.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4780FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.7.8.0FactuGESFactuGES4.7.8.0 + + + + + + + + + diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index c0b104f..e73c24d 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index f44e3be..afd16de 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339..8b251f3 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm index 977dce2..b16d4d2 100644 --- a/Source/GUIBase/uEditorBase.dfm +++ b/Source/GUIBase/uEditorBase.dfm @@ -22,7 +22,7 @@ object fEditorBase: TfEditorBase TextHeight = 13 object JvNavPanelHeader: TJvNavPanelHeader Left = 0 - Top = 49 + Top = 51 Width = 946 Align = alTop Caption = 'Editor' @@ -37,6 +37,7 @@ object fEditorBase: TfEditorBase ImageIndex = 0 StyleManager = dmBase.StyleManager ParentStyleManager = False + ExplicitTop = 49 object Image1: TImage Left = 919 Top = 0 @@ -71,10 +72,10 @@ object fEditorBase: TfEditorBase Left = 0 Top = 0 Width = 946 - Height = 49 + Height = 51 object tbxMain: TTBXToolbar Left = 0 - Top = 23 + Top = 25 Caption = 'tbxMain' ChevronHint = 'M'#225's botones|' DockMode = dmCannotFloatOrChangeDocks diff --git a/Source/GUIBase/uEditorBase.pas b/Source/GUIBase/uEditorBase.pas index 1911118..aa5deed 100644 --- a/Source/GUIBase/uEditorBase.pas +++ b/Source/GUIBase/uEditorBase.pas @@ -463,13 +463,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.Show; diff --git a/Source/GUIBase/uEditorDBBase.dfm b/Source/GUIBase/uEditorDBBase.dfm index f8a8aba..b28e08a 100644 --- a/Source/GUIBase/uEditorDBBase.dfm +++ b/Source/GUIBase/uEditorDBBase.dfm @@ -4,7 +4,7 @@ inherited fEditorDBBase: TfEditorDBBase Caption = 'fEditorDBBase' ClientHeight = 454 ClientWidth = 646 - ExplicitWidth = 654 + ExplicitWidth = 662 ExplicitHeight = 492 PixelsPerInch = 96 TextHeight = 13 diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 3493aa6..2d7c3ca 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -4,24 +4,57 @@ inherited fEditorDBItem: TfEditorDBItem Caption = 'fEditorDBItem' ClientHeight = 459 ClientWidth = 650 - ExplicitWidth = 658 - ExplicitHeight = 493 + ExplicitWidth = 666 + ExplicitHeight = 497 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 650 + ExplicitTop = 51 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 ExplicitWidth = 650 inherited tbxMain: TTBXToolbar - ExplicitWidth = 650 + ExplicitWidth = 647 inherited TBXItem26: TTBXItem Visible = False end @@ -77,14 +110,12 @@ inherited fEditorDBItem: TfEditorDBItem object pgPaginas: TPageControl [3] AlignWithMargins = True Left = 3 - Top = 112 + Top = 111 Width = 644 - Height = 325 + Height = 326 ActivePage = pagGeneral Align = alClient TabOrder = 2 - ExplicitTop = 109 - ExplicitHeight = 328 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 @@ -95,7 +126,7 @@ inherited fEditorDBItem: TfEditorDBItem end object PnlComentario: TPanel [4] Left = 0 - Top = 79 + Top = 78 Width = 650 Height = 30 Align = alTop @@ -105,7 +136,6 @@ inherited fEditorDBItem: TfEditorDBItem ParentBackground = False TabOrder = 4 VerticalAlignment = taAlignTop - ExplicitTop = 76 object lbComentario: TLabel AlignWithMargins = True Left = 6 diff --git a/Source/GUIBase/uEditorDBItem.pas b/Source/GUIBase/uEditorDBItem.pas index 9e34484..05aaa14 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} @@ -80,6 +83,22 @@ begin Result := FComentario; end; +procedure TfEditorDBItem.lblDesbloquearClick(Sender: TObject); +begin + inherited; + + if (ShowConfirmMessage('¿Desbloquear los datos para permitir cambios?', 'Actualmente, los datos de esta ficha 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 a438e24..bc61974 100644 --- a/Source/GUIBase/uViewBase.pas +++ b/Source/GUIBase/uViewBase.pas @@ -40,17 +40,18 @@ var i: integer; begin inherited; + if (csLoading in Self.ComponentState) then + Exit; - 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; + 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 ReadOnly; - end; + 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/Modulos/Articulos/Views/uEditorElegirArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm index b84fc93..9718050 100644 --- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm @@ -24,17 +24,17 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos inherited tbxMain: TTBXToolbar Align = alLeft DockPos = -6 - ExplicitWidth = 142 + ExplicitWidth = 139 inherited TBXItem36: TTBXItem Action = actAnchoAuto2 end end inherited tbxFiltro: TTBXToolbar - Left = 84 + Left = 101 Align = alLeft DockPos = 101 DockRow = 1 - ExplicitLeft = 84 + ExplicitLeft = 101 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 end @@ -43,11 +43,11 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos ExplicitWidth = 656 end inherited TBXTMain2: TTBXToolbar - Left = 304 + Left = 317 DockPos = 536 DockRow = 1 Visible = False - ExplicitLeft = 304 + ExplicitLeft = 317 end end inherited StatusBar: TJvStatusBar diff --git a/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas b/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas index db287d3..0dade3a 100644 --- a/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas +++ b/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas @@ -1561,9 +1561,13 @@ end; function TContratosClienteController.MandarFabrica(AContrato: IBizContratoCliente; AClonarContrato: Boolean = true): Boolean; var AContratoFabrica : IBizContratoCliente; + AFormasPago : IBizFormaPago; + AFormasPagoController : IFormasPagoController; begin Result := false; + AFormasPagoController := TFormasPagoController.Create; + ShowHourglassCursor; try @@ -1622,9 +1626,16 @@ begin TELEFONO := AContratoFabrica.Cliente.TELEFONO_1; MOVIL := AContratoFabrica.Cliente.MOVIL_1; - //LA DIRECCIÖN DE ENVIO SE MANTIENE LA COPIADA DEL CLIENTE FINAL + //FORMA DE PAGO DEL CLIENTE GRADEN/GUNNI Y COMERCIALES ASOCIADOS + AContratoFabrica.ID_AGENTE := AContratoFabrica.Cliente.ID_AGENTE; + AContratoFabrica.NOMBRE_AGENTE := AContratoFabrica.Cliente.AGENTE; + AContratoFabrica.DELEGACION := AContratoFabrica.Cliente.DELEGACION; AContratoFabrica.ID_FORMA_PAGO := AContratoFabrica.Cliente.ID_FORMA_PAGO; + AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO); + AFormasPago.Open; + AContratoFabrica.FORMA_PAGO.Add(AFormasPago.DESCRIPCION); + AContratoFabrica.ID_TIPO_IVA := AContratoFabrica.Cliente.ID_TIPO_IVA; AContratoFabrica.IDIOMA_ISO := AContratoFabrica.Cliente.IDIOMA_ISO; AContratoFabrica.IDIOMA := AContratoFabrica.Cliente.IDIOMA; @@ -1651,6 +1662,8 @@ begin end; finally + AFormasPago:= Nil; + AFormasPagoController := Nil; HideHourglassCursor; end; end; diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas index 296dfe3..8c3a080 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -3,7 +3,7 @@ unit schContratosClienteClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -319,7 +319,7 @@ type end; { TValoresDataTableRules } - TValoresDataTableRules = class(TDADataTableRules, IValores) + TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores) private protected { Property getters and setters } @@ -378,7 +378,7 @@ type end; { TPropiedadesDataTableRules } - TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades) + TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades) private protected { Property getters and setters } @@ -425,7 +425,7 @@ type end; { TListaAnosContratosDataTableRules } - TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos) + TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos) private protected { Property getters and setters } @@ -544,7 +544,7 @@ type end; { TContratosClienteBeneficiosDataTableRules } - TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios) + TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios) private protected { Property getters and setters } @@ -1079,7 +1079,7 @@ type end; { TContratosClienteDataTableRules } - TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente) + TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente) private f_FORMA_PAGO: IROStrings; f_PLAZO_ENTREGA: IROStrings; @@ -1571,7 +1571,7 @@ type end; { TTiposCapitulosDataTableRules } - TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos) + TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos) private protected { Property getters and setters } @@ -1744,7 +1744,7 @@ type end; { TContratosCliente_DetallesDataTableRules } - TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles) + TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles) private protected { Property getters and setters } diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm index 718288f..ce6ecf7 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm @@ -5,14 +5,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ClientHeight = 649 ClientWidth = 1334 OnClose = CustomEditorClose - ExplicitWidth = 1342 + ExplicitWidth = 1350 ExplicitHeight = 687 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 1334 Caption = 'Nuevo contrato de cliente' - ExplicitTop = 52 ExplicitWidth = 1334 inherited Image1: TImage Left = 1307 @@ -125,12 +124,18 @@ inherited fEditorContratoCliente: TfEditorContratoCliente 960000000049454E44AE426082} ExplicitLeft = 735 end + inherited lblDesbloquear: TcxLabel + Left = 1209 + ExplicitLeft = 1209 + AnchorX = 1254 + AnchorY = 14 + end end inherited TBXDock: TTBXDock Width = 1334 ExplicitWidth = 1334 inherited tbxMain: TTBXToolbar - ExplicitWidth = 551 + ExplicitWidth = 518 inherited TBXItem2: TTBXItem Visible = False end @@ -174,17 +179,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited pgPaginas: TPageControl Width = 1328 - Height = 321 + Height = 322 TabOrder = 1 OnChanging = pgPaginasChanging - ExplicitTop = 112 ExplicitWidth = 1328 - ExplicitHeight = 321 + ExplicitHeight = 322 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 1320 - ExplicitHeight = 293 + ExplicitHeight = 294 end object pagContenido: TTabSheet Caption = 'Contenido' @@ -193,7 +197,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 1320 - Height = 293 + Height = 294 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -206,20 +210,33 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 1320 - ExplicitHeight = 293 + ExplicitHeight = 294 inherited ToolBar1: TToolBar Width = 1320 Height = 24 + ButtonWidth = 110 ExplicitWidth = 1320 ExplicitHeight = 24 - inherited ToolButton4: TToolButton - Wrap = False + inherited ToolButton1: TToolButton + ExplicitWidth = 109 end inherited ToolButton14: TToolButton - Left = 334 - Top = 0 - ExplicitLeft = 334 - ExplicitTop = 0 + Left = 109 + ExplicitLeft = 109 + end + inherited ToolButton2: TToolButton + Left = 143 + ExplicitLeft = 143 + ExplicitWidth = 114 + end + inherited ToolButton3: TToolButton + Left = 257 + ExplicitLeft = 257 + end + inherited ToolButton4: TToolButton + Left = 312 + Wrap = False + ExplicitLeft = 312 end inherited FontName: TJvFontComboBox Left = 368 @@ -230,73 +247,73 @@ inherited fEditorContratoCliente: TfEditorContratoCliente inherited FontSize: TEdit Left = 513 Top = 0 - Width = 108 + Width = 124 ExplicitLeft = 513 ExplicitTop = 0 - ExplicitWidth = 108 + ExplicitWidth = 124 end - inherited UpDown1: TUpDown - Left = 621 + inherited UpDown1: TUpDown [7] + Left = 637 Top = 0 - ExplicitLeft = 621 + ExplicitLeft = 637 + ExplicitTop = 0 + end + inherited ToolButton6: TToolButton [8] + Left = 654 + Top = 0 + ExplicitLeft = 654 ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 638 + Left = 688 Top = 0 - ExplicitLeft = 638 - ExplicitTop = 0 - end - inherited ToolButton6: TToolButton - Left = 646 - Top = 0 - ExplicitLeft = 646 + ExplicitLeft = 688 ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 680 + Left = 696 Top = 0 - ExplicitLeft = 680 + ExplicitLeft = 696 ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 714 + Left = 730 Top = 0 - ExplicitLeft = 714 - ExplicitTop = 0 - end - inherited ToolButton12: TToolButton - Left = 748 - Top = 0 - ExplicitLeft = 748 + ExplicitLeft = 730 ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 756 + Left = 764 Top = 0 - ExplicitLeft = 756 + ExplicitLeft = 764 + ExplicitTop = 0 + end + inherited ToolButton12: TToolButton + Left = 798 + Top = 0 + ExplicitLeft = 798 ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 790 + Left = 806 Top = 0 - ExplicitLeft = 790 + ExplicitLeft = 806 ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 824 + Left = 840 Top = 0 - ExplicitLeft = 824 + ExplicitLeft = 840 ExplicitTop = 0 end end inherited cxGrid: TcxGrid Top = 50 Width = 1320 - Height = 243 + Height = 244 ExplicitTop = 50 ExplicitWidth = 1320 - ExplicitHeight = 243 + ExplicitHeight = 244 inherited cxGridView: TcxGridDBTableView inherited cxGridViewPROPIEDAD: TcxGridDBColumn IsCaptionAssigned = True @@ -312,7 +329,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 1042 DockPos = 1042 ExplicitLeft = 1042 - ExplicitWidth = 130 + ExplicitWidth = 122 inherited TBXLabelItem2: TTBXLabelItem Caption = ' Descuento cap'#237'tulo' end @@ -322,7 +339,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente AutoResize = False DockPos = 2 ExplicitLeft = 2 - ExplicitWidth = 839 + ExplicitWidth = 799 inherited TBXLabelItem1: TTBXLabelItem Caption = ' Precio punto' end @@ -388,7 +405,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 1320 - Height = 293 + Height = 294 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -399,7 +416,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 1320 - ExplicitHeight = 293 + ExplicitHeight = 294 inherited pnlSup: TPanel Width = 1320 ExplicitWidth = 1320 @@ -409,13 +426,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited GroupBox1: TGroupBox Width = 1320 - Height = 265 + Height = 266 ExplicitWidth = 1320 - ExplicitHeight = 265 + ExplicitHeight = 266 inherited eIncidencias: TcxDBMemo ExplicitWidth = 1316 - ExplicitHeight = 248 - Height = 248 + ExplicitHeight = 249 + Height = 249 Width = 1316 end end @@ -428,7 +445,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 1320 - Height = 293 + Height = 294 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -439,17 +456,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 1320 - ExplicitHeight = 293 + ExplicitHeight = 294 inherited TBXDock: TTBXDock Width = 1320 ExplicitWidth = 1320 end inherited ListView1: TListView Width = 1320 - Height = 267 - ExplicitTop = 26 + Height = 269 + ExplicitTop = 25 ExplicitWidth = 1320 - ExplicitHeight = 267 + ExplicitHeight = 269 end inherited EditorActionList: TActionList Left = 8 @@ -460,7 +477,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited PnlComentario: TPanel Width = 1334 - ExplicitTop = 79 ExplicitWidth = 1334 inherited lbComentario: TLabel Width = 1324 diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas index db7c37d..19334fe 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas @@ -263,6 +263,18 @@ begin if not Assigned(Contrato) then raise Exception.Create('No hay ningún Contrato asignado'); + //El usuario GERENCIA) + if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_GERENCIA) + or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) then + begin + lblDesbloquear.Visible := True; + + if Self.ReadOnly then + lblDesbloquear.Enabled := True + else + lblDesbloquear.Enabled := False; + end; + frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate; //PRECIO_PUNTO EVENTOS diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorElegirArticulosContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorElegirArticulosContratoCliente.dfm index f8ebade..70f95b9 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorElegirArticulosContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorElegirArticulosContratoCliente.dfm @@ -1,14 +1,6 @@ inherited fEditorElegirArticulosContratoCliente: TfEditorElegirArticulosContratoCliente Caption = 'fEditorElegirArticulosContratoCliente' + ExplicitWidth = 320 PixelsPerInch = 96 TextHeight = 13 - inherited pnlHeader: TPanel - inherited lblTitle: TLabel - Width = 606 - end - inherited lblComments: TLabel - Width = 581 - Height = 27 - end - end end diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index daab929..b0a6306 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -813,8 +813,8 @@ object RptFacturasCliente: TRptFacturasCliente SQL = 'select ID_EMPRESA, ANO, TRIMESTRE || '#39'T'#39' AS TRIMESTRE, ID_PROVE' + 'EDOR, NOMBRE, NIF_CIF, BASE_IMPONIBLE_ANO, IMPORTE_TOTAL_ANO, SU' + - 'M(BASE_IMPONIBLE) as BASE_IMPONIBLE_PERIODO'#10'from V_INF_FAC_PROVE' + - 'EDOR'#10'where {where}'#10'group by 1,2,3,4,5,6,7,8'#10'order by 5,1,2 asc'#10 + 'M(IMPORTE_TOTAL) as BASE_IMPONIBLE_PERIODO'#10'from V_INF_FAC_PROVEE' + + 'DOR'#10'where {where}'#10'group by 1,2,3,4,5,6,7,8'#10'order by 5,1,2 asc'#10 StatementType = stSQL ColumnMappings = < item @@ -909,8 +909,8 @@ object RptFacturasCliente: TRptFacturasCliente SQL = 'select ID_EMPRESA, ANO, TRIMESTRE || '#39'T'#39' AS TRIMESTRE, ID_CLIEN' + 'TE, NOMBRE, NIF_CIF, BASE_IMPONIBLE_ANO, IMPORTE_TOTAL_ANO, SUM(' + - 'BASE_IMPONIBLE) as BASE_IMPONIBLE_PERIODO'#10'from V_INF_FAC_CLIENTE' + - #10'where {where}'#10'group by 1,2,3,4,5,6,7,8'#10'order by 5,1,2 asc'#10 + 'IMPORTE_TOTAL) as BASE_IMPONIBLE_PERIODO'#10'from V_INF_FAC_CLIENTE'#10 + + 'where {where}'#10'group by 1,2,3,4,5,6,7,8'#10'order by 5,1,2 asc'#10 StatementType = stSQL ColumnMappings = < item diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index f21108f..67ddb31 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -60,8 +60,8 @@ type frxDBInforme347FacturasProveedor: TfrxDBDataset; DADSInforme347FacturasProveedor: TDADataSource; tbl_Informe347FacturasProveedor: TDAMemDataTable; - schReport: TDASchema; frxPDFExport1: TfrxPDFExport; + schReport: TDASchema; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu b/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu index 5c1682f..1b31e4c 100644 Binary files a/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu and b/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index c4a9066..225f5ad 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,13 @@ Delphi.Personality -FalseTrueFalseTrueFalse4760FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.7.6.0FactuGES (Servidor)4.7.6.0miércoles, 16 de octubre de 2024 15:49 +FalseTrueFalseTrueFalse4780FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.7.8.0FactuGES (Servidor)4.7.8.0miércoles, 11 de diciembre de 2024 17:56 + + + + + + diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 47633b7..7196e34 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ