diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
index fdd210b2..63c148a1 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
@@ -21,7 +21,7 @@ object srvEmpresas: TsrvEmpresas
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
- TargetTable = 'EMPRESAS_TIENDAS'
+ TargetTable = 'V_EMPRESAS_TIENDAS'
Name = 'IBX'
StatementType = stAutoSQL
ColumnMappings = <
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index ec64903e..426db58c 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -58,55 +58,55 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Informes/3/3/InfFacturaCliente.fr3 b/Source/Informes/3/3/InfFacturaCliente.fr3
new file mode 100644
index 00000000..b9b3d4f4
--- /dev/null
+++ b/Source/Informes/3/3/InfFacturaCliente.fr3
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/3/InfAlbaranCliente.fr3 b/Source/Informes/3/InfAlbaranCliente.fr3
new file mode 100644
index 00000000..9b3be4b0
--- /dev/null
+++ b/Source/Informes/3/InfAlbaranCliente.fr3
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/3/InfComision.fr3 b/Source/Informes/3/InfComision.fr3
new file mode 100644
index 00000000..d6e1837c
--- /dev/null
+++ b/Source/Informes/3/InfComision.fr3
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3
new file mode 100644
index 00000000..1a638f8f
--- /dev/null
+++ b/Source/Informes/3/InfFacturaCliente.fr3
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/3/InfReciboCliente.fr3 b/Source/Informes/3/InfReciboCliente.fr3
new file mode 100644
index 00000000..aceca579
--- /dev/null
+++ b/Source/Informes/3/InfReciboCliente.fr3
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/4/InfAlbaranCliente.fr3 b/Source/Informes/4/InfAlbaranCliente.fr3
new file mode 100644
index 00000000..f67884c2
--- /dev/null
+++ b/Source/Informes/4/InfAlbaranCliente.fr3
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/4/InfComision.fr3 b/Source/Informes/4/InfComision.fr3
new file mode 100644
index 00000000..d6e1837c
--- /dev/null
+++ b/Source/Informes/4/InfComision.fr3
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/4/InfFacturaCliente.fr3 b/Source/Informes/4/InfFacturaCliente.fr3
new file mode 100644
index 00000000..7e35932b
--- /dev/null
+++ b/Source/Informes/4/InfFacturaCliente.fr3
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/4/InfReciboCliente.fr3 b/Source/Informes/4/InfReciboCliente.fr3
new file mode 100644
index 00000000..c3c934fb
--- /dev/null
+++ b/Source/Informes/4/InfReciboCliente.fr3
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/InfContratoCliente.fr3 b/Source/Informes/InfContratoCliente.fr3
index f5faf9f8..0742de91 100644
--- a/Source/Informes/InfContratoCliente.fr3
+++ b/Source/Informes/InfContratoCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -12,19 +12,19 @@
-
+
-
+
-
+
@@ -32,9 +32,9 @@
-
+
-
+
@@ -54,17 +54,17 @@
-
+
-
+
-
+
@@ -73,13 +73,13 @@
-
+
-
+
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
index f839b9ec..8eea53bb 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
@@ -102,10 +102,22 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Height = 221
ExplicitWidth = 442
ExplicitHeight = 221
+ inherited edtlNombre: TcxDBTextEdit
+ ExplicitWidth = 224
+ Width = 224
+ end
+ inherited edtNIFCIF: TcxDBTextEdit
+ ExplicitWidth = 103
+ Width = 103
+ end
inherited bVerFichaCliente: TBitBtn
Left = 160
ExplicitLeft = 160
end
+ inherited edtDireccion: TcxMemo
+ ExplicitWidth = 437
+ Width = 437
+ end
inherited bElegirDireccion: TButton
Left = 329
ExplicitLeft = 329
@@ -117,6 +129,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
inherited edtReferencia: TcxDBTextEdit
Left = 242
ExplicitLeft = 242
+ ExplicitWidth = 103
+ Width = 103
end
end
inherited ActionList1: TActionList
@@ -677,6 +691,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
end
object dxLayoutControl1Group17: TdxLayoutGroup
Caption = 'El albar'#225'n pertenece a la tienda'
+ Visible = False
object dxLayoutControl1Item17: TdxLayoutItem
Caption = 'New Item'
ShowCaption = False
@@ -832,14 +847,6 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
end
end
end
- object cxDBTextEdit1: TcxDBTextEdit
- Left = 176
- Top = 236
- DataBinding.DataField = 'REF_CONTRATO'
- DataBinding.DataSource = DADataSource
- TabOrder = 1
- Width = 297
- end
object DADataSource: TDADataSource
Left = 48
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index 0c99d645..f9d446af 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
@@ -109,7 +109,6 @@ type
Button2: TButton;
dxLayoutControl1Group16: TdxLayoutGroup;
actVerContratoCli: TAction;
- cxDBTextEdit1: TcxDBTextEdit;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actVerPedidoCliExecute(Sender: TObject);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
index 597fbdf4..92d1adf0 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
@@ -63,6 +63,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
+ Visible = False
+ VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
@@ -202,15 +204,27 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
Width = 596
ExplicitWidth = 596
inherited txtFiltroTodo: TcxTextEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 499
Width = 499
end
inherited edtFechaIniFiltro: TcxDateEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 147
Width = 147
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 251
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 251
ExplicitWidth = 335
Width = 335
diff --git a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm
index 70ea55a9..2cd95910 100644
--- a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm
+++ b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.dfm
@@ -458,10 +458,11 @@ object srvContabilidad: TsrvContabilidad
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
+ TargetTable = 'V_EMPRESAS_TIENDAS'
Name = 'IBX'
SQL =
- 'select CODIGO_CONTABLE'#10'from empresas_tiendas'#10'where ID_EMPRESA = ' +
- ':ID_EMPRESA'#10'and ID = :ID_TIENDA'#10
+ 'select CODIGO_CONTABLE'#10'from V_empresas_tiendas'#10'where ID_EMPRESA ' +
+ '= :ID_EMPRESA'#10'and ID = :ID_TIENDA'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -520,7 +521,10 @@ object srvContabilidad: TsrvContabilidad
item
Name = 'ID_CONTACTO'
Value = ''
- ParamType = daptInput
+ end
+ item
+ Name = 'ID_EJERCICIO'
+ Value = ''
end>
Statements = <
item
@@ -530,7 +534,7 @@ object srvContabilidad: TsrvContabilidad
Name = 'IBX'
SQL =
'select COUNT(ID)'#10'from CONT_SUBCUENTAS'#10'where ID_CONTACTO = :ID_CO' +
- 'NTACTO'#10'and {where}'#10#10#10
+ 'NTACTO'#10'and ID_EJERCICIO = :ID_EJERCICIO'#10#10#10
StatementType = stSQL
ColumnMappings = <
item
diff --git a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.pas b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.pas
index b9df3d82..898dd3ce 100644
--- a/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.pas
+++ b/Source/Modulos/Contabilidad/Servidor/srvContabilidad_Impl.pas
@@ -324,27 +324,15 @@ function TsrvContabilidad.TieneCuentaAsociada(const ID_CONTACTO: Integer; const
var
AConn : IDAConnection;
dsData: IDADataset;
- AWhere : TDAWhereExpression;
begin
Result := False;
AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);
- { Construir la expresión del Where a partir de los parámetros
- que se han recibido.
- }
with TDAWhereBuilder.Create do
- try
- AWhere := NewBinaryExpression(NewField('', 'ID_EJERCICIO'), NewConstant(darEjercicioActivo(ID_EMPRESA), datInteger), dboEqual);
- finally
- Free;
- end;
-
try
try
- dsData := schContabilidad.NewDataset(AConn, 'ExisteSubCuenta', ['ID_CONTACTO'], [ID_CONTACTO]);
- dsData.DynamicWhere.Expression := AWhere;
-
+ dsData := schContabilidad.NewDataset(AConn, 'ExisteSubCuenta', ['ID_CONTACTO','ID_EJERCICIO'], [ID_CONTACTO, darEjercicioActivo(ID_EMPRESA)]);
dsData.Active := True;
Result := (dsData.FieldValues[0] > 0);
AConn.CommitTransaction;
diff --git a/Source/Modulos/Contactos/Model/uBizClientesServer.pas b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
index 120d9cef..2671cf61 100644
--- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
@@ -83,14 +83,12 @@ begin
dsData := ASchema.NewDataset(ACurrentConn, 'DarEmpresasContacto', ['ID_CONTACTO'], [AIDCliente]);
dsData.Active := True;
- if not AContabilidadService.TieneCuentaAsociada(AIDCliente, dsData.FieldValues[0]) then
+ //Por cada una de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo, si no la tiene
+ while not dsData.EOF do
begin
- //Por cada ino de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo
- while not dsData.EOF do
- begin
- AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, dsData.FieldValues[0], ANombre);
+ if not AContabilidadService.TieneCuentaAsociada(AIDCliente, dsData.FieldValues[0]) then
+ AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, dsData.FieldValues[0], ANombre);
dsData.Next;
- end;
end;
finally
diff --git a/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas b/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas
index 23916923..36cd7994 100644
--- a/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas
@@ -82,14 +82,12 @@ begin
dsData := ASchema.NewDataset(ACurrentConn, 'DarEmpresasContacto', ['ID_CONTACTO'], [AIDProveedor]);
dsData.Active := True;
- if not AContabilidadService.TieneCuentaAsociada(AIDProveedor, dsData.FieldValues[0]) then
+ //Por cada una de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo, en el caso de no tener
+ while not dsData.EOF do
begin
- //Por cada ino de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo
- while not dsData.EOF do
- begin
- AContabilidadService.AnadirSubCuentaProveedor(AIDProveedor, bEsAcreedor, dsData.FieldValues[0], ANombre);
- dsData.Next;
- end;
+ if not AContabilidadService.TieneCuentaAsociada(AIDProveedor, dsData.FieldValues[0]) then
+ AContabilidadService.AnadirSubCuentaProveedor(AIDProveedor, bEsAcreedor, dsData.FieldValues[0], ANombre);
+ dsData.Next;
end;
finally
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index da4c39e9..f0cbf672 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -368,7 +368,7 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 521
inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewCliente1.dsContacto
- ExplicitWidth = 821
+ ExplicitWidth = 521
Width = 521
end
end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index ddec41e6..ce11306e 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
@@ -359,6 +359,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
object dxLayoutControl1Group4: TdxLayoutGroup
AutoAligns = [aaVertical]
Caption = 'La factura pertenece a la tienda'
+ Visible = False
object dxLayoutControl1Item3: TdxLayoutItem
Caption = 'New Item'
ShowCaption = False
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
index e1328fec..6acf423e 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
@@ -37,6 +37,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
+ Visible = False
+ VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm
index 5b111178..db3f3bad 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm
@@ -1,6 +1,6 @@
inherited frViewFacturaProveedor: TfrViewFacturaProveedor
- Width = 758
- Height = 521
+ Width = 451
+ Height = 304
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@@ -9,19 +9,17 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
- Width = 758
- Height = 521
+ Width = 451
+ Height = 304
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
- ExplicitWidth = 451
- ExplicitHeight = 304
DesignSize = (
- 758
- 521)
+ 451
+ 304)
object eReferencia: TcxDBTextEdit
Left = 124
Top = 30
@@ -97,7 +95,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
Width = 169
end
object bFormasPago: TButton
- Left = 264
+ Left = 150
Top = 135
Width = 132
Height = 23
@@ -173,7 +171,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
Width = 158
end
inline frViewProveedorFactura1: TfrViewProveedorFactura
- Left = 424
+ Left = 310
Top = 30
Width = 312
Height = 260
@@ -185,7 +183,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
ParentFont = False
TabOrder = 7
ReadOnly = False
- ExplicitLeft = 424
+ ExplicitLeft = 310
ExplicitTop = 30
ExplicitWidth = 312
ExplicitHeight = 260
@@ -245,9 +243,12 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
ReadOnly = False
ExplicitLeft = 22
ExplicitTop = 320
+ ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo
DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource
+ ExplicitHeight = 228
+ Height = 228
end
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
@@ -314,6 +315,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
end
object dxLayoutControl1Group4: TdxLayoutGroup
Caption = 'La factura pertenece a la tienda'
+ Visible = False
object dxLayoutControl1Item7: TdxLayoutItem
Control = frViewTienda1
ControlOptions.AutoColor = True
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
index 5f64d5d6..8f7bea1f 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
@@ -74,6 +74,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
+ Visible = False
+ VisibleForCustomization = False
end
object cxGridViewREFERENCIA: TcxGridDBColumn
DataBinding.FieldName = 'REFERENCIA'
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm
index 95cc09ad..64dbcf47 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm
+++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm
@@ -14,7 +14,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
- ExplicitHeight = 509
DesignSize = (
925
471)
@@ -565,6 +564,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente
end
object dxLayoutControl1Group5: TdxLayoutGroup
Caption = 'El recibo pertenece a la tienda'
+ Visible = False
object dxLayoutControl1Item18: TdxLayoutItem
Caption = 'Tienda:'
Control = frViewTienda1
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index 833d6c42..8bca77c3 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
@@ -8,8 +8,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
Height = 317
RootLevelOptions.DetailTabsPosition = dtpTop
OnActiveTabChanged = cxGridActiveTabChanged
- ExplicitWidth = 531
- ExplicitHeight = 259
+ ExplicitWidth = 686
+ ExplicitHeight = 317
inherited cxGridView: TcxGridDBTableView
DataController.KeyFieldNames = 'ID'
DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded]
@@ -58,7 +58,9 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
object cxGridViewTIENDA: TcxGridDBColumn
Caption = 'Tienda'
DataBinding.FieldName = 'TIENDA'
+ Visible = False
BestFitMaxWidth = 60
+ VisibleForCustomization = False
end
object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn
Caption = 'Compensado'
@@ -214,22 +216,34 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 686
- ExplicitWidth = 531
+ ExplicitWidth = 686
inherited TBXDockablePanel1: TTBXDockablePanel
- ExplicitWidth = 531
+ ExplicitWidth = 686
inherited dxLayoutControl1: TdxLayoutControl
Width = 686
- ExplicitWidth = 531
+ ExplicitWidth = 686
inherited txtFiltroTodo: TcxTextEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 434
Width = 434
end
inherited edtFechaIniFiltro: TcxDateEdit
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 183
Width = 183
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 367
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 367
ExplicitWidth = 234
Width = 234
@@ -237,10 +251,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 686
- ExplicitWidth = 531
+ ExplicitWidth = 686
inherited tbxBotones: TTBXToolbar
Width = 676
- ExplicitWidth = 521
+ ExplicitWidth = 676
end
end
end
@@ -248,14 +262,14 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 419
Visible = True
- ExplicitTop = 361
- ExplicitWidth = 531
+ ExplicitTop = 419
+ ExplicitWidth = 686
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 686
- ExplicitWidth = 531
+ ExplicitWidth = 686
inherited TBXToolbar1: TTBXToolbar
Width = 676
- ExplicitWidth = 521
+ ExplicitWidth = 676
object TBXSeparatorItem1: TTBXSeparatorItem
end
object TBXItem2: TTBXItem
diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm
index 287dc7c1..9db3d433 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm
+++ b/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm
@@ -14,7 +14,6 @@ inherited frViewReciboProveedor: TfrViewReciboProveedor
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
- ExplicitWidth = 811
DesignSize = (
858
524)
@@ -627,6 +626,7 @@ inherited frViewReciboProveedor: TfrViewReciboProveedor
end
object dxLayoutControl1Group3: TdxLayoutGroup
Caption = 'El recibo pertenece a la tienda'
+ Visible = False
object dxLayoutControl1Item17: TdxLayoutItem
Caption = 'Tienda:'
Control = frViewTienda1
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 7f908a09..97f4123f 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,301 +1,294 @@
-
+
-
- {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;
- True
-
-
- Delphi.Personality
-
-
-FalseTrueFalseTrueFalse2530FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.3.0FactuGES (Servidor)2.5.3.0viernes, 17 de mayo de 2013 12:12
-
-
-
-
-
-
-
- File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
- TRORemoteDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {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;
+ True
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalseTrueFalse2530FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.5.3.0FactuGES (Servidor)2.5.3.0viernes, 17 de mayo de 2013 12:12
+ File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TRORemoteDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+