From b7e51b4e3dbd0038b3804f9b2f9f96b2cc65f64d Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 9 Jun 2008 17:08:55 +0000 Subject: [PATCH] Cambios en articulos para que se calcule el Precio PVP, cambios en empleados git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@447 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Database/scripts/factuges.sql | 19 +- Source/Base/Base.dproj | 102 ++-- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/GUIBase/uEditorDBItem.dfm | 4 + Source/GUIBase/uViewFiltroBase.dfm | 68 ++- Source/GUIBase/uViewFiltroBase.pas | 4 +- .../Articulos/Articulos_Group.groupproj | 36 +- .../Controller/uArticulosController.pas | 9 +- .../Articulos/Data/uDataModuleArticulos.dfm | 66 ++- .../Articulos/Data/uDataModuleArticulos.pas | 9 + .../Model/Data/uIDataModuleArticulos.pas | 3 +- .../Model/schArticulosClient_Intf.pas | 294 +++++++++- .../Model/schArticulosServer_Intf.pas | 352 ++++++++++- .../Modulos/Articulos/Model/uBizArticulos.pas | Bin 3108 -> 3917 bytes .../Articulos/Servidor/srvArticulos_Impl.dfm | 166 +++++- .../Articulos/Servidor/srvArticulos_Impl.pas | 32 +- .../Articulos/Views/uEditorArticulos.dfm | 9 +- .../Articulos/Views/uEditorArticulos.pas | 3 + .../Modulos/Articulos/Views/uViewArticulo.dfm | 322 +++++----- .../Modulos/Articulos/Views/uViewArticulo.pas | 11 + .../Articulos/Views/uViewArticulos.dfm | 88 ++- .../Articulos/Views/uViewArticulos.pas | 120 +++- .../Modulos/Contactos/Views/uViewEmpleado.dfm | 154 ++--- .../Contactos/Views/uViewEmpleados.dfm | 18 +- .../Views/uEditorFacturaCliente.dfm | 94 ++- Source/Servicios/FactuGES.RODL | 8 + Source/Servicios/FactuGES_Intf.pas | 21 + Source/Servicios/FactuGES_Invk.pas | 31 + Source/Servicios/RODLFILE.res | Bin 25261 -> 25548 bytes Source/Servidor/FactuGES_Server.dpr | 6 +- Source/Servidor/FactuGES_Server.dproj | 550 +++++++++--------- 31 files changed, 1894 insertions(+), 705 deletions(-) diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 8fdcabc1..ef68e278 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -403,7 +403,11 @@ CREATE TABLE ARTICULOS ( FECHA_MODIFICACION TIMESTAMP, USUARIO TIPO_USUARIO, INVENTARIABLE TIPO_BOOLEANO, - ELIMINADO TIPO_BOOLEANO + ELIMINADO TIPO_BOOLEANO, + TIEMPO INTEGER, + PARAM_TIEMPO FLOAT, + MANO_OBRA TIPO_IMPORTE, + PRECIO_PVP TIPO_IMPORTE ); @@ -1479,7 +1483,6 @@ WHERE ALMACENES.TIPO_ALMACEN = 'ALMACEN' ; - /* View: V_ARTICULOS */ CREATE VIEW V_ARTICULOS( ID, @@ -1503,7 +1506,11 @@ CREATE VIEW V_ARTICULOS( NOMBRE_PROVEEDOR, ELIMINADO, FABRICANTE, - REFERENCIA_FABR) + REFERENCIA_FABR, + TIEMPO, + PARAM_TIEMPO, + MANO_OBRA, + PRECIO_PVP) AS SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCRIPCION, ARTICULOS.UNIDAD_MEDIDA, ARTICULOS.FAMILIA, ARTICULOS.IMAGEN, @@ -1519,7 +1526,11 @@ SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCR CONTACTOS.NOMBRE AS NOMBRE_PROVEEDOR, ARTICULOS.ELIMINADO, ARTICULOS.FABRICANTE, - ARTICULOS.REFERENCIA_FABR + ARTICULOS.REFERENCIA_FABR, + ARTICULOS.TIEMPO, + ARTICULOS.PARAM_TIEMPO, + ARTICULOS.MANO_OBRA, + ARTICULOS.PRECIO_PVP FROM ARTICULOS LEFT OUTER JOIN CONTACTOS ON (CONTACTOS.ID = ARTICULOS.ID_PROVEEDOR) WHERE (ARTICULOS.ELIMINADO = 0) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 9e505a74..34b6aca9 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,57 +53,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index dd33b20b..9edf8834 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -47,6 +47,10 @@ inherited fEditorDBItem: TfEditorDBItem TabOrder = 2 object pagGeneral: TTabSheet Caption = 'General' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm index 7c6b0497..dd51d3ac 100644 --- a/Source/GUIBase/uViewFiltroBase.dfm +++ b/Source/GUIBase/uViewFiltroBase.dfm @@ -1,8 +1,8 @@ object frViewFiltroBase: TfrViewFiltroBase Left = 0 Top = 0 - Width = 565 - Height = 102 + Width = 666 + Height = 105 TabOrder = 0 Visible = False object TBXDockablePanel1: TTBXDockablePanel @@ -20,19 +20,16 @@ object frViewFiltroBase: TfrViewFiltroBase ShowCaptionWhenDocked = False SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - ExplicitWidth = 128 - ExplicitHeight = 98 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 565 - Height = 68 + Width = 666 + Height = 73 Align = alTop ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 128 object txtFiltroTodo: TcxTextEdit Left = 87 Top = 10 @@ -42,18 +39,14 @@ object frViewFiltroBase: TfrViewFiltroBase Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 - Width = 273 + Width = 569 end object edtFechaIniFiltro: TcxDateEdit Left = 87 @@ -64,23 +57,19 @@ object frViewFiltroBase: TfrViewFiltroBase Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 - Width = 121 + Width = 150 end object edtFechaFinFiltro: TcxDateEdit - Left = 350 + Left = 254 Top = 37 Properties.OnChange = OnCamposFiltroChange Style.BorderColor = clWindowFrame @@ -88,20 +77,29 @@ object frViewFiltroBase: TfrViewFiltroBase Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 - Width = 121 + Width = 150 + end + object eLista: TcxComboBox + Left = 441 + Top = 37 + Properties.DropDownListStyle = lsEditFixedList + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + TabOrder = 3 + Width = 215 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False @@ -119,25 +117,31 @@ object frViewFiltroBase: TfrViewFiltroBase ShowBorder = False object dxLayoutControl1Item2: TdxLayoutItem AutoAligns = [aaVertical] - AlignHorz = ahClient Caption = 'Entre la fecha:' Control = edtFechaIniFiltro ControlOptions.ShowBorder = False end object dxLayoutControl1Item3: TdxLayoutItem AutoAligns = [aaVertical] - AlignHorz = ahClient Caption = 'y' Control = edtFechaFinFiltro ControlOptions.ShowBorder = False end + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Lista:' + Visible = False + Control = eLista + ControlOptions.ShowBorder = False + end end end end object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 - Top = 68 - Width = 565 + Top = 73 + Width = 666 Height = 30 Margins.Left = 10 Align = alTop @@ -145,7 +149,7 @@ object frViewFiltroBase: TfrViewFiltroBase object tbxBotones: TTBXToolbar Left = 10 Top = 0 - Width = 555 + Width = 656 Height = 30 Align = alTop AutoResize = False @@ -173,8 +177,8 @@ object frViewFiltroBase: TfrViewFiltroBase end object ActionList1: TActionList Images = PngImageList - Left = 384 - Top = 72 + Left = 280 + Top = 24 object actQuitarFiltro: TAction Caption = 'Quitar filtros y ver todo' ImageIndex = 0 @@ -204,8 +208,8 @@ object frViewFiltroBase: TfrViewFiltroBase Name = 'PngImage0' Background = clWindow end> - Left = 424 - Top = 72 + Left = 312 + Top = 24 Bitmap = {} end end diff --git a/Source/GUIBase/uViewFiltroBase.pas b/Source/GUIBase/uViewFiltroBase.pas index af3369f7..4a5c5c18 100644 --- a/Source/GUIBase/uViewFiltroBase.pas +++ b/Source/GUIBase/uViewFiltroBase.pas @@ -13,7 +13,7 @@ uses dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, - dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter; + dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter, cxGraphics; type IViewFiltroBase = interface @@ -49,6 +49,8 @@ type tbxBotones: TTBXToolbar; TBXItem2: TTBXItem; TBXAlignmentPanel1: TTBXAlignmentPanel; + dxLayoutControl1Item4: TdxLayoutItem; + eLista: TcxComboBox; procedure OnCamposFiltroChange(Sender: TObject); procedure actQuitarFiltroExecute(Sender: TObject); diff --git a/Source/Modulos/Articulos/Articulos_Group.groupproj b/Source/Modulos/Articulos/Articulos_Group.groupproj index ae024535..3c810477 100644 --- a/Source/Modulos/Articulos/Articulos_Group.groupproj +++ b/Source/Modulos/Articulos/Articulos_Group.groupproj @@ -10,6 +10,9 @@ + + + @@ -121,14 +124,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas index d5bcedc4..5f27ddf9 100644 --- a/Source/Modulos/Articulos/Controller/uArticulosController.pas +++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas @@ -34,6 +34,7 @@ type procedure ElegirProveedor(AArticulo : IBizArticulo); procedure AnadirProveedor(AArticulo : IBizArticulo); procedure VerProveedor(AArticulo : IBizArticulo); + function DarListaProveedoresConArticulos: TStringList; function ExtraerSeleccionados(AArticulos: IBizArticulo) : IBizArticulo; function ElegirArticulos(AArticulos : IBizArticulo; AMensaje: String; AMultiSelect: Boolean): IBizArticulo; @@ -67,7 +68,7 @@ type function Eliminar(const ID : Integer): Boolean; overload; function Eliminar(AArticulo : IBizArticulo): Boolean; overload; - function Guardar(AArticulo : IBizArticulo): Boolean; + function Guardar(AArticulo : IBizArticulo): Boolean; procedure DescartarCambios(AArticulo : IBizArticulo); virtual; function Existe(const ID: Integer) : Boolean; virtual; procedure Anadir(AArticulo : IBizArticulo); virtual; @@ -92,6 +93,7 @@ type procedure ElegirProveedor(AArticulo : IBizArticulo); procedure AnadirProveedor(AArticulo : IBizArticulo); procedure VerProveedor(AArticulo : IBizArticulo); + function DarListaProveedoresConArticulos: TStringList; end; implementation @@ -322,6 +324,11 @@ begin Result := Supports(EditorRegistry.CreateEditor(AName), IID, Intf); end; +function TArticulosController.DarListaProveedoresConArticulos: TStringList; +begin + Result := (FDataModule as IDataModuleArticulos).DarListaProveedoresConArticulos(AppFactuGES.EmpresaActiva.ID); +end; + procedure TArticulosController.DescartarCambios(AArticulo: IBizArticulo); begin if not Assigned(AArticulo) then diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm index 5ef9b732..2a161bdc 100644 --- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm +++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm @@ -1,6 +1,6 @@ inherited DataModuleArticulos: TDataModuleArticulos OnCreate = DAClientDataModuleCreate - Height = 219 + Height = 289 Width = 518 object RORemoteService: TRORemoteService Message = dmConexion.ROMessage @@ -164,6 +164,22 @@ inherited DataModuleArticulos: TDataModuleArticulos Size = 255 DisplayLabel = 'Ref. fabricante' DictionaryEntry = 'Articulos_REFERENCIA_FABR' + end + item + Name = 'TIEMPO' + DataType = datInteger + end + item + Name = 'PARAM_TIEMPO' + DataType = datFloat + end + item + Name = 'MANO_OBRA' + DataType = datCurrency + end + item + Name = 'PRECIO_PVP' + DataType = datCurrency end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] @@ -172,8 +188,8 @@ inherited DataModuleArticulos: TDataModuleArticulos MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Articulos' IndexDefs = <> - Left = 232 - Top = 112 + Left = 224 + Top = 120 end object ds_Articulos: TDADataSource DataSet = tbl_Articulos.Dataset @@ -322,6 +338,22 @@ inherited DataModuleArticulos: TDataModuleArticulos Size = 255 DisplayLabel = 'Ref. fabricante' DictionaryEntry = 'Articulos_REFERENCIA_FABR' + end + item + Name = 'TIEMPO' + DataType = datInteger + end + item + Name = 'PARAM_TIEMPO' + DataType = datFloat + end + item + Name = 'MANO_OBRA' + DataType = datCurrency + end + item + Name = 'PRECIO_PVP' + DataType = datCurrency end> Params = < item @@ -344,4 +376,32 @@ inherited DataModuleArticulos: TDataModuleArticulos Left = 400 Top = 32 end + object tbl_ProveedoresConArticulos: TDAMemDataTable + RemoteUpdatesOptions = [] + Fields = < + item + Name = 'ID_PROVEEDOR' + DataType = datInteger + end + item + Name = 'NOMBRE' + DataType = datString + Size = 255 + end> + Params = <> + StreamingOptions = [soDisableEventsWhileStreaming] + RemoteDataAdapter = rda_Articulos + DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] + MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'ProveedoresConArticulos' + IndexDefs = <> + Left = 304 + Top = 208 + end + object ds_ProveedoresConArticulos: TDADataSource + DataSet = tbl_ProveedoresConArticulos.Dataset + DataTable = tbl_ProveedoresConArticulos + Left = 304 + Top = 152 + end end diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas b/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas index b7ac930d..adbbf7c8 100644 --- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas +++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.pas @@ -19,6 +19,8 @@ type ds_Articulos: TDADataSource; tbl_ArticulosParaCliente: TDAMemDataTable; ds_ArticulosParaCliente: TDADataSource; + tbl_ProveedoresConArticulos: TDAMemDataTable; + ds_ProveedoresConArticulos: TDADataSource; procedure DAClientDataModuleCreate(Sender: TObject); protected @@ -29,6 +31,7 @@ type function GetItems (IDCliente: Integer) : IBizArticulo; overload; function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo; function NewItem : IBizArticulo; + function DarListaProveedoresConArticulos(const IDEmpresa: Integer) : TStringList; end; implementation @@ -52,6 +55,12 @@ begin RORemoteService.Message := dmConexion.Message; end; +function TDataModuleArticulos.DarListaProveedoresConArticulos(const IDEmpresa: Integer): TStringList; +begin + Result := TStringList.Create; + Result.LoadFromStream((RORemoteService as IsrvArticulos).DarListaProveedoresConArticulos(IDEmpresa)); +end; + function TDataModuleArticulos.NewItem: IBizArticulo; begin Result := GetItem(ID_NULO) diff --git a/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas b/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas index dc6976eb..30afd358 100644 --- a/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas +++ b/Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas @@ -3,7 +3,7 @@ unit uIDataModuleArticulos; interface uses - uBizArticulos; + uBizArticulos, Classes; type IDataModuleArticulos = interface @@ -12,6 +12,7 @@ type function GetItems (IDCliente: Integer) : IBizArticulo; overload; function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo; function NewItem : IBizArticulo; + function DarListaProveedoresConArticulos(const IDEmpresa: Integer) : TStringList; end; implementation diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas index 2d457f07..3b1b9e76 100644 --- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas @@ -3,14 +3,14 @@ unit schArticulosClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; 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_Articulos = '{D722C372-EBBB-4076-B05F-7D3D558AD018}'; - RID_ArticulosParaCliente = '{BD605A42-7AE2-464B-941D-FB4EB1C60932}'; + RID_Articulos = '{7AF29D8D-9759-4857-A440-E0AE2002CA7F}'; + RID_ArticulosParaCliente = '{5FDF1300-DD2E-45E9-88DF-CA220201A815}'; { Data table names } nme_Articulos = 'Articulos'; @@ -39,6 +39,10 @@ const fld_ArticulosELIMINADO = 'ELIMINADO'; fld_ArticulosFABRICANTE = 'FABRICANTE'; fld_ArticulosREFERENCIA_FABR = 'REFERENCIA_FABR'; + fld_ArticulosTIEMPO = 'TIEMPO'; + fld_ArticulosPARAM_TIEMPO = 'PARAM_TIEMPO'; + fld_ArticulosMANO_OBRA = 'MANO_OBRA'; + fld_ArticulosPRECIO_PVP = 'PRECIO_PVP'; { Articulos field indexes } idx_ArticulosID = 0; @@ -63,6 +67,10 @@ const idx_ArticulosELIMINADO = 19; idx_ArticulosFABRICANTE = 20; idx_ArticulosREFERENCIA_FABR = 21; + idx_ArticulosTIEMPO = 22; + idx_ArticulosPARAM_TIEMPO = 23; + idx_ArticulosMANO_OBRA = 24; + idx_ArticulosPRECIO_PVP = 25; { ArticulosParaCliente fields } fld_ArticulosParaClienteID = 'ID'; @@ -87,6 +95,10 @@ const fld_ArticulosParaClienteELIMINADO = 'ELIMINADO'; fld_ArticulosParaClienteFABRICANTE = 'FABRICANTE'; fld_ArticulosParaClienteREFERENCIA_FABR = 'REFERENCIA_FABR'; + fld_ArticulosParaClienteTIEMPO = 'TIEMPO'; + fld_ArticulosParaClientePARAM_TIEMPO = 'PARAM_TIEMPO'; + fld_ArticulosParaClienteMANO_OBRA = 'MANO_OBRA'; + fld_ArticulosParaClientePRECIO_PVP = 'PRECIO_PVP'; { ArticulosParaCliente field indexes } idx_ArticulosParaClienteID = 0; @@ -111,11 +123,15 @@ const idx_ArticulosParaClienteELIMINADO = 19; idx_ArticulosParaClienteFABRICANTE = 20; idx_ArticulosParaClienteREFERENCIA_FABR = 21; + idx_ArticulosParaClienteTIEMPO = 22; + idx_ArticulosParaClientePARAM_TIEMPO = 23; + idx_ArticulosParaClienteMANO_OBRA = 24; + idx_ArticulosParaClientePRECIO_PVP = 25; type { IArticulos } IArticulos = interface(IDAStronglyTypedDataTable) - ['{7054C4D6-0703-46ED-90A8-66909C04B767}'] + ['{688FF0B4-9CA5-4C09-B82C-4D288BCF418F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -204,6 +220,22 @@ type procedure SetREFERENCIA_FABRValue(const aValue: String); function GetREFERENCIA_FABRIsNull: Boolean; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); + function GetTIEMPOValue: Integer; + procedure SetTIEMPOValue(const aValue: Integer); + function GetTIEMPOIsNull: Boolean; + procedure SetTIEMPOIsNull(const aValue: Boolean); + function GetPARAM_TIEMPOValue: Float; + procedure SetPARAM_TIEMPOValue(const aValue: Float); + function GetPARAM_TIEMPOIsNull: Boolean; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); + function GetMANO_OBRAValue: Currency; + procedure SetMANO_OBRAValue(const aValue: Currency); + function GetMANO_OBRAIsNull: Boolean; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); + function GetPRECIO_PVPValue: Currency; + procedure SetPRECIO_PVPValue(const aValue: Currency); + function GetPRECIO_PVPIsNull: Boolean; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); { Properties } @@ -251,10 +283,18 @@ type property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull; property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue; property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; + property TIEMPO: Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull: Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property MANO_OBRA: Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull: Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; end; { TArticulosDataTableRules } - TArticulosDataTableRules = class(TIntfObjectDADataTableRules, IArticulos) + TArticulosDataTableRules = class(TDADataTableRules, IArticulos) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); @@ -347,6 +387,22 @@ type procedure SetREFERENCIA_FABRValue(const aValue: String); virtual; function GetREFERENCIA_FABRIsNull: Boolean; virtual; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual; + function GetTIEMPOValue: Integer; virtual; + procedure SetTIEMPOValue(const aValue: Integer); virtual; + function GetTIEMPOIsNull: Boolean; virtual; + procedure SetTIEMPOIsNull(const aValue: Boolean); virtual; + function GetPARAM_TIEMPOValue: Float; virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; + function GetPARAM_TIEMPOIsNull: Boolean; virtual; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; + function GetMANO_OBRAValue: Currency; virtual; + procedure SetMANO_OBRAValue(const aValue: Currency); virtual; + function GetMANO_OBRAIsNull: Boolean; virtual; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); virtual; + function GetPRECIO_PVPValue: Currency; virtual; + procedure SetPRECIO_PVPValue(const aValue: Currency); virtual; + function GetPRECIO_PVPIsNull: Boolean; virtual; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -393,6 +449,14 @@ type property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull; property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue; property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; + property TIEMPO: Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull: Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property MANO_OBRA: Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull: Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -405,7 +469,7 @@ type } { IArticulosParaCliente } IArticulosParaCliente = interface(IDAStronglyTypedDataTable) - ['{5D823EDE-5BC4-4583-A5B1-B571570AF822}'] + ['{74039390-BC6A-4257-9DAC-63898C73E1A6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -494,6 +558,22 @@ type procedure SetREFERENCIA_FABRValue(const aValue: String); function GetREFERENCIA_FABRIsNull: Boolean; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); + function GetTIEMPOValue: Integer; + procedure SetTIEMPOValue(const aValue: Integer); + function GetTIEMPOIsNull: Boolean; + procedure SetTIEMPOIsNull(const aValue: Boolean); + function GetPARAM_TIEMPOValue: Float; + procedure SetPARAM_TIEMPOValue(const aValue: Float); + function GetPARAM_TIEMPOIsNull: Boolean; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); + function GetMANO_OBRAValue: Currency; + procedure SetMANO_OBRAValue(const aValue: Currency); + function GetMANO_OBRAIsNull: Boolean; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); + function GetPRECIO_PVPValue: Currency; + procedure SetPRECIO_PVPValue(const aValue: Currency); + function GetPRECIO_PVPIsNull: Boolean; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); { Properties } @@ -541,10 +621,18 @@ type property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull; property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue; property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; + property TIEMPO: Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull: Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property MANO_OBRA: Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull: Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; end; { TArticulosParaClienteDataTableRules } - TArticulosParaClienteDataTableRules = class(TIntfObjectDADataTableRules, IArticulosParaCliente) + TArticulosParaClienteDataTableRules = class(TDADataTableRules, IArticulosParaCliente) private f_IMAGEN: IROStream; procedure IMAGEN_OnChange(Sender: TObject); @@ -637,6 +725,22 @@ type procedure SetREFERENCIA_FABRValue(const aValue: String); virtual; function GetREFERENCIA_FABRIsNull: Boolean; virtual; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual; + function GetTIEMPOValue: Integer; virtual; + procedure SetTIEMPOValue(const aValue: Integer); virtual; + function GetTIEMPOIsNull: Boolean; virtual; + procedure SetTIEMPOIsNull(const aValue: Boolean); virtual; + function GetPARAM_TIEMPOValue: Float; virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; + function GetPARAM_TIEMPOIsNull: Boolean; virtual; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; + function GetMANO_OBRAValue: Currency; virtual; + procedure SetMANO_OBRAValue(const aValue: Currency); virtual; + function GetMANO_OBRAIsNull: Boolean; virtual; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); virtual; + function GetPRECIO_PVPValue: Currency; virtual; + procedure SetPRECIO_PVPValue(const aValue: Currency); virtual; + function GetPRECIO_PVPIsNull: Boolean; virtual; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -683,6 +787,14 @@ type property FABRICANTEIsNull: Boolean read GetFABRICANTEIsNull write SetFABRICANTEIsNull; property REFERENCIA_FABR: String read GetREFERENCIA_FABRValue write SetREFERENCIA_FABRValue; property REFERENCIA_FABRIsNull: Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; + property TIEMPO: Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull: Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property MANO_OBRA: Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull: Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property PRECIO_PVP: Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull: Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1178,6 +1290,90 @@ begin DataTable.Fields[idx_ArticulosREFERENCIA_FABR].AsVariant := Null; end; +function TArticulosDataTableRules.GetTIEMPOValue: Integer; +begin + result := DataTable.Fields[idx_ArticulosTIEMPO].AsInteger; +end; + +procedure TArticulosDataTableRules.SetTIEMPOValue(const aValue: Integer); +begin + DataTable.Fields[idx_ArticulosTIEMPO].AsInteger := aValue; +end; + +function TArticulosDataTableRules.GetTIEMPOIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosTIEMPO].IsNull; +end; + +procedure TArticulosDataTableRules.SetTIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosTIEMPO].AsVariant := Null; +end; + +function TArticulosDataTableRules.GetPARAM_TIEMPOValue: Float; +begin + result := DataTable.Fields[idx_ArticulosPARAM_TIEMPO].AsFloat; +end; + +procedure TArticulosDataTableRules.SetPARAM_TIEMPOValue(const aValue: Float); +begin + DataTable.Fields[idx_ArticulosPARAM_TIEMPO].AsFloat := aValue; +end; + +function TArticulosDataTableRules.GetPARAM_TIEMPOIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosPARAM_TIEMPO].IsNull; +end; + +procedure TArticulosDataTableRules.SetPARAM_TIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosPARAM_TIEMPO].AsVariant := Null; +end; + +function TArticulosDataTableRules.GetMANO_OBRAValue: Currency; +begin + result := DataTable.Fields[idx_ArticulosMANO_OBRA].AsCurrency; +end; + +procedure TArticulosDataTableRules.SetMANO_OBRAValue(const aValue: Currency); +begin + DataTable.Fields[idx_ArticulosMANO_OBRA].AsCurrency := aValue; +end; + +function TArticulosDataTableRules.GetMANO_OBRAIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosMANO_OBRA].IsNull; +end; + +procedure TArticulosDataTableRules.SetMANO_OBRAIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosMANO_OBRA].AsVariant := Null; +end; + +function TArticulosDataTableRules.GetPRECIO_PVPValue: Currency; +begin + result := DataTable.Fields[idx_ArticulosPRECIO_PVP].AsCurrency; +end; + +procedure TArticulosDataTableRules.SetPRECIO_PVPValue(const aValue: Currency); +begin + DataTable.Fields[idx_ArticulosPRECIO_PVP].AsCurrency := aValue; +end; + +function TArticulosDataTableRules.GetPRECIO_PVPIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosPRECIO_PVP].IsNull; +end; + +procedure TArticulosDataTableRules.SetPRECIO_PVPIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosPRECIO_PVP].AsVariant := Null; +end; + { TArticulosParaClienteDataTableRules } constructor TArticulosParaClienteDataTableRules.Create(aDataTable: TDADataTable); @@ -1663,6 +1859,90 @@ begin DataTable.Fields[idx_ArticulosParaClienteREFERENCIA_FABR].AsVariant := Null; end; +function TArticulosParaClienteDataTableRules.GetTIEMPOValue: Integer; +begin + result := DataTable.Fields[idx_ArticulosParaClienteTIEMPO].AsInteger; +end; + +procedure TArticulosParaClienteDataTableRules.SetTIEMPOValue(const aValue: Integer); +begin + DataTable.Fields[idx_ArticulosParaClienteTIEMPO].AsInteger := aValue; +end; + +function TArticulosParaClienteDataTableRules.GetTIEMPOIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosParaClienteTIEMPO].IsNull; +end; + +procedure TArticulosParaClienteDataTableRules.SetTIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosParaClienteTIEMPO].AsVariant := Null; +end; + +function TArticulosParaClienteDataTableRules.GetPARAM_TIEMPOValue: Float; +begin + result := DataTable.Fields[idx_ArticulosParaClientePARAM_TIEMPO].AsFloat; +end; + +procedure TArticulosParaClienteDataTableRules.SetPARAM_TIEMPOValue(const aValue: Float); +begin + DataTable.Fields[idx_ArticulosParaClientePARAM_TIEMPO].AsFloat := aValue; +end; + +function TArticulosParaClienteDataTableRules.GetPARAM_TIEMPOIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosParaClientePARAM_TIEMPO].IsNull; +end; + +procedure TArticulosParaClienteDataTableRules.SetPARAM_TIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosParaClientePARAM_TIEMPO].AsVariant := Null; +end; + +function TArticulosParaClienteDataTableRules.GetMANO_OBRAValue: Currency; +begin + result := DataTable.Fields[idx_ArticulosParaClienteMANO_OBRA].AsCurrency; +end; + +procedure TArticulosParaClienteDataTableRules.SetMANO_OBRAValue(const aValue: Currency); +begin + DataTable.Fields[idx_ArticulosParaClienteMANO_OBRA].AsCurrency := aValue; +end; + +function TArticulosParaClienteDataTableRules.GetMANO_OBRAIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosParaClienteMANO_OBRA].IsNull; +end; + +procedure TArticulosParaClienteDataTableRules.SetMANO_OBRAIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosParaClienteMANO_OBRA].AsVariant := Null; +end; + +function TArticulosParaClienteDataTableRules.GetPRECIO_PVPValue: Currency; +begin + result := DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsCurrency; +end; + +procedure TArticulosParaClienteDataTableRules.SetPRECIO_PVPValue(const aValue: Currency); +begin + DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsCurrency := aValue; +end; + +function TArticulosParaClienteDataTableRules.GetPRECIO_PVPIsNull: boolean; +begin + result := DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].IsNull; +end; + +procedure TArticulosParaClienteDataTableRules.SetPRECIO_PVPIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ArticulosParaClientePRECIO_PVP].AsVariant := Null; +end; + initialization RegisterDataTableRules(RID_Articulos, TArticulosDataTableRules); diff --git a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas index a2a212c7..52099ad2 100644 --- a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas @@ -9,13 +9,13 @@ 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_ArticulosDelta = '{2FE9AA89-2E24-415F-BDC4-C0DB800D978E}'; - RID_ArticulosParaClienteDelta = '{9C8B3982-229A-489A-A29D-51F44D852F92}'; + RID_ArticulosDelta = '{E90664CD-974B-4763-AFDF-9B682888F975}'; + RID_ArticulosParaClienteDelta = '{20B7D734-5B3C-4B7E-9731-398937C0E081}'; type { IArticulosDelta } IArticulosDelta = interface(IArticulos) - ['{2FE9AA89-2E24-415F-BDC4-C0DB800D978E}'] + ['{E90664CD-974B-4763-AFDF-9B682888F975}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -39,6 +39,10 @@ type function GetOldELIMINADOValue : SmallInt; function GetOldFABRICANTEValue : String; function GetOldREFERENCIA_FABRValue : String; + function GetOldTIEMPOValue : Integer; + function GetOldPARAM_TIEMPOValue : Float; + function GetOldMANO_OBRAValue : Currency; + function GetOldPRECIO_PVPValue : Currency; { Properties } property OldID : Integer read GetOldIDValue; @@ -63,6 +67,10 @@ type property OldELIMINADO : SmallInt read GetOldELIMINADOValue; property OldFABRICANTE : String read GetOldFABRICANTEValue; property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue; + property OldTIEMPO : Integer read GetOldTIEMPOValue; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; + property OldMANO_OBRA : Currency read GetOldMANO_OBRAValue; + property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue; end; { TArticulosBusinessProcessorRules } @@ -203,6 +211,30 @@ type function GetOldREFERENCIA_FABRIsNull: Boolean; virtual; procedure SetREFERENCIA_FABRValue(const aValue: String); virtual; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual; + function GetTIEMPOValue: Integer; virtual; + function GetTIEMPOIsNull: Boolean; virtual; + function GetOldTIEMPOValue: Integer; virtual; + function GetOldTIEMPOIsNull: Boolean; virtual; + procedure SetTIEMPOValue(const aValue: Integer); virtual; + procedure SetTIEMPOIsNull(const aValue: Boolean); virtual; + function GetPARAM_TIEMPOValue: Float; virtual; + function GetPARAM_TIEMPOIsNull: Boolean; virtual; + function GetOldPARAM_TIEMPOValue: Float; virtual; + function GetOldPARAM_TIEMPOIsNull: Boolean; virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; + function GetMANO_OBRAValue: Currency; virtual; + function GetMANO_OBRAIsNull: Boolean; virtual; + function GetOldMANO_OBRAValue: Currency; virtual; + function GetOldMANO_OBRAIsNull: Boolean; virtual; + procedure SetMANO_OBRAValue(const aValue: Currency); virtual; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); virtual; + function GetPRECIO_PVPValue: Currency; virtual; + function GetPRECIO_PVPIsNull: Boolean; virtual; + function GetOldPRECIO_PVPValue: Currency; virtual; + function GetOldPRECIO_PVPIsNull: Boolean; virtual; + procedure SetPRECIO_PVPValue(const aValue: Currency); virtual; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -293,6 +325,22 @@ type property REFERENCIA_FABRIsNull : Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue; property OldREFERENCIA_FABRIsNull : Boolean read GetOldREFERENCIA_FABRIsNull; + property TIEMPO : Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull : Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property OldTIEMPO : Integer read GetOldTIEMPOValue; + property OldTIEMPOIsNull : Boolean read GetOldTIEMPOIsNull; + property PARAM_TIEMPO : Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull : Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; + property OldPARAM_TIEMPOIsNull : Boolean read GetOldPARAM_TIEMPOIsNull; + property MANO_OBRA : Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull : Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property OldMANO_OBRA : Currency read GetOldMANO_OBRAValue; + property OldMANO_OBRAIsNull : Boolean read GetOldMANO_OBRAIsNull; + property PRECIO_PVP : Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull : Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; + property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue; + property OldPRECIO_PVPIsNull : Boolean read GetOldPRECIO_PVPIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -302,7 +350,7 @@ type { IArticulosParaClienteDelta } IArticulosParaClienteDelta = interface(IArticulosParaCliente) - ['{9C8B3982-229A-489A-A29D-51F44D852F92}'] + ['{20B7D734-5B3C-4B7E-9731-398937C0E081}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -326,6 +374,10 @@ type function GetOldELIMINADOValue : SmallInt; function GetOldFABRICANTEValue : String; function GetOldREFERENCIA_FABRValue : String; + function GetOldTIEMPOValue : Integer; + function GetOldPARAM_TIEMPOValue : Float; + function GetOldMANO_OBRAValue : Currency; + function GetOldPRECIO_PVPValue : Currency; { Properties } property OldID : Integer read GetOldIDValue; @@ -350,6 +402,10 @@ type property OldELIMINADO : SmallInt read GetOldELIMINADOValue; property OldFABRICANTE : String read GetOldFABRICANTEValue; property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue; + property OldTIEMPO : Integer read GetOldTIEMPOValue; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; + property OldMANO_OBRA : Currency read GetOldMANO_OBRAValue; + property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue; end; { TArticulosParaClienteBusinessProcessorRules } @@ -490,6 +546,30 @@ type function GetOldREFERENCIA_FABRIsNull: Boolean; virtual; procedure SetREFERENCIA_FABRValue(const aValue: String); virtual; procedure SetREFERENCIA_FABRIsNull(const aValue: Boolean); virtual; + function GetTIEMPOValue: Integer; virtual; + function GetTIEMPOIsNull: Boolean; virtual; + function GetOldTIEMPOValue: Integer; virtual; + function GetOldTIEMPOIsNull: Boolean; virtual; + procedure SetTIEMPOValue(const aValue: Integer); virtual; + procedure SetTIEMPOIsNull(const aValue: Boolean); virtual; + function GetPARAM_TIEMPOValue: Float; virtual; + function GetPARAM_TIEMPOIsNull: Boolean; virtual; + function GetOldPARAM_TIEMPOValue: Float; virtual; + function GetOldPARAM_TIEMPOIsNull: Boolean; virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; + procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; + function GetMANO_OBRAValue: Currency; virtual; + function GetMANO_OBRAIsNull: Boolean; virtual; + function GetOldMANO_OBRAValue: Currency; virtual; + function GetOldMANO_OBRAIsNull: Boolean; virtual; + procedure SetMANO_OBRAValue(const aValue: Currency); virtual; + procedure SetMANO_OBRAIsNull(const aValue: Boolean); virtual; + function GetPRECIO_PVPValue: Currency; virtual; + function GetPRECIO_PVPIsNull: Boolean; virtual; + function GetOldPRECIO_PVPValue: Currency; virtual; + function GetOldPRECIO_PVPIsNull: Boolean; virtual; + procedure SetPRECIO_PVPValue(const aValue: Currency); virtual; + procedure SetPRECIO_PVPIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -580,6 +660,22 @@ type property REFERENCIA_FABRIsNull : Boolean read GetREFERENCIA_FABRIsNull write SetREFERENCIA_FABRIsNull; property OldREFERENCIA_FABR : String read GetOldREFERENCIA_FABRValue; property OldREFERENCIA_FABRIsNull : Boolean read GetOldREFERENCIA_FABRIsNull; + property TIEMPO : Integer read GetTIEMPOValue write SetTIEMPOValue; + property TIEMPOIsNull : Boolean read GetTIEMPOIsNull write SetTIEMPOIsNull; + property OldTIEMPO : Integer read GetOldTIEMPOValue; + property OldTIEMPOIsNull : Boolean read GetOldTIEMPOIsNull; + property PARAM_TIEMPO : Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPOIsNull : Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; + property OldPARAM_TIEMPOIsNull : Boolean read GetOldPARAM_TIEMPOIsNull; + property MANO_OBRA : Currency read GetMANO_OBRAValue write SetMANO_OBRAValue; + property MANO_OBRAIsNull : Boolean read GetMANO_OBRAIsNull write SetMANO_OBRAIsNull; + property OldMANO_OBRA : Currency read GetOldMANO_OBRAValue; + property OldMANO_OBRAIsNull : Boolean read GetOldMANO_OBRAIsNull; + property PRECIO_PVP : Currency read GetPRECIO_PVPValue write SetPRECIO_PVPValue; + property PRECIO_PVPIsNull : Boolean read GetPRECIO_PVPIsNull write SetPRECIO_PVPIsNull; + property OldPRECIO_PVP : Currency read GetOldPRECIO_PVPValue; + property OldPRECIO_PVPIsNull : Boolean read GetOldPRECIO_PVPIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1297,6 +1393,130 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosREFERENCIA_FABR] := Null; end; +function TArticulosBusinessProcessorRules.GetTIEMPOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosTIEMPO]; +end; + +function TArticulosBusinessProcessorRules.GetTIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosTIEMPO]); +end; + +function TArticulosBusinessProcessorRules.GetOldTIEMPOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosTIEMPO]; +end; + +function TArticulosBusinessProcessorRules.GetOldTIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosTIEMPO]); +end; + +procedure TArticulosBusinessProcessorRules.SetTIEMPOValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosTIEMPO] := aValue; +end; + +procedure TArticulosBusinessProcessorRules.SetTIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosTIEMPO] := Null; +end; + +function TArticulosBusinessProcessorRules.GetPARAM_TIEMPOValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPARAM_TIEMPO]; +end; + +function TArticulosBusinessProcessorRules.GetPARAM_TIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPARAM_TIEMPO]); +end; + +function TArticulosBusinessProcessorRules.GetOldPARAM_TIEMPOValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPARAM_TIEMPO]; +end; + +function TArticulosBusinessProcessorRules.GetOldPARAM_TIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPARAM_TIEMPO]); +end; + +procedure TArticulosBusinessProcessorRules.SetPARAM_TIEMPOValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPARAM_TIEMPO] := aValue; +end; + +procedure TArticulosBusinessProcessorRules.SetPARAM_TIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPARAM_TIEMPO] := Null; +end; + +function TArticulosBusinessProcessorRules.GetMANO_OBRAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosMANO_OBRA]; +end; + +function TArticulosBusinessProcessorRules.GetMANO_OBRAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosMANO_OBRA]); +end; + +function TArticulosBusinessProcessorRules.GetOldMANO_OBRAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosMANO_OBRA]; +end; + +function TArticulosBusinessProcessorRules.GetOldMANO_OBRAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosMANO_OBRA]); +end; + +procedure TArticulosBusinessProcessorRules.SetMANO_OBRAValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosMANO_OBRA] := aValue; +end; + +procedure TArticulosBusinessProcessorRules.SetMANO_OBRAIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosMANO_OBRA] := Null; +end; + +function TArticulosBusinessProcessorRules.GetPRECIO_PVPValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP]; +end; + +function TArticulosBusinessProcessorRules.GetPRECIO_PVPIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP]); +end; + +function TArticulosBusinessProcessorRules.GetOldPRECIO_PVPValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPRECIO_PVP]; +end; + +function TArticulosBusinessProcessorRules.GetOldPRECIO_PVPIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosPRECIO_PVP]); +end; + +procedure TArticulosBusinessProcessorRules.SetPRECIO_PVPValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP] := aValue; +end; + +procedure TArticulosBusinessProcessorRules.SetPRECIO_PVPIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosPRECIO_PVP] := Null; +end; + { TArticulosParaClienteBusinessProcessorRules } constructor TArticulosParaClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); @@ -2003,6 +2223,130 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteREFERENCIA_FABR] := Null; end; +function TArticulosParaClienteBusinessProcessorRules.GetTIEMPOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTIEMPO]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetTIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTIEMPO]); +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldTIEMPOValue: Integer; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteTIEMPO]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldTIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteTIEMPO]); +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetTIEMPOValue(const aValue: Integer); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTIEMPO] := aValue; +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetTIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTIEMPO] := Null; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetPARAM_TIEMPOValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePARAM_TIEMPO]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetPARAM_TIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePARAM_TIEMPO]); +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldPARAM_TIEMPOValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePARAM_TIEMPO]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldPARAM_TIEMPOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePARAM_TIEMPO]); +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetPARAM_TIEMPOValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePARAM_TIEMPO] := aValue; +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetPARAM_TIEMPOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePARAM_TIEMPO] := Null; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetMANO_OBRAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteMANO_OBRA]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetMANO_OBRAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteMANO_OBRA]); +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldMANO_OBRAValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteMANO_OBRA]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldMANO_OBRAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteMANO_OBRA]); +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetMANO_OBRAValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteMANO_OBRA] := aValue; +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetMANO_OBRAIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteMANO_OBRA] := Null; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetPRECIO_PVPValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetPRECIO_PVPIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP]); +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldPRECIO_PVPValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePRECIO_PVP]; +end; + +function TArticulosParaClienteBusinessProcessorRules.GetOldPRECIO_PVPIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClientePRECIO_PVP]); +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetPRECIO_PVPValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP] := aValue; +end; + +procedure TArticulosParaClienteBusinessProcessorRules.SetPRECIO_PVPIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClientePRECIO_PVP] := Null; +end; + initialization RegisterBusinessProcessorRules(RID_ArticulosDelta, TArticulosBusinessProcessorRules); diff --git a/Source/Modulos/Articulos/Model/uBizArticulos.pas b/Source/Modulos/Articulos/Model/uBizArticulos.pas index 18e118178b93449969e3445454eb365440ba31df..883225d17e66f531e0d84259abb46695f4e4a259 100644 GIT binary patch delta 813 zcmbu7ziYxk6vr__hk(0uC~r(EM3;83h>bA?hj<|#T|+dd2F|3!lhP^wK`8`E*FuL< z3J(4q{dYPymqbndv9w#b%lo`{@AG}Dew{rns{k6-ZBw;W!^S<`FcGw%plP=3r+?3Ah129g>OX^ACWuw)4<;W<(lO*H%O3jTSVRXQRo=x-B$Y zM@LFp@3W!;toYi0AdAFwCw5=Q=m?PR?Cs!?`$Q92SU-Y1L`-BP{<4ZAL z)7ovawq4(`FLt6o=-p`Z#^47G28524jax-`J?8lnU{jLIB#X34e9TQiN%))}1EV13CK4mH?7 JSC8Uz=?6o$^6UTr delta 51 zcmV-30L=f*9;6tMud&Mg0h0;?I|3jelSTorv-AV10s|l*Mw5U97_%h^*#nXcJ(FS# JJ+s*jbOH1}5%&N9 diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm index bb662c5f..53750dfb 100644 --- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm +++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm @@ -144,6 +144,47 @@ object srvArticulos: TsrvArticulos ConnectionManager = dmServer.ConnectionManager DataDictionary = DataDictionary Datasets = < + item + Params = < + item + Name = 'ID_EMPRESA' + Value = '' + ParamType = daptInput + end> + Statements = < + item + Connection = 'IBX' + ConnectionType = 'Interbase' + Default = True + TargetTable = 'V_ARTICULOS' + Name = 'IBX' + SQL = + 'select distinct ID_PROVEEDOR, NOMBRE'#10'from V_articulos'#10'inner join' + + ' contactos on (contactos.ID = V_articulos.ID_PROVEEDOR)'#10'where ID' + + '_EMPRESA = :ID_EMPRESA'#10 + StatementType = stSQL + ColumnMappings = < + item + DatasetField = 'ID_PROVEEDOR' + TableField = 'ID_PROVEEDOR' + end + item + DatasetField = 'NOMBRE' + TableField = 'NOMBRE' + end> + end> + Name = 'ProveedoresConArticulos' + Fields = < + item + Name = 'ID_PROVEEDOR' + DataType = datInteger + end + item + Name = 'NOMBRE' + DataType = datString + Size = 255 + end> + end item Params = <> Statements = < @@ -239,6 +280,22 @@ object srvArticulos: TsrvArticulos item DatasetField = 'REFERENCIA_FABR' TableField = 'REFERENCIA_FABR' + end + item + DatasetField = 'TIEMPO' + TableField = 'TIEMPO' + end + item + DatasetField = 'PARAM_TIEMPO' + TableField = 'PARAM_TIEMPO' + end + item + DatasetField = 'MANO_OBRA' + TableField = 'MANO_OBRA' + end + item + DatasetField = 'PRECIO_PVP' + TableField = 'PRECIO_PVP' end> end> Name = 'Articulos' @@ -364,6 +421,22 @@ object srvArticulos: TsrvArticulos DataType = datString Size = 255 DictionaryEntry = 'Articulos_REFERENCIA_FABR' + end + item + Name = 'TIEMPO' + DataType = datInteger + end + item + Name = 'PARAM_TIEMPO' + DataType = datFloat + end + item + Name = 'MANO_OBRA' + DataType = datCurrency + end + item + Name = 'PRECIO_PVP' + DataType = datCurrency end> end item @@ -387,10 +460,12 @@ object srvArticulos: TsrvArticulos 'ORES.DESCUENTO,'#10#9'V_ARTICULOS.PRECIO_NETO, V_ARTICULOS.INVENTARIA' + 'BLE,'#10#9'V_ARTICULOS.ID_PROVEEDOR, V_ARTICULOS.NOMBRE_PROVEEDOR,'#10#9'V' + '_ARTICULOS.ELIMINADO, V_ARTICULOS.FABRICANTE, V_ARTICULOS.REFERE' + - 'NCIA_FABR'#10' FROM'#10' V_ARTICULOS'#10' LEFT OUTER JOIN CLIENTES_DTOS' + - '_PROVEEDORES'#10#9'ON ((CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR = V_AR' + - 'TICULOS.ID_PROVEEDOR)'#10#9#9'AND (CLIENTES_DTOS_PROVEEDORES.ID_CLIENT' + - 'E = :ID_CLIENTE))'#10' WHERE {Where}'#10 + 'NCIA_FABR,'#10#9'V_ARTICULOS.TIEMPO, V_ARTICULOS.PARAM_TIEMPO, V_ARTI' + + 'CULOS.MANO_OBRA,'#10' V_ARTICULOS.PRECIO_PVP'#10' FROM'#10' V_ART' + + 'ICULOS'#10' LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10#9'ON ((CLIENTE' + + 'S_DTOS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDOR)'#10#9#9'AN' + + 'D (CLIENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'#10' WHERE ' + + '{Where}'#10 StatementType = stSQL ColumnMappings = < item @@ -480,6 +555,22 @@ object srvArticulos: TsrvArticulos item DatasetField = 'REFERENCIA_FABR' TableField = 'REFERENCIA_FABR' + end + item + DatasetField = 'TIEMPO' + TableField = 'TIEMPO' + end + item + DatasetField = 'PARAM_TIEMPO' + TableField = 'PARAM_TIEMPO' + end + item + DatasetField = 'MANO_OBRA' + TableField = 'MANO_OBRA' + end + item + DatasetField = 'PRECIO_PVP' + TableField = 'PRECIO_PVP' end> end> Name = 'ArticulosParaCliente' @@ -608,6 +699,22 @@ object srvArticulos: TsrvArticulos DataType = datString Size = 255 DictionaryEntry = 'Articulos_REFERENCIA_FABR' + end + item + Name = 'TIEMPO' + DataType = datInteger + end + item + Name = 'PARAM_TIEMPO' + DataType = datFloat + end + item + Name = 'MANO_OBRA' + DataType = datCurrency + end + item + Name = 'PRECIO_PVP' + DataType = datCurrency end> end> JoinDataTables = <> @@ -700,6 +807,22 @@ object srvArticulos: TsrvArticulos item Name = 'REFERENCIA_FABR' Value = '' + end + item + Name = 'TIEMPO' + Value = '' + end + item + Name = 'PARAM_TIEMPO' + Value = '' + end + item + Name = 'MANO_OBRA' + Value = '' + end + item + Name = 'PRECIO_PVP' + Value = '' end> Statements = < item @@ -710,12 +833,14 @@ object srvArticulos: TsrvArticulos 'CION, UNIDAD_MEDIDA, FAMILIA, IMAGEN,'#10' COMISIONABLE, FECHA_A' + 'LTA, FECHA_MODIFICACION, USUARIO, '#10' PRECIO_COSTE, PRECIO_POR' + 'TE, DESCUENTO, ID_PROVEEDOR, '#10' PRECIO_NETO, REFERENCIA_PROV,' + - ' INVENTARIABLE, ELIMINADO, FABRICANTE,'#10' REFERENCIA_FABR)'#10' V' + - 'ALUES'#10' (:ID, :ID_EMPRESA, :REFERENCIA, :DESCRIPCION, :UNIDAD_' + - 'MEDIDA, :FAMILIA,'#10' :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FEC' + - 'HA_MODIFICACION, '#10' :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :' + - 'DESCUENTO, '#10' :ID_PROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,'#10 + - ' :INVENTARIABLE, :ELIMINADO, :FABRICANTE, :REFERENCIA_FABR)'#10 + ' INVENTARIABLE, ELIMINADO, FABRICANTE,'#10' REFERENCIA_FABR, TIE' + + 'MPO, PARAM_TIEMPO, MANO_OBRA, PRECIO_PVP)'#10' VALUES'#10' (:ID, :ID' + + '_EMPRESA, :REFERENCIA, :DESCRIPCION, :UNIDAD_MEDIDA, :FAMILIA,'#10' ' + + ' :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FECHA_MODIFICACION, '#10' ' + + ' :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, :DESCUENTO, '#10' :I' + + 'D_PROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,'#10' :INVENTARIABLE' + + ', :ELIMINADO, :FABRICANTE, :REFERENCIA_FABR, :TIEMPO, :PARAM_TIE' + + 'MPO,'#10' :MANO_OBRA, :PRECIO_PVP)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -821,6 +946,22 @@ object srvArticulos: TsrvArticulos Name = 'REFERENCIA_FABR' Value = '' end + item + Name = 'TIEMPO' + Value = '' + end + item + Name = 'PARAM_TIEMPO' + Value = '' + end + item + Name = 'MANO_OBRA' + Value = '' + end + item + Name = 'PRECIO_PVP' + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -840,8 +981,9 @@ object srvArticulos: TsrvArticulos 'OVEEDOR = :ID_PROVEEDOR, '#10' PRECIO_NETO = :PRECIO_NETO,'#10' IN' + 'VENTARIABLE = :INVENTARIABLE,'#10' REFERENCIA_PROV = :REFERENCIA_' + 'PROV,'#10' ELIMINADO = :ELIMINADO,'#10' FABRICANTE = :FABRICANTE,'#10 + - ' REFERENCIA_FABR = :REFERENCIA_FABR'#10' WHERE'#10' (ID = :OLD_ID' + - ')'#10 + ' REFERENCIA_FABR = :REFERENCIA_FABR,'#10' TIEMPO = :TIEMPO,'#10' ' + + ' PARAM_TIEMPO = :PARAM_TIEMPO,'#10' MANO_OBRA = :MANO_OBRA,'#10' ' + + 'PRECIO_PVP = :PRECIO_PVP'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas index bd3b2bef..512b83a6 100644 --- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas +++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas @@ -30,14 +30,16 @@ type procedure DARemoteServiceCreate(Sender: TObject); procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject; var aConnectionName: string); + + function DarListaProveedoresConArticulos(Const IDEmpresa: Integer): Binary; end; implementation {$R *.dfm} uses - {Generated:} FactuGES_Invk, uDataModuleServer, - uDatabaseUtils, schArticulosClient_Intf, uRestriccionesUsuarioUtils; + {Generated:} FactuGES_Invk, uDataModuleServer, Variants, uStringsUtils, + uDatabaseUtils, schArticulosClient_Intf, uRestriccionesUsuarioUtils, dialogs; procedure Create_srvArticulos(out anInstance : IUnknown); begin @@ -63,6 +65,32 @@ begin SessionManager := dmServer.SessionManager; end; +function TsrvArticulos.DarListaProveedoresConArticulos(Const IDEmpresa: Integer): Binary; +var + dsProveedores : IDADataset; + Aux : TStringList; +begin + Result := Binary.Create; + + Aux := TStringList.Create; + dsProveedores := schArticulos.NewDataset(Connection, 'ProveedoresConArticulos', ['ID_EMPRESA'], [IDEmpresa], True); + try + while not dsProveedores.EOF do + begin + if not VarIsNull(dsProveedores.Fields[0].AsVariant) then + Aux.Add(Format('%s=%d', [dsProveedores.Fields[1].AsString, dsProveedores.Fields[0].AsInteger])); + dsProveedores.Next; + end; + + Aux.SaveToStream(Result); + + finally + dsProveedores.Close; + dsProveedores := NIL; + FreeAndNil(Aux); + end; +end; + procedure TsrvArticulos.DataAbstractServiceBeforeAcquireConnection( aSender: TObject; var aConnectionName: string); begin diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm index c9050f3f..c587e235 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.dfm @@ -9,6 +9,7 @@ inherited fEditorArticulos: TfEditorArticulos inherited JvNavPanelHeader: TJvNavPanelHeader Width = 657 Caption = 'Lista de articulos' + ExplicitWidth = 657 inherited Image1: TImage Left = 630 Picture.Data = { @@ -30,29 +31,25 @@ inherited fEditorArticulos: TfEditorArticulos end inherited TBXDock: TTBXDock Width = 657 + ExplicitWidth = 657 inherited tbxMain: TTBXToolbar ExplicitWidth = 632 end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem EditOptions = [tboUseEditWhenVertical] end - inherited TBXItem37: TTBXItem - Visible = False - end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 657 end inherited TBXTMain2: TTBXToolbar - Left = 269 DockPos = 267 - ExplicitLeft = 269 end end inherited StatusBar: TJvStatusBar Width = 657 + ExplicitWidth = 657 end inherited EditorActionList: TActionList inherited actNuevo: TAction diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.pas b/Source/Modulos/Articulos/Views/uEditorArticulos.pas index 841254fb..e0e71ac4 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulos.pas +++ b/Source/Modulos/Articulos/Views/uEditorArticulos.pas @@ -125,6 +125,9 @@ end; procedure TfEditorArticulos.SetController(const Value: IArticulosController); begin FController := Value; + if Assigned(ViewGrid) then + (ViewGrid as IViewArticulos).Controller := FController; + end; destructor TfEditorArticulos.Destroy; diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm index bd9319a1..5d8ed3c8 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm @@ -1,6 +1,6 @@ inherited frViewArticulo: TfrViewArticulo - Width = 451 - Height = 304 + Width = 897 + Height = 427 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -10,20 +10,20 @@ inherited frViewArticulo: TfrViewArticulo object dxLayoutControlArticulo: TdxLayoutControl Left = 0 Top = 0 - Width = 451 + Width = 897 Height = 425 Align = alTop ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth] - ExplicitWidth = 986 + ExplicitWidth = 451 DesignSize = ( - 451 + 897 425) object PngSpeedButton2: TPngSpeedButton - Left = 270 - Top = 304 + Left = 405 + Top = 388 Width = 23 Height = 22 Action = actAnadir @@ -49,8 +49,8 @@ inherited frViewArticulo: TfrViewArticulo PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object PngSpeedButton1: TPngSpeedButton - Left = 270 - Top = 332 + Left = 405 + Top = 416 Width = 23 Height = 22 Action = actEliminar @@ -68,18 +68,14 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 - Width = 164 + Width = 171 end object eDescripcion: TcxDBTextEdit Left = 122 @@ -92,18 +88,14 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 - Width = 132 + Width = 171 end object eNoComisionable: TcxDBCheckBox Left = 122 @@ -120,22 +112,18 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 - Width = 144 + Width = 171 end object eImagen: TcxImage Left = 28 - Top = 304 + Top = 388 Properties.GraphicClassName = 'TJPEGImage' Properties.ImmediatePost = True Properties.PopupMenuLayout.MenuItems = [] @@ -145,19 +133,15 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 + TabOrder = 12 Height = 98 - Width = 621 + Width = 236 end object cbFamilia: TcxDBComboBox Left = 122 @@ -172,25 +156,21 @@ inherited frViewArticulo: TfrViewArticulo Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 - Width = 383 + Width = 171 end inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor - Left = 323 + Left = 458 Top = 28 - Width = 526 + Width = 167 Height = 202 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -198,68 +178,46 @@ inherited frViewArticulo: TfrViewArticulo Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 9 + TabOrder = 13 ReadOnly = False - ExplicitLeft = 323 + ExplicitLeft = 458 ExplicitTop = 28 - ExplicitWidth = 526 + ExplicitWidth = 167 inherited dxLayoutControl1: TdxLayoutControl - Width = 526 + Width = 167 ExplicitWidth = 526 inherited edtlNombre: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 221 + Width = 221 end inherited edtNIFCIF: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 562 - Width = 562 + ExplicitWidth = 221 + Width = 221 end inherited edtCalle: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 113 - Width = 113 + ExplicitWidth = 221 + Width = 221 end inherited edtPoblacion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 49 - Width = 49 + ExplicitWidth = 103 + Width = 103 end inherited edtProvincia: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 327 - Width = 327 + ExplicitWidth = 221 + Width = 221 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 203 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 203 + Left = 308 + ExplicitLeft = 308 end inherited Button3: TBitBtn - Left = 87 - ExplicitLeft = 87 + Left = 192 + ExplicitLeft = 192 end end end object eReferenciaProv: TcxDBTextEdit - Left = 404 + Left = 539 Top = 266 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_PROV' @@ -269,18 +227,14 @@ inherited frViewArticulo: TfrViewArticulo Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 - Width = 164 + TabOrder = 14 + Width = 86 end object ePrecioCoste: TcxDBCurrencyEdit - Left = 404 + Left = 539 Top = 293 DataBinding.DataField = 'PRECIO_COSTE' DataBinding.DataSource = dsViewArticulo @@ -290,21 +244,17 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 - Width = 176 + TabOrder = 15 + Width = 254 end object eDescuento: TcxDBSpinEdit - Left = 404 + Left = 539 Top = 320 DataBinding.DataField = 'DESCUENTO' DataBinding.DataSource = dsViewArticulo @@ -316,22 +266,18 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 - Width = 120 + TabOrder = 16 + Width = 313 end object ePrecioNeto: TcxDBCurrencyEdit - Left = 404 + Left = 539 Top = 347 DataBinding.DataField = 'PRECIO_NETO' DataBinding.DataSource = dsViewArticulo @@ -344,23 +290,19 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleFocused.TextColor = clWindowText StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 - Width = 152 + TabOrder = 17 + Width = 86 end object ePrecioPorte: TcxDBCurrencyEdit - Left = 404 + Left = 539 Top = 374 DataBinding.DataField = 'PRECIO_PORTE' DataBinding.DataSource = dsViewArticulo @@ -370,18 +312,14 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - Width = 152 + TabOrder = 18 + Width = 86 end object cbNoInventariable: TcxDBCheckBox Left = 122 @@ -398,18 +336,14 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 - Width = 148 + Width = 171 end object cbUnidadMedida: TcxDBComboBox Left = 122 @@ -424,24 +358,20 @@ inherited frViewArticulo: TfrViewArticulo Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 - Width = 511 + Width = 171 end object cbFabricante: TcxDBComboBox Left = 122 - Top = 220 + Top = 304 DataBinding.DataField = 'FABRICANTE' DataBinding.DataSource = dsViewArticulo Properties.DropDownRows = 16 @@ -452,24 +382,20 @@ inherited frViewArticulo: TfrViewArticulo Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 6 - Width = 479 + TabOrder = 10 + Width = 171 end object eReferenciaFabr: TcxDBTextEdit Left = 122 - Top = 247 + Top = 331 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_FABR' DataBinding.DataSource = dsViewArticulo @@ -479,20 +405,110 @@ inherited frViewArticulo: TfrViewArticulo Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True - Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.Color = clWindow StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 7 + TabOrder = 11 Width = 171 end + object eParamTiempo: TcxDBSpinEdit + Left = 322 + Top = 220 + DataBinding.DataField = 'PARAM_TIEMPO' + DataBinding.DataSource = dsViewArticulo + Properties.Alignment.Horz = taRightJustify + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 8 + Width = 100 + end + object eTiempo: TcxDBSpinEdit + Left = 122 + Top = 220 + DataBinding.DataField = 'TIEMPO' + DataBinding.DataSource = dsViewArticulo + Properties.Alignment.Horz = taRightJustify + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 6 + Width = 50 + end + object ePrecioPvp: TcxDBSpinEdit + Left = 322 + Top = 247 + DataBinding.DataField = 'PRECIO_PVP' + DataBinding.DataSource = dsViewArticulo + Enabled = False + Properties.Alignment.Horz = taRightJustify + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 9 + Width = 100 + end + object eManoObra: TcxDBSpinEdit + Left = 122 + Top = 247 + DataBinding.DataField = 'MANO_OBRA' + DataBinding.DataSource = dsViewArticulo + Enabled = False + Properties.Alignment.Horz = taRightJustify + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 7 + Width = 100 + end object dxLayoutControlArticuloGroup_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -569,6 +585,40 @@ inherited frViewArticulo: TfrViewArticulo end end end + object dxLayoutControlArticuloGroup8: TdxLayoutGroup + Caption = 'C'#225'lculo precio PVP' + LayoutDirection = ldHorizontal + object dxLayoutControlArticuloGroup15: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControlArticuloItem13: TdxLayoutItem + Caption = 'Tiempo:' + Control = eTiempo + ControlOptions.ShowBorder = False + end + object dxLayoutControlArticuloItem21: TdxLayoutItem + Caption = 'Mano de obra:' + Control = eManoObra + ControlOptions.ShowBorder = False + end + end + object dxLayoutControlArticuloGroup9: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControlArticuloItem12: TdxLayoutItem + Caption = 'Parametro tiempo:' + Control = eParamTiempo + ControlOptions.ShowBorder = False + end + object dxLayoutControlArticuloItem20: TdxLayoutItem + Caption = 'Precio PVP:' + Control = ePrecioPvp + ControlOptions.ShowBorder = False + end + end + end object dxLayoutControlArticuloGroup10: TdxLayoutGroup Caption = 'Datos del fabricante' object dxLayoutControlArticuloItem10: TdxLayoutItem diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.pas b/Source/Modulos/Articulos/Views/uViewArticulo.pas index 266f44fe..b21a6361 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulo.pas @@ -84,6 +84,17 @@ type dxLayoutControlArticuloGroup10: TdxLayoutGroup; dxLayoutControlArticuloGroup14: TdxLayoutGroup; dxLayoutControlArticuloGroup7: TdxLayoutGroup; + dxLayoutControlArticuloGroup8: TdxLayoutGroup; + dxLayoutControlArticuloItem12: TdxLayoutItem; + eParamTiempo: TcxDBSpinEdit; + dxLayoutControlArticuloItem13: TdxLayoutItem; + eTiempo: TcxDBSpinEdit; + dxLayoutControlArticuloItem20: TdxLayoutItem; + ePrecioPvp: TcxDBSpinEdit; + dxLayoutControlArticuloItem21: TdxLayoutItem; + eManoObra: TcxDBSpinEdit; + dxLayoutControlArticuloGroup9: TdxLayoutGroup; + dxLayoutControlArticuloGroup15: TdxLayoutGroup; procedure actEliminarExecute(Sender: TObject); procedure actAnadirExecute(Sender: TObject); procedure cbFamiliaPropertiesInitPopup(Sender: TObject); diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 563edaa7..4d8a4927 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -1,12 +1,14 @@ inherited frViewArticulos: TfrViewArticulos - Width = 924 + Width = 715 Height = 462 - ExplicitWidth = 924 + OnCreate = CustomViewCreate + OnDestroy = CustomViewDestroy + ExplicitWidth = 715 ExplicitHeight = 462 inherited cxGrid: TcxGrid - Width = 924 + Width = 715 Height = 334 - ExplicitWidth = 924 + ExplicitWidth = 715 ExplicitHeight = 334 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' @@ -162,52 +164,82 @@ inherited frViewArticulos: TfrViewArticulos FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end + object cxGridViewPRECIO_PVP: TcxGridDBColumn + Caption = 'Precio P.V.P' + DataBinding.FieldName = 'PRECIO_PVP' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + GroupSummaryAlignment = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewID_PROVEEDOR: TcxGridDBColumn + DataBinding.FieldName = 'ID_PROVEEDOR' + Visible = False + VisibleForCustomization = False + end + end + inherited cxGridLevel: TcxGridLevel + Caption = 'Todos los proveedores' end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 924 - ExplicitWidth = 924 + Width = 715 + ExplicitWidth = 715 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 924 + ExplicitWidth = 715 inherited dxLayoutControl1: TdxLayoutControl - Width = 924 - ExplicitWidth = 924 + Width = 715 + ExplicitWidth = 715 inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 827 - Width = 827 + ExplicitWidth = 618 + Width = 618 end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 462 - Width = 462 + inherited eLista: TcxComboBox + Properties.DropDownRows = 20 + Properties.OnChange = frViewFiltroBase1eListaPropertiesChange + ExplicitWidth = 71 + Width = 71 end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 566 - ExplicitLeft = 566 - ExplicitWidth = 348 - Width = 348 + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item2: TdxLayoutItem + Visible = False + end + inherited dxLayoutControl1Item3: TdxLayoutItem + Visible = False + end + inherited dxLayoutControl1Item4: TdxLayoutItem + Visible = True + end + end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 924 - ExplicitWidth = 924 + Width = 715 + ExplicitWidth = 715 inherited tbxBotones: TTBXToolbar - Width = 914 - ExplicitWidth = 914 + Width = 705 + ExplicitWidth = 705 end end end + inherited ActionList1: TActionList + inherited actQuitarFiltro: TAction + OnExecute = frViewFiltroBase1actQuitarFiltroExecute + end + end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 436 Visible = True ExplicitTop = 436 - ExplicitWidth = 924 + ExplicitWidth = 715 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 924 - ExplicitWidth = 924 + Width = 715 + ExplicitWidth = 715 inherited TBXToolbar1: TTBXToolbar - Width = 914 - ExplicitWidth = 914 + Width = 705 + ExplicitWidth = 705 object TBXSeparatorItem1: TTBXSeparatorItem end object TBXItem3: TTBXItem diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index 74caa26f..25568bde 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas @@ -20,7 +20,7 @@ uses dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, - dxSkinXmas2008Blue, dxSkinscxPCPainter; + dxSkinXmas2008Blue, dxSkinscxPCPainter, uArticulosController; type IViewArticulos = interface(IViewGrid) @@ -28,6 +28,10 @@ type function GetArticulos: IBizArticulo; procedure SetArticulos(const Value: IBizArticulo); property Articulos: IBizArticulo read GetArticulos write SetArticulos; + + function GetController : IArticulosController; + procedure SetController (const Value : IArticulosController); + property Controller : IArticulosController read GetController write SetController; end; TfrViewArticulos = class(TfrViewGrid, IViewArticulos) @@ -48,6 +52,8 @@ type TBXSeparatorItem3: TTBXSeparatorItem; actFabricante: TAction; cxGridViewREFERENCIA_FABR: TcxGridDBColumn; + cxGridViewPRECIO_PVP: TcxGridDBColumn; + cxGridViewID_PROVEEDOR: TcxGridDBColumn; procedure actProveedorExecute(Sender: TObject); procedure actProveedorUpdate(Sender: TObject); procedure actFamiliaExecute(Sender: TObject); @@ -57,12 +63,28 @@ type procedure cxGridViewDataControllerCompare( ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); + procedure frViewFiltroBase1eListaPropertiesChange(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); + + private + FListaProveedores: TStringList; + //Filtros relativos a la vista + procedure AnadirFiltroProveedores; + protected FArticulos: IBizArticulo; + FController: IArticulosController; function GetArticulos: IBizArticulo; virtual; procedure SetArticulos(const Value: IBizArticulo); virtual; + function GetController : IArticulosController; + procedure SetController (const Value : IArticulosController); + public property Articulos: IBizArticulo read GetArticulos write SetArticulos; + property Controller : IArticulosController read GetController write SetController; + procedure AnadirOtrosFiltros; override; end; implementation @@ -82,6 +104,11 @@ begin Result := FArticulos; end; +function TfrViewArticulos.GetController: IArticulosController; +begin + Result := FController; +end; + procedure TfrViewArticulos.SetArticulos(const Value: IBizArticulo); begin FArticulos := Value; @@ -90,6 +117,34 @@ begin end; +procedure TfrViewArticulos.SetController(const Value: IArticulosController); +var + i: Integer; + +begin + FController := Value; + + //Rellenamos la lista de proveedores con articulos + if Assigned(FController) then + begin + FListaProveedores := FController.DarListaProveedoresConArticulos; + with frViewFiltroBase1.eLista.Properties.Items do + begin + BeginUpdate; + try + Clear; + Add('Todos'); + for i := 0 to FListaProveedores.Count - 1 do + Add(FListaProveedores.Names[i]); + + frViewFiltroBase1.eLista.ItemIndex := 0; + finally + EndUpdate; + end; + end; + end; +end; + procedure TfrViewArticulos.actFabricanteExecute(Sender: TObject); begin if (cxGridViewFABRICANTE.GroupIndex < 0) then @@ -151,6 +206,57 @@ begin (Sender as TAction).Checked := not (cxGridViewNOMBRE_PROVEEDOR.GroupIndex < 0); end; +procedure TfrViewArticulos.AnadirFiltroProveedores; +var + FFiltro : TcxFilterCriteriaItemList; + CodigoProveedor: Variant; + Index: Integer; +begin + //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro + if frViewFiltroBase1.Visible then + begin + if VarIsNull(frViewFiltroBase1.eLista.EditValue) then + CodigoProveedor := frViewFiltroBase1.eLista.EditValue + else + CodigoProveedor := FListaProveedores.Values[frViewFiltroBase1.eLista.EditValue]; + + if not VarIsNull(CodigoProveedor) + and (VarToStr(CodigoProveedor) <> '') then + begin + FFiltro := AddFilterGrid(fboAnd); + FFiltro.AddItem(cxGridViewID_PROVEEDOR, foEqual, CodigoProveedor, CodigoProveedor); + cxGridViewNOMBRE_PROVEEDOR.Visible := False; + end + else + cxGridViewNOMBRE_PROVEEDOR.Visible := True; + end; +end; + +procedure TfrViewArticulos.AnadirOtrosFiltros; +begin + inherited; + + AnadirFiltroProveedores; + + //Finalmente activamos el filtro si tenemos algo + if cxGridView.DataController.Filter.IsEmpty + then cxGridView.DataController.Filter.Active := False + else cxGridView.DataController.Filter.Active := True; + cxGrid.ActiveLevel.GridView := cxGridView; +end; + +procedure TfrViewArticulos.CustomViewCreate(Sender: TObject); +begin + inherited; + FListaProveedores := Nil; +end; + +procedure TfrViewArticulos.CustomViewDestroy(Sender: TObject); +begin + inherited; + FreeAndNil(FListaProveedores); +end; + procedure TfrViewArticulos.cxGridViewDataControllerCompare( ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); @@ -163,4 +269,16 @@ begin Compare := VarCompare(V1, V2); end; +procedure TfrViewArticulos.frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); +begin + frViewFiltroBase1.txtFiltroTodo.Clear; + frViewFiltroBase1.eLista.Clear; +end; + +procedure TfrViewArticulos.frViewFiltroBase1eListaPropertiesChange(Sender: TObject); +begin + inherited; + RefrescarFiltro; +end; + end. diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm index 712de4d8..9b649a7b 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm @@ -1,22 +1,25 @@ inherited frViewEmpleado: TfrViewEmpleado - Height = 391 + Width = 673 + Height = 424 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy - ExplicitHeight = 391 + ExplicitWidth = 673 + ExplicitHeight = 424 inherited dxLayoutControlContacto: TdxLayoutControl - Height = 391 + Width = 673 + Height = 424 ExplicitHeight = 391 inherited PngSpeedButton1: TPngSpeedButton - Left = 612 - ExplicitLeft = 612 + Left = 628 + ExplicitLeft = 628 end inherited PngSpeedButton2: TPngSpeedButton - Left = 612 - ExplicitLeft = 612 + Left = 628 + ExplicitLeft = 628 end inherited PngSpeedButton3: TPngSpeedButton - Left = 612 - ExplicitLeft = 612 + Left = 628 + ExplicitLeft = 628 end inherited eCalle: TcxDBTextEdit Left = 121 @@ -24,8 +27,8 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 6 ExplicitLeft = 121 ExplicitTop = 226 - ExplicitWidth = 260 - Width = 260 + ExplicitWidth = 183 + Width = 183 end inherited eProvincia: TcxDBTextEdit Left = 121 @@ -33,8 +36,8 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 9 ExplicitLeft = 121 ExplicitTop = 280 - ExplicitWidth = 260 - Width = 260 + ExplicitWidth = 183 + Width = 183 end inherited ePoblacion: TcxDBTextEdit Left = 121 @@ -42,22 +45,24 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 7 ExplicitLeft = 121 ExplicitTop = 253 - ExplicitWidth = 159 - Width = 159 + ExplicitWidth = 82 + Width = 82 end inherited eCodigoPostal: TcxDBTextEdit - Left = 239 + Left = 247 Top = 253 TabOrder = 8 - ExplicitLeft = 239 + ExplicitLeft = 247 ExplicitTop = 253 end inherited eObservaciones: TcxDBMemo Top = 364 TabOrder = 20 ExplicitTop = 364 + ExplicitWidth = 613 ExplicitHeight = 20 Height = 20 + Width = 613 end object eFechaNacimiento: TcxDBDateEdit [8] Left = 121 @@ -74,7 +79,7 @@ inherited frViewEmpleado: TfrViewEmpleado StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 3 - Width = 121 + Width = 183 end object eFechaAltaEmpresa: TcxDBDateEdit [9] Left = 121 @@ -91,7 +96,7 @@ inherited frViewEmpleado: TfrViewEmpleado StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 4 - Width = 235 + Width = 183 end object cbCategoria: TcxDBComboBox [10] Left = 121 @@ -115,20 +120,10 @@ inherited frViewEmpleado: TfrViewEmpleado StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 5 - Width = 225 + Width = 183 end - inherited eTlfParticular: TcxDBTextEdit - Left = 429 - TabOrder = 12 - ExplicitLeft = 429 - end - inherited eTlfTrabajo: TcxDBTextEdit - Left = 429 - TabOrder = 11 - ExplicitLeft = 429 - end - object cbContrato: TcxDBComboBox [13] - Left = 429 + object cbContrato: TcxDBComboBox [11] + Left = 437 Top = 280 DataBinding.DataField = 'CONTRATO' DataBinding.DataSource = dsContacto @@ -149,48 +144,44 @@ inherited frViewEmpleado: TfrViewEmpleado StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 18 - Width = 292 + Width = 206 + end + inherited eTlfParticular: TcxDBTextEdit + Left = 437 + TabOrder = 12 + ExplicitLeft = 437 + ExplicitWidth = 206 + Width = 206 + end + inherited eTlfTrabajo: TcxDBTextEdit + Left = 437 + TabOrder = 11 + ExplicitLeft = 437 + ExplicitWidth = 206 + Width = 206 end inherited eTlfMovil: TcxDBTextEdit - Left = 429 + Left = 437 TabOrder = 13 - ExplicitLeft = 429 + ExplicitLeft = 437 + ExplicitWidth = 206 + Width = 206 end inherited eFax: TcxDBTextEdit - Left = 429 + Left = 437 TabOrder = 14 - ExplicitLeft = 429 + ExplicitLeft = 437 + ExplicitWidth = 206 + Width = 206 end inherited eNombre: TcxDBTextEdit Left = 121 ExplicitLeft = 121 - ExplicitWidth = 263 - Width = 263 + ExplicitWidth = 183 + Width = 183 end - inherited eNIFCIF: TcxDBTextEdit - Left = 198 - ExplicitLeft = 198 - ExplicitWidth = 100 - Width = 100 - end - inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 429 - Properties.Prefix = 'mailto:' - TabOrder = 15 - ExplicitLeft = 429 - ExplicitWidth = 129 - Width = 129 - end - inherited eMailParticular: TcxDBHyperLinkEdit - Left = 429 - Properties.Prefix = 'mailto:' - TabOrder = 16 - ExplicitLeft = 429 - ExplicitWidth = 165 - Width = 165 - end - object eDuracionContrato: TcxDBTextEdit [20] - Left = 429 + object eDuracionContrato: TcxDBTextEdit [17] + Left = 437 Top = 307 DataBinding.DataField = 'DURACION' DataBinding.DataSource = dsContacto @@ -205,18 +196,42 @@ inherited frViewEmpleado: TfrViewEmpleado StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 19 - Width = 114 + Width = 206 + end + inherited eNIFCIF: TcxDBTextEdit + Left = 202 + ExplicitLeft = 202 + ExplicitWidth = 106 + Width = 106 + end + inherited eMailTrabajo: TcxDBHyperLinkEdit + Left = 437 + Properties.Prefix = 'mailto:' + TabOrder = 15 + ExplicitLeft = 437 + ExplicitWidth = 177 + Width = 177 + end + inherited eMailParticular: TcxDBHyperLinkEdit + Left = 437 + Properties.Prefix = 'mailto:' + TabOrder = 16 + ExplicitLeft = 437 + ExplicitWidth = 177 + Width = 177 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 429 + Left = 437 TabOrder = 17 - ExplicitLeft = 429 - ExplicitWidth = 165 - Width = 165 + ExplicitLeft = 437 + ExplicitWidth = 177 + Width = 177 end inherited eReferencia: TcxDBTextEdit Left = 121 ExplicitLeft = 121 + ExplicitWidth = 44 + Width = 44 end inherited ePersonaContacto: TcxDBTextEdit Left = 121 @@ -224,6 +239,8 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 10 ExplicitLeft = 121 ExplicitTop = 307 + ExplicitWidth = 183 + Width = 183 end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup inherited dxLayoutControlContactoGroup9: TdxLayoutGroup @@ -267,6 +284,7 @@ inherited frViewEmpleado: TfrViewEmpleado inherited dxLayoutControlContactoGroup2: TdxLayoutGroup inherited dxLayoutControlContactoItem10: TdxLayoutItem Caption = 'Tlf. trabajo:' + Visible = False end inherited dxLayoutControlContactoItem9: TdxLayoutItem Caption = 'Tlf. particular:' diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm index 0288718a..a5f37389 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm +++ b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm @@ -17,6 +17,10 @@ inherited frViewEmpleados: TfrViewEmpleados inherited cxGridViewNOMBRE: TcxGridDBColumn Caption = 'Nombre y apellidos' end + inherited cxGridViewTELEFONO_1: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end inherited cxGridViewTELEFONO_2: TcxGridDBColumn Visible = True end @@ -28,26 +32,12 @@ inherited frViewEmpleados: TfrViewEmpleados inherited frViewFiltroBase1: TfrViewFiltroBase inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl - inherited txtFiltroTodo: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - end inherited edtFechaIniFiltro: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 238 Width = 238 end inherited edtFechaFinFiltro: TcxDateEdit Left = 342 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 342 ExplicitWidth = 205 Width = 205 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 23091ff9..31cff11a 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -203,90 +203,82 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Height = 51 ExplicitWidth = 815 ExplicitHeight = 51 - inherited ToolButton3: TToolButton - Wrap = False - end - inherited ToolButton4: TToolButton - Left = 278 + inherited FontName: TJvFontComboBox [3] + Left = 279 Top = 0 - ExplicitLeft = 278 + ExplicitLeft = 279 ExplicitTop = 0 end - inherited ToolButton14: TToolButton - Left = 334 + inherited ToolButton14: TToolButton [4] + Left = 424 Top = 0 - Wrap = False - ExplicitLeft = 334 + ExplicitLeft = 424 ExplicitTop = 0 end - inherited FontName: TJvFontComboBox - Left = 399 - Top = 0 - ExplicitLeft = 399 - ExplicitTop = 0 - end - inherited FontSize: TEdit - Left = 544 + inherited FontSize: TEdit [5] + Left = 489 Top = 0 Width = 104 - ExplicitLeft = 544 + ExplicitLeft = 489 ExplicitTop = 0 ExplicitWidth = 104 end - inherited ToolButton13: TToolButton [7] - Left = 0 + inherited UpDown1: TUpDown [6] + Left = 593 Top = 0 - Wrap = True - ExplicitLeft = 0 + ExplicitLeft = 593 ExplicitTop = 0 - ExplicitHeight = 27 end - inherited UpDown1: TUpDown [8] + inherited ToolButton13: TToolButton [7] + Top = 0 + ExplicitTop = 0 + end + inherited ToolButton11: TToolButton [8] Left = 0 Top = 27 + Wrap = False ExplicitLeft = 0 ExplicitTop = 27 end - inherited ToolButton6: TToolButton - Left = 17 + inherited ToolButton3: TToolButton [9] + Left = 141 Top = 27 - ExplicitLeft = 17 + Wrap = False + end + inherited ToolButton12: TToolButton [10] + Left = 196 + Top = 27 + ExplicitLeft = 196 ExplicitTop = 27 end - inherited ToolButton7: TToolButton - Left = 83 + inherited ToolButton9: TToolButton [11] + Left = 204 Top = 27 - ExplicitLeft = 83 + ExplicitLeft = 204 ExplicitTop = 27 end - inherited ToolButton8: TToolButton - Left = 150 + inherited ToolButton10: TToolButton [12] + Left = 349 Top = 27 - ExplicitLeft = 150 + ExplicitLeft = 349 ExplicitTop = 27 end - inherited ToolButton12: TToolButton - Left = 233 + inherited ToolButton6: TToolButton [13] + Left = 474 Top = 27 - ExplicitLeft = 233 + ExplicitLeft = 474 ExplicitTop = 27 end - inherited ToolButton9: TToolButton - Left = 241 + inherited ToolButton7: TToolButton [14] + Left = 540 Top = 27 - ExplicitLeft = 241 + ExplicitLeft = 540 ExplicitTop = 27 end - inherited ToolButton10: TToolButton - Left = 386 + inherited ToolButton8: TToolButton [15] + Left = 607 Top = 27 - ExplicitLeft = 386 - ExplicitTop = 27 - end - inherited ToolButton11: TToolButton - Left = 511 - Top = 27 - ExplicitLeft = 511 + ExplicitLeft = 607 ExplicitTop = 27 end end @@ -352,9 +344,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 829 inherited Bevel1: TBevel Top = 111 - Width = 73 ExplicitTop = 111 - ExplicitWidth = 73 end inherited Bevel3: TBevel Left = 375 @@ -367,10 +357,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited Bevel4: TBevel Left = 487 Top = 111 - Width = 192 ExplicitLeft = 487 ExplicitTop = 111 - ExplicitWidth = 192 end inherited ImporteDto: TcxDBCurrencyEdit Top = 131 diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL index 0b56fab1..e2c4d6b2 100644 --- a/Source/Servicios/FactuGES.RODL +++ b/Source/Servicios/FactuGES.RODL @@ -162,6 +162,14 @@ + + + + + + + + diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas index d4a04862..14c7fddd 100644 --- a/Source/Servicios/FactuGES_Intf.pas +++ b/Source/Servicios/FactuGES_Intf.pas @@ -363,6 +363,7 @@ type { IsrvArticulos } IsrvArticulos = interface(IDataAbstractService) ['{CFBE5841-DF0F-48AD-853E-A35FDA989E6E}'] + function DarListaProveedoresConArticulos(const IDEmpresa: Integer): Binary; end; { CosrvArticulos } @@ -375,6 +376,7 @@ type protected function __GetInterfaceName:string; override; + function DarListaProveedoresConArticulos(const IDEmpresa: Integer): Binary; end; { IsrvRecibosCliente } @@ -1199,11 +1201,30 @@ begin result := TsrvArticulos_Proxy.Create(aMessage, aTransportChannel); end; +{ TsrvArticulos_Proxy } + function TsrvArticulos_Proxy.__GetInterfaceName:string; begin result := 'srvArticulos'; end; +function TsrvArticulos_Proxy.DarListaProveedoresConArticulos(const IDEmpresa: Integer): Binary; +begin + try + result := nil; + __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'DarListaProveedoresConArticulos'); + __Message.Write('IDEmpresa', TypeInfo(Integer), IDEmpresa, []); + __Message.Finalize; + + __TransportChannel.Dispatch(__Message); + + __Message.Read('Result', TypeInfo(Binary), result, []); + finally + __Message.UnsetAttributes(__TransportChannel); + __Message.FreeStream; + end +end; + { CosrvRecibosCliente } class function CosrvRecibosCliente.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvRecibosCliente; diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas index 52205303..b1ebbf07 100644 --- a/Source/Servicios/FactuGES_Invk.pas +++ b/Source/Servicios/FactuGES_Invk.pas @@ -98,6 +98,7 @@ type private protected published + procedure Invoke_DarListaProveedoresConArticulos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); end; TsrvRecibosCliente_Invoker = class(TDataAbstractService_Invoker) @@ -386,6 +387,36 @@ begin end; end; +{ TsrvArticulos_Invoker } + +procedure TsrvArticulos_Invoker.Invoke_DarListaProveedoresConArticulos(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); +{ function DarListaProveedoresConArticulos(const IDEmpresa: Integer): Binary; } +var + IDEmpresa: Integer; + lResult: Binary; + __lObjectDisposer: TROObjectDisposer; +begin + lResult := nil; + try + __Message.Read('IDEmpresa', TypeInfo(Integer), IDEmpresa, []); + + lResult := (__Instance as IsrvArticulos).DarListaProveedoresConArticulos(IDEmpresa); + + __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvArticulos', 'DarListaProveedoresConArticulosResponse'); + __Message.Write('Result', TypeInfo(Binary), lResult, []); + __Message.Finalize; + __Message.UnsetAttributes(__Transport); + + finally + __lObjectDisposer := TROObjectDisposer.Create(__Instance); + try + __lObjectDisposer.Add(lResult); + finally + __lObjectDisposer.Free(); + end; + end; +end; + { TsrvRecibosCliente_Invoker } procedure TsrvRecibosCliente_Invoker.Invoke_GenerateReport(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res index e60f6e2c4533e01907af65f036a0aa144bf79126..b646a7db95d957b760a84040ec582523ef5367d1 100644 GIT binary patch delta 120 zcmZ2`l<~}Q#t8~cHOU*5jvGua5EAfqNi6coEG|h5D9SHOO-;!!N-cKI&vPs)$xJTI z$uCw?2=#QaRjM{|b}=-yv^3W>HFS2=H8F5B)3r1(a?&++ba8YxFm*LDHE@}{&?}$a XHMan0MB-#cUcbo#B5s@Y4eJa6+CV0` delta 24 gcmX?eoN?_@#t8~cu}K@1jvGwA6JoL1!KlX&0EG<-AOHXW diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 77163443..40459e35 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -100,8 +100,6 @@ uses srvFabricantes_Impl in '..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas' {srvFabricantes: TDataAbstractService}, schFabricantesClient_Intf in '..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas', schFabricantesServer_Intf in '..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas', - schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', - schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule}, uRptWordPedidoProveedor in '..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas' {RptWordPedidoProveedor: TDataModule}, srvObras_Impl in '..\Modulos\Obras\Servidor\srvObras_Impl.pas', @@ -124,7 +122,9 @@ uses schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', uRptRecibosCliente_Server in '..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas' {RptRecibosCliente: TDataModule}, schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', - schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas'; + schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', + schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', + schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 39b56556..95df3bb2 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,279 +1,279 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr - - - - - MainSource - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr + + + + + MainSource + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + +