diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 2c1e901..a82074e 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 8ccd372..43fae77 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,12 +52,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4440FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.4.0FactuGESFactuGES4.4.4.0
-
-
-
-
-
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4450FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.5.0FactuGESFactuGES4.4.5.0
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 21dcd0f..23d8e9b 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..b044e14 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,34 +58,34 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3
index 1a20e46..250ca8b 100644
--- a/Source/Informes/1/InfAlbaranCliente.fr3
+++ b/Source/Informes/1/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
-
+
diff --git a/Source/Informes/10/InfContratoCliente.fr3 b/Source/Informes/10/InfContratoCliente.fr3
index 2c67569..26da8b0 100644
--- a/Source/Informes/10/InfContratoCliente.fr3
+++ b/Source/Informes/10/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,7 @@
-
+
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -60,8 +60,8 @@
-
-
+
+
diff --git a/Source/Informes/10/InfPresupuestoCliente.fr3 b/Source/Informes/10/InfPresupuestoCliente.fr3
index 3b69c09..75d70a5 100644
--- a/Source/Informes/10/InfPresupuestoCliente.fr3
+++ b/Source/Informes/10/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -40,12 +40,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -58,7 +58,7 @@
-
+
diff --git a/Source/Informes/2/2/InfContratoCliente.fr3 b/Source/Informes/2/2/InfContratoCliente.fr3
index 80fec3a..6153fae 100644
--- a/Source/Informes/2/2/InfContratoCliente.fr3
+++ b/Source/Informes/2/2/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -17,10 +17,10 @@
-
-
+
+
-
+
@@ -50,12 +50,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -68,8 +68,8 @@
-
-
+
+
diff --git a/Source/Informes/2/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/2/InfPresupuestoCliente.fr3
index e87664a..e78edfc 100644
--- a/Source/Informes/2/2/InfPresupuestoCliente.fr3
+++ b/Source/Informes/2/2/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -40,12 +40,10 @@
-
-
-
-
-
-
+
+
+
+
@@ -58,7 +56,9 @@
-
+
+
+
diff --git a/Source/Informes/2/4/InfContratoCliente.fr3 b/Source/Informes/2/4/InfContratoCliente.fr3
index 6eff194..539186e 100644
--- a/Source/Informes/2/4/InfContratoCliente.fr3
+++ b/Source/Informes/2/4/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,7 @@
-
+
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -60,8 +60,8 @@
-
-
+
+
diff --git a/Source/Informes/2/4/InfPresupuestoCliente.fr3 b/Source/Informes/2/4/InfPresupuestoCliente.fr3
index beee5cf..3ee08ed 100644
--- a/Source/Informes/2/4/InfPresupuestoCliente.fr3
+++ b/Source/Informes/2/4/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -40,12 +40,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -58,7 +58,7 @@
-
+
diff --git a/Source/Informes/2/5/InfContratoCliente.fr3 b/Source/Informes/2/5/InfContratoCliente.fr3
index 79bc562..73c8ca6 100644
--- a/Source/Informes/2/5/InfContratoCliente.fr3
+++ b/Source/Informes/2/5/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,7 @@
-
+
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -60,8 +60,8 @@
-
-
+
+
diff --git a/Source/Informes/2/5/InfPresupuestoCliente.fr3 b/Source/Informes/2/5/InfPresupuestoCliente.fr3
index fc6d0ae..5f74adb 100644
--- a/Source/Informes/2/5/InfPresupuestoCliente.fr3
+++ b/Source/Informes/2/5/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -40,12 +40,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -58,7 +58,7 @@
-
+
diff --git a/Source/Informes/6/InfContratoCliente.fr3 b/Source/Informes/6/InfContratoCliente.fr3
index 65cc128..1d24a3e 100644
--- a/Source/Informes/6/InfContratoCliente.fr3
+++ b/Source/Informes/6/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -8,11 +8,11 @@
-
+
-
+
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -60,8 +60,8 @@
-
-
+
+
@@ -79,7 +79,7 @@
-
+
diff --git a/Source/Informes/6/InfFacturaCliente.fr3 b/Source/Informes/6/InfFacturaCliente.fr3
index 908dc3f..faa2cc5 100644
--- a/Source/Informes/6/InfFacturaCliente.fr3
+++ b/Source/Informes/6/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
diff --git a/Source/Informes/6/InfPresupuestoCliente.fr3 b/Source/Informes/6/InfPresupuestoCliente.fr3
index 6751ea1..7c46158 100644
--- a/Source/Informes/6/InfPresupuestoCliente.fr3
+++ b/Source/Informes/6/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -8,9 +8,9 @@
-
+
-
+
@@ -40,12 +40,11 @@
-
-
-
-
-
-
+
+
+
+
+
@@ -58,7 +57,8 @@
-
+
+
@@ -86,7 +86,7 @@
-
+
diff --git a/Source/Informes/6/InfReciboCliente.fr3 b/Source/Informes/6/InfReciboCliente.fr3
index 19e68f7..c1fb1b6 100644
--- a/Source/Informes/6/InfReciboCliente.fr3
+++ b/Source/Informes/6/InfReciboCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -52,9 +52,9 @@
-
+
-
+
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
index c4c2263..5d67319 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
@@ -4,7 +4,6 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
inherited cxGridViewVISIBLE: TcxGridDBColumn [4]
end
inherited cxGridViewVALORADO: TcxGridDBColumn [5]
- Visible = True
end
inherited cxGridViewREFERENCIA: TcxGridDBColumn [6]
end
@@ -19,13 +18,13 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn [11]
end
- inherited cxGridViewIMPORTENETO: TcxGridDBColumn [12]
- Visible = False
- VisibleForCustomization = False
+ inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn [12]
end
- inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [13]
+ inherited cxGridViewIMPORTENETO: TcxGridDBColumn [13]
end
- inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [14]
+ inherited cxGridViewINCREMENTO: TcxGridDBColumn [16]
+ end
+ inherited cxGridViewDECREMENTO: TcxGridDBColumn [17]
end
end
end
@@ -34,6 +33,7 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
DockPos = 0
object BAnadirCapitulo: TTBXSubmenuItem [0]
Caption = 'A'#241'adir Cap'#237'tulo'
+ Visible = False
object TBXItem14: TTBXItem
end
end
diff --git a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
index 48e941b..0f7a4a9 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
+++ b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.dfm
@@ -2,18 +2,18 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
Left = 489
Top = 325
Caption = 'Cajas / Bancos'
- ClientHeight = 497
- ClientWidth = 774
- ExplicitWidth = 782
- ExplicitHeight = 535
+ ClientHeight = 806
+ ClientWidth = 1073
+ ExplicitWidth = 1081
+ ExplicitHeight = 844
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
- Width = 774
+ Width = 1073
Caption = 'Cajas / Bancos'
- ExplicitWidth = 774
+ ExplicitWidth = 1073
inherited Image1: TImage
- Left = 747
+ Left = 1046
Picture.Data = {
0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
@@ -39,8 +39,8 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
end
end
inherited TBXDock: TTBXDock
- Width = 774
- ExplicitWidth = 774
+ Width = 1073
+ ExplicitWidth = 1073
inherited tbxMain: TTBXToolbar
ExplicitWidth = 632
end
@@ -50,7 +50,7 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
end
end
inherited tbxMenu: TTBXToolbar
- ExplicitWidth = 774
+ ExplicitWidth = 1073
end
inherited TBXTMain2: TTBXToolbar
Left = 287
@@ -77,16 +77,16 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
end
end
inherited StatusBar: TJvStatusBar
- Top = 478
- Width = 774
- ExplicitTop = 478
- ExplicitWidth = 774
+ Top = 787
+ Width = 1073
+ ExplicitTop = 787
+ ExplicitWidth = 1073
end
inline frViewExtractoMovimientos1: TfrViewExtractoMovimientos [3]
Left = 0
Top = 106
- Width = 774
- Height = 372
+ Width = 1073
+ Height = 681
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -97,13 +97,13 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
TabOrder = 3
ReadOnly = False
ExplicitTop = 106
- ExplicitWidth = 774
- ExplicitHeight = 372
+ ExplicitWidth = 1073
+ ExplicitHeight = 681
inherited cxGrid: TcxGrid
- Width = 774
- Height = 244
- ExplicitWidth = 774
- ExplicitHeight = 244
+ Width = 1073
+ Height = 553
+ ExplicitWidth = 1073
+ ExplicitHeight = 553
inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = <
item
@@ -133,6 +133,7 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
Kind = skCount
Column = frViewExtractoMovimientos1.cxGridViewCONCEPTO
end>
+ OptionsSelection.MultiSelect = True
inherited cxGridViewPUNTEADO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
@@ -160,19 +161,16 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
Visible = False
VisibleForCustomization = False
end
- inherited cxGridViewSaldo: TcxGridDBColumn
- HeaderAlignmentHorz = taRightJustify
- end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
- Width = 774
- ExplicitWidth = 774
+ Width = 1073
+ ExplicitWidth = 1073
inherited TBXDockablePanel1: TTBXDockablePanel
- ExplicitWidth = 774
+ ExplicitWidth = 1073
inherited dxLayoutControl1: TdxLayoutControl
- Width = 774
- ExplicitWidth = 774
+ Width = 1073
+ ExplicitWidth = 1073
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
@@ -190,46 +188,46 @@ inherited fEditorExtractoMovimientos: TfEditorExtractoMovimientos
Width = 232
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 474
+ Left = 653
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 474
+ ExplicitLeft = 653
ExplicitWidth = 197
Width = 197
end
inherited txtFiltroTodo2: TcxTextEdit
- Left = 544
+ Left = 750
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 544
+ ExplicitLeft = 750
ExplicitWidth = 223
Width = 223
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
- Width = 774
- ExplicitWidth = 774
+ Width = 1073
+ ExplicitWidth = 1073
inherited tbxBotones: TTBXToolbar
- Width = 764
- ExplicitWidth = 764
+ Width = 1063
+ ExplicitWidth = 1063
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
- Top = 346
- ExplicitTop = 346
- ExplicitWidth = 774
+ Top = 655
+ ExplicitTop = 655
+ ExplicitWidth = 1073
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
- Width = 774
- ExplicitWidth = 774
+ Width = 1073
+ ExplicitWidth = 1073
inherited TBXToolbar1: TTBXToolbar
- Width = 764
- ExplicitWidth = 764
+ Width = 1063
+ ExplicitWidth = 1063
end
end
end
diff --git a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.pas b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.pas
index 4900f42..a687e02 100644
--- a/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.pas
+++ b/Source/Modulos/Contabilidad/Views/uEditorExtractoMovimientos.pas
@@ -224,9 +224,11 @@ begin
//No se podrá eliminar un asiento si es automático por factura, si el ejercicio esta cerrado o el asiento esta punteado
if (Sender as TAction).Enabled then
if Assigned(Diario) then
- (Sender as TAction).Enabled := Diario.ID_FACTURAIsNull and Diario.ID_PAGOIsNull
+ (Sender as TAction).Enabled := (ViewGrid._FocusedView.Controller.SelectedRowCount = 1)
+ and Diario.ID_FACTURAIsNull
+ and Diario.ID_PAGOIsNull
and (Diario.ESTADO = CTE_ABIERTO)
- and (Diario.PUNTEADO = CTE_NO_PUNTEADO);
+ and (Diario.PUNTEADO = CTE_NO_PUNTEADO);
end;
procedure TfEditorExtractoMovimientos.actModificarUpdate(Sender: TObject);
@@ -235,7 +237,9 @@ begin
//No se podrá modificar un asiento si es automático por factura, si el ejercicio esta cerrado o el asiento esta punteado
if (Sender as TAction).Enabled then
if Assigned(Diario) then
- (Sender as TAction).Enabled := Diario.ID_FACTURAIsNull and Diario.ID_PAGOIsNull
+ (Sender as TAction).Enabled := (ViewGrid._FocusedView.Controller.SelectedRowCount = 1)
+ and Diario.ID_FACTURAIsNull
+ and Diario.ID_PAGOIsNull
and (Diario.ESTADO = CTE_ABIERTO)
and (Diario.PUNTEADO = CTE_NO_PUNTEADO);
end;
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
index 862ca94..7bbcc11 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
+++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
@@ -1,89 +1,5 @@
inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
- Width = 1045
- Height = 532
- inherited ToolBar1: TToolBar
- Width = 1045
- Height = 24
- inherited ToolButton4: TToolButton
- Wrap = False
- 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
- Top = 0
- ExplicitLeft = 513
- ExplicitTop = 0
- end
- inherited UpDown1: TUpDown
- Left = 555
- Top = 0
- ExplicitLeft = 555
- ExplicitTop = 0
- end
- inherited ToolButton13: TToolButton
- Left = 572
- Top = 0
- ExplicitLeft = 572
- ExplicitTop = 0
- end
- inherited ToolButton6: TToolButton
- Left = 580
- Top = 0
- ExplicitLeft = 580
- ExplicitTop = 0
- end
- inherited ToolButton7: TToolButton
- Left = 614
- Top = 0
- ExplicitLeft = 614
- ExplicitTop = 0
- end
- inherited ToolButton8: TToolButton
- Left = 648
- Top = 0
- ExplicitLeft = 648
- ExplicitTop = 0
- end
- inherited ToolButton12: TToolButton
- Left = 682
- Top = 0
- ExplicitLeft = 682
- ExplicitTop = 0
- end
- inherited ToolButton9: TToolButton
- Left = 690
- Top = 0
- ExplicitLeft = 690
- ExplicitTop = 0
- end
- inherited ToolButton10: TToolButton
- Left = 724
- Top = 0
- ExplicitLeft = 724
- ExplicitTop = 0
- end
- inherited ToolButton11: TToolButton
- Left = 758
- Top = 0
- ExplicitLeft = 758
- ExplicitTop = 0
- end
- end
inherited cxGrid: TcxGrid
- Top = 50
- Width = 1045
- Height = 482
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Width = 57
@@ -94,7 +10,6 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
VisibleForCustomization = False
end
inherited cxGridViewVALORADO: TcxGridDBColumn [5]
- Visible = True
end
inherited cxGridViewVISIBLE: TcxGridDBColumn [6]
Caption = #191'Importe visible?'
@@ -151,10 +66,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
end
inherited TBXDock1: TTBXDock
- Top = 24
- Width = 1045
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 831
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 286b4d8..8a36924 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
@@ -2,7 +2,6 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewVALORADO: TcxGridDBColumn [4]
- Visible = True
end
inherited cxGridViewVISIBLE: TcxGridDBColumn [5]
Visible = True
@@ -21,13 +20,17 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited cxGridViewDESCUENTO: TcxGridDBColumn [11]
end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn [12]
- Visible = False
- VisibleForCustomization = False
end
inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [13]
end
inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [14]
end
+ inherited cxGridViewINCREMENTO: TcxGridDBColumn [15]
+ end
+ inherited cxGridViewDECREMENTO: TcxGridDBColumn [16]
+ end
+ inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn [17]
+ end
end
end
inherited TBXDock1: TTBXDock
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
index 31ded59..ab0773d 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
@@ -210,6 +210,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
+ object cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn
+ Caption = 'C'#243'd. cliente'
+ DataBinding.FieldName = 'REFERENCIA_CLIENTE'
+ end
end
inherited cxGridLevel: TcxGridLevel
Caption = 'Todas'
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
index 359e018..fd3b4a3 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
@@ -82,6 +82,7 @@ type
actTienda: TAction;
TBXSeparatorItem6: TTBXSeparatorItem;
TBXItem7: TTBXItem;
+ cxGridViewREFERENCIA_CLIENTE: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle);
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
index f7cd8f1..f57ef0d 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
@@ -204,6 +204,11 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
Caption = 'Tipo operaci'#243'n'
DataBinding.FieldName = 'TIPO_OPERACION'
end
+ object cxGridViewREF_PROVEEDOR: TcxGridDBColumn
+ Caption = 'C'#243'd. proveedor'
+ DataBinding.FieldName = 'REF_PROVEEDOR'
+ PropertiesClassName = 'TcxTextEditProperties'
+ end
end
inherited cxGridLevel: TcxGridLevel
Caption = 'Todas'
@@ -259,6 +264,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 361
+ ExplicitWidth = 250
+ Width = 250
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas
index d092052..a1327b3 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas
@@ -63,6 +63,7 @@ type
cxGridViewNOMBRE_COMERCIAL_PROVEEDOR: TcxGridDBColumn;
cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
cxGridViewTIPO_OPERACION: TcxGridDBColumn;
+ cxGridViewREF_PROVEEDOR: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle);
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
index 381ae17..abd179e 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
@@ -1,89 +1,5 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
- Width = 1124
- Height = 455
- inherited ToolBar1: TToolBar
- Width = 1124
- Height = 24
- inherited ToolButton4: TToolButton
- Wrap = False
- 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
- Top = 0
- ExplicitLeft = 513
- ExplicitTop = 0
- end
- inherited UpDown1: TUpDown
- Left = 555
- Top = 0
- ExplicitLeft = 555
- ExplicitTop = 0
- end
- inherited ToolButton13: TToolButton
- Left = 572
- Top = 0
- ExplicitLeft = 572
- ExplicitTop = 0
- end
- inherited ToolButton6: TToolButton
- Left = 580
- Top = 0
- ExplicitLeft = 580
- ExplicitTop = 0
- end
- inherited ToolButton7: TToolButton
- Left = 614
- Top = 0
- ExplicitLeft = 614
- ExplicitTop = 0
- end
- inherited ToolButton8: TToolButton
- Left = 648
- Top = 0
- ExplicitLeft = 648
- ExplicitTop = 0
- end
- inherited ToolButton12: TToolButton
- Left = 682
- Top = 0
- ExplicitLeft = 682
- ExplicitTop = 0
- end
- inherited ToolButton9: TToolButton
- Left = 690
- Top = 0
- ExplicitLeft = 690
- ExplicitTop = 0
- end
- inherited ToolButton10: TToolButton
- Left = 724
- Top = 0
- ExplicitLeft = 724
- ExplicitTop = 0
- end
- inherited ToolButton11: TToolButton
- Left = 758
- Top = 0
- ExplicitLeft = 758
- ExplicitTop = 0
- end
- end
inherited cxGrid: TcxGrid
- Top = 50
- Width = 1124
- Height = 405
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID: TcxGridDBColumn
VisibleForCustomization = False
@@ -105,7 +21,6 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
VisibleForCustomization = False
end
inherited cxGridViewVALORADO: TcxGridDBColumn [5]
- Visible = True
end
inherited cxGridViewVISIBLE: TcxGridDBColumn [6]
Caption = #191'Importe visible?'
@@ -162,11 +77,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
end
inherited TBXDock1: TTBXDock
- Top = 24
- Width = 1124
inherited TBXToolbar1: TTBXToolbar
DockPos = 0
- ExplicitWidth = 839
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
diff --git a/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu b/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu
index 8791f15..555588e 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 04e02b6..7772563 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,7 +28,7 @@
Delphi.Personality
- FalseTrueFalseTrueFalse4440FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.4.0FactuGES (Servidor)4.4.4.0miércoles, 19 de abril de 2023 17:22
+ FalseTrueFalseTrueFalse4450FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.5.0FactuGES (Servidor)4.4.5.0miércoles, 17 de mayo de 2023 19:35
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 14ba592..76dcd3b 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ