diff --git a/Database/scripts/factuges_sysdata.sql b/Database/scripts/factuges_sysdata.sql
index 9933ca1..16cfd62 100644
--- a/Database/scripts/factuges_sysdata.sql
+++ b/Database/scripts/factuges_sysdata.sql
@@ -8,23 +8,16 @@ INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (3, 'EMPLEADO');
SET GENERATOR GEN_CATEGORIAS_ID TO 4;
COMMIT WORK;
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (1, 1, 'REF_FACTURAS_CLIENTE', 'FAC08/000001', 'Ref. facturas de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (2, 1, 'REF_PEDIDOS_PROVEEDOR', 'PED08/000001', 'Ref. pedidos de proveedor');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (3, NULL, 'REF_ALBARANES_CLIENTE', 'ALB08/000001', 'Ref. albaranes de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (4, 1, 'REF_ALBARANES_PROVEEDOR', 'ALP08/000001', 'Ref. albaranes de proveedor');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (5, 1, 'REF_REMESAS_CLIENTE', 'REM08/000001', 'Ref. remesas de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (6, 1, 'REF_FACTURAS_PROVEEDOR', 'FAP08/000001', 'Ref. facturas de proveedor');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (7, 1, 'REF_ALBARANES_DEV_CLIENTE', 'DEV08/000001', 'Ref. ordenes de devolucion de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (8, 1, 'REF_ALBARANES_DEV_PROVEEDOR', 'DEP08/000001', 'Ref. ordenes de devolucion de proveedor');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (9, 1, 'REF_REMESAS_PROVEEDOR', 'REP08/000001', 'Ref. remesas de proveedor');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (10, 1, 'REF_PEDIDOS_CLIENTE', 'PRE08/000001', 'Ref. pedidos de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (11, NULL, 'REF_CLIENTES', '0000000001', 'Ref. clientes');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (12, NULL, 'REF_PROVEEDORES', '0000000001', 'Ref. proveedores');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (13, NULL, 'REF_EMPLEADOS', '00001', 'Ref. empleados');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (1, 1, 'REF_FACTURAS_CLIENTE', '10/000001', 'Ref. facturas de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (3, NULL, 'REF_ALBARANES_CLIENTE', '10/000001', 'Ref. albaranes de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (5, 1, 'REF_REMESAS_CLIENTE', '10/000001', 'Ref. remesas de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (10, 1, 'REF_PEDIDOS_CLIENTE', '10/000001', 'Ref. pedidos de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (11, NULL, 'REF_CLIENTES', '000001', 'Ref. clientes');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (12, NULL, 'REF_PROVEEDORES', '000001', 'Ref. proveedores');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (14, NULL, 'REF_ARTICULOS', '1', 'Ref. artículos');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (15, NULL, 'REF_VENDEDORES', '0000000001', 'Ref. vendedores');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (16, 2, 'REF_FACTURAS_CLIENTE', 'FAC08/000001', 'Ref. facturas de cliente');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (17, 2, 'REF_REMESAS_CLIENTE', 'REM08/000001', 'Ref. remesas de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (15, NULL, 'REF_VENDEDORES', '0000001', 'Ref. vendedores');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (16, 2, 'REF_FACTURAS_CLIENTE', '10-000001', 'Ref. facturas de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (17, 2, 'REF_REMESAS_CLIENTE', '10-000001', 'Ref. remesas de cliente');
SET GENERATOR GEN_REFERENCIAS_ID TO 18;
COMMIT WORK;
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 63228d5..af98a00 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -45,7 +45,6 @@
Package
FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
RemObjects SDK - Indy Library
Base.dpk
@@ -54,58 +53,58 @@
MainSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
TForm
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f3..1641339 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm
index 9cf2843..68996f0 100644
--- a/Source/GUIBase/uViewFiltroBase.dfm
+++ b/Source/GUIBase/uViewFiltroBase.dfm
@@ -1,20 +1,21 @@
inherited frViewFiltroBase: TfrViewFiltroBase
Width = 549
- Height = 105
+ Height = 109
Visible = False
ExplicitWidth = 549
- ExplicitHeight = 105
+ ExplicitHeight = 109
object TBXDockablePanel1: TSpTBXDockablePanel
Left = 0
Top = 0
Width = 549
- Height = 105
+ Height = 109
Caption = 'TBXDockablePanel1'
Align = alClient
DockMode = dmCannotFloatOrChangeDocks
TabOrder = 0
ShowCaption = False
ShowCaptionWhenDocked = False
+ ExplicitHeight = 105
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3
index d878e4f..05d5a2e 100644
--- a/Source/Informes/1/InfFacturaCliente.fr3
+++ b/Source/Informes/1/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -37,7 +37,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3
index d878e4f..191ea42 100644
--- a/Source/Informes/2/InfFacturaCliente.fr3
+++ b/Source/Informes/2/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -37,10 +37,10 @@
-
+
-
+
@@ -52,13 +52,13 @@
-
-
+
+
-
-
+
+
@@ -70,11 +70,11 @@
-
+
-
+
diff --git a/Source/Informes/InfAlbaranCliente.fr3 b/Source/Informes/InfAlbaranCliente.fr3
index 6c64448..7ecf5c4 100644
--- a/Source/Informes/InfAlbaranCliente.fr3
+++ b/Source/Informes/InfAlbaranCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index 35972c5..d78ffb3 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,63 +49,63 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 8b251f3..1641339 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/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index afc30a1..acae475 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -123,6 +123,7 @@ inherited fEditorCliente: TfEditorCliente
inherited pgPaginas: TPageControl
Width = 786
Height = 530
+ ActivePage = pagDatosComerciales
ExplicitWidth = 786
ExplicitHeight = 530
inherited pagGeneral: TTabSheet
@@ -174,8 +175,6 @@ inherited fEditorCliente: TfEditorCliente
inherited cbProvincia: TcxDBComboBox
Left = 138
Style.LookAndFeel.SkinName = ''
- Style.ButtonStyle = bts3D
- Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
@@ -186,8 +185,6 @@ inherited fEditorCliente: TfEditorCliente
inherited cbPoblacion: TcxDBComboBox
Left = 138
Style.LookAndFeel.SkinName = ''
- Style.ButtonStyle = bts3D
- Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
@@ -234,8 +231,6 @@ inherited fEditorCliente: TfEditorCliente
inherited cbGrupoCliente: TcxDBComboBox
Left = 138
Style.LookAndFeel.SkinName = ''
- Style.ButtonStyle = bts3D
- Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
@@ -584,18 +579,6 @@ inherited fEditorCliente: TfEditorCliente
inherited ToolBar1: TToolBar
Width = 778
ExplicitWidth = 778
- 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
diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
index faad918..caf4c64 100644
--- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm
@@ -211,6 +211,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
DataBinding.DataSource = dsDatosComerciales
Properties.AssignedValues.MinValue = True
Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+ Properties.EditFormat = ',0.00 %;-,0.00 %'
Properties.ImmediatePost = True
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
@@ -282,6 +283,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales
DataBinding.DataField = 'DESCUENTO2'
DataBinding.DataSource = dsDatosComerciales
Properties.AssignedValues.MinValue = True
+ Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.EditFormat = ',0.00 %;-,0.00 %'
Properties.ImmediatePost = True
Style.HotTrack = False
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm
index 1d38856..3dea74b 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm
@@ -226,22 +226,22 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
Width = 205
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 229
+ Left = 263
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 229
+ ExplicitLeft = 263
ExplicitWidth = 351
Width = 351
end
inherited eLista: TcxComboBox
- Left = 515
+ Left = 528
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 515
+ ExplicitLeft = 528
ExplicitWidth = 215
Width = 215
end
@@ -287,23 +287,19 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
end>
end
end
- object pnlFiltrar: TSpTBXDockablePanel [6]
+ object pnlFiltrar: TPanel [6]
Left = 0
Top = 64
Width = 670
Height = 128
- Caption = 'Filtrar'
Align = alTop
- DockMode = dmCannotFloat
- DockPos = 88
- DockRow = 2
+ Caption = 'Filtrar'
TabOrder = 5
- ShowCaptionWhenDocked = False
object Label1: TLabel
- Left = 330
+ Left = 329
Top = 50
- Width = 17
- Height = 13
+ Width = 18
+ Height = 15
Caption = 'y el'
end
object txtFiltroTodo: TcxTextEdit
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas
index 3de4a2d..ccd6c30 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas
@@ -51,7 +51,7 @@ type
actBuscar2: TAction;
actQuitarFiltro2: TAction;
actAnchoAuto2: TAction;
- pnlFiltrar: TSpTBXDockablePanel;
+ pnlFiltrar: TPanel;
Label1: TLabel;
txtFiltroTodo: TcxTextEdit;
edtFechaFiltro1: TcxDateEdit;
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index 1463e9f..c9c47f5 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
@@ -189,27 +189,36 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
Width = 195
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 208
+ Left = 236
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 208
+ ExplicitLeft = 236
ExplicitWidth = 222
Width = 222
end
inherited eLista: TcxComboBox
- Left = 389
+ Left = 403
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 389
+ ExplicitLeft = 403
+ ExplicitWidth = 215
+ Width = 215
+ end
+ inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+ inherited dxLayoutControl1Group1: TdxLayoutGroup
+ inherited dxLayoutControl1Item2: TdxLayoutItem
+ CaptionOptions.Text = 'Entre la fecha de vencimiento:'
+ end
+ end
end
end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 521
- ExplicitWidth = 531
+ ExplicitWidth = 521
inherited tbxBotones: TSpTBXToolbar
Width = 521
ExplicitWidth = 521
@@ -228,7 +237,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
ExplicitWidth = 531
inherited TBXToolbar1: TSpTBXToolbar
Width = 531
- ExplicitWidth = 521
+ ExplicitWidth = 531
object TBXSeparatorItem1: TSpTBXSeparatorItem
end
object TBXItem2: TSpTBXItem
@@ -245,6 +254,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
end
end
inherited dxPSEngineController1: TdxPSEngineController
+ Active = True
Top = 152
end
inherited cxStyleRepository1: TcxStyleRepository
diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.dproj b/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
index 99ed94b..e57c057 100644
--- a/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
+++ b/Source/Modulos/Referencias/Controller/Referencias_controller.dproj
@@ -47,24 +47,10 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.res b/Source/Modulos/Referencias/Controller/Referencias_controller.res
index 8b251f3..1641339 100644
Binary files a/Source/Modulos/Referencias/Controller/Referencias_controller.res and b/Source/Modulos/Referencias/Controller/Referencias_controller.res differ
diff --git a/Source/Modulos/Referencias/Data/Referencias_data.dproj b/Source/Modulos/Referencias/Data/Referencias_data.dproj
index c95e0fd..4281ff5 100644
--- a/Source/Modulos/Referencias/Data/Referencias_data.dproj
+++ b/Source/Modulos/Referencias/Data/Referencias_data.dproj
@@ -40,21 +40,20 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Referencias_data.dpk
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Referencias_data.dpk
MainSource
-
-
+
+
-