diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index a18f391..325053c 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Build/Installer.fbl6 b/Build/Installer.fbl6 index 63ff919..f5ac813 100644 Binary files a/Build/Installer.fbl6 and b/Build/Installer.fbl6 differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 990c17d..5e811f4 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,58 +53,58 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f3..1641339 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 060819e..597382e 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -54,7 +54,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1070FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.7.0FactuGESFactuGES1.0.7.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1080FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.8.0FactuGESFactuGES1.0.8.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 30ec531..33d00b5 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo noviseda\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,0,6,0 -PRODUCTVERSION 1,0,6,0 +FILEVERSION 1,0,7,0 +PRODUCTVERSION 1,0,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.0.6.0\0" + VALUE "FileVersion", "1.0.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.0.6.0\0" + VALUE "ProductVersion", "1.0.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index f9cba37..7cddf69 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 2972caa..aec8441 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ - + @@ -42,23 +42,23 @@ - - + + - + - + - + - + - + @@ -66,15 +66,16 @@ - - + + + - + diff --git a/Source/Informes/InfAlbaranCliente.fr3 b/Source/Informes/InfAlbaranCliente.fr3 index 9fd2532..afb3b8e 100644 --- a/Source/Informes/InfAlbaranCliente.fr3 +++ b/Source/Informes/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -35,15 +35,15 @@ - - - - + + + + - - + + diff --git a/Source/Informes/InfEtiquetasAlbaranCliente.fr3 b/Source/Informes/InfEtiquetasAlbaranCliente.fr3 index b6626a5..3227e66 100644 --- a/Source/Informes/InfEtiquetasAlbaranCliente.fr3 +++ b/Source/Informes/InfEtiquetasAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -12,6 +12,7 @@ + diff --git a/Source/Informes/InfPedidoCliente.fr3 b/Source/Informes/InfPedidoCliente.fr3 index 2456b86..47b71d2 100644 --- a/Source/Informes/InfPedidoCliente.fr3 +++ b/Source/Informes/InfPedidoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -35,15 +35,15 @@ - - - - + + + + - - + + diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj index f53db1b..40e7a8c 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj @@ -147,15 +147,6 @@ - - - - - - - - - @@ -165,6 +156,15 @@ + + + + + + + + + @@ -292,13 +292,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm index 0711b42..9cf8566 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm @@ -69,17 +69,14 @@ object RptAlbaranesCliente: TRptAlbaranesCliente 'ESCUENTO,'#10' V_ALBARANES_CLIENTE.IMPORTE_DESCUENTO,'#10' V_ALBARANES' + '_CLIENTE.DESCUENTO2,'#10' V_ALBARANES_CLIENTE.IMPORTE_DESCUENTO2,'#10' ' + ' V_ALBARANES_CLIENTE.IMPORTE_TOTAL,'#10' CONTACTOS.REFERENCIA as RE' + - 'F_CLIENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' V_ALBARANES_CL' + - 'IENTE.PERSONA_CONTACTO,'#10' COALESCE(CONTACTOS_DIRECCIONES.CALLE, ' + - 'CONTACTOS.CALLE) AS CALLE,'#10' COALESCE(CONTACTOS_DIRECCIONES.POBL' + - 'ACION, CONTACTOS.POBLACION) AS POBLACION,'#10' COALESCE(CONTACTOS_D' + - 'IRECCIONES.PROVINCIA, CONTACTOS.PROVINCIA) AS PROVINCIA,'#10' COALE' + - 'SCE(CONTACTOS_DIRECCIONES.CODIGO_POSTAL, CONTACTOS.CODIGO_POSTAL' + - ') AS CODIGO_POSTAL'#10#10'FROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN CONT' + - 'ACTOS ON (CONTACTOS.ID = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT ' + - 'OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID = ' + - 'V_ALBARANES_CLIENTE.ID_DIRECCION)'#10'WHERE V_ALBARANES_CLIENTE.ID =' + - ' :ID'#10#10 + 'F_CLIENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS' + + '.NOMBRE_COMERCIAL,'#10' V_ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' V_A' + + 'LBARANES_CLIENTE.CALLE,'#10' V_ALBARANES_CLIENTE.POBLACION,'#10' V_ALB' + + 'ARANES_CLIENTE.PROVINCIA,'#10' V_ALBARANES_CLIENTE.CODIGO_POSTAL'#10#10'F' + + 'ROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.I' + + 'D = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT JOIN CLIENTES_DATOS O' + + 'N (CLIENTES_DATOS.ID_CLIENTE = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10'W' + + 'HERE V_ALBARANES_CLIENTE.ID = :ID'#10#10 StatementType = stSQL ColumnMappings = < item @@ -181,6 +178,10 @@ object RptAlbaranesCliente: TRptAlbaranesCliente item DatasetField = 'DATOS_BANCARIOS' TableField = 'DATOS_BANCARIOS' + end + item + DatasetField = 'NOMBRE_COMERCIAL' + TableField = 'NOMBRE_COMERCIAL' end> end> Name = 'Informe_Cabecera' @@ -240,7 +241,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente end item Name = 'DESCUENTO' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO' @@ -248,7 +249,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente end item Name = 'DESCUENTO2' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO2' @@ -273,6 +274,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString @@ -427,18 +433,20 @@ object RptAlbaranesCliente: TRptAlbaranesCliente TargetTable = 'ALBARANES_CLIENTE_DETALLES' SQL = 'SELECT V_ALBARANES_CLIENTE.ID,'#10' CONTACTOS.REFERENCIA as REF_CLI' + - 'ENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' V_ALBARANES_CLIENTE' + - '.PERSONA_CONTACTO,'#10' CONTACTOS.CALLE AS CALLE_FISCAL,'#10' CONTACTO' + - 'S_DIRECCIONES.CALLE AS CALLE_ENVIO,'#10' CONTACTOS.POBLACION AS POB' + - 'LACION_FISCAL,'#10' CONTACTOS_DIRECCIONES.POBLACION AS POBLACION_EN' + - 'VIO,'#10' CONTACTOS.PROVINCIA AS PROVINCIA_FISCAL,'#10' CONTACTOS_DIRE' + - 'CCIONES.PROVINCIA AS PROVINCIA_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL ' + - 'AS CODIGO_POSTAL_FISCAL,'#10' CONTACTOS_DIRECCIONES.CODIGO_POSTAL A' + - 'S CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN C' + - 'ONTACTOS ON (CONTACTOS.ID = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LE' + - 'FT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID' + - '_contacto = V_ALBARANES_CLIENTE.ID_cliente)'#10'WHERE V_ALBARANES_CL' + - 'IENTE.ID = :ID'#10 + 'ENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS.NOMB' + + 'RE_COMERCIAL,'#10' V_ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' CONTACTO' + + 'S.CALLE AS CALLE_FISCAL,'#10' CONTACTOS_DIRECCIONES.CALLE AS CALLE_' + + 'ENVIO,'#10' CONTACTOS.POBLACION AS POBLACION_FISCAL,'#10' CONTACTOS_DI' + + 'RECCIONES.POBLACION AS POBLACION_ENVIO,'#10' CONTACTOS.PROVINCIA AS' + + ' PROVINCIA_FISCAL,'#10' CONTACTOS_DIRECCIONES.PROVINCIA AS PROVINCI' + + 'A_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL AS CODIGO_POSTAL_FISCAL,'#10' CO' + + 'NTACTOS_DIRECCIONES.CODIGO_POSTAL AS CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' ' + + ' V_ALBARANES_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = V' + + '_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIREC' + + 'CIONES ON (CONTACTOS_DIRECCIONES.ID_contacto = V_ALBARANES_CLIEN' + + 'TE.ID_cliente)'#10' LEFT JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_' + + 'CLIENTE = V_ALBARANES_CLIENTE.ID_cliente)'#10'WHERE V_ALBARANES_CLIE' + + 'NTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -504,6 +512,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DatasetField = 'CODIGO_POSTAL_ENVIO' TableField = '' SQLOrigin = 'CODIGO_POSTAL_ENVIO' + end + item + DatasetField = 'NOMBRE_COMERCIAL' + TableField = '' + SQLOrigin = 'NOMBRE_COMERCIAL' end> end> Name = 'Informe_Etiquetas' @@ -527,6 +540,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString @@ -883,7 +901,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente end item Name = 'DESCUENTO' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO' @@ -891,7 +909,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente end item Name = 'DESCUENTO2' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO2' @@ -916,6 +934,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString @@ -1087,6 +1110,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas index a04ac45..0b7472b 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas @@ -60,10 +60,10 @@ type tbl_Detalles: TDAMemDataTable; frxPDFExport1: TfrxPDFExport; DABin2DataStreamer1: TDABin2DataStreamer; - schReport: TDASchema; frxDBEtiquetas: TfrxDBDataset; DADSEtiquetas: TDADataSource; tbl_Etiquetas: TDAMemDataTable; + schReport: TDASchema; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 30aefff..fb1dd25 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -203,74 +203,77 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Height = 51 ExplicitWidth = 841 ExplicitHeight = 51 - inherited ToolButton14: TToolButton - Wrap = False - end - inherited FontName: TJvFontComboBox - Left = 399 + inherited FontName: TJvFontComboBox [3] + Left = 278 Top = 0 - ExplicitLeft = 399 + ExplicitLeft = 278 + ExplicitTop = 0 + end + inherited FontSize: TEdit [4] + Left = 423 + Top = 0 + Width = 250 + ExplicitLeft = 423 + ExplicitTop = 0 + ExplicitWidth = 250 + end + inherited UpDown1: TUpDown [5] + Left = 673 + Top = 0 + ExplicitLeft = 673 ExplicitTop = 0 end inherited ToolButton13: TToolButton [6] - Left = 544 - Top = 0 - Wrap = False - ExplicitLeft = 544 ExplicitTop = 0 + end + inherited ToolButton4: TToolButton [7] + end + inherited ToolButton6: TToolButton [8] + Left = 56 + Wrap = False + ExplicitLeft = 56 + end + inherited ToolButton7: TToolButton + Left = 122 + Top = 27 + ExplicitLeft = 122 + ExplicitTop = 27 + end + inherited ToolButton8: TToolButton + Left = 189 + Top = 27 + ExplicitLeft = 189 + ExplicitTop = 27 + end + inherited ToolButton12: TToolButton + Left = 272 + Top = 27 + Wrap = False + ExplicitLeft = 272 + ExplicitTop = 27 ExplicitHeight = 22 end - inherited ToolButton6: TToolButton [7] - Left = 552 - Top = 0 - ExplicitLeft = 552 - ExplicitTop = 0 - end - inherited ToolButton7: TToolButton [8] - Left = 618 - Top = 0 - ExplicitLeft = 618 - ExplicitTop = 0 - end - inherited ToolButton8: TToolButton [9] - Left = 0 - Top = 22 - ExplicitLeft = 0 - ExplicitTop = 22 - end - inherited ToolButton12: TToolButton [10] - Top = 22 - ExplicitTop = 22 - end - inherited FontSize: TEdit [11] - Left = 0 - Top = 49 - Width = 250 - ExplicitLeft = 0 - ExplicitTop = 49 - ExplicitWidth = 250 - end - inherited UpDown1: TUpDown [12] - Left = 250 - ExplicitLeft = 250 + inherited ToolButton14: TToolButton [12] + Left = 280 + ExplicitLeft = 280 end inherited ToolButton9: TToolButton - Left = 267 - Top = 49 - ExplicitLeft = 267 - ExplicitTop = 49 + Left = 345 + Top = 27 + ExplicitLeft = 345 + ExplicitTop = 27 end inherited ToolButton10: TToolButton - Left = 412 - Top = 49 - ExplicitLeft = 412 - ExplicitTop = 49 + Left = 490 + Top = 27 + ExplicitLeft = 490 + ExplicitTop = 27 end inherited ToolButton11: TToolButton - Left = 537 - Top = 49 - ExplicitLeft = 537 - ExplicitTop = 49 + Left = 615 + Top = 27 + ExplicitLeft = 615 + ExplicitTop = 27 end end inherited cxGrid: TcxGrid @@ -339,16 +342,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end end end - inherited StatusBar: TJvStatusBar - Top = 607 - Width = 855 - Panels = < - item - Width = 200 - end> - ExplicitTop = 607 - ExplicitWidth = 855 - end inline frViewTotalesAlbaran1: TfrViewTotalesAlbaran [4] Left = 0 Top = 464 @@ -372,18 +365,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitWidth = 855 ExplicitHeight = 143 inherited Bevel3: TBevel - Left = 338 + Left = 437 Height = 201 - ExplicitLeft = 338 + ExplicitLeft = 437 ExplicitHeight = 201 end inherited Bevel4: TBevel - Left = 471 - Width = 342 - Height = 9 - ExplicitLeft = 471 - ExplicitWidth = 342 - ExplicitHeight = 9 + Left = 570 + ExplicitLeft = 570 end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -393,24 +382,22 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 542 + Left = 641 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 542 + ExplicitLeft = 641 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 471 + Left = 570 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 471 - ExplicitWidth = 90 - Width = 90 + ExplicitLeft = 570 end inherited edtDescuento: TcxDBSpinEdit Style.LookAndFeel.SkinName = '' @@ -420,41 +407,41 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 471 + Left = 570 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 471 + ExplicitLeft = 570 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 471 + Left = 570 DataBinding.DataField = 'IMPORTE_NETO' Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 471 + ExplicitLeft = 570 end inherited edtRE: TcxDBSpinEdit - Left = 471 + Left = 570 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 471 + ExplicitLeft = 570 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 542 + Left = 641 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 542 + ExplicitLeft = 641 end inherited eImporteNeto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -477,37 +464,28 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' end inherited bTiposIVA: TButton - Left = 190 - ExplicitLeft = 190 + Left = 289 + ExplicitLeft = 289 end inherited cbRecargoEquivalencia: TcxDBCheckBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 221 - Width = 221 - end - inherited Panel1: TPanel - Width = 185 - ExplicitWidth = 185 end end end - inherited EditorActionList: TActionList [5] - Left = 32 - Top = 96 - object actEnviarEMail: TAction - Category = 'Acciones' - Caption = 'Enviar por e-mail...' - Enabled = False - ImageIndex = 21 - Visible = False - OnExecute = actEnviarEMailExecute - OnUpdate = actEnviarEMailUpdate - end + inherited StatusBar: TJvStatusBar [5] + Top = 607 + Width = 855 + Panels = < + item + Width = 200 + end> + ExplicitTop = 607 + ExplicitWidth = 855 end - inherited SmallImages: TPngImageList [6] + inherited SmallImages: TPngImageList PngImages = < item PngImage.Data = { @@ -1013,7 +991,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end> Bitmap = {} end - inherited LargeImages: TPngImageList [7] + inherited LargeImages: TPngImageList PngImages = < item PngImage.Data = { @@ -1809,10 +1787,23 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end> Bitmap = {} end - inherited JvFormStorage: TJvFormStorage [8] + inherited EditorActionList: TActionList [9] + Left = 32 + Top = 96 + object actEnviarEMail: TAction + Category = 'Acciones' + Caption = 'Enviar por e-mail...' + Enabled = False + ImageIndex = 21 + Visible = False + OnExecute = actEnviarEMailExecute + OnUpdate = actEnviarEMailUpdate + end end inherited dsDataTable: TDADataSource [10] Left = 24 Top = 136 end + inherited JvAppRegistryStorage: TJvAppRegistryStorage [11] + end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas index a0f6313..6053f31 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas @@ -15,7 +15,7 @@ uses uIEditorAlbaranCliente, uBizAlbaranesCliente, uViewAlbaranCliente, uViewDetallesDTO, uViewDetallesArticulos, uDAInterfaces, uViewDetallesArticulosParaVenta, cxLabel, Grids, DBGrids, uViewTotalesAlbaran, - cxGraphics, cxLookAndFeels, cxLookAndFeelPainters; + cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, JvEnterTab; type TfEditorAlbaranCliente = class(TfEditorDBItem, IEditorAlbaranCliente) @@ -227,8 +227,8 @@ begin end; procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject); -{var - ADireccion : IBizDireccionesContacto;} +var + ADireccion : IBizDireccionesContacto; begin if Assigned(FAlbaran) then begin @@ -245,7 +245,7 @@ begin end; // Elegir la dirección de envio -{ case FAlbaran.Cliente.Direcciones.RecordCount of + case FAlbaran.Cliente.Direcciones.RecordCount of 0 : begin ADireccion := NIL; //ShowWarningMessage('Este cliente no tiene ninguna dirección de envío en su ficha'); @@ -260,7 +260,7 @@ begin begin try FAlbaran.Edit; - FAlbaran.IMPORTE_PORTE := ADireccion.PORTE; +// FAlbaran.IMPORTE_PORTE := ADireccion.PORTE; FController.CopiarDireccionEnvio(ADireccion, FAlbaran); finally ADireccion := NIL; @@ -268,10 +268,10 @@ begin end else begin FController.QuitarDireccionEnvio(FAlbaran); - FAlbaran.Edit; - FAlbaran.IMPORTE_PORTE := 0; +// FAlbaran.Edit; +// FAlbaran.IMPORTE_PORTE := 0; end; -} + // Si el pedido tiene detalles hay que mirar si los descuentos // para los artículos hay que cambiarlos. diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index 1a9e876..68b1ecf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -1,6 +1,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 802 Height = 490 + OnCreate = CustomViewCreate + OnDestroy = CustomViewDestroy + OnShow = CustomViewShow ExplicitWidth = 802 ExplicitHeight = 490 inherited cxGrid: TcxGrid @@ -142,8 +145,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente end object cxGridViewPROVINCIA: TcxGridDBColumn DataBinding.FieldName = 'PROVINCIA' - Visible = False - VisibleForCustomization = False end object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn DataBinding.FieldName = 'PERSONA_CONTACTO' @@ -221,25 +222,33 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 228 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 257 + Left = 252 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 257 + ExplicitLeft = 252 ExplicitWidth = 460 Width = 460 end inherited eLista: TcxComboBox - Left = 638 + Left = 647 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 638 + ExplicitLeft = 647 ExplicitWidth = 215 Width = 215 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item4: TdxLayoutItem + CaptionOptions.Text = 'Provincia:' + Visible = True + end + end + end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 792 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index b6e9ded..ab623bf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -78,16 +78,25 @@ type procedure cxGridViewDataControllerCompare( ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); + procedure OnFiltroListaPropertiesChange(Sender: TObject); + procedure OnFiltroListaPropertiesInitPopup(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure CustomViewShow(Sender: TObject); private //Filtros relativos a la vista procedure AnadirFiltroSituaciones; procedure AnadirFiltroFechas; + procedure AnadirFiltroProvincia; protected + FProvincias : TStringList; FAlbaranes: IBizAlbaranCliente; function GetAlbaranes: IBizAlbaranCliente; procedure SetAlbaranes(const Value: IBizAlbaranCliente); + procedure CargarProvincias; + public procedure AnadirOtrosFiltros; override; property Albaranes: IBizAlbaranCliente read GetAlbaranes write SetAlbaranes; @@ -97,7 +106,7 @@ implementation uses SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf, - uViewGridBase, uReferenciasUtils, cxVariants; + uViewGridBase, uReferenciasUtils, cxVariants, uProvinciasPoblacionesController, uStringsUtils; {$R *.dfm} @@ -166,6 +175,23 @@ begin end; end; +procedure TfrViewAlbaranesCliente.AnadirFiltroProvincia; +var + FFiltro : TcxFilterCriteriaItemList; +begin + + //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro + //y sobre la lista de pedidos + if frViewFiltroBase1.Visible then + begin + if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then + begin + FFiltro := AddFilterGrid(fboAnd); + FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue)); + end; + end; +end; + procedure TfrViewAlbaranesCliente.AnadirFiltroSituaciones; var FFiltro : TcxFilterCriteriaItemList; @@ -192,6 +218,7 @@ begin AnadirFiltroSituaciones; AnadirFiltroFechas; + AnadirFiltroProvincia; //Finalmente activamos el filtro si tenemos algo if cxGridView.DataController.Filter.IsEmpty @@ -200,6 +227,57 @@ begin cxGrid.ActiveLevel.GridView := cxGridView; end; +procedure TfrViewAlbaranesCliente.CargarProvincias; +var + i : integer; +begin + with TProvinciasPoblacionesController.Create do + try + FProvincias := DarListaProvincias; + + with frViewFiltroBase1.eLista.Properties.Items do + begin + BeginUpdate; + try + Clear; + Add('Todos'); //Case 0 + for i := 0 to FProvincias.Count - 1 do + Add(FProvincias.Names[i]); + + frViewFiltroBase1.eLista.ItemIndex := 0; + finally + EndUpdate; + end; + end; + finally + Free; + end; +end; + +procedure TfrViewAlbaranesCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + FProvincias := NIL; +end; + +procedure TfrViewAlbaranesCliente.CustomViewDestroy(Sender: TObject); +begin + frViewFiltroBase1.eLista.Properties.OnChange := Nil; + frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil; + + if Assigned(FProvincias) then + FreeANDNIL(FProvincias); + + inherited; +end; + +procedure TfrViewAlbaranesCliente.CustomViewShow(Sender: TObject); +begin + inherited; + frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange; + frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup; +end; + procedure TfrViewAlbaranesCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); begin inherited; @@ -272,6 +350,24 @@ begin Result := FAlbaranes; end; +procedure TfrViewAlbaranesCliente.OnFiltroListaPropertiesChange(Sender: TObject); +begin + inherited; + RefrescarFiltro; +end; + +procedure TfrViewAlbaranesCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject); +begin + inherited; + ShowHourglassCursor; + try + if not Assigned(FProvincias) then + CargarProvincias; + finally + HideHourglassCursor; + end; +end; + procedure TfrViewAlbaranesCliente.SetAlbaranes(const Value: IBizAlbaranCliente); begin FAlbaranes := Value; diff --git a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm index 9fc56d8..9c72ceb 100644 --- a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm +++ b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm @@ -134,7 +134,7 @@ object RptComisiones: TRptComisiones 'ODIFICACION, USUARIO, ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA, I' + 'D_TIPO_IVA, IMPORTE_NETO, IMPORTE_PORTE,'#10' ID_AGENTE, COMISION' + ', IMPORTE_COMISION'#10' FROM'#10' V_FACTURAS_CLIENTE'#10' WHERE ID_COMI' + - 'SION_LIQUIDADA = :ID'#10 + 'SION_LIQUIDADA = :ID'#10' order by referencia'#10 StatementType = stSQL ColumnMappings = < item diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj index a50f4ed..2911d9b 100644 --- a/Source/Modulos/Contactos/Contactos_Group.groupproj +++ b/Source/Modulos/Contactos/Contactos_Group.groupproj @@ -10,6 +10,8 @@ + + @@ -151,14 +153,32 @@ + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index d703375..9d52fc4 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -73,6 +73,10 @@ inherited fEditorClientes: TfEditorClientes end end end + inherited tbxFiltro: TSpTBXToolbar + DockPos = -6 + ExplicitWidth = 396 + end inherited tbxMenu: TSpTBXToolbar ExplicitWidth = 857 inherited TBXSubmenuItemAcciones: TSpTBXSubmenuItem @@ -104,7 +108,9 @@ inherited fEditorClientes: TfEditorClientes end end inherited TBXTMain2: TSpTBXToolbar + Left = 396 DockPos = 275 + ExplicitLeft = 396 end end inherited StatusBar: TJvStatusBar @@ -170,22 +176,22 @@ inherited fEditorClientes: TfEditorClientes Width = 460 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 467 + Left = 458 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 467 + ExplicitLeft = 458 ExplicitWidth = 212 Width = 212 end inherited eLista: TcxComboBox - Left = 676 + Left = 685 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 676 + ExplicitLeft = 685 ExplicitWidth = 215 Width = 215 end @@ -224,6 +230,9 @@ inherited fEditorClientes: TfEditorClientes BuiltInReportLink = True end end + inherited dxPSEngineController1: TdxPSEngineController + Active = True + end inherited cxViewGridPopupMenu: TcxGridPopupMenu PopupMenus = < item diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index 6c09299..886c610 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -11,10 +11,7 @@ inherited fEditorContactos: TfEditorContactos end inherited TBXDock: TSpTBXDock inherited tbxFiltro: TSpTBXToolbar - ExplicitWidth = 328 - inherited TBXItem37: TSpTBXItem - Visible = False - end + DockPos = -6 end inherited tbxMenu: TSpTBXToolbar object TBXSubmenuItemAcciones: TSpTBXSubmenuItem [4] @@ -22,9 +19,7 @@ inherited fEditorContactos: TfEditorContactos end end inherited TBXTMain2: TSpTBXToolbar - Left = 328 DockPos = 286 - ExplicitLeft = 328 end end inherited EditorActionList: TActionList diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 8160532..db5fd25 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -104,29 +104,36 @@ inherited frViewClientes: TfrViewClientes Width = 154 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 214 + Left = 210 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 214 + ExplicitLeft = 210 ExplicitWidth = 525 Width = 525 end inherited eLista: TcxComboBox - Left = 675 + Left = 683 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 675 + ExplicitLeft = 683 ExplicitWidth = 140 Width = 140 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item4: TdxLayoutItem + CaptionOptions.Text = 'Provincia:' + end + end + end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 783 - ExplicitWidth = 793 + ExplicitWidth = 783 inherited tbxBotones: TSpTBXToolbar Width = 783 ExplicitWidth = 783 @@ -137,7 +144,7 @@ inherited frViewClientes: TfrViewClientes inherited pnlAgrupaciones: TSpTBXDockablePanel Top = 423 Width = 793 - ExplicitTop = 422 + ExplicitTop = 423 ExplicitWidth = 793 inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 793 @@ -145,7 +152,7 @@ inherited frViewClientes: TfrViewClientes inherited TBXToolbar1: TSpTBXToolbar Width = 793 Visible = False - ExplicitWidth = 783 + ExplicitWidth = 793 end end end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index 8cd0913..019a127 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.pas +++ b/Source/Modulos/Contactos/Views/uViewClientes.pas @@ -37,6 +37,7 @@ type ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; var AHintText: TCaption; var AIsHintMultiLine: Boolean; var AHintTextRect: TRect); + end; @@ -47,7 +48,6 @@ uses uViewGridBase; {$R *.dfm} - procedure TfrViewClientes.cxGridViewFELICITACIONGetCellHint( Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index a028983..7fea0e0 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -1,6 +1,9 @@ inherited frViewContactos: TfrViewContactos Width = 557 Height = 458 + OnCreate = CustomViewCreate + OnDestroy = CustomViewDestroy + OnShow = CustomViewShow ExplicitWidth = 557 ExplicitHeight = 458 inherited cxGrid: TcxGrid @@ -133,15 +136,30 @@ inherited frViewContactos: TfrViewContactos Width = 322 end inherited eLista: TcxComboBox + Left = 450 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 450 + end + 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: TSpTBXDockablePanel Width = 547 - ExplicitWidth = 557 + ExplicitWidth = 547 inherited tbxBotones: TSpTBXToolbar Width = 547 ExplicitWidth = 547 @@ -152,14 +170,14 @@ inherited frViewContactos: TfrViewContactos inherited pnlAgrupaciones: TSpTBXDockablePanel Top = 432 Width = 557 - ExplicitTop = 431 + ExplicitTop = 432 ExplicitWidth = 557 inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 557 ExplicitWidth = 557 inherited TBXToolbar1: TSpTBXToolbar Width = 557 - ExplicitWidth = 547 + ExplicitWidth = 557 end end end diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas index 85d51f8..4f72bea 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.pas +++ b/Source/Modulos/Contactos/Views/uViewContactos.pas @@ -41,28 +41,138 @@ type cxGridViewEMAIL_2: TcxGridDBColumn; cxGridViewPAGINA_WEB: TcxGridDBColumn; cxGridViewREFERENCIA: TcxGridDBColumn; + procedure OnFiltroListaPropertiesChange(Sender: TObject); + procedure OnFiltroListaPropertiesInitPopup(Sender: TObject); + + procedure CustomViewCreate(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure CustomViewShow(Sender: TObject); + private + procedure AnadirFiltroProvincia; + protected + FProvincias : TStringList; FContactos: IBizContacto; function GetContactos: IBizContacto; virtual; procedure SetContactos(const Value: IBizContacto); virtual; + procedure CargarProvincias; public + procedure AnadirOtrosFiltros; override; property DataSet: IBizContacto read GetContactos write SetContactos; end; implementation - {$R *.dfm} - { TfrViewContactos } +uses uProvinciasPoblacionesController; + { ******************************* TfrViewContactos ******************************* } +procedure TfrViewContactos.AnadirFiltroProvincia; +var + FFiltro : TcxFilterCriteriaItemList; +begin + + //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro + //y sobre la lista de pedidos + if frViewFiltroBase1.Visible then + begin + if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then + begin + FFiltro := AddFilterGrid(fboAnd); + FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue)); + end; + end; +end; + +procedure TfrViewContactos.AnadirOtrosFiltros; +begin + inherited; + AnadirFiltroProvincia; + + //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 TfrViewContactos.CargarProvincias; +var + i : integer; +begin + with TProvinciasPoblacionesController.Create do + try + FProvincias := DarListaProvincias; + + with frViewFiltroBase1.eLista.Properties.Items do + begin + BeginUpdate; + try + Clear; + Add('Todos'); //Case 0 + for i := 0 to FProvincias.Count - 1 do + Add(FProvincias.Names[i]); + + frViewFiltroBase1.eLista.ItemIndex := 0; + finally + EndUpdate; + end; + end; + finally + Free; + end; +end; + +procedure TfrViewContactos.CustomViewCreate(Sender: TObject); +begin + inherited; + FProvincias := NIL; +end; + +procedure TfrViewContactos.CustomViewDestroy(Sender: TObject); +begin + frViewFiltroBase1.eLista.Properties.OnChange := Nil; + frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil; + + if Assigned(FProvincias) then + FreeANDNIL(FProvincias); + + inherited; +end; + +procedure TfrViewContactos.CustomViewShow(Sender: TObject); +begin + inherited; + frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange; + frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup; +end; + function TfrViewContactos.GetContactos: IBizContacto; begin Result := FContactos; end; +procedure TfrViewContactos.OnFiltroListaPropertiesChange(Sender: TObject); +begin + inherited; + RefrescarFiltro; +end; + +procedure TfrViewContactos.OnFiltroListaPropertiesInitPopup(Sender: TObject); +begin + inherited; + ShowHourglassCursor; + try + if not Assigned(FProvincias) then + CargarProvincias; + finally + HideHourglassCursor; + end; +end; + procedure TfrViewContactos.SetContactos(const Value: IBizContacto); begin FContactos := Value; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm index fd237b4..61d07ef 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm @@ -1,6 +1,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente Caption = 'Seleccionar facturas de cliente' ClientWidth = 654 + ExplicitTop = 7 ExplicitWidth = 662 PixelsPerInch = 96 TextHeight = 13 @@ -70,6 +71,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente Top = 23 DockPos = 462 DockRow = 1 + Visible = False ExplicitLeft = 462 ExplicitTop = 23 end @@ -267,6 +269,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente inherited pnlAgrupaciones: TSpTBXDockablePanel Top = 445 Width = 654 + Visible = False ExplicitTop = 445 ExplicitWidth = 654 inherited TBXAlignmentPanel1: TSpTBXDockablePanel diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 5c84be2..253ed5e 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -1,6 +1,9 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 665 Height = 418 + OnCreate = CustomViewCreate + OnDestroy = CustomViewDestroy + OnShow = CustomViewShow ExplicitWidth = 665 ExplicitHeight = 418 inherited cxGrid: TcxGrid @@ -177,25 +180,33 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 144 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 248 + Left = 241 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 248 + ExplicitLeft = 241 ExplicitWidth = 273 Width = 273 end inherited eLista: TcxComboBox - Left = 558 + Left = 563 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 558 + ExplicitLeft = 563 ExplicitWidth = 97 Width = 97 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item4: TdxLayoutItem + CaptionOptions.Text = 'Provincia:' + Visible = True + end + end + end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 655 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index 120fa3e..5278b31 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -71,16 +71,24 @@ type procedure cxGridViewDataControllerCompare( ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); + procedure OnFiltroListaPropertiesChange(Sender: TObject); + procedure OnFiltroListaPropertiesInitPopup(Sender: TObject); + procedure CustomViewShow(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); private //Filtros relativos a la vista procedure AnadirFiltroSituaciones; procedure AnadirFiltroFechas; + procedure AnadirFiltroProvincia; protected + FProvincias : TStringList; FFacturas: IBizFacturaCliente; function GetFacturas: IBizFacturaCliente; procedure SetFacturas(const Value: IBizFacturaCliente); + procedure CargarProvincias; public procedure AnadirOtrosFiltros; override; @@ -92,7 +100,7 @@ implementation uses uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils, - cxVariants; + cxVariants, uProvinciasPoblacionesController, uStringsUtils; {$R *.dfm} @@ -158,6 +166,23 @@ begin end; end; +procedure TfrViewFacturasCliente.AnadirFiltroProvincia; +var + FFiltro : TcxFilterCriteriaItemList; +begin + + //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro + //y sobre la lista de pedidos + if frViewFiltroBase1.Visible then + begin + if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then + begin + FFiltro := AddFilterGrid(fboAnd); + FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue)); + end; + end; +end; + procedure TfrViewFacturasCliente.AnadirFiltroSituaciones; var FFiltro : TcxFilterCriteriaItemList; @@ -177,6 +202,7 @@ begin AnadirFiltroSituaciones; AnadirFiltroFechas; + AnadirFiltroProvincia; //Finalmente activamos el filtro si tenemos algo if cxGridView.DataController.Filter.IsEmpty @@ -185,6 +211,57 @@ begin cxGrid.ActiveLevel.GridView := cxGridView; end; +procedure TfrViewFacturasCliente.CargarProvincias; +var + i : integer; +begin + with TProvinciasPoblacionesController.Create do + try + FProvincias := DarListaProvincias; + + with frViewFiltroBase1.eLista.Properties.Items do + begin + BeginUpdate; + try + Clear; + Add('Todos'); //Case 0 + for i := 0 to FProvincias.Count - 1 do + Add(FProvincias.Names[i]); + + frViewFiltroBase1.eLista.ItemIndex := 0; + finally + EndUpdate; + end; + end; + finally + Free; + end; +end; + +procedure TfrViewFacturasCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + FProvincias := NIL; +end; + +procedure TfrViewFacturasCliente.CustomViewDestroy(Sender: TObject); +begin + frViewFiltroBase1.eLista.Properties.OnChange := Nil; + frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil; + + if Assigned(FProvincias) then + FreeANDNIL(FProvincias); + + inherited; +end; + +procedure TfrViewFacturasCliente.CustomViewShow(Sender: TObject); +begin + inherited; + frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange; + frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup; +end; + procedure TfrViewFacturasCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); begin @@ -236,6 +313,24 @@ begin Result := FFacturas; end; +procedure TfrViewFacturasCliente.OnFiltroListaPropertiesChange(Sender: TObject); +begin + inherited; + RefrescarFiltro; +end; + +procedure TfrViewFacturasCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject); +begin + inherited; + ShowHourglassCursor; + try + if not Assigned(FProvincias) then + CargarProvincias; + finally + HideHourglassCursor; + end; +end; + procedure TfrViewFacturasCliente.SetFacturas(const Value: IBizFacturaCliente); begin FFacturas := Value; diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc index c43ab23..cd5acc3 100644 --- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc +++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.res */ -/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.drf */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E0.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc index 882ce9d..99190b8 100644 --- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc +++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc @@ -14,4 +14,4 @@ END /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBC.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DE.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc index 776c1fd..5b2723f 100644 --- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc +++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc @@ -13,4 +13,4 @@ BEGIN END /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBA.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DC.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc index ea5a4ae..5fe0d88 100644 --- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc +++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc @@ -14,4 +14,4 @@ END /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.res */ -/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf132.tmp */ +/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf254.tmp */ diff --git a/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm b/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm index 8d36f1f..bb884b4 100644 --- a/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm +++ b/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm @@ -60,24 +60,22 @@ object RptPedidosCliente: TRptPedidosCliente Connection = 'IBX' TargetTable = 'PEDIDOS_CLIENTE' SQL = - 'SELECT'#10' PEDIDOS_CLIENTE.ID, PEDIDOS_CLIENTE.ID_EMPRESA,'#10' PEDID' + - 'OS_CLIENTE.ID_CLIENTE,'#10' PEDIDOS_CLIENTE.FECHA_PEDIDO,'#10' PEDIDOS' + - '_CLIENTE.REFERENCIA,'#10' PEDIDOS_CLIENTE.REFERENCIA_CLIENTE,'#10' PED' + - 'IDOS_CLIENTE.DATOS_BANCARIOS,'#10' PEDIDOS_CLIENTE.OBSERVACIONES,'#10' ' + - ' PEDIDOS_CLIENTE.IMPORTE_NETO,'#10' PEDIDOS_CLIENTE.DESCUENTO,'#10' PE' + - 'DIDOS_CLIENTE.IMPORTE_DESCUENTO,'#10' PEDIDOS_CLIENTE.DESCUENTO2,'#10' ' + - ' PEDIDOS_CLIENTE.IMPORTE_DESCUENTO2,'#10' PEDIDOS_CLIENTE.IMPORTE_T' + - 'OTAL,'#10' CONTACTOS.REFERENCIA as REF_CLIENTE, CONTACTOS.NIF_CIF, ' + - 'CONTACTOS.NOMBRE,'#10' PEDIDOS_CLIENTE.PERSONA_CONTACTO,'#10' COALESCE' + - '(CONTACTOS_DIRECCIONES.CALLE, CONTACTOS.CALLE) AS CALLE,'#10' COALE' + - 'SCE(CONTACTOS_DIRECCIONES.POBLACION, CONTACTOS.POBLACION) AS POB' + - 'LACION,'#10' COALESCE(CONTACTOS_DIRECCIONES.PROVINCIA, CONTACTOS.PR' + - 'OVINCIA) AS PROVINCIA,'#10' COALESCE(CONTACTOS_DIRECCIONES.CODIGO_P' + - 'OSTAL, CONTACTOS.CODIGO_POSTAL) AS CODIGO_POSTAL'#10#10'FROM'#10' PEDIDOS' + - '_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_CLIEN' + - 'TE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTA' + - 'CTOS_DIRECCIONES.ID = PEDIDOS_CLIENTE.ID_DIRECCION)'#10'WHERE PEDIDO' + - 'S_CLIENTE.ID = :ID'#10#10 + 'SELECT'#10' V_PEDIDOS_CLIENTE.ID, V_PEDIDOS_CLIENTE.ID_EMPRESA,'#10' V' + + '_PEDIDOS_CLIENTE.ID_CLIENTE,'#10' V_PEDIDOS_CLIENTE.FECHA_PEDIDO,'#10' ' + + ' V_PEDIDOS_CLIENTE.REFERENCIA,'#10' V_PEDIDOS_CLIENTE.REFERENCIA_CL' + + 'IENTE,'#10' V_PEDIDOS_CLIENTE.DATOS_BANCARIOS,'#10' V_PEDIDOS_CLIENTE.' + + 'OBSERVACIONES,'#10' V_PEDIDOS_CLIENTE.IMPORTE_NETO,'#10' V_PEDIDOS_CLI' + + 'ENTE.DESCUENTO,'#10' V_PEDIDOS_CLIENTE.IMPORTE_DESCUENTO,'#10' V_PEDID' + + 'OS_CLIENTE.DESCUENTO2,'#10' V_PEDIDOS_CLIENTE.IMPORTE_DESCUENTO2,'#10' ' + + ' V_PEDIDOS_CLIENTE.IMPORTE_TOTAL,'#10' CONTACTOS.NIF_CIF, CONTACTOS' + + '.REFERENCIA as REF_ClIENTE,'#10' CLIENTES_DATOS.NOMBRE_COMERCIAL,'#10' ' + + ' V_PEDIDOS_CLIENTE.NOMBRE,'#10' V_PEDIDOS_CLIENTE.PERSONA_CONTACTO,' + + #10' V_PEDIDOS_CLIENTE.CALLE,'#10' V_PEDIDOS_CLIENTE.POBLACION,'#10' V_P' + + 'EDIDOS_CLIENTE.PROVINCIA,'#10' V_PEDIDOS_CLIENTE.CODIGO_POSTAL'#10#10'FRO' + + 'M'#10' V_PEDIDOS_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = ' + + 'V_PEDIDOS_CLIENTE.ID_CLIENTE)'#10' LEFT JOIN CLIENTES_DATOS ON (CLI' + + 'ENTES_DATOS.ID_CLIENTE = V_PEDIDOS_CLIENTE.ID_CLIENTE)'#10'WHERE V_P' + + 'EDIDOS_CLIENTE.ID = :ID'#10#10 StatementType = stSQL ColumnMappings = < item @@ -136,10 +134,6 @@ object RptPedidosCliente: TRptPedidosCliente DatasetField = 'NIF_CIF' TableField = 'NIF_CIF' end - item - DatasetField = 'REF_CLIENTE' - TableField = 'REF_CLIENTE' - end item DatasetField = 'IMPORTE_NETO' TableField = 'IMPORTE_NETO' @@ -167,6 +161,16 @@ object RptPedidosCliente: TRptPedidosCliente item DatasetField = 'FECHA_PEDIDO' TableField = 'FECHA_PEDIDO' + end + item + DatasetField = 'REF_CLIENTE' + TableField = '' + SQLOrigin = 'REF_CLIENTE' + end + item + DatasetField = 'NOMBRE_COMERCIAL' + TableField = '' + SQLOrigin = 'NOMBRE_COMERCIAL' end> end> Name = 'Informe_Cabecera' @@ -212,7 +216,7 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'DESCUENTO' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO' @@ -220,7 +224,7 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'DESCUENTO2' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO2' @@ -230,15 +234,20 @@ object RptPedidosCliente: TRptPedidosCliente Name = 'IMPORTE_TOTAL' DataType = datCurrency end + item + Name = 'NIF_CIF' + DataType = datString + Size = 15 + end item Name = 'REF_CLIENTE' DataType = datString Size = 255 end item - Name = 'NIF_CIF' + Name = 'NOMBRE_COMERCIAL' DataType = datString - Size = 15 + Size = 255 end item Name = 'NOMBRE' @@ -388,17 +397,19 @@ object RptPedidosCliente: TRptPedidosCliente TargetTable = 'PEDIDOS_CLIENTE_DETALLES' SQL = 'SELECT PEDIDOS_CLIENTE.ID,'#10' CONTACTOS.REFERENCIA as REF_CLIENTE' + - ', CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' PEDIDOS_CLIENTE.PERSONA' + - '_CONTACTO,'#10' CONTACTOS.CALLE AS CALLE_FISCAL,'#10' CONTACTOS_DIRECC' + - 'IONES.CALLE AS CALLE_ENVIO,'#10' CONTACTOS.POBLACION AS POBLACION_F' + - 'ISCAL,'#10' CONTACTOS_DIRECCIONES.POBLACION AS POBLACION_ENVIO,'#10' C' + - 'ONTACTOS.PROVINCIA AS PROVINCIA_FISCAL,'#10' CONTACTOS_DIRECCIONES.' + - 'PROVINCIA AS PROVINCIA_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL AS CODIG' + - 'O_POSTAL_FISCAL,'#10' CONTACTOS_DIRECCIONES.CODIGO_POSTAL AS CODIGO' + - '_POSTAL_ENVIO'#10#10'FROM'#10' PEDIDOS_CLIENTE'#10' INNER JOIN CONTACTOS ON ' + - '(CONTACTOS.ID = PEDIDOS_CLIENTE.ID_CLIENTE)'#10' LEFT OUTER JOIN CO' + - 'NTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID_contacto = PEDI' + - 'DOS_CLIENTE.ID_cliente)'#10'WHERE PEDIDOS_CLIENTE.ID = :ID'#10 + ', CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS.NOMBRE_C' + + 'OMERCIAL,'#10' PEDIDOS_CLIENTE.PERSONA_CONTACTO,'#10' CONTACTOS.CALLE ' + + 'AS CALLE_FISCAL,'#10' CONTACTOS_DIRECCIONES.CALLE AS CALLE_ENVIO,'#10' ' + + ' CONTACTOS.POBLACION AS POBLACION_FISCAL,'#10' CONTACTOS_DIRECCIONE' + + 'S.POBLACION AS POBLACION_ENVIO,'#10' CONTACTOS.PROVINCIA AS PROVINC' + + 'IA_FISCAL,'#10' CONTACTOS_DIRECCIONES.PROVINCIA AS PROVINCIA_ENVIO,' + + #10' CONTACTOS.CODIGO_POSTAL AS CODIGO_POSTAL_FISCAL,'#10' CONTACTOS_' + + 'DIRECCIONES.CODIGO_POSTAL AS CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' PEDIDOS' + + '_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_CLIEN' + + 'TE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTA' + + 'CTOS_DIRECCIONES.ID_contacto = PEDIDOS_CLIENTE.ID_cliente)'#10' LEF' + + 'T JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_CLIENTE = PEDIDOS_CL' + + 'IENTE.ID_cliente)'#10'WHERE PEDIDOS_CLIENTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -420,6 +431,11 @@ object RptPedidosCliente: TRptPedidosCliente TableField = '' SQLOrigin = 'NOMBRE' end + item + DatasetField = 'NOMBRE_COMERCIAL' + TableField = '' + SQLOrigin = 'NOMBRE_COMERCIAL' + end item DatasetField = 'PERSONA_CONTACTO' TableField = '' @@ -487,6 +503,11 @@ object RptPedidosCliente: TRptPedidosCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString @@ -552,7 +573,7 @@ object RptPedidosCliente: TRptPedidosCliente PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 39065.872423495400000000 - ReportOptions.LastChange = 40245.779754583330000000 + ReportOptions.LastChange = 40365.554343831020000000 ScriptLanguage = 'PascalScript' ShowProgress = False StoreInDFM = False @@ -829,7 +850,7 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'DESCUENTO' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO' @@ -837,7 +858,7 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'DESCUENTO2' - DataType = datCurrency + DataType = datFloat end item Name = 'IMPORTE_DESCUENTO2' @@ -847,15 +868,20 @@ object RptPedidosCliente: TRptPedidosCliente Name = 'IMPORTE_TOTAL' DataType = datCurrency end + item + Name = 'NIF_CIF' + DataType = datString + Size = 15 + end item Name = 'REF_CLIENTE' DataType = datString Size = 255 end item - Name = 'NIF_CIF' + Name = 'NOMBRE_COMERCIAL' DataType = datString - Size = 15 + Size = 255 end item Name = 'NOMBRE' @@ -1026,6 +1052,11 @@ object RptPedidosCliente: TRptPedidosCliente DataType = datString Size = 255 end + item + Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 + end item Name = 'PERSONA_CONTACTO' DataType = datString diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.dfm index 248e58c..97dd518 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.dfm @@ -178,18 +178,81 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente ExplicitHeight = 336 inherited ToolBar1: TToolBar Width = 618 + Height = 73 ExplicitWidth = 618 + ExplicitHeight = 73 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 278 + Top = 0 + ExplicitLeft = 278 + ExplicitTop = 0 + end + inherited ToolButton14: TToolButton [4] + Left = 334 + Top = 0 + Wrap = True + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox [5] + Left = 0 + ExplicitLeft = 0 + end + inherited FontSize: TEdit + Left = 145 + ExplicitLeft = 145 + end + inherited UpDown1: TUpDown + Left = 187 + ExplicitLeft = 187 + end + inherited ToolButton13: TToolButton + Left = 204 + ExplicitLeft = 204 + end + inherited ToolButton6: TToolButton [9] + Left = 212 + Top = 22 + ExplicitLeft = 212 + ExplicitTop = 22 + end + inherited ToolButton7: TToolButton [10] + Left = 278 + Top = 22 + ExplicitLeft = 278 + ExplicitTop = 22 + end + inherited ToolButton8: TToolButton [11] + Left = 345 + Top = 22 + ExplicitLeft = 345 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton [12] + end + inherited ToolButton9: TToolButton [13] + end + inherited ToolButton10: TToolButton [14] + end + inherited ToolButton11: TToolButton [15] + Left = 270 + Top = 49 + ExplicitLeft = 270 + ExplicitTop = 49 + end end inherited cxGrid: TcxGrid + Top = 99 Width = 618 Height = 237 ExplicitWidth = 618 ExplicitHeight = 237 - inherited cxGridView: TcxGridDBTableView - OptionsSelection.InvertSelect = False - end end inherited TBXDock1: TSpTBXDock + Top = 73 Width = 618 ExplicitWidth = 618 end @@ -276,8 +339,10 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente inherited Bevel4: TBevel Left = 433 Width = 206 + Height = 9 ExplicitLeft = 433 ExplicitWidth = 206 + ExplicitHeight = 9 end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas index 29f0b9e..71c0f17 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas +++ b/Source/Modulos/Pedidos de cliente/Views/uEditorPedidoCliente.pas @@ -223,48 +223,47 @@ begin ViewPedido.AsignarCuentaBancaria; end; -{ AClientesController := TClientesController.Create; try - if not AClientesController.TieneDatosBancarios(FPedido.Cliente) then - MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK); +// if not AClientesController.TieneDatosBancarios(FPedido.Cliente) then +// MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK); case FPedido.Cliente.Direcciones.RecordCount of 0 : begin FController.QuitarDireccionEnvio(FPedido); MessageBox(0, '¡Atención! Este cliente no tiene ' + #10#13 + 'ninguna dirección de envío en su ficha', 'Atención', MB_ICONWARNING or MB_OK); - FPedido.Edit; - FPedido.IMPORTE_PORTE := 0; +// FPedido.Edit; +// FPedido.IMPORTE_PORTE := 0; end; 1 : begin FController.CopiarDireccionEnvio(FPedido.Cliente.Direcciones, FPedido); - FPedido.Edit; - FPedido.IMPORTE_PORTE := FPedido.Cliente.Direcciones.PORTE; +// FPedido.Edit; +// FPedido.IMPORTE_PORTE := FPedido.Cliente.Direcciones.PORTE; end else begin - ADireccion := AClientesController.ElegirDireccionEntrega(FPedido.Cliente.Direcciones, ''); + ADireccion := AClientesController.ElegirDireccionEntrega(FPedido.Cliente, ''); try if Assigned(ADireccion) then begin FController.CopiarDireccionEnvio(ADireccion, FPedido); - FPedido.Edit; - FPedido.IMPORTE_PORTE := ADireccion.PORTE; +// FPedido.Edit; +// FPedido.IMPORTE_PORTE := ADireccion.PORTE; end; finally ADireccion := NIL; end; end; end; -} + // Si el pedido tiene detalles hay que mirar si los descuentos y otros campos // para los artículos hay que cambiarlos. if (FPedido.Detalles.RecordCount > 0) then FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Cliente); -{ finally + finally AClientesController := NIL; end; -} + end; end; diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm index 7e518b1..00f4190 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm +++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm @@ -1,6 +1,9 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente Width = 596 Height = 479 + OnCreate = CustomViewCreate + OnDestroy = CustomViewDestroy + OnShow = CustomViewShow ExplicitWidth = 596 ExplicitHeight = 479 inherited cxGrid: TcxGrid @@ -9,8 +12,9 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente Height = 388 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged + ExplicitTop = 65 ExplicitWidth = 596 - ExplicitHeight = 351 + ExplicitHeight = 388 inherited cxGridView: TcxGridDBTableView OnMouseMove = cxGridViewMouseMove DataController.KeyFieldNames = 'ID' @@ -141,8 +145,6 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente end object cxGridViewPROVINCIA: TcxGridDBColumn DataBinding.FieldName = 'PROVINCIA' - Visible = False - VisibleForCustomization = False end object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn DataBinding.FieldName = 'PERSONA_CONTACTO' @@ -193,6 +195,7 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente Width = 596 Height = 65 ExplicitWidth = 596 + ExplicitHeight = 65 inherited dxLayoutControl1: TdxLayoutControl Width = 596 ExplicitWidth = 596 @@ -211,25 +214,33 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 265 + Left = 259 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 265 + ExplicitLeft = 259 ExplicitWidth = 221 Width = 221 end inherited eLista: TcxComboBox - Left = 449 + Left = 460 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 449 + ExplicitLeft = 460 ExplicitWidth = 215 Width = 215 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item4: TdxLayoutItem + CaptionOptions.Text = 'Provincia:' + Visible = True + end + end + end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 586 @@ -266,9 +277,6 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente BuiltInReportLink = True end end - inherited dxPSEngineController1: TdxPSEngineController - Active = True - end inherited cxStyleRepository1: TcxStyleRepository Left = 248 object cxStylePENDIENTES: TcxStyle diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas index 851d60c..e6eb735 100644 --- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas +++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas @@ -77,16 +77,25 @@ type ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean); procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); + procedure CustomViewShow(Sender: TObject); + procedure CustomViewDestroy(Sender: TObject); + procedure OnFiltroListaPropertiesChange(Sender: TObject); + procedure OnFiltroListaPropertiesInitPopup(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); private //Filtros relativos a la vista procedure AnadirFiltroSituaciones; procedure AnadirFiltroFechas; + procedure AnadirFiltroProvincia; protected + FProvincias : TStringList; FPedidos: IBizPedidoCliente; function GetPedidos: IBizPedidoCliente; procedure SetPedidos(const Value: IBizPedidoCliente); + procedure CargarProvincias; + public procedure AnadirOtrosFiltros; override; property Pedidos: IBizPedidoCliente read GetPedidos write SetPedidos; @@ -95,7 +104,7 @@ type implementation uses SysUtils, variants, windows, uDataModulePedidosCliente, schPedidosClienteClient_Intf, - uViewGridBase; + uViewGridBase, uProvinciasPoblacionesController, uStringsUtils; {$R *.dfm} @@ -159,6 +168,23 @@ begin end; end; +procedure TfrViewPedidosCliente.AnadirFiltroProvincia; +var + FFiltro : TcxFilterCriteriaItemList; +begin + + //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro + //y sobre la lista de pedidos + if frViewFiltroBase1.Visible then + begin + if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then + begin + FFiltro := AddFilterGrid(fboAnd); + FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue)); + end; + end; +end; + procedure TfrViewPedidosCliente.AnadirFiltroSituaciones; var FFiltro : TcxFilterCriteriaItemList; @@ -178,7 +204,8 @@ begin AnadirFiltroSituaciones; AnadirFiltroFechas; - + AnadirFiltroProvincia; + //Finalmente activamos el filtro si tenemos algo if cxGridView.DataController.Filter.IsEmpty then cxGridView.DataController.Filter.Active := False @@ -186,6 +213,57 @@ begin cxGrid.ActiveLevel.GridView := cxGridView; end; +procedure TfrViewPedidosCliente.CargarProvincias; +var + i : integer; +begin + with TProvinciasPoblacionesController.Create do + try + FProvincias := DarListaProvincias; + + with frViewFiltroBase1.eLista.Properties.Items do + begin + BeginUpdate; + try + Clear; + Add('Todos'); //Case 0 + for i := 0 to FProvincias.Count - 1 do + Add(FProvincias.Names[i]); + + frViewFiltroBase1.eLista.ItemIndex := 0; + finally + EndUpdate; + end; + end; + finally + Free; + end; +end; + +procedure TfrViewPedidosCliente.CustomViewCreate(Sender: TObject); +begin + inherited; + FProvincias := NIL; +end; + +procedure TfrViewPedidosCliente.CustomViewDestroy(Sender: TObject); +begin + frViewFiltroBase1.eLista.Properties.OnChange := Nil; + frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil; + + if Assigned(FProvincias) then + FreeANDNIL(FProvincias); + + inherited; +end; + +procedure TfrViewPedidosCliente.CustomViewShow(Sender: TObject); +begin + inherited; + frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange; + frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup; +end; + procedure TfrViewPedidosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); begin inherited; @@ -330,6 +408,25 @@ begin Result := FPedidos; end; +procedure TfrViewPedidosCliente.OnFiltroListaPropertiesChange(Sender: TObject); +begin + inherited; + RefrescarFiltro; +end; + +procedure TfrViewPedidosCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject); +begin + inherited; + + ShowHourglassCursor; + try + if not Assigned(FProvincias) then + CargarProvincias; + finally + HideHourglassCursor; + end; +end; + procedure TfrViewPedidosCliente.SetPedidos(const Value: IBizPedidoCliente); begin FPedidos := Value; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index cd969cc..64eef67 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index dd009b2..9a293c8 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality -FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.7.0FactuGES ServidorFactuGES Servidor1.0.7.0jueves, 01 de julio de 2010 17:59FactuGES_Server.dpr +FalseTrueFalse/standaloneTrueFalse1080FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.8.0FactuGES ServidorFactuGES Servidor1.0.8.0jueves, 01 de julio de 2010 19:29FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index b9288f9..54282a1 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo noviseda\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 1,0,6,0 -PRODUCTVERSION 1,0,6,0 +FILEVERSION 1,0,7,0 +PRODUCTVERSION 1,0,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,11 +13,11 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.0.6.0\0" + VALUE "FileVersion", "1.0.7.0\0" VALUE "InternalName", "FactuGES Servidor\0" VALUE "ProductName", "FactuGES Servidor\0" - VALUE "ProductVersion", "1.0.6.0\0" - VALUE "CompileDate", "jueves, 01 de julio de 2010 17:59\0" + VALUE "ProductVersion", "1.0.7.0\0" + VALUE "CompileDate", "jueves, 01 de julio de 2010 19:29\0" END END BLOCK "VarFileInfo"