From 85fc7faa6cf6a084c743dc4e6169f54e253adf1b Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 12 May 2017 09:36:01 +0000 Subject: [PATCH] git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@259 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2 --- Source/Cliente/FactuGES.dproj | 2 +- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 172156 -> 171984 bytes Source/Informes/6/InfPedidoCliente.fr3 | 39 +- Source/Informes/6/en/InfPedidoCliente.fr3 | 38 +- .../Informes/6/en/InfPresupuestoCliente.fr3 | 4 +- .../Views/uEditorAlbaranProveedor.dfm | 262 +++++++------ .../Views/uViewAlbaranesProveedor.dfm | 12 +- .../Views/uViewAlbaranesProveedor.pas | 2 +- .../Views/uViewProveedorArticulo.dfm | 1 + .../Views/uViewProveedorArticulo.pas | 2 +- .../Controller/uAgentesController.pas | 11 +- .../Contactos/Views/uViewEmpleados.pas | 4 +- .../Data/uDataModuleFacturasCliente.dfm | 5 + .../Model/schFacturasClienteClient_Intf.pas | 51 ++- .../Model/schFacturasClienteServer_Intf.pas | 59 ++- .../Servidor/srvFacturasCliente_Impl.dfm | 9 + .../Views/uViewFacturasCliente.dfm | 14 + .../Views/uViewFacturasCliente.pas | 54 ++- .../FacturasProveedor_Group.groupproj | 16 +- .../Model/schFacturasProveedorClient_Intf.pas | 20 +- .../Model/schFacturasProveedorServer_Intf.pas | 20 +- .../Views/uViewFacturasProveedor.dfm | 2 - .../Views/uViewFacturasProveedor.pas | 29 +- .../Views/uViewFacturasProforma.pas | 25 +- .../Views/uEditorFormasPago.dfm | 2 +- .../Views/uEditorFormasPago.pas | 16 +- .../Views/uViewHistoricoMovimientos.dfm | 3 + .../Views/uViewHistoricoMovimientos.pas | 3 +- .../Inventario/Views/uViewInventario.pas | 4 +- .../Views/uEditorPedidoProveedor.dfm | 367 +++++++++--------- .../Views/uViewPedidosProveedor.dfm | 12 +- .../Views/uViewPedidosProveedor.pas | 23 +- .../Reports/uRptPedidosCliente_Server.dfm | 77 ++-- .../Views/uViewPresupuestosCliente.dfm | 2 - .../Views/uViewPresupuestosCliente.pas | 20 +- .../Views/uViewRecibosCliente.dfm | 2 - .../Views/uViewRecibosCliente.pas | 21 +- .../Tipos de IVA/Views/uEditorTiposIVA.dfm | 4 - .../Tipos de IVA/Views/uEditorTiposIVA.pas | 18 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dpr | 4 +- Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 10 +- 44 files changed, 745 insertions(+), 534 deletions(-) diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 5144848..3fc1549 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4490FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.9.0FactuGESFactuGES4.4.9.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4610FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.6.1.0FactuGESFactuGES4.6.1.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 04b6664..6e76529 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,4,8,0 -PRODUCTVERSION 4,4,8,0 +FILEVERSION 4,6,1,0 +PRODUCTVERSION 4,6,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "4.4.8.0\0" + VALUE "FileVersion", "4.6.1.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.4.8.0\0" + VALUE "ProductVersion", "4.6.1.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 3f86e5bf99c849425ef2510f6879e0622b2eff49..475b91d4b603e932bccff33e7a51bc86c802b42e 100644 GIT binary patch delta 332 zcmex!fa}73u7(!IElezP>kS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d< z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX` zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go zlb$Xc(0L%8Fxnoh669zWpeQN`m~K0dNtsb+dg45$_~~!vF{!YcG3YTEP8XfeWIg@D Ne5M#E-*5qwHvj-}D@p(W delta 502 zcmY+9JxfAS7{`D2bS=F}+|luZ^a_bXOGG3UAr!Q@hDwD>Sz;|sIu!T;g1hK-^#im< zjg5`XZG8v9o^#JJ>49^e^XLEaJm>Sx8^3$qN9RSkgO2ZeY5vL~jqig)l6pdSg97R< zC^8wteayq0MFG7OxCDXWMoCCm6flysdGdM7Ey03C!YxylL4|@Q1J?E-MX_j5uLK^I zib11iSftyv%A{Tt`U>&EWa7(lZNtw{~Cw8k;*z> zVKq|a^$p=2j%aYrC5LkEIHxVR#l76O+!%ZK8mZO97CE-VpGfU=R$}LgIBHbIeIVKv z53#pKUEHS3gqf}+iYgc4Yf5i(B@?G*w5K+sA+vSzbUTfj;)^TH4%M06=V_>pe*x}X BMSTDO diff --git a/Source/Informes/6/InfPedidoCliente.fr3 b/Source/Informes/6/InfPedidoCliente.fr3 index afbf976..d4bc269 100644 --- a/Source/Informes/6/InfPedidoCliente.fr3 +++ b/Source/Informes/6/InfPedidoCliente.fr3 @@ -1,13 +1,15 @@ - + - - - - - + + + + + + + @@ -15,9 +17,9 @@ - - - + + + @@ -29,18 +31,23 @@ - + - - - - - - + + + + + + + + + + + diff --git a/Source/Informes/6/en/InfPedidoCliente.fr3 b/Source/Informes/6/en/InfPedidoCliente.fr3 index a3dfce6..c83dca3 100644 --- a/Source/Informes/6/en/InfPedidoCliente.fr3 +++ b/Source/Informes/6/en/InfPedidoCliente.fr3 @@ -1,13 +1,15 @@ - + - - - - - + + + + + + + @@ -16,9 +18,9 @@ - - - + + + @@ -30,16 +32,20 @@ - + - - - - - - + + + + + + + + + + diff --git a/Source/Informes/6/en/InfPresupuestoCliente.fr3 b/Source/Informes/6/en/InfPresupuestoCliente.fr3 index 243cdad..9c2238b 100644 --- a/Source/Informes/6/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/6/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm index ba8c26d..4d7c052 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm @@ -2,19 +2,19 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor Left = 332 Top = 147 Caption = 'Nuevo albar'#225'n de proveedor' - ClientHeight = 619 - ClientWidth = 765 + ClientHeight = 662 + ClientWidth = 778 OnClose = CustomEditorClose - ExplicitWidth = 773 - ExplicitHeight = 653 + ExplicitWidth = 786 + ExplicitHeight = 696 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 765 + Width = 778 Caption = 'Nuevo albar'#225'n de proveedor' ExplicitWidth = 765 inherited Image1: TImage - Left = 632 + Left = 645 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -125,14 +125,14 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitLeft = 735 end inherited lblDesbloquear: TcxLabel - Left = 667 + Left = 680 ExplicitLeft = 667 - AnchorX = 712 + AnchorX = 725 AnchorY = 14 end end inherited TBXDock: TTBXDock - Width = 765 + Width = 778 ExplicitWidth = 765 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 @@ -147,12 +147,12 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 765 + ExplicitWidth = 778 end end inherited pgPaginas: TPageControl - Width = 759 - Height = 382 + Width = 772 + Height = 425 TabOrder = 1 OnChanging = pgPaginasChanging ExplicitWidth = 759 @@ -166,15 +166,13 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 751 + ExplicitHeight = 354 inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor Left = 0 Top = 0 - Width = 751 - Height = 354 + Width = 764 + Height = 397 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -189,7 +187,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitWidth = 751 ExplicitHeight = 354 inherited ToolBar1: TToolBar - Width = 751 + Width = 764 Height = 51 ExplicitWidth = 751 ExplicitHeight = 51 @@ -217,18 +215,12 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor inherited FontSize: TEdit Left = 544 Top = 0 - Width = 170 + Width = 186 ExplicitLeft = 544 ExplicitTop = 0 - ExplicitWidth = 170 + ExplicitWidth = 186 end - inherited UpDown1: TUpDown - Left = 714 - Top = 0 - ExplicitLeft = 714 - ExplicitTop = 0 - end - inherited ToolButton13: TToolButton + inherited ToolButton13: TToolButton [7] Left = 0 Top = 0 Wrap = True @@ -236,61 +228,67 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitTop = 0 ExplicitHeight = 27 end - inherited ToolButton6: TToolButton [9] + inherited UpDown1: TUpDown [8] Left = 0 Top = 27 ExplicitLeft = 0 ExplicitTop = 27 end - inherited ToolButton7: TToolButton [10] - Left = 66 + inherited ToolButton6: TToolButton [9] + Left = 17 Top = 27 - ExplicitLeft = 66 + ExplicitLeft = 17 + ExplicitTop = 27 + end + inherited ToolButton7: TToolButton [10] + Left = 83 + Top = 27 + ExplicitLeft = 83 ExplicitTop = 27 end inherited ToolButton8: TToolButton [11] - Left = 133 + Left = 150 Top = 27 - ExplicitLeft = 133 + ExplicitLeft = 150 ExplicitTop = 27 end inherited ToolButton12: TToolButton [12] - Left = 216 + Left = 233 Top = 27 - ExplicitLeft = 216 + ExplicitLeft = 233 ExplicitTop = 27 ExplicitHeight = 22 end inherited ToolButton9: TToolButton [13] - Left = 224 + Left = 241 Top = 27 - ExplicitLeft = 224 + ExplicitLeft = 241 ExplicitTop = 27 end inherited ToolButton10: TToolButton [14] - Left = 369 + Left = 386 Top = 27 - ExplicitLeft = 369 + ExplicitLeft = 386 ExplicitTop = 27 end inherited ToolButton11: TToolButton [15] - Left = 494 + Left = 511 Top = 27 - ExplicitLeft = 494 + ExplicitLeft = 511 ExplicitTop = 27 end end inherited cxGrid: TcxGrid Top = 77 - Width = 751 - Height = 277 + Width = 764 + Height = 320 ExplicitTop = 77 ExplicitWidth = 751 ExplicitHeight = 277 end inherited TBXDock1: TTBXDock Top = 51 - Width = 751 + Width = 764 ExplicitTop = 51 ExplicitWidth = 751 inherited TBXToolbar1: TTBXToolbar @@ -311,15 +309,13 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 751 + ExplicitHeight = 354 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 - Width = 751 - Height = 354 + Width = 764 + Height = 397 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -332,30 +328,30 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitWidth = 751 ExplicitHeight = 354 inherited pnlSup: TPanel - Width = 751 + Width = 764 ExplicitWidth = 751 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end end inherited GroupBox1: TGroupBox - Width = 751 - Height = 326 + Width = 764 + Height = 369 ExplicitWidth = 751 ExplicitHeight = 326 inherited eIncidencias: TcxDBMemo ExplicitWidth = 734 ExplicitHeight = 299 - Height = 299 - Width = 734 + Height = 342 + Width = 747 end end end end end inherited StatusBar: TJvStatusBar - Top = 600 - Width = 765 + Top = 643 + Width = 778 Panels = < item Width = 200 @@ -365,8 +361,8 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 464 - Width = 765 + Top = 507 + Width = 778 Height = 136 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -381,85 +377,85 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitWidth = 765 ExplicitHeight = 136 inherited dxLayoutControl1: TdxLayoutControl - Width = 765 + Width = 778 Height = 136 LookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 765 ExplicitHeight = 136 inherited Bevel3: TBevel - Left = 425 - Top = 11 + Left = 433 + Top = -63 Height = 30 - ExplicitLeft = 425 - ExplicitTop = 11 + ExplicitLeft = 433 + ExplicitTop = -63 ExplicitHeight = 30 end inherited Bevel4: TBevel - Left = 537 - Top = 53 + Left = 545 + Top = -21 Width = 21 - ExplicitLeft = 537 - ExplicitTop = 53 + ExplicitLeft = 545 + ExplicitTop = -21 ExplicitWidth = 21 end inherited Bevel1: TBevel - Left = 537 - Top = 169 + Left = 545 + Top = 95 Width = 73 - ExplicitLeft = 537 - ExplicitTop = 169 + ExplicitLeft = 545 + ExplicitTop = 95 ExplicitWidth = 73 end inherited Bevel2: TBevel Left = 120 - Top = 171 + Top = 97 Width = 368 ExplicitLeft = 120 - ExplicitTop = 171 + ExplicitTop = 97 ExplicitWidth = 368 end inherited ImporteDto: TcxDBCurrencyEdit Left = 191 - Top = 38 + Top = -36 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 191 - ExplicitTop = 38 + ExplicitTop = -36 ExplicitWidth = 199 Width = 199 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 608 - Top = 88 + Left = 616 + Top = 14 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 608 - ExplicitTop = 88 + ExplicitLeft = 616 + ExplicitTop = 14 ExplicitWidth = 192 Width = 192 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 538 - Top = 142 + Left = 546 + Top = 68 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 538 - ExplicitTop = 142 + ExplicitLeft = 546 + ExplicitTop = 68 ExplicitWidth = 262 Width = 262 end inherited edtDescuento: TcxDBSpinEdit Left = 120 - Top = 38 + Top = -36 Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -467,73 +463,73 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 38 + ExplicitTop = -36 end inherited edtIVA: TcxDBSpinEdit - Left = 537 - Top = 88 + Left = 545 + Top = 14 Properties.OnValidate = frViewTotales1edtIVAPropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 537 - ExplicitTop = 88 + ExplicitLeft = 545 + ExplicitTop = 14 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 537 - Top = 11 + Left = 545 + Top = -63 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 537 - ExplicitTop = 11 + ExplicitLeft = 545 + ExplicitTop = -63 ExplicitWidth = 263 Width = 263 end inherited edtRE: TcxDBSpinEdit - Left = 537 - Top = 115 + Left = 545 + Top = 41 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 537 - ExplicitTop = 115 + ExplicitLeft = 545 + ExplicitTop = 41 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 608 - Top = 115 + Left = 616 + Top = 41 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 608 - ExplicitTop = 115 + ExplicitLeft = 616 + ExplicitTop = 41 ExplicitWidth = 192 Width = 192 end inherited eImporteNeto: TcxDBCurrencyEdit Left = 120 - Top = 11 + Top = -63 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 11 + ExplicitTop = -63 ExplicitWidth = 270 Width = 270 end inherited ePorte: TcxDBCurrencyEdit Left = 120 - Top = 65 + Top = -9 Properties.OnValidate = frViewTotales1ePortePropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -541,74 +537,74 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 65 + ExplicitTop = -9 ExplicitWidth = 270 Width = 270 end inherited eIVA: TcxDBLookupComboBox Left = 120 - Top = 92 + Top = 18 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 92 + ExplicitTop = 18 ExplicitWidth = 132 Width = 132 end inherited bTiposIVA: TButton - Left = 277 - Top = 92 + Left = 285 + Top = 18 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 277 - ExplicitTop = 92 + ExplicitLeft = 285 + ExplicitTop = 18 end inherited cbRecargoEquivalencia: TcxDBCheckBox Left = 120 - Top = 119 + Top = 45 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 119 + ExplicitTop = 45 ExplicitWidth = 270 Width = 270 end inherited edtRetencion: TcxDBSpinEdit - Left = 537 - Top = 189 + Left = 545 + Top = 115 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 537 - ExplicitTop = 189 + ExplicitLeft = 545 + ExplicitTop = 115 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Left = 608 - Top = 189 + Left = 616 + Top = 115 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 608 - ExplicitTop = 189 + ExplicitLeft = 616 + ExplicitTop = 115 ExplicitWidth = 180 Width = 180 end inherited edtFechaRetencion: TcxDBDateEdit Left = 120 - Top = 191 + Top = 117 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 191 + ExplicitTop = 117 ExplicitWidth = 280 Width = 280 end @@ -617,10 +613,15 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ShowCaption = False ShowBorder = False inherited dxLayoutControl1Group2: TdxLayoutGroup - inherited dxLayoutControl1Item8: TdxLayoutItem + inherited dxLayoutControl1Group7: TdxLayoutGroup + inherited dxLayoutControl1Group10: TdxLayoutGroup + Visible = False + end + end + inherited dxLayoutControl1Group6: TdxLayoutGroup Visible = False end - inherited dxLayoutControl1Group7: TdxLayoutGroup + inherited dxLayoutControl1Item16: TdxLayoutItem Visible = False end inherited dxLayoutControl1Item19: TdxLayoutItem @@ -635,11 +636,18 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor inherited dxLayoutControl1Item14: TdxLayoutItem Visible = False end + inherited dxLayoutControl1Group9: TdxLayoutGroup + Visible = False + end inherited dxLayoutControl1Group8: TdxLayoutGroup + Visible = False inherited dxLayoutControl1Item7: TdxLayoutItem Visible = True end end + inherited dxLayoutControl1Item3: TdxLayoutItem + Visible = False + end inherited dxLayoutControl1Item10: TdxLayoutItem Visible = False end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 3bc2cdc..2eac2e5 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -18,7 +18,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter - Column = cxGridViewIMPORTE_TOTAL + Column = cxGridViewBASE_IMPONIBLE end> DataController.Summary.FooterSummaryItems = < item @@ -33,7 +33,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum - Column = cxGridViewIMPORTE_TOTAL + Column = cxGridViewBASE_IMPONIBLE end> DataController.OnCompare = cxGridViewDataControllerCompare OptionsView.GroupFooters = gfAlwaysVisible @@ -159,9 +159,9 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor HeaderAlignmentHorz = taRightJustify Width = 52 end - object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn - Caption = 'Importe total' - DataBinding.FieldName = 'IMPORTE_TOTAL' + object cxGridViewBASE_IMPONIBLE: TcxGridDBColumn + Caption = 'Base Imponible' + DataBinding.FieldName = 'BASE_IMPONIBLE' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify FooterAlignmentHorz = taRightJustify @@ -225,6 +225,8 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 447 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas index 960277d..d65ae88 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas @@ -37,7 +37,7 @@ type cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn; cxGridViewREF_PED_PROVEEDOR: TcxGridDBColumn; cxGridViewREF_FACTURA: TcxGridDBColumn; - cxGridViewIMPORTE_TOTAL: TcxGridDBColumn; + cxGridViewBASE_IMPONIBLE: TcxGridDBColumn; actProveedor: TAction; actAlmacen: TAction; TBXItem2: TTBXItem; diff --git a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm index 5d48dca..e463ae1 100644 --- a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm @@ -97,6 +97,7 @@ inherited frViewProveedorArticulo: TfrViewProveedorArticulo Top = 136 DataBinding.DataField = 'DESCUENTO' Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = '#,0.00%' Properties.ImmediatePost = True Properties.MaxValue = 100.000000000000000000 Style.BorderColor = clWindowFrame diff --git a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas index f2e401a..c9a0a79 100644 --- a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas +++ b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas @@ -185,7 +185,7 @@ begin DesactivarEventos; try eDescuento.DataBinding.DataSource.Edit; - eDescuento.DataBinding.Field.AsFloat := RoundTo(ADescuento, -2); + eDescuento.DataBinding.Field.AsFloat := ADescuento; //RoundTo(ADescuento, -2); finally ActivarEventos; end; diff --git a/Source/Modulos/Contactos/Controller/uAgentesController.pas b/Source/Modulos/Contactos/Controller/uAgentesController.pas index 0bb20bb..1fca117 100644 --- a/Source/Modulos/Contactos/Controller/uAgentesController.pas +++ b/Source/Modulos/Contactos/Controller/uAgentesController.pas @@ -107,6 +107,13 @@ end; function TAgentesController.Duplicar(AContacto: IBizContacto): IBizContacto; begin Result := inherited Duplicar(AContacto); + +// if Assigned((Result as IBizAgente).ObjetivosAlbaranes) then +// DuplicarRegistros((AContacto as IBizAgente).ObjetivosAlbaranes.DataTable, (Result as IBizAgente).ObjetivosAlbaranes.DataTable, mdrTodos); + +// if Assigned((Result as IBizAgente).ObjetivosFacturas) then +// DuplicarRegistros((AContacto as IBizAgente).ObjetivosFacturas.DataTable, (Result as IBizAgente).ObjetivosFacturas.DataTable, mdrTodos); + end; function TAgentesController.ElegirContacto(AContactos: IBizContacto; @@ -202,8 +209,8 @@ function TAgentesController.Guardar(AContacto: IBizContacto): Boolean; begin if inherited Guardar(AContacto) then begin - (AContacto as IBizAgente).ObjetivosAlbaranes.DataTable.Refresh; - (AContacto as IBizAgente).ObjetivosFacturas.DataTable.Refresh; +// (AContacto as IBizAgente).ObjetivosAlbaranes.DataTable.Refresh; +// (AContacto as IBizAgente).ObjetivosFacturas.DataTable.Refresh; end; end; diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.pas b/Source/Modulos/Contactos/Views/uViewEmpleados.pas index aa663eb..746a39a 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleados.pas +++ b/Source/Modulos/Contactos/Views/uViewEmpleados.pas @@ -88,9 +88,9 @@ begin IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_EmpleadosFECHA_BAJA).Index; ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); if Length(ASituacion) = 0 then - AStyle.TextColor := cxStyleActivos.TextColor + AStyle := cxStyleActivos else - AStyle.TextColor := cxStyleInactivos.TextColor; + AStyle := cxStyleInactivos; end; end; diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm index b10e30f..c41a96e 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm @@ -298,6 +298,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente Name = 'NOMBRE_COMERCIAL' DataType = datString Size = 255 + end + item + Name = 'NOMBRE_AGENTE' + DataType = datString + Size = 255 end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas index 7b55508..9757555 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas @@ -9,10 +9,10 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturas = '{02AB48F1-470E-474A-92D7-F25AE742845D}'; - RID_FacturasCliente = '{5ACD68C9-AB25-461E-801E-2A702D4010FA}'; - RID_FacturasCliente_Detalles = '{106B1153-506B-4F4F-89BD-3ED3CFCAE27C}'; - RID_FacturasClienteDeAlbaran = '{F35590A9-AE16-4478-B3B3-17A4E5A3A5F7}'; + RID_ListaAnosFacturas = '{3B978089-46EE-45E5-B753-7FD013A73DC2}'; + RID_FacturasCliente = '{EC537E6E-2DF3-4E4B-BAED-AAE2ECA9EBF2}'; + RID_FacturasCliente_Detalles = '{3F1D33DC-E40C-4F7F-9D31-CFE4CDDD7555}'; + RID_FacturasClienteDeAlbaran = '{CF8A313F-0925-4AD4-B850-DB7ADC3D1075}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -73,6 +73,7 @@ const fld_FacturasClienteID_ALBARAN = 'ID_ALBARAN'; fld_FacturasClientePAIS = 'PAIS'; fld_FacturasClienteNOMBRE_COMERCIAL = 'NOMBRE_COMERCIAL'; + fld_FacturasClienteNOMBRE_AGENTE = 'NOMBRE_AGENTE'; { FacturasCliente field indexes } idx_FacturasClienteID = 0; @@ -121,6 +122,7 @@ const idx_FacturasClienteID_ALBARAN = 43; idx_FacturasClientePAIS = 44; idx_FacturasClienteNOMBRE_COMERCIAL = 45; + idx_FacturasClienteNOMBRE_AGENTE = 46; { FacturasCliente_Detalles fields } fld_FacturasCliente_DetallesID = 'ID'; @@ -251,7 +253,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{BCBC17E8-5138-42CD-9874-B52C08C5748B}'] + ['{1B46D9B4-3797-4541-82F0-6574118C088E}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -286,7 +288,7 @@ type { IFacturasCliente } IFacturasCliente = interface(IDAStronglyTypedDataTable) - ['{4244914D-A271-4967-97C4-502EBBCABC1D}'] + ['{C1D52241-E925-4005-B0F6-9F6FE2937B2D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -471,6 +473,10 @@ type procedure SetNOMBRE_COMERCIALValue(const aValue: String); function GetNOMBRE_COMERCIALIsNull: Boolean; procedure SetNOMBRE_COMERCIALIsNull(const aValue: Boolean); + function GetNOMBRE_AGENTEValue: String; + procedure SetNOMBRE_AGENTEValue(const aValue: String); + function GetNOMBRE_AGENTEIsNull: Boolean; + procedure SetNOMBRE_AGENTEIsNull(const aValue: Boolean); { Properties } @@ -566,6 +572,8 @@ type property PAISIsNull: Boolean read GetPAISIsNull write SetPAISIsNull; property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue; property NOMBRE_COMERCIALIsNull: Boolean read GetNOMBRE_COMERCIALIsNull write SetNOMBRE_COMERCIALIsNull; + property NOMBRE_AGENTE: String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; + property NOMBRE_AGENTEIsNull: Boolean read GetNOMBRE_AGENTEIsNull write SetNOMBRE_AGENTEIsNull; end; { TFacturasClienteDataTableRules } @@ -758,6 +766,10 @@ type procedure SetNOMBRE_COMERCIALValue(const aValue: String); virtual; function GetNOMBRE_COMERCIALIsNull: Boolean; virtual; procedure SetNOMBRE_COMERCIALIsNull(const aValue: Boolean); virtual; + function GetNOMBRE_AGENTEValue: String; virtual; + procedure SetNOMBRE_AGENTEValue(const aValue: String); virtual; + function GetNOMBRE_AGENTEIsNull: Boolean; virtual; + procedure SetNOMBRE_AGENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -852,6 +864,8 @@ type property PAISIsNull: Boolean read GetPAISIsNull write SetPAISIsNull; property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue; property NOMBRE_COMERCIALIsNull: Boolean read GetNOMBRE_COMERCIALIsNull write SetNOMBRE_COMERCIALIsNull; + property NOMBRE_AGENTE: String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; + property NOMBRE_AGENTEIsNull: Boolean read GetNOMBRE_AGENTEIsNull write SetNOMBRE_AGENTEIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -861,7 +875,7 @@ type { IFacturasCliente_Detalles } IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{3C6995B4-07EA-4767-9854-BDD151D83BE5}'] + ['{9F17C201-9C4F-4DED-855A-23CECA074B2D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1064,7 +1078,7 @@ type { IFacturasClienteDeAlbaran } IFacturasClienteDeAlbaran = interface(IDAStronglyTypedDataTable) - ['{4326AA0D-927C-440F-9511-433694EC80D7}'] + ['{37E2EB81-D03D-4D28-BDB1-53AF019A5989}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2634,6 +2648,27 @@ begin DataTable.Fields[idx_FacturasClienteNOMBRE_COMERCIAL].AsVariant := Null; end; +function TFacturasClienteDataTableRules.GetNOMBRE_AGENTEValue: String; +begin + result := DataTable.Fields[idx_FacturasClienteNOMBRE_AGENTE].AsString; +end; + +procedure TFacturasClienteDataTableRules.SetNOMBRE_AGENTEValue(const aValue: String); +begin + DataTable.Fields[idx_FacturasClienteNOMBRE_AGENTE].AsString := aValue; +end; + +function TFacturasClienteDataTableRules.GetNOMBRE_AGENTEIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasClienteNOMBRE_AGENTE].IsNull; +end; + +procedure TFacturasClienteDataTableRules.SetNOMBRE_AGENTEIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasClienteNOMBRE_AGENTE].AsVariant := Null; +end; + { TFacturasCliente_DetallesDataTableRules } constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas index d7eb72a..4b8f89f 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas @@ -9,15 +9,15 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturasDelta = '{38B4B73D-66DC-44E6-9FD6-A497533203B1}'; - RID_FacturasClienteDelta = '{6A8B4E4D-5FEE-4C32-AFBF-2084F66563F5}'; - RID_FacturasCliente_DetallesDelta = '{72D6D853-218D-4292-825E-633CC9413944}'; - RID_FacturasClienteDeAlbaranDelta = '{1BD62FD7-DB5A-435A-8428-FFD60E2015FA}'; + RID_ListaAnosFacturasDelta = '{B718E26C-623C-41F8-BFF3-3DAFCEAB064A}'; + RID_FacturasClienteDelta = '{640B108D-0A95-4EE3-9C21-9C034ED5A0AD}'; + RID_FacturasCliente_DetallesDelta = '{EBF40DCF-0538-4B75-BFFC-C28CDD13FC5F}'; + RID_FacturasClienteDeAlbaranDelta = '{82174611-294F-4A44-9CC6-941D23135874}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{38B4B73D-66DC-44E6-9FD6-A497533203B1}'] + ['{B718E26C-623C-41F8-BFF3-3DAFCEAB064A}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IFacturasClienteDelta } IFacturasClienteDelta = interface(IFacturasCliente) - ['{6A8B4E4D-5FEE-4C32-AFBF-2084F66563F5}'] + ['{640B108D-0A95-4EE3-9C21-9C034ED5A0AD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -99,6 +99,7 @@ type function GetOldID_ALBARANValue : String; function GetOldPAISValue : String; function GetOldNOMBRE_COMERCIALValue : String; + function GetOldNOMBRE_AGENTEValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -147,6 +148,7 @@ type property OldID_ALBARAN : String read GetOldID_ALBARANValue; property OldPAIS : String read GetOldPAISValue; property OldNOMBRE_COMERCIAL : String read GetOldNOMBRE_COMERCIALValue; + property OldNOMBRE_AGENTE : String read GetOldNOMBRE_AGENTEValue; end; { TFacturasClienteBusinessProcessorRules } @@ -431,6 +433,12 @@ type function GetOldNOMBRE_COMERCIALIsNull: Boolean; virtual; procedure SetNOMBRE_COMERCIALValue(const aValue: String); virtual; procedure SetNOMBRE_COMERCIALIsNull(const aValue: Boolean); virtual; + function GetNOMBRE_AGENTEValue: String; virtual; + function GetNOMBRE_AGENTEIsNull: Boolean; virtual; + function GetOldNOMBRE_AGENTEValue: String; virtual; + function GetOldNOMBRE_AGENTEIsNull: Boolean; virtual; + procedure SetNOMBRE_AGENTEValue(const aValue: String); virtual; + procedure SetNOMBRE_AGENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -617,6 +625,10 @@ type property NOMBRE_COMERCIALIsNull : Boolean read GetNOMBRE_COMERCIALIsNull write SetNOMBRE_COMERCIALIsNull; property OldNOMBRE_COMERCIAL : String read GetOldNOMBRE_COMERCIALValue; property OldNOMBRE_COMERCIALIsNull : Boolean read GetOldNOMBRE_COMERCIALIsNull; + property NOMBRE_AGENTE : String read GetNOMBRE_AGENTEValue write SetNOMBRE_AGENTEValue; + property NOMBRE_AGENTEIsNull : Boolean read GetNOMBRE_AGENTEIsNull write SetNOMBRE_AGENTEIsNull; + property OldNOMBRE_AGENTE : String read GetOldNOMBRE_AGENTEValue; + property OldNOMBRE_AGENTEIsNull : Boolean read GetOldNOMBRE_AGENTEIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -626,7 +638,7 @@ type { IFacturasCliente_DetallesDelta } IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles) - ['{72D6D853-218D-4292-825E-633CC9413944}'] + ['{EBF40DCF-0538-4B75-BFFC-C28CDD13FC5F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -828,7 +840,7 @@ type { IFacturasClienteDeAlbaranDelta } IFacturasClienteDeAlbaranDelta = interface(IFacturasClienteDeAlbaran) - ['{1BD62FD7-DB5A-435A-8428-FFD60E2015FA}'] + ['{82174611-294F-4A44-9CC6-941D23135874}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -2870,6 +2882,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_COMERCIAL] := Null; end; +function TFacturasClienteBusinessProcessorRules.GetNOMBRE_AGENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_AGENTE]; +end; + +function TFacturasClienteBusinessProcessorRules.GetNOMBRE_AGENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_AGENTE]); +end; + +function TFacturasClienteBusinessProcessorRules.GetOldNOMBRE_AGENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteNOMBRE_AGENTE]; +end; + +function TFacturasClienteBusinessProcessorRules.GetOldNOMBRE_AGENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteNOMBRE_AGENTE]); +end; + +procedure TFacturasClienteBusinessProcessorRules.SetNOMBRE_AGENTEValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_AGENTE] := aValue; +end; + +procedure TFacturasClienteBusinessProcessorRules.SetNOMBRE_AGENTEIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteNOMBRE_AGENTE] := Null; +end; + { TFacturasCliente_DetallesBusinessProcessorRules } constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm index 856c4db..5ec2601 100644 --- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm +++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm @@ -231,6 +231,10 @@ object srvFacturasCliente: TsrvFacturasCliente item DatasetField = 'NOMBRE_COMERCIAL' TableField = 'NOMBRE_COMERCIAL' + end + item + DatasetField = 'NOMBRE_AGENTE' + TableField = 'NOMBRE_AGENTE' end> end> Name = 'FacturasCliente' @@ -473,6 +477,11 @@ object srvFacturasCliente: TsrvFacturasCliente Name = 'NOMBRE_COMERCIAL' DataType = datString Size = 255 + end + item + Name = 'NOMBRE_AGENTE' + DataType = datString + Size = 255 end> end item diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 65caf40..ffb4dfb 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -193,6 +193,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Caption = 'Pa'#237's' DataBinding.FieldName = 'PAIS' end + object cxGridViewAgente: TcxGridDBColumn + Caption = 'Agente' + DataBinding.FieldName = 'NOMBRE_AGENTE' + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -283,6 +287,11 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente object TBXItem2: TTBXItem Action = actPais end + object TBXSeparatorItem3: TTBXSeparatorItem + end + object TBXItem4: TTBXItem + Action = actAgente + end end end end @@ -323,6 +332,11 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente OnExecute = actPaisExecute OnUpdate = actPaisUpdate end + object actAgente: TAction + Caption = 'Agente' + OnExecute = actAgenteExecute + OnUpdate = actAgenteUpdate + end end inherited GridPNGImageList: TPngImageList PngImages = < diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index df6b519..d06c17a 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -62,6 +62,10 @@ type cxGridViewIMPORTE_RE: TcxGridDBColumn; cxGridViewPAIS: TcxGridDBColumn; cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn; + cxGridViewAgente: TcxGridDBColumn; + actAgente: TAction; + TBXSeparatorItem3: TTBXSeparatorItem; + TBXItem4: TTBXItem; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); @@ -79,6 +83,8 @@ type procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean); + procedure actAgenteExecute(Sender: TObject); + procedure actAgenteUpdate(Sender: TObject); private //Filtros relativos a la vista @@ -99,13 +105,33 @@ type implementation uses - uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils, + uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils, schFacturasClienteClient_Intf , cxVariants; {$R *.dfm} { TfrViewFacturasCliente } +procedure TfrViewFacturasCliente.actAgenteExecute(Sender: TObject); +begin + if (cxGridViewAGENTE.GroupIndex < 0) then + begin + cxGridViewAGENTE.GroupIndex := cxGridView.GroupedColumnCount; + cxGridViewAGENTE.Visible := False; + end + else + begin + cxGridViewAGENTE.GroupIndex := -1; + cxGridViewAGENTE.Visible := True; + end; +end; + +procedure TfrViewFacturasCliente.actAgenteUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Checked := not (cxGridViewAGENTE.GroupIndex < 0); +end; + procedure TfrViewFacturasCliente.actClienteExecute(Sender: TObject); begin if (cxGridViewNOMBRE.GroupIndex < 0) then @@ -266,18 +292,22 @@ begin if Assigned(ARecord) then begin - IndiceCol := cxGridViewSITUACION.Index; - ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); - if (ASituacion = CTE_PAGADA) then - AStyle.TextColor := cxStylePagada.TextColor - else if (ASituacion = CTE_PENDIENTE) then - AStyle.TextColor := cxStylePendientes.TextColor - else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then - AStyle.TextColor := cxStyleParciales.TextColor; + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasClienteSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasClienteSITUACION).Index; + ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); + if (ASituacion = CTE_PAGADA) then + AStyle := cxStylePagada + else if (ASituacion = CTE_PENDIENTE) then + AStyle := cxStylePendientes + else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then + AStyle := cxStyleParciales; - IndiceCol := cxGridViewIMPORTE_TOTAL.Index; - if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then - AStyle.TextColor := cxStyleAbono.TextColor; + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasClienteIMPORTE_TOTAL).Index; + if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then + AStyle := cxStyleAbono; + end; end; end; diff --git a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj index 4993e3c..84f4b55 100644 --- a/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj +++ b/Source/Modulos/Facturas de proveedor/FacturasProveedor_Group.groupproj @@ -27,7 +27,6 @@ - @@ -238,15 +237,6 @@ - - - - - - - - - @@ -302,13 +292,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index 3737d73..0b6b15b 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas @@ -9,11 +9,11 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturas = '{39EC9E1B-2911-46D1-ACA9-FA1EF6E51A75}'; - RID_FacturasProveedor = '{694516CA-63EE-41E4-82BB-75782E314DC8}'; - RID_FacturasProveedor_Detalles = '{16B3A1FB-A523-4336-B56A-60823DDE3E24}'; - RID_FacturasProveedor_Pedidos = '{6A7C212A-59AC-4E29-95AD-ACC947BB7D9A}'; - RID_FacturasProveedorDeAlbaran = '{EE202C16-34F4-4B4C-B6BB-EB811D237AB6}'; + RID_ListaAnosFacturas = '{DE72C5AA-3A81-46F2-A596-E612C9A8E0DF}'; + RID_FacturasProveedor = '{CCA571D8-A9AA-42CC-B352-B028348D8BCE}'; + RID_FacturasProveedor_Detalles = '{DFCD3856-B73B-4594-9663-8EAFA99403F2}'; + RID_FacturasProveedor_Pedidos = '{0D6A1D92-CEE3-480C-ACAF-F8E6BD8AD400}'; + RID_FacturasProveedorDeAlbaran = '{CE90EB16-10A3-4E23-A1E1-2BD2C0281449}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -237,7 +237,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{83DE52CB-0D48-4AE6-B88A-7162486BBBA8}'] + ['{67A508CE-EAC3-4F10-8A21-C6AE7FC4A5B1}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -272,7 +272,7 @@ type { IFacturasProveedor } IFacturasProveedor = interface(IDAStronglyTypedDataTable) - ['{AE58DD6C-AE26-4255-AE43-9D2D7B371A56}'] + ['{EBBDE259-AFF4-499A-A384-232A7B003087}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -727,7 +727,7 @@ type { IFacturasProveedor_Detalles } IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{745A7B7E-1729-48B9-BF23-444482E23AB7}'] + ['{0EB649EC-EB49-4EDB-A5F8-F9224CA96190}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -942,7 +942,7 @@ type { IFacturasProveedor_Pedidos } IFacturasProveedor_Pedidos = interface(IDAStronglyTypedDataTable) - ['{3836DA85-3066-4BC8-974B-04C2148275B8}'] + ['{B9E6740D-870F-4569-8F79-CA2B1E597A98}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1049,7 +1049,7 @@ type { IFacturasProveedorDeAlbaran } IFacturasProveedorDeAlbaran = interface(IDAStronglyTypedDataTable) - ['{62E0726A-2187-4779-956B-09258612C07A}'] + ['{04C6392D-0292-4E63-8735-340085D4B9AE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas index fd507f0..a5e0959 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas @@ -9,16 +9,16 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturasDelta = '{D07287C5-EC7A-4659-B15A-6260065DCEEA}'; - RID_FacturasProveedorDelta = '{745B5F49-A1E1-45BA-B8AE-0847024CEE5A}'; - RID_FacturasProveedor_DetallesDelta = '{12331A1D-2031-4A48-B546-AC5F8B49D841}'; - RID_FacturasProveedor_PedidosDelta = '{8EB730A8-ED88-46F8-96D9-C5DF0A86AFD9}'; - RID_FacturasProveedorDeAlbaranDelta = '{804D2139-7836-4684-8A0B-E0D7E97E7F52}'; + RID_ListaAnosFacturasDelta = '{907E16FE-0521-405C-A967-11989922E9D6}'; + RID_FacturasProveedorDelta = '{1C45684B-EB3E-4CB6-BF48-C71FD3CB3219}'; + RID_FacturasProveedor_DetallesDelta = '{9623AA50-5B1E-4752-B6BC-2ABB0044DD02}'; + RID_FacturasProveedor_PedidosDelta = '{C59F83C5-F496-4D6B-AD34-8A6673017C3B}'; + RID_FacturasProveedorDeAlbaranDelta = '{7793CA17-D13C-4B90-8243-B75F1DFA5BC2}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{D07287C5-EC7A-4659-B15A-6260065DCEEA}'] + ['{907E16FE-0521-405C-A967-11989922E9D6}'] { Property getters and setters } function GetOldANOValue : String; @@ -52,7 +52,7 @@ type { IFacturasProveedorDelta } IFacturasProveedorDelta = interface(IFacturasProveedor) - ['{745B5F49-A1E1-45BA-B8AE-0847024CEE5A}'] + ['{1C45684B-EB3E-4CB6-BF48-C71FD3CB3219}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -507,7 +507,7 @@ type { IFacturasProveedor_DetallesDelta } IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) - ['{12331A1D-2031-4A48-B546-AC5F8B49D841}'] + ['{9623AA50-5B1E-4752-B6BC-2ABB0044DD02}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -721,7 +721,7 @@ type { IFacturasProveedor_PedidosDelta } IFacturasProveedor_PedidosDelta = interface(IFacturasProveedor_Pedidos) - ['{8EB730A8-ED88-46F8-96D9-C5DF0A86AFD9}'] + ['{C59F83C5-F496-4D6B-AD34-8A6673017C3B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -827,7 +827,7 @@ type { IFacturasProveedorDeAlbaranDelta } IFacturasProveedorDeAlbaranDelta = interface(IFacturasProveedorDeAlbaran) - ['{804D2139-7836-4684-8A0B-E0D7E97E7F52}'] + ['{7793CA17-D13C-4B90-8243-B75F1DFA5BC2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index 0678c9a..2c67913 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -233,8 +233,6 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 388 - ExplicitWidth = 215 - Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas index 2fb401d..2e22397 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas @@ -94,7 +94,7 @@ implementation uses uDataModuleFacturasProveedor, DateUtils, uViewGridBase, uReferenciasUtils, - cxVariants; + cxVariants, schFacturasProveedorClient_Intf; {$R *.dfm} @@ -261,19 +261,22 @@ begin if Assigned(ARecord) then begin + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProveedorSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProveedorSITUACION).Index; + ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); + if (ASituacion = CTE_PAGADA) then + AStyle := cxStylePagada + else if (ASituacion = CTE_PENDIENTE) then + AStyle := cxStylePendientes + else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then + AStyle := cxStyleParciales; - IndiceCol := cxGridViewSITUACION.Index; - ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); - if (ASituacion = CTE_PAGADA) then - AStyle.TextColor := cxStylePagada.TextColor - else if (ASituacion = CTE_PENDIENTE) then - AStyle.TextColor := cxStylePendientes.TextColor - else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then - AStyle.TextColor := cxStyleParciales.TextColor; - - IndiceCol := cxGridViewIMPORTE_TOTAL.Index; - if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then - AStyle.TextColor := cxStyleAbono.TextColor; + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProveedorIMPORTE_TOTAL).Index; + if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then + AStyle := cxStyleAbono; + end; end; end; diff --git a/Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.pas b/Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.pas index 9b9a2cf..f945717 100644 --- a/Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.pas +++ b/Source/Modulos/Facturas proforma/Views/uViewFacturasProforma.pas @@ -97,7 +97,7 @@ implementation uses uDataModuleFacturasProforma, DateUtils, uViewGridBase, uReferenciasUtils, - cxVariants; + cxVariants, schFacturasProformaClient_Intf; {$R *.dfm} @@ -261,16 +261,21 @@ begin if Assigned(ARecord) then begin - IndiceCol := cxGridViewSITUACION.Index; - ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); - if (ASituacion = CTE_PAGADA) then - AStyle.TextColor := cxStylePagada.TextColor - else if (ASituacion = CTE_PENDIENTE) then - AStyle.TextColor := cxStylePendientes.TextColor; + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProformaSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProformaSITUACION).Index; - IndiceCol := cxGridViewIMPORTE_TOTAL.Index; - if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then - AStyle.TextColor := cxStyleAbono.TextColor; + ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); + if (ASituacion = CTE_PAGADA) then + AStyle := cxStylePagada + else if (ASituacion = CTE_PENDIENTE) then + AStyle := cxStylePendientes; + + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_FacturasProformaIMPORTE_TOTAL).Index; + if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then + AStyle := cxStyleAbono; + end; end; end; diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm index cd908f9..44b4918 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm +++ b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm @@ -61,7 +61,7 @@ object fEditorFormasPago: TfEditorFormasPago end object bAnadir: TButton Left = 284 - Top = 31 + Top = 32 Width = 95 Height = 23 Action = actAnadir diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas index 01b9449..e5e85b0 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas +++ b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas @@ -79,7 +79,7 @@ implementation { TfEditorFormasPago } uses - uDialogUtils; + uDialogUtils, uFactuGES_App; function TfEditorFormasPago.GetFormasPago: IBizFormaPago; begin @@ -114,7 +114,8 @@ procedure TfEditorFormasPago.actEliminarUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FFormasPago) and FFormasPago.DataTable.Active and - (FFormasPago.DataTable.RecordCount > 0); + (FFormasPago.DataTable.RecordCount > 0) and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; procedure TfEditorFormasPago.actModificarExecute(Sender: TObject); @@ -126,7 +127,8 @@ procedure TfEditorFormasPago.actModificarUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FFormasPago) and FFormasPago.DataTable.Active and - (FFormasPago.DataTable.RecordCount > 0); + (FFormasPago.DataTable.RecordCount > 0) and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; constructor TfEditorFormasPago.Create(AOwner: TComponent); @@ -170,7 +172,8 @@ end; procedure TfEditorFormasPago.actAnadirUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FFormasPago) and - FFormasPago.DataTable.Active; + FFormasPago.DataTable.Active and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; procedure TfEditorFormasPago.FormShow(Sender: TObject); @@ -179,6 +182,11 @@ begin FFormasPago.DataTable.Active := true; ListaFormasPago.SetFocus; + + if (AppFactuGES.UsuarioActivo.ID_PERFIL = 11) then + actAceptar.enabled:= True + else + actAceptar.enabled:= False; end; end. diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm index 51799a1..add5443 100644 --- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.dfm @@ -146,6 +146,9 @@ inherited frViewHistoricoMovimientos: TfrViewHistoricoMovimientos end end end + inherited pnlAgrupaciones: TTBXDockablePanel + ExplicitWidth = 128 + end inherited dxComponentPrinter: TdxComponentPrinter Left = 400 Top = 160 diff --git a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas index d2c7495..849787b 100644 --- a/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas +++ b/Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas @@ -14,7 +14,8 @@ uses cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox, cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid, uBizHistoricoMovimientos, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uDAInterfaces, + uCustomView, uViewBase; type IViewHistoricoMovimientos = interface(IViewGrid) diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas index 1e35da4..2aadb7b 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.pas +++ b/Source/Modulos/Inventario/Views/uViewInventario.pas @@ -167,9 +167,9 @@ begin IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_INVENTARIOSTOCK).Index; AStock := ARecord.DisplayTexts[IndiceCol]; if (AStock < 0) then - AStyle.TextColor := cxStyleArticuloSinStock.TextColor + AStyle := cxStyleArticuloSinStock else - AStyle.TextColor := cxStyleArticuloConStock.TextColor; + AStyle := cxStyleArticuloConStock; end; end; diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm index 996e6a9..c833256 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm @@ -2,19 +2,20 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Left = 332 Top = 147 Caption = 'Nuevo pedido a proveedor' - ClientHeight = 678 - ClientWidth = 879 + ClientHeight = 686 + ClientWidth = 885 OnClose = CustomEditorClose - ExplicitWidth = 887 - ExplicitHeight = 712 + ExplicitTop = -7 + ExplicitWidth = 893 + ExplicitHeight = 720 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 879 + Width = 885 Caption = 'Nuevo pedido a proveedor' ExplicitWidth = 879 inherited Image1: TImage - Left = 852 + Left = 858 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -42,14 +43,14 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitLeft = 735 end inherited lblDesbloquear: TcxLabel - Left = 754 + Left = 760 ExplicitLeft = 754 - AnchorX = 799 + AnchorX = 805 AnchorY = 14 end end inherited TBXDock: TTBXDock - Width = 879 + Width = 885 ExplicitWidth = 879 inherited tbxMain: TTBXToolbar ExplicitWidth = 596 @@ -69,7 +70,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 879 + ExplicitWidth = 885 object TBXSubmenuItem2: TTBXSubmenuItem [4] Caption = 'A&cciones' object TBXItem7: TTBXItem @@ -79,31 +80,29 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end end inherited pgPaginas: TPageControl - Width = 873 - Height = 528 + Width = 879 + Height = 527 ActivePage = pagContenido TabOrder = 1 OnChanging = pgPaginasChanging - ExplicitWidth = 873 - ExplicitHeight = 528 + ExplicitWidth = 879 + ExplicitHeight = 536 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 865 - ExplicitHeight = 500 + ExplicitWidth = 871 + ExplicitHeight = 508 end object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 865 + ExplicitHeight = 500 inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor Left = 0 Top = 0 - Width = 865 - Height = 500 + Width = 871 + Height = 499 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -118,105 +117,108 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitWidth = 865 ExplicitHeight = 500 inherited ToolBar1: TToolBar - Width = 865 - Height = 46 + Width = 871 + Height = 51 ExplicitWidth = 865 - ExplicitHeight = 46 + ExplicitHeight = 51 inherited ToolButton3: TToolButton Wrap = False end inherited ToolButton4: TToolButton Left = 278 Top = 0 - Wrap = True ExplicitLeft = 278 ExplicitTop = 0 end - inherited ToolButton14: TToolButton - Left = 0 - Wrap = False - ExplicitLeft = 0 + inherited ToolButton14: TToolButton [4] + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 end - inherited FontName: TJvFontComboBox - Left = 65 - Top = 22 - ExplicitLeft = 65 - ExplicitTop = 22 + inherited FontName: TJvFontComboBox [5] + Left = 399 + Top = 0 + ExplicitLeft = 399 + ExplicitTop = 0 end inherited FontSize: TEdit - Left = 210 - Top = 22 + Left = 544 + Top = 0 Width = 58 - ExplicitLeft = 210 - ExplicitTop = 22 + ExplicitLeft = 544 + ExplicitTop = 0 ExplicitWidth = 58 end - inherited UpDown1: TUpDown - Left = 268 - Top = 22 - ExplicitLeft = 268 - ExplicitTop = 22 + inherited ToolButton13: TToolButton [7] + Left = 0 + Top = 0 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitHeight = 27 end - inherited ToolButton13: TToolButton - Left = 285 - Top = 22 - ExplicitLeft = 285 - ExplicitTop = 22 + inherited UpDown1: TUpDown [8] + Left = 0 + Top = 27 + ExplicitLeft = 0 + ExplicitTop = 27 end - inherited ToolButton6: TToolButton - Left = 293 - Top = 22 - ExplicitLeft = 293 - ExplicitTop = 22 + inherited ToolButton6: TToolButton [9] + Left = 17 + Top = 27 + ExplicitLeft = 17 + ExplicitTop = 27 end - inherited ToolButton7: TToolButton - Left = 359 - Top = 22 - ExplicitLeft = 359 - ExplicitTop = 22 + inherited ToolButton7: TToolButton [10] + Left = 83 + Top = 27 + ExplicitLeft = 83 + ExplicitTop = 27 end - inherited ToolButton8: TToolButton - Left = 426 - Top = 22 - ExplicitLeft = 426 - ExplicitTop = 22 + inherited ToolButton8: TToolButton [11] + Left = 150 + Top = 27 + ExplicitLeft = 150 + ExplicitTop = 27 end - inherited ToolButton12: TToolButton - Left = 509 - Top = 22 - ExplicitLeft = 509 - ExplicitTop = 22 + inherited ToolButton12: TToolButton [12] + Left = 233 + Top = 27 + ExplicitLeft = 233 + ExplicitTop = 27 + ExplicitHeight = 22 end - inherited ToolButton9: TToolButton - Left = 517 - Top = 22 - ExplicitLeft = 517 - ExplicitTop = 22 + inherited ToolButton9: TToolButton [13] + Left = 241 + Top = 27 + ExplicitLeft = 241 + ExplicitTop = 27 end - inherited ToolButton10: TToolButton - Left = 662 - Top = 22 - ExplicitLeft = 662 - ExplicitTop = 22 + inherited ToolButton10: TToolButton [14] + Left = 386 + Top = 27 + ExplicitLeft = 386 + ExplicitTop = 27 end - inherited ToolButton11: TToolButton - Left = 787 - Top = 22 - ExplicitLeft = 787 - ExplicitTop = 22 + inherited ToolButton11: TToolButton [15] + Left = 511 + Top = 27 + ExplicitLeft = 511 + ExplicitTop = 27 end end inherited cxGrid: TcxGrid - Top = 72 - Width = 865 - Height = 428 + Top = 77 + Width = 871 + Height = 422 ExplicitTop = 77 ExplicitWidth = 865 ExplicitHeight = 423 end inherited TBXDock1: TTBXDock - Top = 46 - Width = 865 + Top = 51 + Width = 871 ExplicitTop = 51 ExplicitWidth = 865 inherited TBXToolbar1: TTBXToolbar @@ -237,15 +239,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 865 + ExplicitHeight = 500 inline frViewIncidenciasProv: TfrViewIncidencias Left = 0 Top = 0 - Width = 865 - Height = 500 + Width = 871 + Height = 499 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -258,30 +258,30 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitWidth = 865 ExplicitHeight = 500 inherited pnlSup: TPanel - Width = 865 - ExplicitWidth = 865 + Width = 871 + ExplicitWidth = 871 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end end inherited GroupBox1: TGroupBox - Width = 865 - Height = 472 - ExplicitWidth = 865 - ExplicitHeight = 472 + Width = 871 + Height = 471 + ExplicitWidth = 871 + ExplicitHeight = 480 inherited eIncidencias: TcxDBMemo - ExplicitWidth = 848 - ExplicitHeight = 445 - Height = 445 - Width = 848 + ExplicitWidth = 854 + ExplicitHeight = 453 + Height = 444 + Width = 854 end end end end end inherited StatusBar: TJvStatusBar - Top = 659 - Width = 879 + Top = 667 + Width = 885 Panels = < item Width = 200 @@ -291,9 +291,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 610 - Width = 879 - Height = 49 + Top = 609 + Width = 885 + Height = 58 Align = alBottom Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -303,124 +303,124 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 610 - ExplicitWidth = 879 - ExplicitHeight = 49 + ExplicitTop = 609 + ExplicitWidth = 885 + ExplicitHeight = 58 inherited dxLayoutControl1: TdxLayoutControl - Width = 879 - Height = 49 + Width = 885 + Height = 58 LookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 879 ExplicitHeight = 49 inherited Bevel3: TBevel - Left = 458 - Top = 11 + Left = 462 + Top = 1 Height = 30 - ExplicitLeft = 458 - ExplicitTop = 11 + ExplicitLeft = 462 + ExplicitTop = 1 ExplicitHeight = 30 end inherited Bevel4: TBevel - Left = 570 - Top = 53 + Left = 574 + Top = 43 Width = 21 - ExplicitLeft = 570 - ExplicitTop = 53 + ExplicitLeft = 574 + ExplicitTop = 43 ExplicitWidth = 21 end inherited Bevel1: TBevel - Left = 570 - Top = 169 + Left = 574 + Top = 159 Width = 73 - ExplicitLeft = 570 - ExplicitTop = 169 + ExplicitLeft = 574 + ExplicitTop = 159 ExplicitWidth = 73 end inherited Bevel2: TBevel Left = 120 - Top = 171 + Top = 161 Width = 368 ExplicitLeft = 120 - ExplicitTop = 171 + ExplicitTop = 161 ExplicitWidth = 368 end inherited ImporteDto: TcxDBCurrencyEdit Left = 191 - Top = 38 + Top = 28 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 191 - ExplicitTop = 38 + ExplicitTop = 28 ExplicitWidth = 253 Width = 253 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 641 - Top = 88 + Left = 645 + Top = 78 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 641 - ExplicitTop = 88 + ExplicitLeft = 645 + ExplicitTop = 78 ExplicitWidth = 252 Width = 252 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 571 - Top = 142 + Left = 575 + Top = 132 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 571 - ExplicitTop = 142 + ExplicitLeft = 575 + ExplicitTop = 132 ExplicitWidth = 322 Width = 322 end inherited edtDescuento: TcxDBSpinEdit Left = 120 - Top = 38 + Top = 28 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 38 + ExplicitTop = 28 end inherited edtIVA: TcxDBSpinEdit - Left = 570 - Top = 88 + Left = 574 + Top = 78 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 570 - ExplicitTop = 88 + ExplicitLeft = 574 + ExplicitTop = 78 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 570 - Top = 11 + Left = 574 + Top = 1 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 570 - ExplicitTop = 11 + ExplicitLeft = 574 + ExplicitTop = 1 ExplicitWidth = 323 Width = 323 end inherited edtRE: TcxDBSpinEdit - Left = 570 - Top = 115 + Left = 574 + Top = 105 DataBinding.DataField = '' DataBinding.DataSource = nil Style.LookAndFeel.SkinName = '' @@ -428,12 +428,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 570 - ExplicitTop = 115 + ExplicitLeft = 574 + ExplicitTop = 105 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 641 - Top = 115 + Left = 645 + Top = 105 DataBinding.DataField = '' DataBinding.DataSource = nil Style.LookAndFeel.SkinName = '' @@ -441,27 +441,27 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 641 - ExplicitTop = 115 + ExplicitLeft = 645 + ExplicitTop = 105 ExplicitWidth = 252 Width = 252 end inherited eImporteNeto: TcxDBCurrencyEdit Left = 120 - Top = 11 + Top = 1 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 11 + ExplicitTop = 1 ExplicitWidth = 324 Width = 324 end inherited ePorte: TcxDBCurrencyEdit Left = 120 - Top = 65 + Top = 55 Properties.OnValidate = frViewTotales1ePortePropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -469,13 +469,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 65 + ExplicitTop = 55 ExplicitWidth = 324 Width = 324 end inherited eIVA: TcxDBLookupComboBox Left = 120 - Top = 92 + Top = 82 DataBinding.DataField = '' DataBinding.DataSource = nil Style.LookAndFeel.SkinName = '' @@ -483,62 +483,62 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 92 + ExplicitTop = 82 ExplicitWidth = 186 Width = 186 end inherited bTiposIVA: TButton - Left = 310 - Top = 92 - ExplicitLeft = 310 - ExplicitTop = 92 + Left = 314 + Top = 82 + ExplicitLeft = 314 + ExplicitTop = 82 end inherited cbRecargoEquivalencia: TcxDBCheckBox Left = 120 - Top = 119 + Top = 109 DataBinding.DataField = '' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 119 + ExplicitTop = 109 ExplicitWidth = 324 Width = 324 end inherited edtRetencion: TcxDBSpinEdit - Left = 570 - Top = 189 + Left = 574 + Top = 179 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 570 - ExplicitTop = 189 + ExplicitLeft = 574 + ExplicitTop = 179 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Left = 641 - Top = 189 + Left = 645 + Top = 179 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 641 - ExplicitTop = 189 + ExplicitLeft = 645 + ExplicitTop = 179 ExplicitWidth = 180 Width = 180 end inherited edtFechaRetencion: TcxDBDateEdit Left = 120 - Top = 191 + Top = 181 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 120 - ExplicitTop = 191 + ExplicitTop = 181 ExplicitWidth = 280 Width = 280 end @@ -547,9 +547,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ShowCaption = False ShowBorder = False inherited dxLayoutControl1Group2: TdxLayoutGroup - inherited dxLayoutControl1Item8: TdxLayoutItem - Visible = False - end inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Group10: TdxLayoutGroup Visible = False @@ -567,9 +564,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup - inherited dxLayoutControl1Item12: TdxLayoutItem - Visible = False - end inherited dxLayoutControl1Item14: TdxLayoutItem Visible = False end @@ -579,6 +573,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor inherited dxLayoutControl1Group8: TdxLayoutGroup Visible = False end + inherited dxLayoutControl1Item3: TdxLayoutItem + Visible = False + end inherited dxLayoutControl1Item10: TdxLayoutItem Visible = False end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index 3e8eac6..b219b8a 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -18,7 +18,7 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Position = spFooter - Column = cxGridViewIMPORTE_TOTAL + Column = cxGridViewBASE_IMPONIBLE end> DataController.Summary.FooterSummaryItems = < item @@ -29,7 +29,7 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum - Column = cxGridViewIMPORTE_TOTAL + Column = cxGridViewBASE_IMPONIBLE end> DataController.OnCompare = cxGridViewDataControllerCompare OptionsView.GroupFooters = gfAlwaysVisible @@ -162,9 +162,9 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor Caption = 'Ref. Cliente' DataBinding.FieldName = 'REFERENCIA_CLIENTE' end - object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn - Caption = 'Importe total' - DataBinding.FieldName = 'IMPORTE_TOTAL' + object cxGridViewBASE_IMPONIBLE: TcxGridDBColumn + Caption = 'Base Imponible' + DataBinding.FieldName = 'BASE_IMPONIBLE' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify FooterAlignmentHorz = taRightJustify @@ -244,6 +244,8 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 673 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index 3634ed6..4c83ef5 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -46,7 +46,7 @@ type cxStylePendientes: TcxStyle; cxStyleParciales: TcxStyle; cxStyleRecibidos: TcxStyle; - cxGridViewIMPORTE_TOTAL: TcxGridDBColumn; + cxGridViewBASE_IMPONIBLE: TcxGridDBColumn; actProveedor: TAction; actAlmacen: TAction; TBXItem2: TTBXItem; @@ -277,15 +277,20 @@ begin inherited; if Assigned(ARecord) then begin - IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PedidosProveedorSITUACION).Index; - ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PedidosProveedorSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PedidosProveedorSITUACION).Index; - if (ASituacion = SITUACION_PEDIDO_PENDIENTE) then - AStyle.TextColor := cxStylePendientes.TextColor - else if (ASituacion = SITUACION_PEDIDO_PARCIAL) then - AStyle.TextColor := cxStyleParciales.TextColor - else if (ASituacion = SITUACION_PEDIDO_RECIBIDO) then - AStyle.TextColor := cxStyleRecibidos.TextColor; + ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); + + if (ASituacion = SITUACION_PEDIDO_PENDIENTE) then + AStyle := cxStylePendientes + else if (ASituacion = SITUACION_PEDIDO_PARCIAL) then + AStyle := cxStyleParciales + else if (ASituacion = SITUACION_PEDIDO_RECIBIDO) then + AStyle := cxStyleRecibidos; + end; end; end; diff --git a/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm b/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm index bdfb39e..03bb3c3 100644 --- a/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm +++ b/Source/Modulos/Pedidos de cliente/Reports/uRptPedidosCliente_Server.dfm @@ -502,14 +502,14 @@ object RptPedidosCliente: TRptPedidosCliente SQL = 'SELECT DET.ID, DET.ID_PEDIDO,'#10' DET.POSICION, DET.TIPO_DETA' + 'LLE,'#10' ARTICULOS.REFERENCIA, F_RTFTOTEXT(DET.CONCEPTO) as C' + - 'ONCEPTO, DET.CANTIDAD,'#10' DET.IMPORTE_UNIDAD - (DET.IMPORTE_' + - 'UNIDAD * (COALESCE(DET.DESCUENTO,0) / 100)) as IMPORTE_UNIDAD, D' + - 'ET.IMPORTE_TOTAL,'#10' ARTICULOS.REFERENCIA_PROV as REFERENCIA' + - '_PROVEEDOR'#10'FROM PEDIDOS_CLIENTE_DETALLES DET'#10'LEFT OUTER JOIN ART' + - 'ICULOS ON (DET.ID_ARTICULO = ARTICULOS.ID)'#10'LEFT JOIN PEDIDOS_CLI' + - 'ENTE ON (PEDIDOS_CLIENTE.ID = DET.ID_PEDIDO)'#10#10'WHERE DET.ID_PEDID' + - 'O = :ID_PEDIDO AND DET.VISIBLE = 1 AND {Where}'#10'ORDER BY DET.ID_P' + - 'EDIDO, DET.POSICION;'#10#10#10#10#10 + 'ONCEPTO, DET.CANTIDAD, DET.IMPORTE_UNIDAD, DET.DESCUENTO,'#10' ' + + ' DET.IMPORTE_UNIDAD - (DET.IMPORTE_UNIDAD * (COALESCE(DET.DESCUE' + + 'NTO,0) / 100)) as IMPORTE_NETO, DET.IMPORTE_TOTAL,'#10' ARTICU' + + 'LOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10'FROM PEDIDOS_CLIENTE' + + '_DETALLES DET'#10'LEFT OUTER JOIN ARTICULOS ON (DET.ID_ARTICULO = AR' + + 'TICULOS.ID)'#10'LEFT JOIN PEDIDOS_CLIENTE ON (PEDIDOS_CLIENTE.ID = D' + + 'ET.ID_PEDIDO)'#10#10'WHERE DET.ID_PEDIDO = :ID_PEDIDO AND DET.VISIBLE ' + + '= 1 AND {Where}'#10'ORDER BY DET.ID_PEDIDO, DET.POSICION;'#10#10#10#10#10#10#10 StatementType = stSQL ColumnMappings = < item @@ -551,6 +551,14 @@ object RptPedidosCliente: TRptPedidosCliente item DatasetField = 'CONCEPTO' TableField = 'CONCEPTO' + end + item + DatasetField = 'DESCUENTO' + TableField = 'DESCUENTO' + end + item + DatasetField = 'IMPORTE_NETO' + TableField = 'IMPORTE_NETO' end> end> Name = 'Informe_Detalles' @@ -588,6 +596,14 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'IMPORTE_UNIDAD' + DataType = datCurrency + end + item + Name = 'DESCUENTO' + DataType = datFloat + end + item + Name = 'IMPORTE_NETO' DataType = datFloat end item @@ -704,7 +720,7 @@ object RptPedidosCliente: TRptPedidosCliente PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 39065.872423495400000000 - ReportOptions.LastChange = 41807.715566319440000000 + ReportOptions.LastChange = 42864.516198865740000000 ScriptLanguage = 'PascalScript' ScriptText.Strings = ( '' @@ -712,35 +728,34 @@ object RptPedidosCliente: TRptPedidosCliente 'var' ' ACadena : String;' 'begin' - ' ACadena := '#39#39';' ' DireccionEnvio.Lines.Clear;' - ' if ( <> '#39#39') then' - ' ACadena := ;' - '' - ' if ( <> '#39#39') then' - - ' ACadena := ACadena + '#39' '#39' + ;' - '' - ' DireccionEnvio.Lines.Add(ACadena);' - ' ACadena := '#39#39';' ' DireccionEnvio.Lines.Add();' + ' ACadena := '#39#39'; ' ' if ( <> '#39#39') then' ' ACadena := + '#39' '#39';' ' if ( <> '#39#39') then' - ' ACadena := ACadena + ;' - '' + ' ACadena := ACadena + ;' ' if (ACadena <> '#39#39') then' ' DireccionEnvio.Lines.Add(ACadena);' - '' + ' ACadena := '#39#39'; ' ' if ( <> '#39#39') then' - ' DireccionEnvio.Lines.Add();' - '' + ' ACadena := + '#39' '#39';' ' if ( <> '#39#39') then' - ' DireccionEnvio.Lines.Add();' + ' ACadena := ACadena + ;' + ' if (ACadena <> '#39#39') then' + ' DireccionEnvio.Lines.Add(ACadena);' ' ' + ' ACadena := '#39#39';' + ' if ( <> '#39#39') then' + + ' ACadena := '#39'Persona de Contacto: '#39' + ;' ' if ( <> '#39#39') then' - ' DireccionEnvio.Lines.Add();' + + ' ACadena := ACadena + '#39'('#39' + + '#39')'#39 + + ';' + ' if (ACadena <> '#39#39') then' + ' DireccionEnvio.Lines.Add(ACadena);' 'end;' '' 'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);' @@ -1100,6 +1115,14 @@ object RptPedidosCliente: TRptPedidosCliente end item Name = 'IMPORTE_UNIDAD' + DataType = datCurrency + end + item + Name = 'DESCUENTO' + DataType = datFloat + end + item + Name = 'IMPORTE_NETO' DataType = datFloat end item diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index fff449c..917ec66 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -243,8 +243,6 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 757 - ExplicitWidth = 215 - Width = 215 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas index 8bd08e5..a40ceaa 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas @@ -371,14 +371,18 @@ begin inherited; if Assigned(ARecord) then begin - IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PresupuestosClienteSITUACION).Index; - ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); - if ASituacion = SITUACION_PRESUPUESTO_PENDIENTE then - AStyle.TextColor := cxStylePENDIENTES.TextColor - else if ASituacion = SITUACION_PRESUPUESTO_ACEPTADO then - AStyle.TextColor := cxStyleACEPTADO.TextColor - else if ASituacion = SITUACION_PRESUPUESTO_ANULADO then - AStyle.TextColor := cxStyleRECHAZADO.TextColor + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PresupuestosClienteSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PresupuestosClienteSITUACION).Index; + ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]); + if ASituacion = SITUACION_PRESUPUESTO_PENDIENTE then + AStyle := cxStylePENDIENTES + else if ASituacion = SITUACION_PRESUPUESTO_ACEPTADO then + AStyle := cxStyleACEPTADO + else if ASituacion = SITUACION_PRESUPUESTO_ANULADO then + AStyle := cxStyleRECHAZADO + end; end; end; diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index ee15563..3fbf6e0 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -226,8 +226,6 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 389 - ExplicitWidth = 215 - Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas index da89b8e..1ba673c 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas @@ -300,14 +300,19 @@ begin if Assigned(ARecord) then begin - IndiceCol := cxGridViewSITUACION.Index; - ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); - if (ASituacion = CTE_PENDIENTE) then - AStyle.TextColor := cxStylePendientes.TextColor - else if (ASituacion = CTE_COBRADO) then - AStyle.TextColor := cxStylePagados.TextColor - else if (ASituacion = CTE_DEVUELTO) then - AStyle.TextColor := cxStyleDevueltos.TextColor; + //ESTILO SITUACIONES + if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_RecibosClienteSITUACION)) then + begin + IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_RecibosClienteSITUACION).Index; + + ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); + if (ASituacion = CTE_PENDIENTE) then + AStyle := cxStylePendientes + else if (ASituacion = CTE_COBRADO) then + AStyle := cxStylePagados + else if (ASituacion = CTE_DEVUELTO) then + AStyle := cxStyleDevueltos; + end; end; end; diff --git a/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.dfm b/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.dfm index 73b3801..fef17b6 100644 --- a/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.dfm +++ b/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.dfm @@ -44,10 +44,6 @@ object fEditorTiposIVA: TfEditorTiposIVA TabOrder = 0 object TabSheet1: TTabSheet Caption = 'Tipos de IVA' - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Label1: TLabel Left = 6 Top = 12 diff --git a/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.pas b/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.pas index c1dbbbd..5380f18 100644 --- a/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.pas +++ b/Source/Modulos/Tipos de IVA/Views/uEditorTiposIVA.pas @@ -28,7 +28,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, uIEditorTiposIVA, uBizTiposIVA, uTiposIVAController, DB, uDADataTable, - ActnList, Grids, DBGrids, StdCtrls, ComCtrls; + ActnList, Grids, DBGrids, StdCtrls, ComCtrls, uDAInterfaces; type TfEditorTiposIVA = class(TForm, IEditorTiposIVA) @@ -79,7 +79,7 @@ implementation { TfEditorTiposIVA } uses - uDialogUtils; + uDialogUtils, uFactuGES_App; function TfEditorTiposIVA.GetTiposIVA: IBizTipoIVA; begin @@ -114,7 +114,8 @@ procedure TfEditorTiposIVA.actEliminarUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FTiposIVA) and FTiposIVA.DataTable.Active and - (FTiposIVA.DataTable.RecordCount > 0); + (FTiposIVA.DataTable.RecordCount > 0) and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; procedure TfEditorTiposIVA.actModificarExecute(Sender: TObject); @@ -126,7 +127,8 @@ procedure TfEditorTiposIVA.actModificarUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FTiposIVA) and FTiposIVA.DataTable.Active and - (FTiposIVA.DataTable.RecordCount > 0); + (FTiposIVA.DataTable.RecordCount > 0) and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; constructor TfEditorTiposIVA.Create(AOwner: TComponent); @@ -170,7 +172,8 @@ end; procedure TfEditorTiposIVA.actAnadirUpdate(Sender: TObject); begin (Sender as TAction).Enabled := Assigned(FTiposIVA) and - FTiposIVA.DataTable.Active; + FTiposIVA.DataTable.Active and + (AppFactuGES.UsuarioActivo.ID_PERFIL = 11); end; procedure TfEditorTiposIVA.FormShow(Sender: TObject); @@ -179,6 +182,11 @@ begin FTiposIVA.DataTable.Active := true; ListaTiposIVA.SetFocus; + + if (AppFactuGES.UsuarioActivo.ID_PERFIL = 11) then + actAceptar.Enabled := True + else + actAceptar.Enabled := False; end; end. diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index f6cb9483df747cb63753fae16d5ca4dc1acca512..a1e2df4e259a6f3dea5b42010f9b166479982b3a 100644 GIT binary patch delta 119 zcmZ3mm2tsV#tk}={A>&?3=9m63{ZNqb!0888G{~!;pDxM`cT%#NOi|DhD?T3h9ZVM wAX&_y!=S)m$Y2B{Q-FL0hFpe3hDwHfINylD04Q$`R%OUw1ypG|IWo!}0FMC`=>Px# delta 119 zcmZ3mm2tsV#tk}={45MC3=9k$KoU$(wvMc2HDSDelphi.Personality - FalseTrueFalse/standaloneTrueFalse4480FalseFalseFalseFalseFalse308212524.4.8.04.4.8.0lunes, 04 de abril de 2016 19:46 + FalseTrueFalse/standaloneTrueFalse4610FalseFalseFalseFalseFalse308212524.6.1.04.6.1.0martes, 14 de febrero de 2017 11:25 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dprFalse diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 624c629..7b04043 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 4,4,8,0 -PRODUCTVERSION 4,4,8,0 +FILEVERSION 4,6,1,0 +PRODUCTVERSION 4,6,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "4.4.8.0\0" - VALUE "ProductVersion", "4.4.8.0\0" - VALUE "CompileDate", "jueves, 28 de abril de 2016 19:13\0" + VALUE "FileVersion", "4.6.1.0\0" + VALUE "ProductVersion", "4.6.1.0\0" + VALUE "CompileDate", "viernes, 12 de mayo de 2017 11:25\0" END END BLOCK "VarFileInfo"