diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index f5b4d13..83bd772 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Build/Installer.fbl6 b/Build/Installer.fbl6 index 8620f44..43a81d9 100644 Binary files a/Build/Installer.fbl6 and b/Build/Installer.fbl6 differ diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf index 4e2b4a8..fc0fec9 100644 --- a/Build/Installer.fbpInf +++ b/Build/Installer.fbpInf @@ -1,7 +1,7 @@ - + {4C9F0547-B042-46E8-A905-4C8954627078} @@ -14,8 +14,8 @@ - 00:03:00 - 09/12/2011 16:25:00 - True + 00:02:57 + 19/06/2013 12:00:44 + False diff --git a/Build/Installer.fbz6 b/Build/Installer.fbz6 index 11e775c..e85527b 100644 Binary files a/Build/Installer.fbz6 and b/Build/Installer.fbz6 differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index a0c3f23..7dae4e8 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -65,55 +65,55 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index db9dc16..705deaf 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -51,7 +51,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2600FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.0.0FactuGESFactuGES2.6.0.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2610FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.1.0FactuGESFactuGES2.6.1.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 28bef4e..712e273 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index d3baf70..c396aa0 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,11 +1,8 @@ - + - - - - + @@ -15,41 +12,50 @@ - - - - - - - - + + + + + + + - + - - + + - + - - - - + + + + - + - - + + + + - + + + + + + + + + diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/1/InfContratoCliente.fr3 index 0e7a137..8a73f79 100644 --- a/Source/Informes/1/InfContratoCliente.fr3 +++ b/Source/Informes/1/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -17,18 +17,20 @@ - - - - - + + + + + + - - - - - + + + + + + diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 4b419d9..83c4ef5 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,72 +1,75 @@ - + - - - - - - - - - + - + - - + + - - - - - - - + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 index 97696a2..944b511 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -17,18 +17,20 @@ - - - - - + + + + + + - - - - - + + + + + + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index 35b37f5..017f8c4 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,57 +1,63 @@ - + - - - - + - - - - - + + - + + + - - - + + - - - - - - + + + + + + + - + - - + + - + - - - - + + + + - + - - + + + + - + + + + + + + + + diff --git a/Source/Informes/2/InfContratoCliente.fr3 b/Source/Informes/2/InfContratoCliente.fr3 index 093c36c..bb7257b 100644 --- a/Source/Informes/2/InfContratoCliente.fr3 +++ b/Source/Informes/2/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -15,11 +15,11 @@ - + - + diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index aa31135..0fd44cc 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,74 +1,77 @@ - + - - - - - - - - - + - + + - - + - - + + - - - - - - - - + + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3 index 3b5b2d4..03e7865 100644 --- a/Source/Informes/2/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -15,11 +15,11 @@ - + - + diff --git a/Source/Informes/3/InfAlbaranCliente.fr3 b/Source/Informes/3/InfAlbaranCliente.fr3 index 35b37f5..017f8c4 100644 --- a/Source/Informes/3/InfAlbaranCliente.fr3 +++ b/Source/Informes/3/InfAlbaranCliente.fr3 @@ -1,57 +1,63 @@ - + - - - - + - - - - - + + - + + + - - - + + - - - - - - + + + + + + + - + - - + + - + - - - - + + + + - + - - + + + + - + + + + + + + + + diff --git a/Source/Informes/3/InfContratoCliente.fr3 b/Source/Informes/3/InfContratoCliente.fr3 index 6c03d1a..e26a62a 100644 --- a/Source/Informes/3/InfContratoCliente.fr3 +++ b/Source/Informes/3/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -15,11 +15,11 @@ - + - + diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3 index 58af16c..78a7ea3 100644 --- a/Source/Informes/3/InfFacturaCliente.fr3 +++ b/Source/Informes/3/InfFacturaCliente.fr3 @@ -1,74 +1,77 @@ - + - - - - - - - - - + - + + - - + - - + + - - - - - - - - + + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Source/Informes/3/InfPresupuestoCliente.fr3 b/Source/Informes/3/InfPresupuestoCliente.fr3 index 6f4fdbb..05d7010 100644 --- a/Source/Informes/3/InfPresupuestoCliente.fr3 +++ b/Source/Informes/3/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -15,11 +15,11 @@ - + - + diff --git a/Source/Informes/4/InfAlbaranCliente.fr3 b/Source/Informes/4/InfAlbaranCliente.fr3 index eafd08b..c396aa0 100644 --- a/Source/Informes/4/InfAlbaranCliente.fr3 +++ b/Source/Informes/4/InfAlbaranCliente.fr3 @@ -1,11 +1,8 @@ - + - - - - + @@ -15,41 +12,50 @@ - - - - - - - - + + + + + + + - + - - + + - + - - - - + + + + - + - - + + + + - + + + + + + + + + diff --git a/Source/Informes/4/InfContratoCliente.fr3 b/Source/Informes/4/InfContratoCliente.fr3 index 9e1988a..65d2c99 100644 --- a/Source/Informes/4/InfContratoCliente.fr3 +++ b/Source/Informes/4/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -13,11 +13,11 @@ - + - + diff --git a/Source/Informes/4/InfFacturaCliente.fr3 b/Source/Informes/4/InfFacturaCliente.fr3 index 89e8ce0..66643b3 100644 --- a/Source/Informes/4/InfFacturaCliente.fr3 +++ b/Source/Informes/4/InfFacturaCliente.fr3 @@ -1,72 +1,75 @@ - + - - - - - - - - - + - - + + - - + + - - - - - - - - + + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Source/Informes/4/InfPresupuestoCliente.fr3 b/Source/Informes/4/InfPresupuestoCliente.fr3 index 82401d8..aa88ad9 100644 --- a/Source/Informes/4/InfPresupuestoCliente.fr3 +++ b/Source/Informes/4/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -13,11 +13,11 @@ - + - + diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj index 788ebf9..dac01d5 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj @@ -11,6 +11,7 @@ + @@ -161,14 +162,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm index 27c894d..8d08a1c 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm @@ -398,14 +398,12 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente item Name = 'VISIBLE' DataType = datInteger - DisplayLabel = #191'Visible?' DictionaryEntry = 'AlbaranesCliente_Detalles_VISIBLE' end item Name = 'VALORADO' DataType = datSmallInt DisplayLabel = #191'Valorado?' - DictionaryEntry = 'AlbaranesCliente_Detalles_VALORADO' end item Name = 'ID_ARTICULO' @@ -416,11 +414,15 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente Name = 'REFERENCIA' DataType = datString Size = 255 + DisplayLabel = 'Referencia' + DictionaryEntry = 'AlbaranesCliente_Detalles_REFERENCIA' end item Name = 'REFERENCIA_PROVEEDOR' DataType = datString Size = 255 + DisplayLabel = 'Ref. proveedor' + DictionaryEntry = 'AlbaranesCliente_Detalles_REFERENCIA_PROVEEDOR' end> Params = <> MasterMappingMode = mmWhere diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas index f479573..2ff0c11 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas +++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas @@ -9,9 +9,9 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosAlbaranes = '{DB65F866-8E50-42B2-827F-521E6CFD9736}'; - RID_AlbaranesCliente = '{2F713114-4AE3-47F8-815B-6ED7EC03D5B4}'; - RID_AlbaranesCliente_Detalles = '{42ABF8C9-71ED-4ECD-8C0C-E8E0D332B5DD}'; + RID_ListaAnosAlbaranes = '{F1405E5E-2557-4222-8709-EE2F6A0D9542}'; + RID_AlbaranesCliente = '{69D16F16-C561-4FB5-B0A6-57197A742A38}'; + RID_AlbaranesCliente_Detalles = '{F249E060-7F8D-4515-A8ED-9B547A282F9F}'; { Data table names } nme_ListaAnosAlbaranes = 'ListaAnosAlbaranes'; @@ -153,7 +153,7 @@ const type { IListaAnosAlbaranes } IListaAnosAlbaranes = interface(IDAStronglyTypedDataTable) - ['{ABC86BBD-9620-4CC8-A034-528DED051BE9}'] + ['{FE187003-4E59-47D2-88C1-8E70EF5C1015}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -188,7 +188,7 @@ type { IAlbaranesCliente } IAlbaranesCliente = interface(IDAStronglyTypedDataTable) - ['{E435B394-38E9-4AC4-A4D4-E1DC178C1FB4}'] + ['{9D28E73E-56C6-4D73-835B-96C1171AD3AC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -739,7 +739,7 @@ type { IAlbaranesCliente_Detalles } IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{D2940820-F9DD-42ED-ABF8-B5DF56546C12}'] + ['{43704339-3297-4D9C-ABA1-A9B1FD3529C7}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas index 6046718..aad655c 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas +++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosAlbaranesDelta = '{0602292C-AA68-424A-991B-04CE60D0A195}'; - RID_AlbaranesClienteDelta = '{74B6E7D9-BE60-45A7-B8FA-4865D7EE369D}'; - RID_AlbaranesCliente_DetallesDelta = '{DCFA7477-810D-466A-9C22-B70882CA6F4B}'; + RID_ListaAnosAlbaranesDelta = '{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}'; + RID_AlbaranesClienteDelta = '{CD300F28-DA65-4511-905E-17534DE499F2}'; + RID_AlbaranesCliente_DetallesDelta = '{FD279313-BC40-4AD8-8370-E05FB59C733D}'; type { IListaAnosAlbaranesDelta } IListaAnosAlbaranesDelta = interface(IListaAnosAlbaranes) - ['{0602292C-AA68-424A-991B-04CE60D0A195}'] + ['{8A8F5396-5B0A-4D9F-8F0B-F06E0F97799B}'] { Property getters and setters } function GetOldANOValue : String; @@ -50,7 +50,7 @@ type { IAlbaranesClienteDelta } IAlbaranesClienteDelta = interface(IAlbaranesCliente) - ['{74B6E7D9-BE60-45A7-B8FA-4865D7EE369D}'] + ['{CD300F28-DA65-4511-905E-17534DE499F2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -602,7 +602,7 @@ type { IAlbaranesCliente_DetallesDelta } IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles) - ['{DCFA7477-810D-466A-9C22-B70882CA6F4B}'] + ['{FD279313-BC40-4AD8-8370-E05FB59C733D}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_ALBARANValue : Integer; diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm index 1e67cfa..434fbc3 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm @@ -208,15 +208,10 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 10 end - item - Name = 'CONCEPTO_RTF' - DataType = datString - Size = 2000 - end item Name = 'CONCEPTO' DataType = datString - Size = 32765 + Size = 2000 end item Name = 'CANTIDAD' @@ -647,16 +642,17 @@ object RptAlbaranesCliente: TRptAlbaranesCliente SQL = 'SELECT ALBARANES_CLIENTE_DETALLES.ID, ALBARANES_CLIENTE_DETALLES' + '.ID_ALBARAN,'#10' ALBARANES_CLIENTE_DETALLES.POSICION, ALBARAN' + - 'ES_CLIENTE_DETALLES.TIPO_DETALLE,'#10' ALBARANES_CLIENTE_DETAL' + - 'LES.CONCEPTO as CONCEPTO_RTF,'#10' F_RTFTOTEXT(ALBARANES_CLIEN' + - 'TE_DETALLES.CONCEPTO) as CONCEPTO,'#10' ALBARANES_CLIENTE_DETA' + - 'LLES.CANTIDAD,'#10' ALBARANES_CLIENTE_DETALLES.DESCUENTO, ALBA' + - 'RANES_CLIENTE_DETALLES.VISIBLE,'#10' ALBARANES_CLIENTE_DETALLE' + - 'S.IMPORTE_UNIDAD, ALBARANES_CLIENTE_DETALLES.IMPORTE_TOTAL,'#10' ' + - ' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERENCIA' + - '_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM ALBARANES_CLIENTE_DETALLES'#10'L' + - 'EFT JOIN ARTICULOS ON (ALBARANES_CLIENTE_DETALLES.ID_ARTICULO = ' + - 'ARTICULOS.ID)'#10'WHERE ID_ALBARAN = :ID_ALBARAN'#10'ORDER BY POSICION'#10 + 'ES_CLIENTE_DETALLES.TIPO_DETALLE,'#10'/*'#10' ALBARANES_CLIENTE_DE' + + 'TALLES.CONCEPTO as CONCEPTO_RTF,'#10' F_RTFTOTEXT(ALBARANES_CL' + + 'IENTE_DETALLES.CONCEPTO) as CONCEPTO,'#10'*/'#10' ALBARANES_CLIENT' + + 'E_DETALLES.CONCEPTO,'#10' ALBARANES_CLIENTE_DETALLES.CANTIDAD,' + + #10' ALBARANES_CLIENTE_DETALLES.DESCUENTO, ALBARANES_CLIENTE_' + + 'DETALLES.VISIBLE,'#10' ALBARANES_CLIENTE_DETALLES.IMPORTE_UNID' + + 'AD, ALBARANES_CLIENTE_DETALLES.IMPORTE_TOTAL,'#10' ARTICULOS.R' + + 'EFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERENCIA_PROV as REFER' + + 'ENCIA_PROVEEDOR'#10#10'FROM ALBARANES_CLIENTE_DETALLES'#10'LEFT JOIN ARTIC' + + 'ULOS ON (ALBARANES_CLIENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID)'#10 + + 'WHERE ID_ALBARAN = :ID_ALBARAN'#10'ORDER BY POSICION'#10 StatementType = stSQL ColumnMappings = < item @@ -707,11 +703,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DatasetField = 'DESCUENTO' TableField = 'DESCUENTO' end - item - DatasetField = 'CONCEPTO_RTF' - TableField = '' - SQLOrigin = 'CONCEPTO_RTF' - end item DatasetField = 'VISIBLE' TableField = 'VISIBLE' @@ -736,15 +727,10 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 10 end - item - Name = 'CONCEPTO_RTF' - DataType = datString - Size = 2000 - end item Name = 'CONCEPTO' DataType = datString - Size = 32765 + Size = 2000 end item Name = 'CANTIDAD' diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm index 0dd6fc0..5f21307 100644 --- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm +++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm @@ -1106,11 +1106,6 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente end item Params = < - item - Name = 'VALORADO' - DataType = datSmallInt - Value = '' - end item Name = 'ID' DataType = datAutoInc @@ -1119,38 +1114,49 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente end item Name = 'ID_ALBARAN' + DataType = datInteger Value = '' end item Name = 'POSICION' + DataType = datInteger Value = '' end item Name = 'TIPO_DETALLE' + DataType = datString + Size = 10 Value = '' end item Name = 'CONCEPTO' + DataType = datString + Size = 2000 Value = '' end item Name = 'CANTIDAD' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_UNIDAD' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item @@ -1158,8 +1164,14 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente DataType = datSmallInt Value = '' end + item + Name = 'VALORADO' + DataType = datSmallInt + Value = '' + end item Name = 'ID_ARTICULO' + DataType = datInteger Value = '' end> Statements = < @@ -1202,49 +1214,56 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente end item Params = < - item - Name = 'VALORADO' - DataType = datSmallInt - Value = '' - end item Name = 'ID' + DataType = datInteger Value = '' end item Name = 'ID_ALBARAN' + DataType = datInteger Value = '' end item Name = 'POSICION' + DataType = datInteger Value = '' end item Name = 'TIPO_DETALLE' + DataType = datString + Size = 10 Value = '' end item Name = 'CONCEPTO' + DataType = datString + Size = 2000 Value = '' end item Name = 'CANTIDAD' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_UNIDAD' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item @@ -1252,8 +1271,14 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente DataType = datSmallInt Value = '' end + item + Name = 'VALORADO' + DataType = datSmallInt + Value = '' + end item Name = 'ID_ARTICULO' + DataType = datInteger Value = '' end item diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm index 05a680d..f78c1b2 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm @@ -12,6 +12,7 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [7] end inherited cxGridViewDESCRIPCION: TcxGridDBColumn [8] + OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit end inherited cxGridViewCANTIDAD: TcxGridDBColumn [9] end @@ -29,4 +30,22 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente end end end + object cxRichEdit1: TcxRichEdit [3] + Left = 78 + Top = 225 + ParentFont = False + Properties.MemoMode = True + Lines.Strings = ( + 'cxRichEdit1') + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -13 + Style.Font.Name = 'Lucida Console' + Style.Font.Style = [] + Style.IsFontAssigned = True + TabOrder = 3 + Visible = False + Height = 25 + Width = 145 + end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas index d2f3c39..f1ed23a 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas @@ -13,7 +13,7 @@ uses JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uBizAlbaranesCliente, cxDropDownEdit, cxCalendar, cxDBEdit, dxLayoutControl, cxContainer, cxLookupEdit, - cxDBLookupEdit, cxDBLookupComboBox, uDAInterfaces; + cxDBLookupEdit, cxDBLookupComboBox, uDAInterfaces, cxMemo; type IViewDetallesAlbaranCliente = interface(IViewDetallesArticulos) @@ -24,6 +24,10 @@ type end; TfrViewDetallesAlbaranCliente = class(TfrViewDetallesArticulos, IViewDetallesAlbaranCliente) + cxRichEdit1: TcxRichEdit; + procedure cxGridViewDESCRIPCIONGetPropertiesForEdit( + Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; + var AProperties: TcxCustomEditProperties); protected FAlbaran: IBizAlbaranCliente; function GetAlbaran: IBizAlbaranCliente; @@ -60,6 +64,14 @@ begin (Controller as IDetallesAlbaranClienteController).AnadirArticulos(Detalles, Albaran.Cliente); end; +procedure TfrViewDetallesAlbaranCliente.cxGridViewDESCRIPCIONGetPropertiesForEdit( + Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; + var AProperties: TcxCustomEditProperties); +begin + inherited; + AProperties := cxRichEdit1.Properties; +end; + function TfrViewDetallesAlbaranCliente.GetAlbaran: IBizAlbaranCliente; begin Result := FAlbaran; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm index 7666e43..c4ad4c7 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm @@ -1,10 +1,31 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView + inherited cxGridViewDESCRIPCION: TcxGridDBColumn + OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit + end inherited cxGridViewIMPORTENETO: TcxGridDBColumn Visible = False VisibleForCustomization = False end end end + object cxRichEdit1: TcxRichEdit [3] + Left = 78 + Top = 225 + ParentFont = False + Properties.MemoMode = True + Lines.Strings = ( + 'cxRichEdit1') + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -13 + Style.Font.Name = 'Lucida Console' + Style.Font.Style = [] + Style.IsFontAssigned = True + TabOrder = 3 + Visible = False + Height = 25 + Width = 145 + end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas index 009137c..1d514f3 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas @@ -12,7 +12,7 @@ uses Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente, - uDAInterfaces; + uDAInterfaces, cxContainer, cxMemo; type IViewDetallesFacturaCliente = interface(IViewDetallesArticulos) @@ -23,6 +23,10 @@ type end; TfrViewDetallesFacturaCliente = class(TfrViewDetallesArticulos) + cxRichEdit1: TcxRichEdit; + procedure cxGridViewDESCRIPCIONGetPropertiesForEdit( + Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; + var AProperties: TcxCustomEditProperties); protected FFactura: IBizFacturaCliente; function GetFactura: IBizFacturaCliente; @@ -61,6 +65,14 @@ begin (Controller as IDetallesFacturaClienteController).AnadirArticulos(Detalles, Factura.Cliente); end; +procedure TfrViewDetallesFacturaCliente.cxGridViewDESCRIPCIONGetPropertiesForEdit( + Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; + var AProperties: TcxCustomEditProperties); +begin + inherited; + AProperties := cxRichEdit1.Properties; +end; + function TfrViewDetallesFacturaCliente.EsTipoEditable(AItem: TcxCustomGridTableItem): Boolean; var IndiceCol : Integer; diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 1a9ad96..c7fd16f 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -111,8 +111,6 @@ uses srvContratosCliente_Impl in '..\Modulos\Contratos de cliente\Servidor\srvContratosCliente_Impl.pas' {srvContratosCliente: TDataAbstractService}, uBizContratosClienteServer in '..\Modulos\Contratos de cliente\Model\uBizContratosClienteServer.pas', uRptContratosCliente_Server in '..\Modulos\Contratos de cliente\Reports\uRptContratosCliente_Server.pas' {RptContratosCliente}, - schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', - schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', @@ -141,7 +139,9 @@ uses schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', - schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas'; + schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', + schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', + schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 93ef54e..ab33744 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2600FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.0.0FactuGES (Servidor)2.6.0.0jueves, 13 de junio de 2013 17:17 + FalseTrueFalseTrueFalse2610FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.6.1.0FactuGES (Servidor)2.6.1.0jueves, 13 de junio de 2013 17:25 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 c0694fa..6cb07ce 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ