diff --git a/Source/Modulos/Albaranes de cliente/Views/uDialogOpcionesImpresionAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uDialogOpcionesImpresionAlbaranesCliente.dfm new file mode 100644 index 0000000..d76872e --- /dev/null +++ b/Source/Modulos/Albaranes de cliente/Views/uDialogOpcionesImpresionAlbaranesCliente.dfm @@ -0,0 +1,110 @@ +inherited fDialogOpcionesImpresionAlbaranesCliente: TfDialogOpcionesImpresionAlbaranesCliente + Caption = 'Opciones para el albar'#225'n de cliente' + ClientHeight = 237 + ClientWidth = 393 + ExplicitWidth = 399 + ExplicitHeight = 269 + PixelsPerInch = 96 + TextHeight = 13 + inherited Bevel2: TBevel + Width = 393 + ExplicitWidth = 393 + end + inherited Bevel3: TBevel + Top = 193 + Width = 393 + ExplicitTop = 195 + ExplicitWidth = 393 + end + inherited pnlBotones: TPanel + Top = 195 + Width = 393 + ExplicitTop = 195 + ExplicitWidth = 393 + inherited btnAceptar: TButton + Left = 229 + ExplicitLeft = 229 + end + inherited btnCancelar: TButton + Left = 308 + ExplicitLeft = 308 + end + end + inherited pnlHeader: TPanel + Width = 393 + ExplicitWidth = 393 + inherited lblInstruccion: TLabel + Width = 343 + Margins.Bottom = 10 + Caption = 'Indique las siguiente opciones para el albar'#225'n de cliente:' + ExplicitWidth = 319 + end + inherited Label2: TLabel + Top = 31 + Width = 318 + Height = 25 + Visible = False + ExplicitTop = 31 + end + end + inherited pnlCuerpo: TPanel + Width = 393 + Height = 127 + ExplicitWidth = 393 + ExplicitHeight = 127 + object cbVerPrecios: TCheckBox + AlignWithMargins = True + Left = 50 + Top = 29 + Width = 415 + Height = 17 + Caption = 'Mostrar los precios en los conceptos' + Checked = True + State = cbChecked + TabOrder = 0 + end + object cbVerRefProveedor: TCheckBox + AlignWithMargins = True + Left = 50 + Top = 99 + Width = 441 + Height = 17 + Caption = 'Mostrar las referencias de proveedor de los conceptos' + Checked = True + State = cbChecked + TabOrder = 1 + Visible = False + end + object cbVerIncidencias: TCheckBox + AlignWithMargins = True + Left = 50 + Top = 52 + Width = 441 + Height = 17 + Caption = 'Mostrar las incidencias del albar'#225'n' + Checked = True + State = cbChecked + TabOrder = 2 + end + object cbVerObservaciones: TCheckBox + AlignWithMargins = True + Left = 50 + Top = 75 + Width = 441 + Height = 17 + Caption = 'Mostrar las observaciones del albar'#225'n' + Checked = True + State = cbChecked + TabOrder = 3 + end + end + inherited ActionList1: TActionList + Top = 16 + inherited actAceptar: TAction + OnExecute = actAceptarExecute + end + inherited actCancelar: TAction + OnExecute = actCancelarExecute + end + end +end diff --git a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm index cb67103..da576ad 100644 --- a/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm @@ -92,6 +92,24 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor DisplayLabel = 'Tipo' DictionaryEntry = 'AlbaranesProveedor_TIPO' end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + end item Name = 'ID_ALMACEN' DataType = datInteger @@ -284,18 +302,12 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor DictionaryEntry = 'AlbaranesProveedor_ID_FORMA_PAGO' end item - Name = 'ID_ALBARAN' - DataType = datInteger - DisplayLabel = 'AlbaranesProveedor_ID_ALBARAN' - DictionaryEntry = 'AlbaranesProveedor_ID_ALBARAN' + Name = 'NUM_COPIAS' + DataType = datSmallInt end item - Name = 'REFERENCIA_ALBARAN' - DataType = datString - Size = 255 - DisplayLabel = 'AlbaranesProveedor_REFERENCIA_ALBARAN' - ServerAutoRefresh = True - DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_ALBARAN' + Name = 'NUM_CORREOS' + DataType = datSmallInt end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm index 68a9dc1..af31e10 100644 --- a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm +++ b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.dfm @@ -204,12 +204,28 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor TableField = 'ID_FORMA_PAGO' end item - DatasetField = 'ID_ALBARAN' - TableField = 'ID_ALBARAN' + DatasetField = 'ID_ALBARAN_DEV' + TableField = 'ID_ALBARAN_DEV' end item - DatasetField = 'REFERENCIA_ALBARAN' - TableField = 'REFERENCIA_ALBARAN' + DatasetField = 'REFERENCIA_ALB_DEV' + TableField = 'REFERENCIA_ALB_DEV' + end + item + DatasetField = 'ID_FAC_ALB_DEV' + TableField = 'ID_FAC_ALB_DEV' + end + item + DatasetField = 'REFERENCIA_FAC_ALB_DEV' + TableField = 'REFERENCIA_FAC_ALB_DEV' + end + item + DatasetField = 'NUM_COPIAS' + TableField = 'NUM_COPIAS' + end + item + DatasetField = 'NUM_CORREOS' + TableField = 'NUM_CORREOS' end> end> Name = 'AlbaranesProveedor' @@ -273,6 +289,24 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor Size = 1 DictionaryEntry = 'AlbaranesProveedor_TIPO' end + item + Name = 'ID_ALBARAN_DEV' + DataType = datInteger + end + item + Name = 'REFERENCIA_ALB_DEV' + DataType = datString + Size = 255 + end + item + Name = 'ID_FAC_ALB_DEV' + DataType = datInteger + end + item + Name = 'REFERENCIA_FAC_ALB_DEV' + DataType = datString + Size = 255 + end item Name = 'ID_ALMACEN' DataType = datInteger @@ -436,16 +470,12 @@ object srvAlbaranesProveedor: TsrvAlbaranesProveedor DictionaryEntry = 'AlbaranesProveedor_ID_FORMA_PAGO' end item - Name = 'ID_ALBARAN' - DataType = datInteger - DictionaryEntry = 'AlbaranesProveedor_ID_ALBARAN' + Name = 'NUM_COPIAS' + DataType = datSmallInt end item - Name = 'REFERENCIA_ALBARAN' - DataType = datString - Size = 255 - ServerAutoRefresh = True - DictionaryEntry = 'AlbaranesProveedor_REFERENCIA_ALBARAN' + Name = 'NUM_CORREOS' + DataType = datSmallInt end> end item diff --git a/Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.dfm index fb61a46..610b38c 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.dfm @@ -1,9 +1,9 @@ inherited fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionAlbaranesProveedor Caption = 'Opciones para albar'#225'n a proveedor' - ClientHeight = 239 + ClientHeight = 186 ClientWidth = 393 ExplicitWidth = 399 - ExplicitHeight = 271 + ExplicitHeight = 218 PixelsPerInch = 96 TextHeight = 13 inherited Bevel2: TBevel @@ -11,13 +11,13 @@ inherited fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionA ExplicitWidth = 393 end inherited Bevel3: TBevel - Top = 195 + Top = 142 Width = 393 ExplicitTop = 195 ExplicitWidth = 393 end inherited pnlBotones: TPanel - Top = 197 + Top = 144 Width = 393 ExplicitTop = 197 ExplicitWidth = 393 @@ -49,7 +49,7 @@ inherited fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionA end inherited pnlCuerpo: TPanel Width = 393 - Height = 129 + Height = 76 ExplicitWidth = 393 ExplicitHeight = 129 object cbVerPrecios: TCheckBox @@ -73,6 +73,7 @@ inherited fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionA Checked = True State = cbChecked TabOrder = 1 + Visible = False end end inherited ActionList1: TActionList diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm index 5c14d05..fd07b4a 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.dfm @@ -2,6 +2,17 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor OnCreate = CustomViewCreate inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView + inherited cxGridViewNUM_COPIAS: TcxGridDBColumn + IsCaptionAssigned = True + end + object cxGridViewREFERENCIA_ALB_DEV: TcxGridDBColumn [4] + Caption = 'Ref. alb. origen' + DataBinding.FieldName = 'REFERENCIA_ALB_DEV' + end + object cxGridViewREFERENCIA_FAC_ALB_DEV: TcxGridDBColumn [5] + Caption = 'Ref. fac. alb. origen' + DataBinding.FieldName = 'REFERENCIA_FAC_ALB_DEV' + end inherited cxGridViewREF_FACTURA: TcxGridDBColumn Caption = 'Ref. abono' end @@ -28,6 +39,14 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' end + inherited eLista: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 215 + Width = 215 + end end end end @@ -156,6 +175,47 @@ inherited frViewAlbaranesDevProveedor: TfrViewAlbaranesDevProveedor 82} Name = 'PngImage1' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000774494D45000000000000000973942E000000097048597300001712 + 0000171201679FD252000001724944415478DA6364A0103062135CB1E2C26E20 + E5824F63448401235603809AA381D412374F5506413E2EB0D89FBFFF187EFFF9 + 0BC62F3EFD6728A999C0B0795E15A60150CD1540CD3A7B4FDCC5B0D5D94299E1 + CAD3BF0CDD3D53F280064CC666C06EA066176C36FF05B25F7F6544B11DC50098 + D3C3C3F519D6ECBA8C61BBBDA922C38D17FF41B6C384B6020DF261846AFE0FA4 + AE809C0EB21DDD6610FFCF9F7F0CE91553194CF49518A4558D1836AE59037609 + 23C8E6AB4F2E2C2136DAE4B5AC186E9CD9C570F3C1278801B53D0BFE3715C7E3 + D4F0E5C75F86CFDF8118487FF9F18F61C3BA350C12CA260C3B366F4218408CCD + 17AE3D03D3065A520CEC42AA0C278F1CC4EF02749BBF82F0CFBF0CC7F66E64F8 + C92AC970FDE259DC06A06BAE3DEFC390ABB49EE1FEB5530CCF9F3F6778FA919D + E1F5D3FBD80DC066F3AC743D8680EEB30CAFEE9E61D8BEF72C4CA90CD080A770 + 03A62FDB45542C400D006B062724DFA4366920FD84D86844D68C9212C905001F + 16FA1194E3DBC30000000049454E44AE426082} + Name = 'PngImage2' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000001964944415478DA + 636440038B371DFFCF8005C4FA5932621347115CB2F9D8FF30075154053F3F30 + 30FC7CCF6096B49EE1FCCEE98C380D58B9F5F0FF403B09AC9A61B469C1050C43 + C09C659B8FFE0F7110C3AB194CFFFAC0E0D2FD9B61FFEA1EB8218C203F873B8A + 10A59911C806F18DBB85E02E011BF0E1C30786F44015A234671F0B653871742F + AA0131BE160C5316EF60C8F012012B9AB1F72F8A8BB2153782C5A73E4B00F3E7 + 2DDD846A80BF93215862E1BAFD603A27D603C580ACE6B50C5A0ADC0CB97D0F19 + AEAEF66788C9694235C0D6580DAC70F3DE530CF1418E0CB88063F17D86B3270F + 324C2E9267C88DF3441860A4A9C0B0EFF80506171B230C4D319DEF50F8113E1A + 0CA5B53319182E64A006A28EBA0A565B4BE6FD61C88B85C83D7EF98FE1EBD76F + 60767BDF4AB0216003A4440518AEDD7E80D580054715C006BC7ACFC2F0EBF76F + 862F5FBE8231883D73FE4E880BFAA62EC2AAD9C2DA99E1D4536D86A42019860F + 5FD9E19ABF7CFDCA307FE97E880B180800E3F4EBFF4101070389D18E70CDF0A4 + 4C34309801C9A950CDE41980A4190400B843EED8DFC8CDA30000000049454E44 + AE426082} + Name = 'PngImage3' + Background = clWindow end> end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 81f5c65..d4983a5 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -36,6 +36,33 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor end> DataController.OnCompare = cxGridViewDataControllerCompare OptionsView.GroupFooters = gfAlwaysVisible + inherited cxGridViewICONO: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end + object cxGridViewNUM_COPIAS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_COPIAS' + MinWidth = 30 + Options.HorzSizing = False + VisibleForCustomization = False + Width = 30 + OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader + IsCaptionAssigned = True + end + object cxGridViewNUM_CORREOS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_CORREOS' + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + BestFitMaxWidth = 25 + MinWidth = 25 + Options.Editing = False + Options.HorzSizing = False + Options.Moving = False + Options.ShowCaption = False + VisibleForCustomization = False + Width = 25 + OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader + end object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn Caption = 'Incidencias' DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS' @@ -171,22 +198,22 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Width = 188 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 292 + Left = 210 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 292 + ExplicitLeft = 210 ExplicitWidth = 294 Width = 294 end inherited eLista: TcxComboBox - Left = 623 + Left = 447 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 623 + ExplicitLeft = 447 ExplicitWidth = 215 Width = 215 end @@ -444,6 +471,47 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor 89C05E9EC10500D1295EA9BD5461080000000049454E44AE426082} Name = 'PngImage1' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000774494D45000000000000000973942E000000097048597300001712 + 0000171201679FD252000001724944415478DA6364A0103062135CB1E2C26E20 + E5824F63448401235603809AA381D412374F5506413E2EB0D89FBFFF187EFFF9 + 0BC62F3EFD6728A999C0B0795E15A60150CD1540CD3A7B4FDCC5B0D5D94299E1 + CAD3BF0CDD3D53F280064CC666C06EA066176C36FF05B25F7F6544B11DC50098 + D3C3C3F519D6ECBA8C61BBBDA922C38D17FF41B6C384B6020DF261846AFE0FA4 + AE809C0EB21DDD6610FFCF9F7F0CE91553194CF49518A4558D1836AE59037609 + 23C8E6AB4F2E2C2136DAE4B5AC186E9CD9C570F3C1278801B53D0BFE3715C7E3 + D4F0E5C75F86CFDF8118487FF9F18F61C3BA350C12CA260C3B366F4218408CCD + 17AE3D03D3065A520CEC42AA0C278F1CC4EF02749BBF82F0CFBF0CC7F66E64F8 + C92AC970FDE259DC06A06BAE3DEFC390ABB49EE1FEB5530CCF9F3F6778FA919D + E1F5D3FBD80DC066F3AC743D8680EEB30CAFEE9E61D8BEF72C4CA90CD080A770 + 03A62FDB45542C400D006B062724DFA4366920FD84D86844D68C9212C905001F + 16FA1194E3DBC30000000049454E44AE426082} + Name = 'PngImage2' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000001964944415478DA + 636440038B371DFFCF8005C4FA5932621347115CB2F9D8FF30075154053F3F30 + 30FC7CCF6096B49EE1FCCEE98C380D58B9F5F0FF403B09AC9A61B469C1050C43 + C09C659B8FFE0F7110C3AB194CFFFAC0E0D2FD9B61FFEA1EB8218C203F873B8A + 10A59911C806F18DBB85E02E011BF0E1C30786F44015A234671F0B653871742F + AA0131BE160C5316EF60C8F012012B9AB1F72F8A8BB2153782C5A73E4B00F3E7 + 2DDD846A80BF93215862E1BAFD603A27D603C580ACE6B50C5A0ADC0CB97D0F19 + AEAEF66788C9694235C0D6580DAC70F3DE530CF1418E0CB88063F17D86B3270F + 324C2E9267C88DF3441860A4A9C0B0EFF80506171B230C4D319DEF50F8113E1A + 0CA5B53319182E64A006A28EBA0A565B4BE6FD61C88B85C83D7EF98FE1EBD76F + 60767BDF4AB0216003A4440518AEDD7E80D580054715C006BC7ACFC2F0EBF76F + 862F5FBE8231883D73FE4E880BFAA62EC2AAD9C2DA99E1D4536D86A42019860F + 5FD9E19ABF7CFDCA307FE97E880B180800E3F4EBFF4101070389D18E70CDF0A4 + 4C34309801C9A950CDE41980A4190400B843EED8DFC8CDA30000000049454E44 + AE426082} + Name = 'PngImage3' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm index a2d744c..5bf0439 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm @@ -152,11 +152,13 @@ inherited frViewDireccionEntregaAlbaranProv: TfrViewDireccionEntregaAlbaranProv end object dxLayoutControl1Item6: TdxLayoutItem ShowCaption = False + Visible = False Control = RadioButton1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end object dxLayoutControl1Item5: TdxLayoutItem + Visible = False Control = cbListaObras ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm index 8a28864..57a2bd2 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm @@ -140,7 +140,9 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos Kind = bkEllipsis end> Properties.OnButtonClick = cxGridViewREFERENCIA_FABRICANTEPropertiesButtonClick + Visible = False BestFitMaxWidth = 50 + VisibleForCustomization = False Width = 50 end inherited cxGridViewDESCRIPCION: TcxGridDBColumn diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm index f55dfce..51d8f77 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Top = 84 end object rda_FacturasProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 51 Top = 151 end @@ -239,12 +239,18 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Size = 255 DisplayLabel = 'Datos bancarios' DictionaryEntry = 'FacturasProveedor_DATOS_BANCARIOS' + end + item + Name = 'NUM_COPIAS' + DataType = datSmallInt + end + item + Name = 'NUM_CORREOS' + DataType = datSmallInt end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_FacturasProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FacturasProveedor' IndexDefs = <> Left = 208 @@ -363,8 +369,6 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor MasterSource = ds_FacturasProveedor MasterFields = 'ID' DetailFields = 'ID_FACTURA' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FacturasProveedor_Detalles' IndexDefs = <> Left = 368 @@ -431,8 +435,6 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor MasterSource = ds_FacturasProveedor MasterFields = 'ID' DetailFields = 'ID_FACTURA' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'FacturasProveedor_Pedidos' IndexDefs = <> Left = 368 @@ -455,8 +457,6 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_FacturasProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosFacturas' IndexDefs = <> Left = 208 diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm index a6dd319..514df6a 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm @@ -179,6 +179,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor item DatasetField = 'FECHA_VENCIMIENTO' TableField = 'FECHA_VENCIMIENTO' + end + item + DatasetField = 'NUM_COPIAS' + TableField = 'NUM_COPIAS' + end + item + DatasetField = 'NUM_CORREOS' + TableField = 'NUM_CORREOS' end> end> Name = 'FacturasProveedor' @@ -362,6 +370,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor DataType = datString Size = 255 DictionaryEntry = 'FacturasProveedor_DATOS_BANCARIOS' + end + item + Name = 'NUM_COPIAS' + DataType = datSmallInt + end + item + Name = 'NUM_CORREOS' + DataType = datSmallInt end> end item diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm index 2c91f1e..72e9ff7 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor - Width = 687 - Height = 304 + Width = 751 + Height = 429 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 687 - Height = 304 + Width = 751 + Height = 429 Align = alClient ParentBackground = True TabOrder = 0 @@ -18,9 +18,10 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 451 + ExplicitHeight = 304 DesignSize = ( - 687 - 304) + 751 + 429) object eReferencia: TcxDBTextEdit Left = 136 Top = 30 @@ -130,7 +131,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 78 end object bFormasPago: TButton - Left = 204 + Left = 237 Top = 135 Width = 132 Height = 23 @@ -163,7 +164,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 158 end inline frViewProveedorFactura: TfrViewDatosYSeleccionProveedor - Left = 364 + Left = 397 Top = 30 Width = 350 Height = 202 @@ -175,7 +176,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ParentFont = False TabOrder = 8 ReadOnly = False - ExplicitLeft = 364 + ExplicitLeft = 397 ExplicitTop = 30 inherited dxLayoutControl1: TdxLayoutControl inherited edtlNombre: TcxDBTextEdit @@ -217,16 +218,16 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 209 + Left = 240 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 209 + ExplicitLeft = 240 end inherited Button3: TBitBtn - Left = 93 - ExplicitLeft = 93 + Left = 124 + ExplicitLeft = 124 end end end @@ -334,12 +335,14 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor end object ledtFechaVencimiento: TdxLayoutItem Caption = 'Fecha vencimiento:' + Visible = False Control = edtFechaVencimiento ControlOptions.ShowBorder = False end end object dxLayoutControl1Item7: TdxLayoutItem Caption = 'Cuenta bancaria:' + Visible = False Control = cbCuentaBancaria ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index bf4624d..0678c9a 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -34,6 +34,33 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor DataController.OnCompare = cxGridViewDataControllerCompare OptionsCustomize.ColumnHidingOnGrouping = False OptionsView.GroupFooters = gfAlwaysVisible + inherited cxGridViewICONO: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end + object cxGridViewNUM_COPIAS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_COPIAS' + MinWidth = 30 + Options.HorzSizing = False + VisibleForCustomization = False + Width = 30 + OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader + IsCaptionAssigned = True + end + object cxGridViewNUM_CORREOS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_CORREOS' + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + BestFitMaxWidth = 25 + MinWidth = 25 + Options.Editing = False + Options.HorzSizing = False + Options.Moving = False + Options.ShowCaption = False + VisibleForCustomization = False + Width = 25 + OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader + end object cxGridViewTIPO: TcxGridDBColumn DataBinding.FieldName = 'TIPO' PropertiesClassName = 'TcxImageComboBoxProperties' @@ -67,6 +94,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Width = 32 end object cxGridViewFECHA_FACTURA: TcxGridDBColumn + Caption = 'Fecha factura' DataBinding.FieldName = 'FECHA_FACTURA' PropertiesClassName = 'TcxDateEditProperties' Width = 27 @@ -75,6 +103,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Caption = 'Fecha vto.' DataBinding.FieldName = 'FECHA_VENCIMIENTO' PropertiesClassName = 'TcxDateEditProperties' + Visible = False + VisibleForCustomization = False end object cxGridViewNIF_CIF: TcxGridDBColumn DataBinding.FieldName = 'NIF_CIF' @@ -146,6 +176,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Caption = 'Liquidaci'#243'n' DataBinding.FieldName = 'REFERENCIA_COMISION' Visible = False + VisibleForCustomization = False end end inherited cxGridLevel: TcxGridLevel @@ -186,22 +217,22 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Width = 229 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 333 + Left = 230 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 333 + ExplicitLeft = 230 ExplicitWidth = 188 Width = 188 end inherited eLista: TcxComboBox - Left = 558 + Left = 388 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 558 + ExplicitLeft = 388 ExplicitWidth = 215 Width = 215 end @@ -391,6 +422,47 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor 00004B6D80F047EC10D30000000049454E44AE426082} Name = 'PngImage1' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000774494D45000000000000000973942E000000097048597300001712 + 0000171201679FD252000001724944415478DA6364A0103062135CB1E2C26E20 + E5824F63448401235603809AA381D412374F5506413E2EB0D89FBFFF187EFFF9 + 0BC62F3EFD6728A999C0B0795E15A60150CD1540CD3A7B4FDCC5B0D5D94299E1 + CAD3BF0CDD3D53F280064CC666C06EA066176C36FF05B25F7F6544B11DC50098 + D3C3C3F519D6ECBA8C61BBBDA922C38D17FF41B6C384B6020DF261846AFE0FA4 + AE809C0EB21DDD6610FFCF9F7F0CE91553194CF49518A4558D1836AE59037609 + 23C8E6AB4F2E2C2136DAE4B5AC186E9CD9C570F3C1278801B53D0BFE3715C7E3 + D4F0E5C75F86CFDF8118487FF9F18F61C3BA350C12CA260C3B366F4218408CCD + 17AE3D03D3065A520CEC42AA0C278F1CC4EF02749BBF82F0CFBF0CC7F66E64F8 + C92AC970FDE259DC06A06BAE3DEFC390ABB49EE1FEB5530CCF9F3F6778FA919D + E1F5D3FBD80DC066F3AC743D8680EEB30CAFEE9E61D8BEF72C4CA90CD080A770 + 03A62FDB45542C400D006B062724DFA4366920FD84D86844D68C9212C905001F + 16FA1194E3DBC30000000049454E44AE426082} + Name = 'PngImage2' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000001964944415478DA + 636440038B371DFFCF8005C4FA5932621347115CB2F9D8FF30075154053F3F30 + 30FC7CCF6096B49EE1FCCEE98C380D58B9F5F0FF403B09AC9A61B469C1050C43 + C09C659B8FFE0F7110C3AB194CFFFAC0E0D2FD9B61FFEA1EB8218C203F873B8A + 10A59911C806F18DBB85E02E011BF0E1C30786F44015A234671F0B653871742F + AA0131BE160C5316EF60C8F012012B9AB1F72F8A8BB2153782C5A73E4B00F3E7 + 2DDD846A80BF93215862E1BAFD603A27D603C580ACE6B50C5A0ADC0CB97D0F19 + AEAEF66788C9694235C0D6580DAC70F3DE530CF1418E0CB88063F17D86B3270F + 324C2E9267C88DF3441860A4A9C0B0EFF80506171B230C4D319DEF50F8113E1A + 0CA5B53319182E64A006A28EBA0A565B4BE6FD61C88B85C83D7EF98FE1EBD76F + 60767BDF4AB0216003A4440518AEDD7E80D580054715C006BC7ACFC2F0EBF76F + 862F5FBE8231883D73FE4E880BFAA62EC2AAD9C2DA99E1D4536D86A42019860F + 5FD9E19ABF7CFDCA307FE97E880B180800E3F4EBFF4101070389D18E70CDF0A4 + 4C34309801C9A950CDE41980A4190400B843EED8DFC8CDA30000000049454E44 + AE426082} + Name = 'PngImage3' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm index 19ed028..6c19862 100644 --- a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Top = 84 end object rda_PedidosProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 43 Top = 151 end @@ -302,12 +302,18 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Size = 255 DisplayLabel = 'PedidosProveedor_REF_FACTURA_PROV' DictionaryEntry = 'PedidosProveedor_REF_FACTURA_PROV' + end + item + Name = 'NUM_COPIAS' + DataType = datSmallInt + end + item + Name = 'NUM_CORREOS' + DataType = datSmallInt end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor' IndexDefs = <> Left = 160 @@ -367,8 +373,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor end> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor_Articulos_Pendientes' IndexDefs = <> Left = 480 @@ -495,8 +499,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor MasterSource = ds_PedidosProveedor MasterFields = 'ID' DetailFields = 'ID_PEDIDO' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'PedidosProveedor_Detalles' IndexDefs = <> Left = 296 @@ -519,8 +521,6 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_PedidosProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosPedidos' IndexDefs = <> Left = 168 diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm index f278a93..1181d97 100644 --- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm +++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm @@ -214,6 +214,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor item DatasetField = 'PERSONA_CONTACTO_PROV' TableField = 'PERSONA_CONTACTO_PROV' + end + item + DatasetField = 'NUM_COPIAS' + TableField = 'NUM_COPIAS' + end + item + DatasetField = 'NUM_CORREOS' + TableField = 'NUM_CORREOS' end> end> Name = 'PedidosProveedor' @@ -452,6 +460,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor DataType = datString Size = 255 DictionaryEntry = 'PedidosProveedor_REF_FACTURA_PROV' + end + item + Name = 'NUM_COPIAS' + DataType = datSmallInt + end + item + Name = 'NUM_CORREOS' + DataType = datSmallInt end> end item diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm index 4f87f64..828e389 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm @@ -20,7 +20,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor 965 560) object edtFechaPedido: TcxDBDateEdit - Left = 121 + Left = 137 Top = 55 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_PEDIDO' @@ -46,8 +46,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 333 end object edtFechaConfirmacion: TcxDBDateEdit - Left = 589 - Top = 292 + Left = 137 + Top = 195 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_CONFIRMACION' DataBinding.DataSource = DADataSource @@ -67,12 +67,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 + TabOrder = 7 Width = 344 end object edtFechaEntrega: TcxDBDateEdit - Left = 589 - Top = 319 + Left = 137 + Top = 222 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ENTREGA' DataBinding.DataSource = DADataSource @@ -90,12 +90,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 + TabOrder = 8 Width = 344 end object memObservaciones: TcxDBMemo - Left = 474 - Top = 376 + Left = 488 + Top = 265 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -111,12 +111,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 + TabOrder = 11 Height = 200 Width = 459 end object eReferencia: TcxDBTextEdit - Left = 121 + Left = 137 Top = 28 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' @@ -143,7 +143,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv Left = 22 - Top = 301 + Top = 279 Width = 432 Height = 248 Font.Charset = DEFAULT_CHARSET @@ -152,10 +152,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 7 + TabOrder = 9 ReadOnly = False ExplicitLeft = 22 - ExplicitTop = 301 + ExplicitTop = 279 ExplicitWidth = 432 ExplicitHeight = 248 inherited dxLayoutControl1: TdxLayoutControl @@ -167,9 +167,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor 432 248) inherited Bevel1: TBevel - Top = 175 + Top = 197 Width = 566 - ExplicitTop = 175 + ExplicitTop = 197 ExplicitWidth = 566 end inherited lblObra: TLabel @@ -189,10 +189,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 551 end inherited bModificar: TBitBtn - Left = 284 - Top = 139 - ExplicitLeft = 284 - ExplicitTop = 139 + Left = 298 + Top = 161 + ExplicitLeft = 298 + ExplicitTop = 161 end inherited txtDireccion: TStaticText Width = 882 @@ -205,15 +205,22 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ExplicitWidth = 223 end inherited edtEntregarA: TcxDBButtonEdit - Top = 206 + Top = 228 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 206 + ExplicitTop = 228 ExplicitWidth = 334 Width = 334 end + inherited dxLayoutGroup1: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Group3: TdxLayoutGroup + Visible = False + end + end + end end inherited ActionList1: TActionList Left = 72 @@ -227,7 +234,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end end object cbFormaPago: TcxDBLookupComboBox - Left = 121 + Left = 137 Top = 82 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource @@ -261,7 +268,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 195 end object bFormasPago: TButton - Left = 312 + Left = 326 Top = 82 Width = 132 Height = 21 @@ -270,8 +277,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor OnClick = bFormasPagoClick end object edtFechaEnvio: TcxDBDateEdit - Left = 589 - Top = 265 + Left = 137 + Top = 168 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ENVIO' DataBinding.DataSource = DADataSource @@ -291,11 +298,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 6 Width = 344 end object eReferenciaPedidoCli: TcxTextEdit - Left = 121 + Left = 137 Top = 109 Anchors = [akLeft, akTop, akRight] Enabled = False @@ -322,7 +329,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 195 end object bVerPedidoCliente: TButton - Left = 312 + Left = 326 Top = 109 Width = 132 Height = 23 @@ -330,8 +337,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor TabOrder = 5 end inline frViewObraReserva1: TfrViewObraReserva - Left = 22 - Top = 168 + Left = 488 + Top = 441 Width = 422 Height = 97 Font.Charset = DEFAULT_CHARSET @@ -340,25 +347,31 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 6 + TabOrder = 12 ReadOnly = False - ExplicitLeft = 22 - ExplicitTop = 168 + ExplicitLeft = 488 + ExplicitTop = 441 ExplicitWidth = 422 ExplicitHeight = 97 inherited dxLayoutControl1: TdxLayoutControl Width = 422 Height = 97 - ExplicitWidth = 432 - ExplicitHeight = 72 + ExplicitWidth = 422 + ExplicitHeight = 97 DesignSize = ( 422 97) + inherited Label1: TLabel + Width = 202 + ExplicitWidth = 202 + end inherited cbObraReserva: TcxComboBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 581 + Width = 581 end end inherited PngImageList: TPngImageList @@ -371,7 +384,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end end inline frViewDatosYSeleccionProveedorPedido1: TfrViewDatosYSeleccionProveedorPedido - Left = 474 + Left = 488 Top = 28 Width = 480 Height = 201 @@ -381,9 +394,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 8 + TabOrder = 10 ReadOnly = False - ExplicitLeft = 474 + ExplicitLeft = 488 ExplicitTop = 28 ExplicitWidth = 480 ExplicitHeight = 201 @@ -401,12 +414,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 224 end inherited edtCODIGO_ASIGNADO: TcxDBTextEdit - Left = 356 + Left = 342 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 356 + ExplicitLeft = 342 end inherited edtPersonaContacto: TcxDBTextEdit Style.LookAndFeel.SkinName = '' @@ -425,16 +438,16 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 121 end inherited Button4: TButton - Left = 436 - ExplicitLeft = 436 + Left = 422 + ExplicitLeft = 422 end inherited Button5: TButton - Left = 436 - ExplicitLeft = 436 + Left = 422 + ExplicitLeft = 422 end inherited Button3: TBitBtn - Left = 261 - ExplicitLeft = 261 + Left = 247 + ExplicitLeft = 247 end end end @@ -490,7 +503,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end object dxLayoutControl1Group10: TdxLayoutGroup ShowCaption = False - Visible = False Hidden = True LayoutDirection = ldHorizontal ShowBorder = False @@ -511,14 +523,22 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end end end - object dxLayoutControl1Group11: TdxLayoutGroup + object dxLayoutControl1Group5: TdxLayoutGroup AutoAligns = [aaHorizontal] - Caption = 'Obra relacionada' - object dxLayoutControl1Item13: TdxLayoutItem - Caption = 'Reservar para obra:' - ShowCaption = False - Control = frViewObraReserva1 - ControlOptions.AutoColor = True + Caption = 'Situaci'#243'n del pedido' + object dxLayoutControl1Item7: TdxLayoutItem + Caption = 'Enviado al prov. el d'#237'a:' + Control = edtFechaEnvio + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item4: TdxLayoutItem + Caption = 'Confirmado el d'#237'a:' + Control = edtFechaConfirmacion + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Entrega prevista:' + Control = edtFechaEntrega ControlOptions.ShowBorder = False end end @@ -554,25 +574,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ControlOptions.ShowBorder = False end end - object dxLayoutControl1Group5: TdxLayoutGroup - AutoAligns = [aaHorizontal] - Caption = 'Situaci'#243'n del pedido' - object dxLayoutControl1Item7: TdxLayoutItem - Caption = 'Enviado al prov. el d'#237'a:' - Control = edtFechaEnvio - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item4: TdxLayoutItem - Caption = 'Confirmado el d'#237'a:' - Control = edtFechaConfirmacion - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item5: TdxLayoutItem - Caption = 'Entrega prevista:' - Control = edtFechaEntrega - ControlOptions.ShowBorder = False - end - end object dxLayoutControl1Group7: TdxLayoutGroup AutoAligns = [aaHorizontal] AlignVert = avClient @@ -584,6 +585,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ControlOptions.ShowBorder = False end end + object dxLayoutControl1Group11: TdxLayoutGroup + AutoAligns = [aaHorizontal] + Caption = 'Obra relacionada' + Visible = False + object dxLayoutControl1Item13: TdxLayoutItem + Caption = 'Reservar para obra:' + ShowCaption = False + Control = frViewObraReserva1 + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end + end end end end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index 7fe251a..6b20b96 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -34,9 +34,34 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor DataController.OnCompare = cxGridViewDataControllerCompare OptionsView.GroupFooters = gfAlwaysVisible inherited cxGridViewICONO: TcxGridDBColumn + Visible = False MinWidth = 30 + VisibleForCustomization = False Width = 30 end + object cxGridViewNUM_COPIAS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_COPIAS' + MinWidth = 30 + Options.HorzSizing = False + VisibleForCustomization = False + Width = 30 + OnCustomDrawHeader = cxGridViewNUM_COPIASCustomDrawHeader + IsCaptionAssigned = True + end + object cxGridViewNUM_CORREOS: TcxGridDBColumn + DataBinding.FieldName = 'NUM_CORREOS' + PropertiesClassName = 'TcxTextEditProperties' + Properties.Alignment.Horz = taCenter + BestFitMaxWidth = 25 + MinWidth = 25 + Options.Editing = False + Options.HorzSizing = False + Options.Moving = False + Options.ShowCaption = False + VisibleForCustomization = False + Width = 25 + OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader + end object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn Caption = 'Incidencias' DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS' @@ -124,13 +149,13 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end object cxGridViewNOMBRE_OBRA: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_OBRA' + Visible = False + VisibleForCustomization = False Width = 54 end object cxGridViewREF_PED_CLIENTE: TcxGridDBColumn Caption = 'Ref. pedido cli.' DataBinding.FieldName = 'REF_PED_CLIENTE' - Visible = False - VisibleForCustomization = False Width = 65 end object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn @@ -150,6 +175,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor object cxGridViewREF_FACTURA_PROV: TcxGridDBColumn Caption = 'Ref. factura' DataBinding.FieldName = 'REF_FACTURA_PROV' + Visible = False + VisibleForCustomization = False Width = 95 end end @@ -213,6 +240,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 673 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -430,6 +459,47 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor CF0000000049454E44AE426082} Name = 'PngImage1' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000774494D45000000000000000973942E000000097048597300001712 + 0000171201679FD252000001724944415478DA6364A0103062135CB1E2C26E20 + E5824F63448401235603809AA381D412374F5506413E2EB0D89FBFFF187EFFF9 + 0BC62F3EFD6728A999C0B0795E15A60150CD1540CD3A7B4FDCC5B0D5D94299E1 + CAD3BF0CDD3D53F280064CC666C06EA066176C36FF05B25F7F6544B11DC50098 + D3C3C3F519D6ECBA8C61BBBDA922C38D17FF41B6C384B6020DF261846AFE0FA4 + AE809C0EB21DDD6610FFCF9F7F0CE91553194CF49518A4558D1836AE59037609 + 23C8E6AB4F2E2C2136DAE4B5AC186E9CD9C570F3C1278801B53D0BFE3715C7E3 + D4F0E5C75F86CFDF8118487FF9F18F61C3BA350C12CA260C3B366F4218408CCD + 17AE3D03D3065A520CEC42AA0C278F1CC4EF02749BBF82F0CFBF0CC7F66E64F8 + C92AC970FDE259DC06A06BAE3DEFC390ABB49EE1FEB5530CCF9F3F6778FA919D + E1F5D3FBD80DC066F3AC743D8680EEB30CAFEE9E61D8BEF72C4CA90CD080A770 + 03A62FDB45542C400D006B062724DFA4366920FD84D86844D68C9212C905001F + 16FA1194E3DBC30000000049454E44AE426082} + Name = 'PngImage3' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000001964944415478DA + 636440038B371DFFCF8005C4FA5932621347115CB2F9D8FF30075154053F3F30 + 30FC7CCF6096B49EE1FCCEE98C380D58B9F5F0FF403B09AC9A61B469C1050C43 + C09C659B8FFE0F7110C3AB194CFFFAC0E0D2FD9B61FFEA1EB8218C203F873B8A + 10A59911C806F18DBB85E02E011BF0E1C30786F44015A234671F0B653871742F + AA0131BE160C5316EF60C8F012012B9AB1F72F8A8BB2153782C5A73E4B00F3E7 + 2DDD846A80BF93215862E1BAFD603A27D603C580ACE6B50C5A0ADC0CB97D0F19 + AEAEF66788C9694235C0D6580DAC70F3DE530CF1418E0CB88063F17D86B3270F + 324C2E9267C88DF3441860A4A9C0B0EFF80506171B230C4D319DEF50F8113E1A + 0CA5B53319182E64A006A28EBA0A565B4BE6FD61C88B85C83D7EF98FE1EBD76F + 60767BDF4AB0216003A4440518AEDD7E80D580054715C006BC7ACFC2F0EBF76F + 862F5FBE8231883D73FE4E880BFAA62EC2AAD9C2DA99E1D4536D86A42019860F + 5FD9E19ABF7CFDCA307FE97E880B180800E3F4EBFF4101070389D18E70CDF0A4 + 4C34309801C9A950CDE41980A4190400B843EED8DFC8CDA30000000049454E44 + AE426082} + Name = 'PngImage4' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm index d014425..d923604 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm @@ -130,6 +130,26 @@ object RptRecibosCliente: TRptRecibosCliente DataType = datString Size = 255 end + item + Name = 'ENTIDAD_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'DC_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_CLIENTE' + DataType = datString + Size = 15 + end item Name = 'NIF_CIF_EMPRESA' DataType = datString @@ -199,7 +219,6 @@ object RptRecibosCliente: TRptRecibosCliente Name = 'ID' DataType = datInteger Value = '' - ParamType = daptInput end> MasterMappingMode = mmDataRequest LogChanges = False @@ -207,8 +226,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 @@ -452,7 +469,6 @@ object RptRecibosCliente: TRptRecibosCliente Name = 'ID' DataType = datInteger Value = '' - ParamType = daptInput end> Statements = < item @@ -474,15 +490,17 @@ object RptRecibosCliente: TRptRecibosCliente 'NOMBRE_CLIENTE,'#10' V_RECIBOS_CLIENTE.NIF_CIF_CLIENTE,'#10' V_REC' + 'IBOS_CLIENTE.CALLE_CLIENTE,'#10' V_RECIBOS_CLIENTE.CODIGO_POSTAL_' + 'CLIENTE,'#10' V_RECIBOS_CLIENTE.PROVINCIA_CLIENTE,'#10' V_RECIBOS_' + - 'CLIENTE.POBLACION_CLIENTE,'#10#10' EMPRESAS.NIF_CIF as NIF_CIF_EMPR' + - 'ESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS.CALLE as CALLE_EMPRESA,' + - ' EMPRESAS.POBLACION as POBLACION_EMPRESA,'#10' EMPRESAS.PROVINCIA' + - ' as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POSTAL as CODIGO_POSTAL_E' + - 'MPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1,' + - ' EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_ME' + - 'RCANTIL, EMPRESAS.LOGOTIPO'#10#10'FROM'#10' V_RECIBOS_CLIENTE'#10' LEFT OUTE' + - 'R JOIN EMPRESAS ON (EMPRESAS.ID = V_RECIBOS_CLIENTE.ID_EMPRESA)'#10 + - 'WHERE'#10' V_RECIBOS_CLIENTE.ID = :ID'#10 + 'CLIENTE.POBLACION_CLIENTE,'#10#10' V_RECIBOS_CLIENTE.ENTIDAD_CLIENT' + + 'E,'#10' V_RECIBOS_CLIENTE.SUCURSAL_CLIENTE,'#10' V_RECIBOS_CLIENTE' + + '.DC_CLIENTE,'#10' V_RECIBOS_CLIENTE.CUENTA_CLIENTE,'#10#10' EMPRESAS' + + '.NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS' + + '.CALLE as CALLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRESA' + + ','#10' EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_P' + + 'OSTAL as CODIGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESA' + + 'S.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_W' + + 'EB, EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO'#10#10'FROM'#10' V_REC' + + 'IBOS_CLIENTE'#10' LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_RECI' + + 'BOS_CLIENTE.ID_EMPRESA)'#10'WHERE'#10' V_RECIBOS_CLIENTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -610,6 +628,26 @@ object RptRecibosCliente: TRptRecibosCliente TableField = '' SQLOrigin = 'POBLACION_CLIENTE' end + item + DatasetField = 'ENTIDAD_CLIENTE' + TableField = '' + SQLOrigin = 'ENTIDAD_CLIENTE' + end + item + DatasetField = 'SUCURSAL_CLIENTE' + TableField = '' + SQLOrigin = 'SUCURSAL_CLIENTE' + end + item + DatasetField = 'DC_CLIENTE' + TableField = '' + SQLOrigin = 'DC_CLIENTE' + end + item + DatasetField = 'CUENTA_CLIENTE' + TableField = '' + SQLOrigin = 'CUENTA_CLIENTE' + end item DatasetField = 'NIF_CIF_EMPRESA' TableField = '' @@ -796,6 +834,26 @@ object RptRecibosCliente: TRptRecibosCliente DataType = datString Size = 255 end + item + Name = 'ENTIDAD_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'DC_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_CLIENTE' + DataType = datString + Size = 15 + end item Name = 'NIF_CIF_EMPRESA' DataType = datString @@ -1179,7 +1237,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 158 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.7.71' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -1241,6 +1299,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -1254,6 +1313,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCompensados' CloseDataSource = False DataSource = DADataCompensados + BCDToCurrency = False Left = 360 Top = 16 end @@ -1286,8 +1346,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Informe_Compensados' IndexDefs = <> Left = 360 @@ -1351,8 +1409,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeListadoRecibos' IndexDefs = <> Left = 496 @@ -1368,6 +1424,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibos' CloseDataSource = False DataSource = DADSInformeListadoRecibos + BCDToCurrency = False Left = 496 Top = 16 end @@ -1379,6 +1436,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosResumen' CloseDataSource = False DataSource = DADSInformeListadoRecibosResumen + BCDToCurrency = False Left = 504 Top = 192 end @@ -1396,8 +1454,6 @@ object RptRecibosCliente: TRptRecibosCliente LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 504 Top = 304 @@ -1406,6 +1462,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosPendientes' CloseDataSource = False DataSource = DADSInformeListadoRecibosPendientes + BCDToCurrency = False Left = 704 Top = 16 end @@ -1482,8 +1539,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeListadoRecibosPendientes' IndexDefs = <> Left = 704 @@ -1493,6 +1548,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosPendResumen' CloseDataSource = False DataSource = DADSInformeListadoRecibosPendResumen + BCDToCurrency = False Left = 704 Top = 192 end @@ -1510,8 +1566,6 @@ object RptRecibosCliente: TRptRecibosCliente LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 704 Top = 304 diff --git a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm index 2ec5a4b..038b981 100644 --- a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm @@ -243,6 +243,26 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor DataType = datString Size = 15 end + item + Name = 'ENTIDAD_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'DC_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_PROVEEDOR' + DataType = datString + Size = 15 + end item Name = 'FECHA_ALTA' DataType = datDateTime @@ -428,6 +448,26 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor DisplayLabel = 'RecibosProveedor_NIF_CIF_PROVEEDOR' DictionaryEntry = 'RecibosProveedor_NIF_CIF_PROVEEDOR' end + item + Name = 'ENTIDAD_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'DC_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_PROVEEDOR' + DataType = datString + Size = 15 + end item Name = 'FECHA_ALTA' DataType = datDateTime diff --git a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm index 716cfb2..5a9ceaf 100644 --- a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm +++ b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm @@ -158,6 +158,22 @@ object srvRecibosProveedor: TsrvRecibosProveedor item DatasetField = 'USUARIO' TableField = 'USUARIO' + end + item + DatasetField = 'ENTIDAD_PROVEEDOR' + TableField = 'ENTIDAD_PROVEEDOR' + end + item + DatasetField = 'SUCURSAL_PROVEEDOR' + TableField = 'SUCURSAL_PROVEEDOR' + end + item + DatasetField = 'DC_PROVEEDOR' + TableField = 'DC_PROVEEDOR' + end + item + DatasetField = 'CUENTA_PROVEEDOR' + TableField = 'CUENTA_PROVEEDOR' end> end> Name = 'RecibosCompensadosProv' @@ -277,6 +293,26 @@ object srvRecibosProveedor: TsrvRecibosProveedor DataType = datString Size = 15 end + item + Name = 'ENTIDAD_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'DC_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_PROVEEDOR' + DataType = datString + Size = 15 + end item Name = 'FECHA_ALTA' DataType = datDateTime @@ -410,6 +446,22 @@ object srvRecibosProveedor: TsrvRecibosProveedor item DatasetField = 'USUARIO' TableField = 'USUARIO' + end + item + DatasetField = 'ENTIDAD_PROVEEDOR' + TableField = 'ENTIDAD_PROVEEDOR' + end + item + DatasetField = 'SUCURSAL_PROVEEDOR' + TableField = 'SUCURSAL_PROVEEDOR' + end + item + DatasetField = 'DC_PROVEEDOR' + TableField = 'DC_PROVEEDOR' + end + item + DatasetField = 'CUENTA_PROVEEDOR' + TableField = 'CUENTA_PROVEEDOR' end> end> Name = 'RecibosProveedor' @@ -552,6 +604,26 @@ object srvRecibosProveedor: TsrvRecibosProveedor Size = 15 DictionaryEntry = 'RecibosProveedor_NIF_CIF_PROVEEDOR' end + item + Name = 'ENTIDAD_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'DC_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_PROVEEDOR' + DataType = datString + Size = 15 + end item Name = 'FECHA_ALTA' DataType = datDateTime diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm index c4e2963..305473c 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm @@ -54,15 +54,11 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn Caption = 'Compensado' DataBinding.FieldName = 'ID_RECIBO_COMPENSADO' - Visible = False OnCustomDrawCell = cxGridViewID_RECIBO_COMPENSADOCustomDrawCell - VisibleForCustomization = False end object cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn Caption = 'Ref. recibo compensado' DataBinding.FieldName = 'REFERENCIA_REC_COMPENSADO' - Visible = False - VisibleForCustomization = False end object cxGridViewREFERENCIA_FACTURA_PROV: TcxGridDBColumn Caption = 'Ref. factura prov.' @@ -147,6 +143,8 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor object cxGridViewDATOS_BANCARIOS: TcxGridDBColumn Caption = 'Banco' DataBinding.FieldName = 'DATOS_BANCARIOS' + Visible = False + VisibleForCustomization = False end end inherited cxGridLevel: TcxGridLevel @@ -187,22 +185,22 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor Width = 201 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 212 + Left = 232 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 212 + ExplicitLeft = 232 ExplicitWidth = 216 Width = 216 end inherited eLista: TcxComboBox - Left = 389 + Left = 426 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 389 + ExplicitLeft = 426 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm index 8f55673..c1e7b44 100644 --- a/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm +++ b/Source/Modulos/Remesas de cliente/Reports/uRptRemesasCliente_Server.dfm @@ -16,38 +16,263 @@ object RptRemesasCliente: TRptRemesasCliente Left = 344 Top = 72 end - object tbl_Cabecera: TDACDSDataTable + object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_REMESA' + DataType = datDateTime + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'TITULAR' + DataType = datString + Size = 255 + end + item + Name = 'ENTIDAD' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL' + DataType = datString + Size = 15 + end + item + Name = 'DC' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA' + DataType = datString + Size = 15 + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_EMPRESA' + DataType = datString + Size = 15 + end + item + Name = 'RAZON_SOCIAL' + DataType = datString + Size = 255 + end + item + Name = 'CALLE_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'POBLACION_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'PROVINCIA_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'CODIGO_POSTAL_EMPRESA' + DataType = datString + Size = 10 + end + item + Name = 'TELEFONO_1' + DataType = datString + Size = 25 + end + item + Name = 'FAX' + DataType = datString + Size = 25 + end + item + Name = 'MOVIL_1' + DataType = datString + Size = 25 + end + item + Name = 'EMAIL_1' + DataType = datString + Size = 255 + end + item + Name = 'PAGINA_WEB' + DataType = datString + Size = 255 + end + item + Name = 'REGISTRO_MERCANTIL' + DataType = datString + Size = 255 + end + item + Name = 'LOGOTIPO' + DataType = datBlob + end> + Params = < + item + Name = 'ID' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 Top = 128 end - object tbl_Detalles: TDACDSDataTable + object tbl_Detalles: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'SITUACION' + DataType = datString + Size = 9 + end + item + Name = 'ID_FACTURA' + DataType = datInteger + end + item + Name = 'ID_REMESA' + DataType = datInteger + end + item + Name = 'REFERENCIA_REMESA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'OBSERVACIONES' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE' + DataType = datFloat + end + item + Name = 'OTROS_GASTOS' + DataType = datFloat + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'FECHA_FACTURA' + DataType = datDateTime + end + item + Name = 'FORMA_PAGO_FACTURA' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_FACTURA' + DataType = datFloat + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'NOMBRE_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'ENTIDAD_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'DC_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_CLIENTE' + DataType = datString + Size = 15 + end> + Params = < + item + Name = 'ID_REMESA' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + LogicalName = 'Informe_Detalles' IndexDefs = <> Left = 344 Top = 128 end - object DABINAdapter: TDABINAdapter - Left = 48 - Top = 80 - end object frxRichObject1: TfrxRichObject Left = 48 Top = 296 @@ -562,7 +787,7 @@ object RptRemesasCliente: TRptRemesasCliente Top = 158 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.7.71' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -627,6 +852,7 @@ object RptRemesasCliente: TRptRemesasCliente UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -634,7 +860,12 @@ object RptRemesasCliente: TRptRemesasCliente UserName = 'frxDBDetalles' CloseDataSource = False DataSource = DADataDetalles + BCDToCurrency = False Left = 344 Top = 16 end + object Bin2DataStreamer: TDABin2DataStreamer + Left = 48 + Top = 88 + end end diff --git a/Source/Modulos/Remesas de proveedor/Data/uDataModuleRemesasProveedor.dfm b/Source/Modulos/Remesas de proveedor/Data/uDataModuleRemesasProveedor.dfm index 551d11a..27b1fef 100644 --- a/Source/Modulos/Remesas de proveedor/Data/uDataModuleRemesasProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Data/uDataModuleRemesasProveedor.dfm @@ -14,12 +14,12 @@ inherited DataModuleRemesasProveedor: TDataModuleRemesasProveedor Top = 84 end object rda_RemesasProveedor: TDARemoteDataAdapter + DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService - DataStreamer = Bin2DataStreamer Left = 49 Top = 151 end @@ -147,8 +147,6 @@ inherited DataModuleRemesasProveedor: TDataModuleRemesasProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_RemesasProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'RemesasProveedor' IndexDefs = <> Left = 192 @@ -171,8 +169,6 @@ inherited DataModuleRemesasProveedor: TDataModuleRemesasProveedor Params = <> StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_RemesasProveedor - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListaAnosRemesas' IndexDefs = <> Left = 312 diff --git a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm index b308378..5869a68 100644 --- a/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm +++ b/Source/Modulos/Remesas de proveedor/Reports/uRptRemesasProveedor_Server.dfm @@ -16,38 +16,273 @@ object RptRemesasProveedor: TRptRemesasProveedor Left = 344 Top = 72 end - object tbl_Cabecera: TDACDSDataTable + object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_REMESA' + DataType = datDateTime + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'TITULAR' + DataType = datString + Size = 255 + end + item + Name = 'ENTIDAD' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL' + DataType = datString + Size = 15 + end + item + Name = 'DC' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA' + DataType = datString + Size = 15 + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_EMPRESA' + DataType = datString + Size = 15 + end + item + Name = 'RAZON_SOCIAL' + DataType = datString + Size = 255 + end + item + Name = 'CALLE_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'POBLACION_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'PROVINCIA_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'CODIGO_POSTAL_EMPRESA' + DataType = datString + Size = 10 + end + item + Name = 'TELEFONO_1' + DataType = datString + Size = 25 + end + item + Name = 'FAX' + DataType = datString + Size = 25 + end + item + Name = 'MOVIL_1' + DataType = datString + Size = 25 + end + item + Name = 'EMAIL_1' + DataType = datString + Size = 255 + end + item + Name = 'PAGINA_WEB' + DataType = datString + Size = 255 + end + item + Name = 'REGISTRO_MERCANTIL' + DataType = datString + Size = 255 + end + item + Name = 'LOGOTIPO' + DataType = datBlob + end> + Params = < + item + Name = 'ID' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 Top = 128 end - object tbl_Detalles: TDACDSDataTable + object tbl_Detalles: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + end + item + Name = 'SITUACION' + DataType = datString + Size = 9 + end + item + Name = 'ID_FACTURA' + DataType = datInteger + end + item + Name = 'ID_REMESA' + DataType = datInteger + end + item + Name = 'REFERENCIA_REMESA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'OBSERVACIONES' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE' + DataType = datFloat + end + item + Name = 'OTROS_GASTOS' + DataType = datFloat + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'FECHA_FACTURA' + DataType = datDateTime + end + item + Name = 'REFERENCIA_FACTURA_PROV' + DataType = datString + Size = 255 + end + item + Name = 'FORMA_PAGO_FACTURA' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_FACTURA' + DataType = datFloat + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'NOMBRE_PROVEEDOR' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'ENTIDAD_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'DC_PROVEEDOR' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_PROVEEDOR' + DataType = datString + Size = 15 + end> + Params = < + item + Name = 'ID_REMESA' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + LogicalName = 'Informe_Detalles' IndexDefs = <> Left = 344 Top = 128 end - object DABINAdapter: TDABINAdapter - Left = 48 - Top = 80 - end object frxRichObject1: TfrxRichObject Left = 48 Top = 296 @@ -108,7 +343,7 @@ object RptRemesasProveedor: TRptRemesasProveedor #10#10'FROM'#10' V_REMESAS_PROVEEDOR'#10' LEFT OUTER JOIN EMPRESAS ON (EMPR' + 'ESAS.ID = V_REMESAS_PROVEEDOR.ID_EMPRESA)'#10' LEFT OUTER JOIN EMPR' + 'ESAS_DATOS_BANCO ON (EMPRESAS_DATOS_BANCO.ID = V_REMESAS_PROVEED' + - 'OR.ID_DATOS_BANCO)'#10'WHERE'#10' V_REMESAS_PROVEEDOR.ID = :ID' + 'OR.ID_DATOS_BANCO)'#10'WHERE'#10' V_REMESAS_PROVEEDOR.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -583,7 +818,7 @@ object RptRemesasProveedor: TRptRemesasProveedor Top = 158 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.7.71' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -664,6 +899,7 @@ object RptRemesasProveedor: TRptRemesasProveedor UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -671,7 +907,12 @@ object RptRemesasProveedor: TRptRemesasProveedor UserName = 'frxDBDetalles' CloseDataSource = False DataSource = DADataDetalles + BCDToCurrency = False Left = 344 Top = 16 end + object Bin2DataStreamer: TDABin2DataStreamer + Left = 48 + Top = 88 + end end