From 4189781476a76a38e359daeb1fa986c7e4ab8c1d Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 8 Jan 2008 18:58:09 +0000 Subject: [PATCH] Informe de facturas de cliente, recibos de cliente, y algunos iconos git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@96 f4e31baf-9722-1c47-927c-6f952f962d4b --- Resources/Iconos/Cuentas/16x16/Chart.png | Bin 0 -> 611 bytes Resources/Iconos/Cuentas/16x16/User-Edit.png | Bin 0 -> 818 bytes .../Iconos/Cuentas/16x16/addsubcuenta.png | Bin 0 -> 3656 bytes .../Cuentas/16x16/cuentasespeciales.png | Bin 0 -> 3602 bytes Resources/Iconos/Cuentas/24x24/Chart.png | Bin 0 -> 831 bytes Resources/Iconos/Cuentas/24x24/User-Edit.png | Bin 0 -> 1385 bytes .../Cuentas/24x24/cuentasespeciales.png | Bin 0 -> 4139 bytes Resources/Iconos/Cuentas/28x28/Chart.png | Bin 0 -> 816 bytes Resources/Iconos/Cuentas/28x28/User-Edit.png | Bin 0 -> 1728 bytes Resources/Iconos/Empresa/16x16/Outline.png | Bin 0 -> 390 bytes Resources/Iconos/Empresa/24x24/Outline-2.png | Bin 0 -> 573 bytes Resources/Iconos/Empresa/28x28/Outline-2.png | Bin 0 -> 627 bytes Resources/Iconos/logoacana.jpg | Bin 0 -> 50613 bytes Source/Base/Base.dproj | 7 - Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Cliente/Utiles/uClienteUtils.pas | 9 +- Source/Cliente/Utiles/uNavPaneUtils.pas | 3 +- Source/Cliente/uBootStrap.pas | 6 +- Source/Cliente/uNavPaneController.pas | 3 +- Source/Cliente/uPantallaPrincipal.dfm | 74 ++- Source/Cliente/uPantallaPrincipal.pas | 3 +- Source/FactuGES.inc | 3 +- Source/Informes/InfFacturaCliente.fr3 | 76 +++ Source/Informes/InfReciboCliente.fr3 | 90 +++ .../Plugin/uPluginContabilidad.dfm | 259 +++++++++ .../Contabilidad/Views/uEditorBalances.dfm | 77 ++- .../Contabilidad/Views/uEditorBalances.pas | Bin 4308 -> 4326 bytes .../Views/uEditorCuentasEspeciales.dfm | 205 ++++++- .../Views/uEditorCuentasEspeciales.pas | Bin 4887 -> 4905 bytes .../Contactos/Plugin/Contactos_plugin.dproj | 17 +- .../Contactos/Plugin/uPluginContactos.dfm | 140 ++++- .../Reports/uRptFacturasCliente_Server.dfm | 423 +++++++------- .../Reports/uRptFacturasCliente_Server.pas | 2 +- .../Views/uEditorFacturaCliente.dfm | 9 - .../uRecibosClienteReportController.pas | 6 +- .../Data/uDataModuleRecibosCliente.pas | 2 +- .../Reports/uRptRecibosCliente_Server.dfm | 550 +++++++----------- .../Reports/uRptRecibosCliente_Server.pas | 37 +- .../Servidor/srvRecibosCliente_Impl.pas | 12 +- .../Views/uEditorReciboCliente.dfm | 74 +-- .../Views/uEditorReciboCliente.pas | 6 - .../Views/uEditorReciboClienteReport.dfm | 6 +- .../Views/uEditorReciboClienteReport.pas | 3 +- .../Views/uEditorRecibosCliente.pas | 6 - .../Tipos de IVA/Plugin/uPluginTiposIVA.dfm | 2 +- .../Plugin/uPluginUnidadesMedida.dfm | 2 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dpr | 3 +- Source/Servidor/FactuGES_Server.dproj | 488 ++++++++-------- Source/Servidor/FactuGES_Server.rc | 2 +- 50 files changed, 1662 insertions(+), 943 deletions(-) create mode 100644 Resources/Iconos/Cuentas/16x16/Chart.png create mode 100644 Resources/Iconos/Cuentas/16x16/User-Edit.png create mode 100644 Resources/Iconos/Cuentas/16x16/addsubcuenta.png create mode 100644 Resources/Iconos/Cuentas/16x16/cuentasespeciales.png create mode 100644 Resources/Iconos/Cuentas/24x24/Chart.png create mode 100644 Resources/Iconos/Cuentas/24x24/User-Edit.png create mode 100644 Resources/Iconos/Cuentas/24x24/cuentasespeciales.png create mode 100644 Resources/Iconos/Cuentas/28x28/Chart.png create mode 100644 Resources/Iconos/Cuentas/28x28/User-Edit.png create mode 100644 Resources/Iconos/Empresa/16x16/Outline.png create mode 100644 Resources/Iconos/Empresa/24x24/Outline-2.png create mode 100644 Resources/Iconos/Empresa/28x28/Outline-2.png create mode 100644 Resources/Iconos/logoacana.jpg create mode 100644 Source/Informes/InfFacturaCliente.fr3 create mode 100644 Source/Informes/InfReciboCliente.fr3 diff --git a/Resources/Iconos/Cuentas/16x16/Chart.png b/Resources/Iconos/Cuentas/16x16/Chart.png new file mode 100644 index 0000000000000000000000000000000000000000..b73a44dac362c7174986fb8316a000286d155833 GIT binary patch literal 611 zcmV-p0-XJcP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ-*-1n}RCwBylRsz^aTLctm!3%~LL+okun0OOP!Y0p zbI2sFf&{F%9Eg9wpvIx72o4RUi*+eFWOpovR;PePXv9B7T&gj|a4ku5&2dS{{hmY8 zIgdyHy z5s`YWD7DIl9E9~9q%&E$a_IuDtA>J)ZyzTywcC4&aP>sk2YFR$YC1qDsE-8PeDIb) zXcB-I(KEdK<*Y`E#cL zxESdrw@g&i^c5?o;Ronr0RZNoTeZWBj z)wGBI#C;V@Cf1(K)PBeMS0A8LGf|HHcL&y<&D!$iLC2=a%)JSZ0~_VotcA}qoiN1b zVDWAofTWRv;tgUmv%myNBSm@PIZcG_ZA8}g%EmCdb+ xYz@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ;s7XXYRCwBilU+!YQ5eVn=Y8Mlwzlb}rVcl-ggGgh z^npQLL_`!yVAe$hhLP1p7uL-#yi=?o5KKZyf}n2d!h#%i(M>^m6>GyjbYkGlk2&|@ zKHm2|?|V)cwV{~xTs;TQ|HuD1&;Jn4IS3&r)VCKsmjL~CBAMR3x|Rxt=a%~W#==wB zp@hwc@YAj<4!ik@vDDx*mPpQBCh^SPTHCv8?F}dY3wYk!YSOuOCz(tO8<{NfvVv4b zfgljG*IhOY!18Ygw7cUe z1ym!jm)mgskQ0PyP!$E;o?o40>AspM*>9$ z=lVV@eHyD8FSGIs0Kgf8u4|x_;`3}QvKUvUr$)hF?+IZo^bA4}0Ql)GYYa{Qyp>3A zEK@~>swz+w1@S~$ee`B_cxn`@&21w%Ao;PJF#!O20742uYVt=twQQ8%{}O@u%t2#SO})8Ptv z0bq;R*>xDzEtMy>=YR^jAWIPP28bd9VZR;vx-|qJOXwV^L(TOT2q_6nlPWd?2`c(&#s0d6Txm!gtq|xeCJA|Tk=?H%x;)O w3uh3xqEStzIW11pxkY^mz&wEDW(U6p05XnB6LaUlIsgCw07*qoM6N<$f)`_8cmMzZ literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Cuentas/16x16/addsubcuenta.png b/Resources/Iconos/Cuentas/16x16/addsubcuenta.png new file mode 100644 index 0000000000000000000000000000000000000000..5882db44dfe13a248db97209515682dd0e572bdd GIT binary patch literal 3656 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 Y03VjFGzBuWSpWb407*qoM6N<$f&pIEL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Cuentas/24x24/Chart.png b/Resources/Iconos/Cuentas/24x24/Chart.png new file mode 100644 index 0000000000000000000000000000000000000000..ec588fa1d46d4fb2c357c966025d7488128c0640 GIT binary patch literal 831 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 literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Cuentas/28x28/Chart.png b/Resources/Iconos/Cuentas/28x28/Chart.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d2b614fb1bb066db02b2331ab13bcd8875f70e GIT binary patch literal 816 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 gD|t)ioaf98DL;Rlzopr0FOwX=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Empresa/24x24/Outline-2.png b/Resources/Iconos/Empresa/24x24/Outline-2.png new file mode 100644 index 0000000000000000000000000000000000000000..34461310c28319a3c95d32b8a4bf50c968c7035e GIT binary patch literal 573 zcmV-D0>b@?P)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ-vq?ljRCwC7R=rBYU=%${x3)TnB7zU$>;t&EiUn5% z!A3-G));qoHs0Pknj)(6Na*Rn_kb z+6@)~vo?ug$7-QfW zg6A1{#)Ip6_;ed6?yrWxnKhjt2p*TmN)-T4t-x^{q~%GPN3W+=(5WBA>#`j|&=0?C z8$Zalf}s9HV(o`D!F#<9@ik__L-i?9e-QysW;Fs=AE&n!)1knZgLm-NBr52him!-R=-jNy9?1Si= z$8F!0EZ9fLz@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ-=}AOERCwCFmP<+lK@f)jNOr*xP!UAIE4cCoy72V^3F=i%E|?nara#Ol`WUrswaf`nsk| zB7!2V3;?@F7lo*dEAD>;BTU-?p2_hVpF*ArH z7+Ii+!7SK0IF6?Dza}DJ77ztOMvz%R%<&r9R;g6Nd8gBf`Le9}`W_KumUKY?SYF%2 z-quFUr<8{8`%u1yQa+Tg;CTvP-Z!)++?;O5#4;lU5ED!C4X$HUEHgrr#x!46&7xzD zl>P@04(a^$I|-@8X>AksQGxf4Y6hm;y%Oq$#vVmHB7s}<=U z%z~$vw-^}qdVj~UZN#NjB~h3rrYUEHW@D{Z4SgoE>8Xj_(41Y~WDDA-w4t#(M_y<+ z3mRL@q{9HBi9^A>&?L6Dqzm16ev8$ue%Ao^=7aVSGnj%g5gM0Phd;M>;as-yXE@J;)Tp&pj8xW!3q0tP}YsTx_ z$Jm9oYfAK6=QObaHO$vN{wmfNA!GmOteA%|04yx87xMBh75&uz82~hrt{Rj)fO`M{ N002ovPDHLkV1fc@2gCpX literal 0 HcmV?d00001 diff --git a/Resources/Iconos/logoacana.jpg b/Resources/Iconos/logoacana.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0926f90c883a955bb63789f2e021733be4ae8cc3 GIT binary patch literal 50613 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 FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Cliente/Utiles/uClienteUtils.pas b/Source/Cliente/Utiles/uClienteUtils.pas index 2f5827d7..c16db6ad 100644 --- a/Source/Cliente/Utiles/uClienteUtils.pas +++ b/Source/Cliente/Utiles/uClienteUtils.pas @@ -7,13 +7,20 @@ uses function EsUnModulo(AMenuItem : TMenuItem) : Boolean; +function EsModuloVisible(AMenuItem : TMenuItem) : Boolean; implementation function EsUnModulo(AMenuItem : TMenuItem) : Boolean; begin - Result := (AMenuItem.Tag >= 0) and (AMenuItem.Tag < 9000) + Result := (AMenuItem.Tag >= 0) and (AMenuItem.Tag < 9000); +end; + +function EsModuloVisible(AMenuItem : TMenuItem) : Boolean; +begin + Result := AMenuItem.Visible; end; + end. diff --git a/Source/Cliente/Utiles/uNavPaneUtils.pas b/Source/Cliente/Utiles/uNavPaneUtils.pas index 7e9658ca..752765fb 100644 --- a/Source/Cliente/Utiles/uNavPaneUtils.pas +++ b/Source/Cliente/Utiles/uNavPaneUtils.pas @@ -28,7 +28,8 @@ begin for ItemIndex := 0 to (AMenuItem.Count - 1) do begin if ((not AMenuItem[ItemIndex].IsLine) // que no sea una línea separadora - and (AMenuItem[ItemIndex].Count = 0)) // y que no sea el padre de un submenú + and (AMenuItem[ItemIndex].Count = 0) // y que no sea el padre de un submenú + and (AMenuItem[ItemIndex].Visible)) // y que sea una acción visible para el submenú then with TTBXLink.Create(Application) do begin diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 12c2bf9a..39ceda38 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -23,12 +23,12 @@ begin begin LoadModule('FormasPago_plugin.bpl'); LoadModule('TiposIVA_plugin.bpl'); - LoadModule('Familias_plugin.bpl'); - LoadModule('UnidadesMedida_plugin.bpl'); LoadModule('Contactos_plugin.bpl'); {$IFDEF ALMACEN} + LoadModule('Familias_plugin.bpl'); + LoadModule('UnidadesMedida_plugin.bpl'); LoadModule('Almacenes_plugin.bpl'); LoadModule('Articulos_plugin.bpl'); {$ENDIF} @@ -39,8 +39,10 @@ begin LoadModule('RecibosCliente_plugin.bpl'); LoadModule('FacturasCliente_plugin.bpl'); + {$IFDEF PEDIDOSPROVEEDOR} LoadModule('PedidosProveedor_plugin.bpl'); LoadModule('AlbaranesProveedor_plugin.bpl'); + {$ENDIF} LoadModule('RecibosProveedor_plugin.bpl'); LoadModule('FacturasProveedor_plugin.bpl'); diff --git a/Source/Cliente/uNavPaneController.pas b/Source/Cliente/uNavPaneController.pas index 35206ff3..8ca080b7 100644 --- a/Source/Cliente/uNavPaneController.pas +++ b/Source/Cliente/uNavPaneController.pas @@ -117,7 +117,8 @@ begin // Guardar la lista de secciones (Ventas, Compras, etc...) for ASeccionCount := 0 to MainMenuController.MainMenu.Items.Count - 1 do begin - if not EsUnModulo(MainMenuController.MainMenu.Items[ASeccionCount]) then + if (not EsUnModulo(MainMenuController.MainMenu.Items[ASeccionCount])) + or (not EsModuloVisible(MainMenuController.MainMenu.Items[ASeccionCount])) then Continue; AListaSecciones.AddObject(StringReplace(MainMenuController.MainMenu.Items[ASeccionCount].Caption, '&', '', []), MainMenuController.MainMenu.Items[ASeccionCount]) diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index cc32d99b..6313970a 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -278,6 +278,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object actLogisticaMenu: TAction Category = 'Log'#237'stica' Caption = 'Log'#237'stica' + Enabled = False + Visible = False OnExecute = actLogisticaMenuExecute OnUpdate = actMenuComprasUpdate end @@ -347,6 +349,21 @@ object fPantallaPrincipal: TfPantallaPrincipal 00000049454E44AE426082} Name = 'PngImage0' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000000EE4944415478DA + 63FCFFFF3F0325801164C0D22D27C93225DAC79C116E00904350C3DF7FFF197E + FFF9CBF0EBF71F0687E02286733BA6116F00B2E645EB0E30CC5BBA09D3006E6E + 6E86AF5FBF82696CE0F9ABB70CBF7FFF6558BEF930760308D90CD20C62AFD97E + 0CBF01F85C72FDCE13864D7B4E127601369B7F81E97F0CDB0F9C26EC82B7EF3F + 32080BF263B8E0D4C5BB0CFB8F5FC06DC02FA04D2836C2D848E2474E5FC61D0B + AFDEBC67101311C41AA047CFDE021B7AEAC2354C03423D4C08DA0C133F7FF526 + A60101CE86446906B1AFDCBC836980B7BD1EC3920D0789CE071806F44E59485A + 4E0202B80194000082585AF04025F9110000000049454E44AE426082} + Name = 'PngImage2' + Background = clWindow end> Left = 51 Top = 181 @@ -429,6 +446,30 @@ object fPantallaPrincipal: TfPantallaPrincipal 1B2694FBE012B66F2C0000000049454E44AE426082} Name = 'PngImage0' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D + F80000000970485973000017120000171201679FD252000002064944415478DA + 63FCFFFF3F032D0123C882851B8E46B3B0B02CA1A6C17FFEFC89890FB05E0AB6 + 60E99693FFA37DCCC932E81F50FFBF7FFF19FEFEFD07C1FF40F47F06A7B06286 + 733BA631526401CC30080D321C62D1A67DA71826CD5C8569013737375CF3D7AF + 5F51F8F8C0CBD7EFE086832CDB7AE00C6E0B2273DA19964FA9845B00E2FFFAF5 + 87E1F7EFDF0CBF7EFF01B241F42F861F3F7E317CFFF193E1EAFE790CCF5EBE45 + 099E1D87CF52D7078F9FBD4609AEDD47CF63B780DC304717DF77E222610BC8F5 + CDD55B8F190E9CBA449C05B0F8F8F4F933031F2F2F51F171F1FA43862367AF90 + E68377EF3F320809F213E583B357EE339CB8708DB005B83210B6F007AB03E23F + 50B5A72FDFC06F01C8705E1E1E38FFC5ABB70C1262C244F9E0F8F9DB0CE7AEDE + C26D01CCE5FC7CBCF03878FAFC0D83B4A408517170E4CC4D868B37EE60B70039 + 5890C3FCD1D3570C72D26244F9E0E0C91B0C576EDFC5B420D2DB8CEC300789FD + F9F30FCEBF79FF01A605E19EA6E060810150EE94951225CAD5874FDF44B1ECCE + C347981604B91A31880809C0C3FDC193970C0A32E24485FBFE13D7917CFD8FE1 + FE93279816F83B1930888B0AC15D75F7E10B06657909A27CB0E7E855B8E1A00A + F2C1532C16F838E8630D7B4878A3C507344EFEA0C417C47010C06A81A7AD2E55 + 0CC769819BB536B8A2A01640B10054E94F9CB194AA957E7E4634A2D2A7250000 + 06681DFEF282FA5E0000000049454E44AE426082} + Name = 'PngImage2' + Background = clWindow end> Left = 83 Top = 181 @@ -599,6 +640,7 @@ object fPantallaPrincipal: TfPantallaPrincipal end object Informacindeempresa1: TMenuItem Caption = 'Informaci'#243'n de empresa' + ImageIndex = 3 OnClick = Informacindeempresa1Click end end @@ -614,20 +656,8 @@ object fPantallaPrincipal: TfPantallaPrincipal Caption = '-' end end - object Logstica1: TMenuItem - Tag = 3000 - Action = actLogisticaMenu - object N7: TMenuItem - Tag = 200 - Caption = '-' - end - object N8: TMenuItem - Tag = 300 - Caption = '-' - end - end object Compras1: TMenuItem - Tag = 4000 + Tag = 3000 Action = actMenuCompras object N9: TMenuItem Tag = 200 @@ -639,7 +669,7 @@ object fPantallaPrincipal: TfPantallaPrincipal end end object Ventas1: TMenuItem - Tag = 5000 + Tag = 4000 Action = actVentasMenu object N3: TMenuItem Tag = 200 @@ -650,6 +680,22 @@ object fPantallaPrincipal: TfPantallaPrincipal Caption = '-' end end + object Logistica1: TMenuItem + Tag = 5000 + Action = actLogisticaMenu + object N7: TMenuItem + Tag = 200 + Caption = '-' + end + object N8: TMenuItem + Tag = 300 + Caption = '-' + end + end + object Contabilidad1: TMenuItem + Tag = 6000 + Caption = 'Contabilidad' + end end object JvXPMenuItemPainter1: TJvXPMenuItemPainter SelectionFrameBrush.Color = 13811126 diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 157aa24f..cd5aa022 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -65,7 +65,7 @@ type actMenuCompras: TAction; actLogisticaMenu: TAction; actVentasMenu: TAction; - Logstica1: TMenuItem; + Logistica1: TMenuItem; pagInicio: TJvNavPanelPage; Panel1: TPanel; Label1: TLabel; @@ -90,6 +90,7 @@ type N8: TMenuItem; N9: TMenuItem; N10: TMenuItem; + Contabilidad1: TMenuItem; procedure FormCreate(Sender: TObject); procedure Salir1Click(Sender: TObject); procedure actSalirExecute(Sender: TObject); diff --git a/Source/FactuGES.inc b/Source/FactuGES.inc index 50642759..08af9c18 100644 --- a/Source/FactuGES.inc +++ b/Source/FactuGES.inc @@ -1 +1,2 @@ -{DEFINE ALMACEN} \ No newline at end of file +{DEFINE ALMACEN} +{DEFINE PEDIDOSPROVEEDOR} \ No newline at end of file diff --git a/Source/Informes/InfFacturaCliente.fr3 b/Source/Informes/InfFacturaCliente.fr3 new file mode 100644 index 00000000..b70bd740 --- /dev/null +++ b/Source/Informes/InfFacturaCliente.fr3 @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/InfReciboCliente.fr3 b/Source/Informes/InfReciboCliente.fr3 new file mode 100644 index 00000000..21a82669 --- /dev/null +++ b/Source/Informes/InfReciboCliente.fr3 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm index 3d80c525..79be17ee 100644 --- a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm +++ b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm @@ -498,6 +498,82 @@ object PluginContabilidad: TPluginContabilidad 4E44AE426082} Name = 'PngImage4' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D + F80000000970485973000017120000171201679FD252000003B54944415478DA + B5D57D4C13671C07F0EFB5B2E812339986B8F88FC67F345B966C7119BAB8F8B6 + 90C95458548AAB2020C88B2B982E02AD52AA1BBE44DCDC1F2E8BCBE68CC686E9 + 66A286FA12821A08906605362604116A95D20AED51105AEE6DCF3DCE0B47E36D + 23FA2497DFD3E7AEDF4F9EE7EE9E632449C2CB6C8C0C300CA31AB4549F95AACC + 46669A994AA3D9530139BCF67A03DCD7BE7BF1801C9EF461224AF655AB007BF1 + 9C34521C93FEEBB09D60D3FF17F02C3C7EF62C64167F3915902ABE0981F5BBE9 + EF6F0FAD0101FE75860A603D7E4E09D7E9186CFFFC600C20D7A4452CE29718E0 + A875A2F762645502B7B83E10D7035241AAE3F4C348FA730143F26A1A3E63860E + E905F618A0A4B29DF6FB9BF6A2C64901FCE41D47D4DD80F1E69BD8F3D5611080 + 792E60DCB4F629A0D7634B5EC57F02E4667B7F315E59B008D65F6F6A0319A9EB + 68B83C83D4EC7D3140B1CD4DEE955E057C6D2DA3E723F73B507EFEB23690BD39 + 8986CBC7860C4B2C50E1223D06BE16EBF4803CC3C734BCE31E8BA4FCDAC9D735 + D9D758124D96DB8018C5406BF5F48042633259221DE6AF3E07A9BD000FC3223D + 96AF3F0502C054EA24F941043ACFA800491410EDBB4B802BDA8029730374E47D + 485875969E5CF6EE42BC91300F979D2E0AECDE731EE2783F06FB6E28C0F1B22F + 20452388FA7A61715CD5064A766C849ECC60EECA333876301B1CC7A3B1E52F05 + 282C3A09E1491F4203ED0A506D36411C1B013734004B4DAD3660CE49A1C09C15 + A729108D4EA0C9D5A90005B9551046BBC10E795073BD8E02C74CF9E0C341884F + C2B0FCE2D406F6E67D0ABD4E87D9893FE24865264646C7D0F667AF02E4679581 + 1FEE001BF4E2427D2B058E1666830F062045C660BD54A70D94E76FA63779D67B + 3FC0566A40881D4157F7235CAB6BA5C02E6301B8901BC3A17E5C6C7CF014C835 + 827BDC0F9100FB9D4DDAC0FEA2AD74D39BB9EC14CC451B31180CE3DE7D1F1A9A + BB28909BB60DFC500B58D68FDF5C231438929586099F8702B6FA766DA0D264A0 + 40DC3BDF6367C63A0C0482F0781FE38F0E2F0576A6AE07377807C364CD2FB5C5 + 51E0D0672998F0F690C7770CF6E61EB4BD99A5DA4D7F779E6414C05E9C8EF068 + 843C453F634BCA72F8FC43F0075874F7042890F3C90764396E211C9114A06A6B + 32A29E2E40E060777960B9E3012F8878E01F46F981136AC09C938A1B8D9D3094 + 36ABF774F2D21D2889578DEDB63F82F9ADB9AAB1A9E1F256A35AA2B7972EC547 + 2B96E0F5D75E8DF970F0BC084E104815C091BE5C05122607CA7DFE9FFEE4F098 + 7B207F875F449BBC492AC0CB6C7F035D0EECEF5AA66FD20000000049454E44AE + 426082} + Name = 'PngImage5' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D + F80000000970485973000017120000171201679FD252000003B54944415478DA + B5D57D4C13671C07F0EFB5B2E812339986B8F88FC67F345B966C7119BAB8F8B6 + 90C95458548AAB2020C88B2B982E02AD52AA1BBE44DCDC1F2E8BCBE68CC686E9 + 66A286FA12821A08906605362604116A95D20AED51105AEE6DCF3DCE0B47E36D + 23FA2497DFD3E7AEDF4F9EE7EE9E632449C2CB6C8C0C300CA31AB4549F95AACC + 46669A994AA3D9530139BCF67A03DCD7BE7BF1801C9EF461224AF655AB007BF1 + 9C34521C93FEEBB09D60D3FF17F02C3C7EF62C64167F3915902ABE0981F5BBE9 + EF6F0FAD0101FE75860A603D7E4E09D7E9186CFFFC600C20D7A4452CE29718E0 + A875A2F762645502B7B83E10D7035241AAE3F4C348FA730143F26A1A3E63860E + E905F618A0A4B29DF6FB9BF6A2C64901FCE41D47D4DD80F1E69BD8F3D5611080 + 792E60DCB4F629A0D7634B5EC57F02E4667B7F315E59B008D65F6F6A0319A9EB + 68B83C83D4EC7D3140B1CD4DEE955E057C6D2DA3E723F73B507EFEB23690BD39 + 8986CBC7860C4B2C50E1223D06BE16EBF4803CC3C734BCE31E8BA4FCDAC9D735 + D9D758124D96DB8018C5406BF5F48042633259221DE6AF3E07A9BD000FC3223D + 96AF3F0502C054EA24F941043ACFA800491410EDBB4B802BDA8029730374E47D + 485875969E5CF6EE42BC91300F979D2E0AECDE731EE2783F06FB6E28C0F1B22F + 20452388FA7A61715CD5064A766C849ECC60EECA333876301B1CC7A3B1E52F05 + 282C3A09E1491F4203ED0A506D36411C1B013734004B4DAD3660CE49A1C09C15 + A729108D4EA0C9D5A90005B9551046BBC10E795073BD8E02C74CF9E0C341884F + C2B0FCE2D406F6E67D0ABD4E87D9893FE24865264646C7D0F667AF02E4679581 + 1FEE001BF4E2427D2B058E1666830F062045C660BD54A70D94E76FA63779D67B + 3FC0566A40881D4157F7235CAB6BA5C02E6301B8901BC3A17E5C6C7CF014C835 + 827BDC0F9100FB9D4DDAC0FEA2AD74D39BB9EC14CC451B31180CE3DE7D1F1A9A + BB28909BB60DFC500B58D68FDF5C231438929586099F8702B6FA766DA0D264A0 + 40DC3BDF6367C63A0C0482F0781FE38F0E2F0576A6AE07377807C364CD2FB5C5 + 51E0D0672998F0F690C7770CF6E61EB4BD99A5DA4D7F779E6414C05E9C8EF068 + 843C453F634BCA72F8FC43F0075874F7042890F3C90764396E211C9114A06A6B + 32A29E2E40E060777960B9E3012F8878E01F46F981136AC09C938A1B8D9D3094 + 36ABF774F2D21D2889578DEDB63F82F9ADB9AAB1A9E1F256A35AA2B7972EC547 + 2B96E0F5D75E8DF970F0BC084E104815C091BE5C05122607CA7DFE9FFEE4F098 + 7B207F875F449BBC492AC0CB6C7F035D0EECEF5AA66FD20000000049454E44AE + 426082} + Name = 'PngImage6' + Background = clWindow end> Left = 232 Top = 16 @@ -516,11 +592,13 @@ object PluginContabilidad: TPluginContabilidad object actBalances: TAction Category = 'Contabilidad' Caption = 'Balances' + ImageIndex = 5 OnExecute = actBalancesExecute end object actCuentasEspeciales: TAction Category = 'Contabilidad' Caption = 'Cuentas especiales' + ImageIndex = 6 OnExecute = actCuentasEspecialesExecute end object actCuentas: TAction @@ -981,6 +1059,150 @@ object PluginContabilidad: TPluginContabilidad 454E44AE426082} Name = 'PngImage4' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000002234944415478DA + 6364400255BD4BFEB715C7303290001891356FDF7594E1FCCEE970B1C67C81FF + C88AEB277E60C46A004873A09B2D435A4907DC0090E6BA09EF193E7D78CCF0EF + E71B8649ED4ED80D00698EF67766F8FBF71F437C5E0B8A0120DA5DF10358E1CE + FB020CF7D7FE40D1BCE0C90F46B00149A1EE600322321A500CC8ABDCC7C0C42E + 02569CAFABC630FFF177869FE78F327C3FB987A1B0B5036140669437C3DF7FFF + 1802936AF01A000E07736548F89CBC8B30A0383910EC023187C570E7353A5531 + C00CF80F0C8302132B86FEEA0AB83C8A0BAA32431978CCE732FCBF94C9F0E4D3 + 3F30DED5230A36E0FF8F57C0407CC550E29C0637E0DFF7EF0CC57D13110634E6 + 4732B01ACE044B9A182980695F8128B0017F3F5E61F80734A4CCBB066C0048F3 + BFEF5F184AA7CF4518D05A14CDC0A8379DA1A73909EEC4AFFB25C006FC7CB482 + E1FFAFD70C9511CBC106FC7A7A1F6C40E5CAADB80DF8F8E92B03CB5965B0013F + EE4C06BBA03A612FD8801F772E03F95F19AA371EC06EC0A327AF183E7DFECAA0 + F8C2126CC097B3196003EAF35F800DF8727A2FD0055F19EA0F5FC36EC095EBF7 + 19F6CE8D6048F17E0836E0D3D120069B727E06E71F37C1067C3AB4096C80DD15 + 0E0611652B06140364BF43023236B39481FD510EC39CADF270FEB3FE1486BD1C + EAF030028981F20ED880DC783F0609615E8C9CF6EDC76F86AFDF7F016920FEF9 + 8BE1C7CF3F0CDF8162205C5ADF0F4E74E05467E89EF99F8144004BB100E8BE59 + E0AED726660000000049454E44AE426082} + Name = 'PngImage5' + Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD25200000A4D694343505068 + 6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF + F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A + 561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5 + 7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8 + 1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC + 01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200 + C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05 + 00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2 + 00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C + CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97 + 4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313 + 48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F + 223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA + 560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED + 2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383 + FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A + F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86 + 4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432 + 79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0 + 812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C + 0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70 + 170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261 + 48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA + 90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F + 5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961 + 5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402 + 8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2 + 272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93 + 48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90 + 6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452 + A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650 + 2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83 + 1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7 + 192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295 + 3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9 + 09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685 + 46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9 + EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C + 4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED + EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB + 79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31 + 3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87 + 67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94 + 6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85 + A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6 + 5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29 + D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B + 743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6 + 4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD + D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7 + C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E + 3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B + FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5 + 0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1 + 15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0 + 476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67 + BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845 + F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC + A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7 + 6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA + 68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C + 949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423 + F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433 + DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317 + 772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2 + A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17 + 955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4 + EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E + CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9 + 26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD + 8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF + B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C + 7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD + EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293 + E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7 + 5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F + EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6 + EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07 + FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247 + CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73 + ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC + CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F + F73EE77CFEFC2FF784F3FB25D29F33000003804944415478DA45936B6C145514 + C7FF7766F6D96E9DD2ADBA45E4A1480CADFD5053D2DA6A688A36015B9F21044D + 8CC6F841340408C4C444BFC987565452572C36D8B4B52F427641884AA4DD6D83 + 10A49A1212ACB62E8F6ECB769DB6B33B3B8F3B33DED925E124939B3B77CEEFFC + E7FCEF21C3DF1F8E8678A109B091B4ACB8E2D972CA1D0872966510CBB2C17136 + FC3E176ECF2D90F07783714555A73C2E0184103841267ADBD57AD9EF7136D25A + 1B97293BB09DC70228856C08A8AC7D05CB8A85E1C8CFB7864F9F7FD9CDF3BF0B + 025F00C47ADBA546D92FDEDA403133A7C0A76B80C5924D93AD065678829C3B00 + D7BA06D4D63D83AE9EE8CD9EA11FDFA494C6388E0319EFEB906A15B7789E2CE3 + A93B0A4AB34BACB00173711956568331378F496D1AE90347302B9540CBCA885D + FCE3EC7F4BCB3B388EB7C9C5BE76497443949269D42516417314349D01953320 + 3915D3FC14320DDBB1696F1857FEFC07B3376FE3786FF44C7261F145B7D38BB1 + C1CF25505BAC5AB88B92441ADA8A029301CCAC025D4EE1929140F5C859881575 + E02C1DF1DF6EE0EDB7BA53A979A59CB56086F4873F91ABE653C58F4D26A0B3EA + 969A8369A820A04804FE82F4DCAB787AFF0928B20C69298B377675A1B1F189EB + 9D9DBF6E668066D2FD71DBBF81C8990705AFE8234EF7999DCEC23C44A6D88567 + 4FFC84A2B24AD8A68AA3472F20C15476857747BD457BDAF22E7CF55EBDDF7A20 + D8B6FDFDEEFE8A521E9ACE7A402DE8CC428E17E00F943226CD5BD6D4D4812F8E + EC4455F59A48E8A5E8CE47371473E4EBC3FBE159F7C28E96E686D315653EE434 + 139A6142672038821C4B992A272A42073097EC8058EC8A7CF0E5D5D74F5E9DE7 + 48D7C80408C7B5366FD91809958BC8E6B4BC026ADE4F74221E9F46B873147D03 + EFA2C82344CB82FB0ABF706C28C6AEA5DDBAB5F6C9C8C3C11206301880B27BC4 + 92C97DC0C4F8DFF8263C869EDE7760DB883EBEFEA302E0DBA13106406B63CDA6 + 48F9AA00949CCEAA9B70E6802983F3B513D7AEDDC1877B7E406CFC1038427E59 + BBE6E0F3794078E0027B81D6AD759591505084A268D0997C839AAC0504859921 + 8C63A1A6FA53EC3BB86D745BCBE693F5359FF5B18343E4D8E028049EBCF6D0AA + C070F26EBA90C88A9AF72AE7018E0BC48589D1590CF64C22F44820955AC81AD4 + B0F6928173979D5EADEF1F39D772FDC60CBC5E4F4136B937919C0BC4BB9AB373 + 09CB51A2AE70ABD50C826E1F8E27A6AC2BFF034532AC3BDDD1324B0000000049 + 454E44AE426082} + Name = 'PngImage6' + Background = clWindow end> PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] Left = 308 @@ -1419,6 +1641,43 @@ object PluginContabilidad: TPluginContabilidad 350000000049454E44AE426082} Name = 'PngImage4' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF + 940000000970485973000017120000171201679FD252000003A24944415478DA + BDD6794814511800F06FD695220A3BA4FF82A2FEE88090105A83448C922C3A29 + B522D2E80EDB142ADDCAB4EC80EC262B232D3A362C3292AC3CA243714DB4C46E + C3CC32A35CD75D9DD973A6F73EF5B1E3AC32DAF1C1C7DB7933BBBFF9BED9F718 + 4E9224F89FC15190E338C589E48CABD2C1C455DC007EB3D740CB1748B18247A5 + 50FD30F3DF83148B08D5817E77860C4CDD363C8A0C07484EE89A3292CC4B3969 + B93960B01B0B183A1862F5E93DC18F7B4FB42266B53482E8F805A70E851B0918 + 3320D01BF3D7FAC1AAAD693D41FC77458CB3E071906E0D1CB991070454DD7606 + 1A8E5D936134A336A62840FDBE1AF6E58ED7FB212B3717EA6FDBC3C8E14692D1 + 5EAD3E97F3D5FEA44F70796418C3341A0E96ADDFAB163466370A8839AA4B4130 + 15C1F6F4C34602C6F409AE5C30AB13F4272069F1A238835A108F53A68FC771D0 + 98F1907CEB111090EB135CB3640E625A3F0D56387F75926AF0B861179B17DE57 + A903D745CD45ACBBA5112B7628C0F8A412D00C0AFC3BE0A615F31846C7F0E589 + BD82929B07FE7DC69F81F1AB178056AB81C0D02BC1E4DC1992BAAEEBCA496E4D + 0D4FAEA420864700A13EE7CFC084B8455859C08CEC72A96613625FAD22664864 + 5639017508128C2E7A4753BE02943C6EB0D7D5A80377AE5F8AED1CA6BB842783 + A78DC5312478329CBE701F08081414F9CE5DC6D5522E032926390470347E5407 + 1A362F033F8D06060767C1D1FD71ECA286C66619E86EAD46D0D35E270345DE06 + A29D07D7CF6FEAC07DF1D158A136E87C9FA0B3B91024670B88CE5619E836FF20 + 372280C76A5607A6E963B0426E6A26035D2E173435B7C840C717236292D30C17 + EF1633D0F9FD33A95020F3823A303D61254E768314B3B50B24791928D4652226 + 92BC5450CD407BFD5BC424871D0CF79EF61F34B75A11A368CEF5C70CE4DFA423 + 46D1ECE20606D2E540315AE59EC217FD07E9B3A3589BB503EEE45730B0FD6522 + ABF0F2331B03F99A32C4E8734C795ADB7FB0F66D3D626DB60E2879F29A81B68A + 5856E115933F03DB2B8A11A3996AFA04AFA6C4F6F4A0EAC159AE57B0D4548B98 + 956465D56706B63D5F88180D6FD0FA2C1F3120EB31B5B201F48575E0728B243D + 60E51D90947652099ADB781835F33282F78B4C88D1F0062D2533D91D7B8396A2 + 5CC470DF25E096820F328CEECBB29626AE5D0C8565EF207AA749D10AB2D5419A + 7E84627EC39E2FB02B68B462DE17A6788653274D82D93326C2C88021E02BDC9E + CEF6D074BB7D7C7679BAE6449F9802A4EFA17F3B7ABED732F07FC66FC8CFCCF6 + FD53D0090000000049454E44AE426082} + Name = 'PngImage5' + Background = clWindow end> Left = 232 Top = 80 diff --git a/Source/Modulos/Contabilidad/Views/uEditorBalances.dfm b/Source/Modulos/Contabilidad/Views/uEditorBalances.dfm index d7fe896f..89df3e48 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorBalances.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorBalances.dfm @@ -6,27 +6,37 @@ inherited fEditorBalances: TfEditorBalances PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Caption = 'Lista de cuentas' + Caption = 'Lista de balances' inherited Image1: TImage Picture.Data = { - 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 - 0000180806000000E0773DF80000000970485973000017120000171201679FD2 - 520000000467414D410000B18E7CFB5193000001D44944415478DAB5D4BD4B02 - 7118C0F1E737D552D0105843616F838519166551345443A32D2E0DD15863FF41 - 6B2141353544144A2004114144431695841445D00BE950E7905618742F2257CF - D9D9EFCE3BEF4EF001797E9CFAFD1C8A125114A19C43648010A2F98205AF5D7C - 611296C3FE33961802189F5909C13B1383EFF427B05FB94738B40976BB0DC6E7 - 56FEAE7D289EF7EF3E422010280E941ADF589E8754A3AF3820C7F10DA9D798A5 - 785D8D0D6EAB87F5013A8E81D46BDC521C471750C731F0CEC44DC55B1B9A41E0 - 0510848C36B038D15410C7F3C1FAB261BCABC3998BF31969472B070A81D97E52 - D20F62D0E381CCEF5DF3129043CE494F21B03445C4B1D169C360369B95223C27 - C0D17E181CCE36E963A19163C1551A40C731747274019DDDED529C460EBF1CD6 - 01751CCF91D328F40DBA81653905B2976CB10668C5715F5DDEC2D088473AD3C8 - 0ED3681ED08BE3BEBBB997001C1AD98ED79B038AC5F14E9FEE9FF3008D6C3DD4 - 1A03EA38FBCDE501FE6F332F090520236BD755C5013A22A8367D3DF9962C0056 - 2315100C06FFFF21D480D938EE743AAD00E4389E3581E1A149D371FC0E388ECD - 03745C17F0F4FA4CC77164401DD705DC2EAFE9B80CE03FA73AAE0B9C733EB03A - 5A714DA05C5376E00756B52DFEBD3C9AE50000000049454E44AE426082} + 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018 + 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741 + 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000 + 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000 + 17110000171101CA26F33F000002C149444154484BB5954D48545114C76D17D4 + A25D9B5C460B3308AC4D41EE8C32B05412A9A6C51028A1696A144AB970FA945A + 98B52988C4928C0269B42F48481D92B4C4D486D1E77CBD99E7F8E6CB512747F9 + 37E7D6DCE6CE3C782A79E1F0DE8337BFDF39E7CE3B7713808C0D5D5A822BCD6D + FFC5CAD8A90282EFCD2BDB1801C17B076D6982C6CA6D27E381A478B69AB60A15 + 24E023136E2D41FC5D20E01D6241A2350992E1A35659534050CBBD0CFCEC2961 + 82B33B361FAADB9E4557FCBDA655C52B2001654EF08929AFA62014708062BC9B + 0B5855D1A1CF083CB8C644A9550982319B87C16D76DFAA0504950AB3E0AEC8D7 + 1724E0D36E555310F44B691550E6149EDA627D01654E709712D016A83604D549 + A1456B1224E06FFB246464B726C7006D6A401941C033B87E0165EE9D0D31302D + 67680503CE187B6602D9025532A709FCF71BE22D2AD26F11C167D430CF3CC760 + C6B1DA2F5CA04E77C337FE4810F85BEAA136D740AE29D417105C0D4618F0CEEB + 28AEBF8808029FB51DDE61932050EFD6C1D75406B9FAB8BE80E0C1B9052E68EA + 080B8299D156782C55187F7322F1A161F6D60578EBCF40AE2AD017107C6E3ECA + 04375FCEA3FE894F1028DF6EC0DD7B1A3F5EE572C18CA93CDE9E22B8CF1FD117 + 107C31BAC40457DBFCA868B123AFB29FEF8177F0329CEF0E63B463CF3F41A391 + C19DC65C7D01C1A3BFFEFC6B2E3E74C1601AC301E3472E90FBCBE1E8CAC1C8D3 + 4C2E501A0C0C6E3FB55F5FB0145B466C7985018DB7ADC8AFB520BBA48B0BDC9F + 4A31DD9989EF8FB77081E75209ECA5FBD8B8A0B141E7487208B388E06A709E01 + 8B1B8671F0DC07EC2CE8E402D7FBA390DAB70A02B9BA300EDF0DA96017135825 + 0534D37AFA2698481010FCB9F96BEA57CC3EBA94C3862542C0E44885D3641504 + 04A71F6AAD586C050BF13D0A4716D93BCA6C18B2128443F663CAE14BCB3C31B6 + 05416AFFD6FB9C7C267001DD6C54FC0655D24B589BE60D550000000049454E44 + AE426082} end end inherited TBXDock: TTBXDock @@ -130,7 +140,7 @@ inherited fEditorBalances: TfEditorBalances end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink - ReportDocument.CreationDate = 39422.603399155090000000 + ReportDocument.CreationDate = 39422.603399155080000000 BuiltInReportLink = True end end @@ -150,7 +160,7 @@ inherited fEditorBalances: TfEditorBalances end inherited EditorActionList: TActionList [4] inherited actNuevo: TAction - ImageIndex = 22 + ImageIndex = 23 end end inherited SmallImages: TPngImageList [5] @@ -678,6 +688,31 @@ inherited fEditorBalances: TfEditorBalances 10910DF85FFC2BE6F80376357B8923C9356C0000000049454E44AE426082} Name = 'PngImage22' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000002234944415478DA + 6364400255BD4BFEB715C7303290001891356FDF7594E1FCCEE970B1C67C81FF + C88AEB277E60C46A004873A09B2D435A4907DC0090E6BA09EF193E7D78CCF0EF + E71B8649ED4ED80D00698EF67766F8FBF71F437C5E0B8A0120DA5DF10358E1CE + FB020CF7D7FE40D1BCE0C90F46B00149A1EE600322321A500CC8ABDCC7C0C42E + 02569CAFABC630FFF177869FE78F327C3FB987A1B0B5036140669437C3DF7FFF + 1802936AF01A000E07736548F89CBC8B30A0383910EC023187C570E7353A5531 + C00CF80F0C8302132B86FEEA0AB83C8A0BAA32431978CCE732FCBF94C9F0E4D3 + 3F30DED5230A36E0FF8F57C0407CC550E29C0637E0DFF7EF0CC57D13110634E6 + 4732B01ACE044B9A182980695F8128B0017F3F5E61F80734A4CCBB066C0048F3 + BFEF5F184AA7CF4518D05A14CDC0A8379DA1A73909EEC4AFFB25C006FC7CB482 + E1FFAFD70C9511CBC106FC7A7A1F6C40E5CAADB80DF8F8E92B03CB5965B0013F + EE4C06BBA03A612FD8801F772E03F95F19AA371EC06EC0A327AF183E7DFECAA0 + F8C2126CC097B3196003EAF35F800DF8727A2FD0055F19EA0F5FC36EC095EBF7 + 19F6CE8D6048F17E0836E0D3D120069B727E06E71F37C1067C3AB4096C80DD15 + 0E0611652B06140364BF43023236B39481FD510EC39CADF270FEB3FE1486BD1C + EAF030028981F20ED880DC783F0609615E8C9CF6EDC76F86AFDF7F016920FEF9 + 8BE1C7CF3F0CDF8162205C5ADF0F4E74E05467E89EF99F8144004BB100E8BE59 + E0AED726660000000049454E44AE426082} + Name = 'PngImage23' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Contabilidad/Views/uEditorBalances.pas b/Source/Modulos/Contabilidad/Views/uEditorBalances.pas index 5dcc2f421c4775ad0fe00c7b80740f8fc559cbb4..e3f844b0b3dcbf8563819373e4adf6de37b4fd00 100644 GIT binary patch delta 29 lcmcbj_)KxbQzii&g_H_+7tes4(qiYF#Ny)3kC{I50sya93(x=n delta 12 UcmaE+ctvr;Q>M+|ncnjP04mD{JOBUy diff --git a/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.dfm b/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.dfm index 89ec4f80..66b13296 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.dfm @@ -2,7 +2,6 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales Left = 489 Top = 325 Caption = 'Lista de cuentas especiales' - ExplicitWidth = 320 ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 @@ -10,24 +9,59 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales Caption = 'Lista de cuentas especiales' inherited Image1: TImage Picture.Data = { - 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 - 0000180806000000E0773DF80000000970485973000017120000171201679FD2 - 520000000467414D410000B18E7CFB5193000001D44944415478DAB5D4BD4B02 - 7118C0F1E737D552D0105843616F838519166551345443A32D2E0DD15863FF41 - 6B2141353544144A2004114144431695841445D00BE950E7905618742F2257CF - D9D9EFCE3BEF4EF001797E9CFAFD1C8A125114A19C43648010A2F98205AF5D7C - 611296C3FE33961802189F5909C13B1383EFF427B05FB94738B40976BB0DC6E7 - 56FEAE7D289EF7EF3E422010280E941ADF589E8754A3AF3820C7F10DA9D798A5 - 785D8D0D6EAB87F5013A8E81D46BDC521C471750C731F0CEC44DC55B1B9A41E0 - 0510848C36B038D15410C7F3C1FAB261BCABC3998BF31969472B070A81D97E52 - D20F62D0E381CCEF5DF3129043CE494F21B03445C4B1D169C360369B95223C27 - C0D17E181CCE36E963A19163C1551A40C731747274019DDDED529C460EBF1CD6 - 01751CCF91D328F40DBA81653905B2976CB10668C5715F5DDEC2D088473AD3C8 - 0ED3681ED08BE3BEBBB997001C1AD98ED79B038AC5F14E9FEE9FF3008D6C3DD4 - 1A03EA38FBCDE501FE6F332F090520236BD755C5013A22A8367D3DF9962C0056 - 2315100C06FFFF21D480D938EE743AAD00E4389E3581E1A149D371FC0E388ECD - 03745C17F0F4FA4CC77164401DD705DC2EAFE9B80CE03FA73AAE0B9C733EB03A - 5A714DA05C5376E00756B52DFEBD3C9AE50000000049454E44AE426082} + 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018 + 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741 + 4D410000B18F0BFC6105000000206348524D00007A26000080840000FA000000 + 80E8000075300000EA6000003A98000017709CBA513C00000009704859730000 + 17110000171101CA26F33F000005F249444154484B7D950954945518862F9AA2 + C725C92C2D2D174C2B3C29E5392EA5A688961E4D33734754C446054D73064501 + 9545365359676010942DE4E0129882E9801AA48902C2A0C48E800CB36F6CF376 + EFCF4090DACC79CE9DFFBB73DEF7BBF77EFF772D4467BC058306F4F124209D1F + 0B42543A78598D9D916C39741481C944D897CD03A00348474707696F6B238307 + 0F2451B1A9A4A2AAB6DCD2B2BF59E03F43A2C8D784B030B48776820821326303 + 208AB980D8E4DF7136290B3149991CE2C44C44275E434A7A366EE695E2EAED62 + F0DC233179EE96F553ED7790698B7E78019220F43532616378080C1453682820 + 0EC7BD383FE4461F476EF831E4867921F78C27F24E1F4156D00164A4C5D3C500 + 0F8A6B91FD5705047E7198F8B9C346DBC5FF63C0C4210E45FE8560649C0B8224 + E924240941C88E0BA404205BEC8F9CE813B826F481285208C9AD9B48CDC8C1FD + E21A3CAD9683EF1B07EBD90E3B6C17F37AADA27B05A6302A7E311829223F147A + EC45A9FB3E480FEF43C9A1BD283EE48A22B79D28707346A1DB3614ED5D8ED80F + 4620D05B80B2865634A98C28AF55C1F36452FBE4398E2E3DB78A333045844317 + 7C0AC9A147F1D8731FE0E304D3518A9713DAF81BD0B27315F45B9642BBC60EBA + 95B390BFDC126976637027270D0E3F0961BFCE0D4B1C0E63D1FA83F864A173F4 + 0B066C6BEEC5FB2325D207EA4057B453E116AFED30ECDF04ED8ED5506F5A06C5 + 6A7BC8BF998BC61DB6B8349220EBF86E749800C9FD3224FC9A0751F20DECF711 + E3C3B95B427B192445FB19B5C127914AB32FF03E00783BC1E8D929AE73A6E21B + 9741F99D3D9A57CC85FCDB9978B86220A266BF034DDD0328B4ED902B7568A654 + D72BB09D1F8EC16F6FBEDBB7DFF64C337C921AE56BACBCF233E2438E417FC205 + AD1E5BA1E732FFBE3B73262E5B3513F57C1BA48DB180C4C309BA0EA049AE417D + 938AE351491D264C12800AF78288C37C8DE96911283AED05046C83E19023F4BB + D742BB7525D46BBF8262E53C34AF9C8DE6F5D321DD3208211FBD0E8DBA0A4D0A + 231A646A3C7BAEE298F6E9510C1FB1074ECEE7D80A08C58A1249A202042D92AF + AD21DD331165AEA351CA7B17A54E2321DDF616157C13258E6FA0C4C10A52E761 + 48184D70EF300F548F8A2ABBC50382AF71590BC5392C166A3660268408FD7E54 + 89861263F870D21631E635448EEA8B483632DEEBD78D90FE3E633D048DCFEB20 + 57EB21A7FDA40BDBCF8E61BE5DA0F959DFDB20DC7B8F659015B13CEDB9D9A5B4 + 4683B656235A8C06E8F57A68341A28556AC8E44A3436C9D14C4785C608A546DF + CDC3C21A2EFB5321595C0CE8E00CFA2F481A30CBED461F12EEED42845E1B484C + BA94F7A4B2916B016DED1D30B6B441AB6F85526D804CA14363B3063273C5B0AA + E9E2E4E92CCEE0C1A36A2E06DAD1B8ADF9227EDCEC8337069298F3C924F1BA94 + 445FC8E1492B1A380383B1958AB740A531D0C3D4727BCD2AA5EB407B8EEE1E17 + 3983AE985AA3EDDEA2E907322D487CC60372FE4A2E89A206C57F3FA3DD19D0E8 + D83618B88C9ED35264D5D22053BD94790B02C0E89A7FE190CF5DFE83304429D9 + BCC227B56869ED80821EA28C66CEB685554B0D7D89AAEBE52F65CE97FE60F498 + EF7DC87197EE12863045C27B28AD81CE409B975CCB655DD7A842D533392AEB9A + 5F09131F3B41D073FEE506226A905F520DB5F6DF17A89A8A57D4CA505E23A3E3 + CB4D782EF1DC193CA2778339919E065624F6E21D0EE12FB778F78AAAB81A6799 + 73E234F3B26A19A415CFF1A492D1D48B521A3BEE97CE1930A3CA670AD4342863 + CD2F9A1D1DF9E46CDA6D8EC8E45BBCBC8272A8E80A3AF79E9A3428699F97D30B + 4586D28A263CAD92514366DAC913FACC62EF8FE39B98C9A48FDD0B6DA67A449A + 1B1D33E613716A364758C20DDEE3B27A1494D6E0B79C025CBF53846B3985B89A + 5D8074C9235CB9998F0C3AF6A6803E17E09430B37DC8B05DF2AE46D7CFD259CD + C4593FA2F52FE13877F9AEAB7BE079EED258B0468085F41261D8AF3B087B1AEB + C53A018DF33B63E6F9250E473063918083FE66E29DBDA8CB20E9EA9F43D7ECF2 + 1F3F6EE6C6F136F39D5ECD3CC7F153961EB59EB24A3CD166DE2BFF3B946A10C6 + 3FA327B93991E7C4140000000049454E44AE426082} end end inherited TBXDock: TTBXDock @@ -91,9 +125,19 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales inherited dxLayoutControl1: TdxLayoutControl Width = 543 ExplicitWidth = 543 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit Left = 337 ExplicitLeft = 337 + ExplicitWidth = 121 + Width = 121 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -121,7 +165,7 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink - ReportDocument.CreationDate = 39422.701746956020000000 + ReportDocument.CreationDate = 39422.701746956030000000 BuiltInReportLink = True end end @@ -141,7 +185,7 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales end inherited EditorActionList: TActionList [4] inherited actNuevo: TAction - ImageIndex = 22 + ImageIndex = 23 end end inherited SmallImages: TPngImageList [5] @@ -669,6 +713,125 @@ inherited fEditorCuentasEspeciales: TfEditorCuentasEspeciales 10910DF85FFC2BE6F80376357B8923C9356C0000000049454E44AE426082} Name = 'PngImage22' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD25200000A4D694343505068 + 6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF + F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A + 561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5 + 7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8 + 1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC + 01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200 + C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05 + 00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2 + 00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C + CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97 + 4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313 + 48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F + 223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA + 560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED + 2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383 + FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A + F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86 + 4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432 + 79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0 + 812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C + 0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70 + 170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261 + 48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA + 90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F + 5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961 + 5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402 + 8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2 + 272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93 + 48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90 + 6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452 + A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650 + 2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83 + 1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7 + 192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295 + 3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9 + 09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685 + 46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9 + EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C + 4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED + EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB + 79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31 + 3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87 + 67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94 + 6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85 + A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6 + 5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29 + D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B + 743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6 + 4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD + D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7 + C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E + 3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B + FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5 + 0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1 + 15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0 + 476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67 + BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845 + F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC + A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7 + 6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA + 68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C + 949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423 + F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433 + DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317 + 772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2 + A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17 + 955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4 + EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E + CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9 + 26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD + 8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF + B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C + 7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD + EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293 + E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7 + 5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F + EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6 + EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07 + FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247 + CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73 + ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC + CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F + F73EE77CFEFC2FF784F3FB25D29F33000003804944415478DA45936B6C145514 + C7FF7766F6D96E9DD2ADBA45E4A1480CADFD5053D2DA6A688A36015B9F21044D + 8CC6F841340408C4C444BFC987565452572C36D8B4B52F427641884AA4DD6D83 + 10A49A1212ACB62E8F6ECB769DB6B33B3B8F3B33DED925E124939B3B77CEEFFC + E7FCEF21C3DF1F8E8678A109B091B4ACB8E2D972CA1D0872966510CBB2C17136 + FC3E176ECF2D90F07783714555A73C2E0184103841267ADBD57AD9EF7136D25A + 1B97293BB09DC70228856C08A8AC7D05CB8A85E1C8CFB7864F9F7FD9CDF3BF0B + 025F00C47ADBA546D92FDEDA403133A7C0A76B80C5924D93AD065678829C3B00 + D7BA06D4D63D83AE9EE8CD9EA11FDFA494C6388E0319EFEB906A15B7789E2CE3 + A93B0A4AB34BACB00173711956568331378F496D1AE90347302B9540CBCA885D + FCE3EC7F4BCB3B388EB7C9C5BE76497443949269D42516417314349D01953320 + 3915D3FC14320DDBB1696F1857FEFC07B3376FE3786FF44C7261F145B7D38BB1 + C1CF25505BAC5AB88B92441ADA8A029301CCAC025D4EE1929140F5C859881575 + E02C1DF1DF6EE0EDB7BA53A979A59CB56086F4873F91ABE653C58F4D26A0B3EA + 969A8369A820A04804FE82F4DCAB787AFF0928B20C69298B377675A1B1F189EB + 9D9DBF6E668066D2FD71DBBF81C8990705AFE8234EF7999DCEC23C44A6D88567 + 4FFC84A2B24AD8A68AA3472F20C15476857747BD457BDAF22E7CF55EBDDF7A20 + D8B6FDFDEEFE8A521E9ACE7A402DE8CC428E17E00F943226CD5BD6D4D4812F8E + EC4455F59A48E8A5E8CE47371473E4EBC3FBE159F7C28E96E686D315653EE434 + 139A6142672038821C4B992A272A42073097EC8058EC8A7CF0E5D5D74F5E9DE7 + 48D7C80408C7B5366FD91809958BC8E6B4BC026ADE4F74221E9F46B873147D03 + EFA2C82344CB82FB0ABF706C28C6AEA5DDBAB5F6C9C8C3C11206301880B27BC4 + 92C97DC0C4F8DFF8263C869EDE7760DB883EBEFEA302E0DBA13106406B63CDA6 + 48F9AA00949CCEAA9B70E6802983F3B513D7AEDDC1877B7E406CFC1038427E59 + BBE6E0F3794078E0027B81D6AD759591505084A268D0997C839AAC0504859921 + 8C63A1A6FA53EC3BB86D745BCBE693F5359FF5B18343E4D8E028049EBCF6D0AA + C070F26EBA90C88A9AF72AE7018E0BC48589D1590CF64C22F44820955AC81AD4 + B0F6928173979D5EADEF1F39D772FDC60CBC5E4F4136B937919C0BC4BB9AB373 + 09CB51A2AE70ABD50C826E1F8E27A6AC2BFF034532AC3BDDD1324B0000000049 + 454E44AE426082} + Name = 'PngImage23' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.pas b/Source/Modulos/Contabilidad/Views/uEditorCuentasEspeciales.pas index 50584b5dc63ebeec92bdefcd2e298ef64e40a21b..dcaa71417200934ff5a7f2ea23f6af3e23e70491 100644 GIT binary patch delta 29 kcmbQPwo+|_5VL@eLP~|Zi)TPiX|Z!oVsY_i0cLgq0E$8g)c^nh delta 12 TcmZ3fHeGFl5c6ggW>x_J8yEvY diff --git a/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj b/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj index 82a3ff5a..6c7f524e 100644 --- a/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj +++ b/Source/Modulos/Contactos/Plugin/Contactos_plugin.dproj @@ -48,16 +48,17 @@ MainSource - - - - - - - - + + + + + + + +
PluginContactos
+ TDataModule diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm index 2a0982f0..de76d419 100644 --- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm +++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm @@ -207,13 +207,62 @@ object PluginContactos: TPluginContactos 000049454E44AE426082} Name = 'PngImage7' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D4948445200000018000000180806000000E0773D + F8000000097048597300000AC400000AC401666D82D40000052F4944415478DA + 9596794C14571CC7BF73ECBD8BE06E16835204A1423CAAD636581B6B2D6AD50A + D8186A6BEABFA5872D264AD4D668AAAD47AAD4D436452555898146C588D5AA35 + 0A06F1C083D48A16AC72ACDCAB0BBB3BB3BB73F5CDB018114CD6497E79B36FDE + FB7CDEFBBD79F3965214051445E1D9EBF8F6052347391D798A22CFE2F94074AF + 8F6BEFE8F29EA9AA6D2DDA7BEA9E0B115ED45082AB451FBF95F092E3304DC1E1 + F373D0C2D757763DF2BA2B6FB4E7169EB8779434955E5870ECFB39C913C6255D + B6988C764114C0F341F8391EFEB048BDF7F282FF7045E3D2E3D56DE5A48BF242 + 82AAC29CDF631D51393419BE24C9080643E00301705C80C039F0E4B7DABABEC5 + 5BBF664FEDDBE4B63562C1AE95AF8D989C1CFFC06C361A695227C93204414080 + 403B1FF9E1EAE4111B63848E0E91678A5270E8DFBC2B77BA7791AE724482E2B5 + D3178D1C117344A76328B54E961578BC013475F0700EB761728A032CA5A0A1C5 + 8D879D1EFC71B1F94459554B0EE9CA4524F86BC7FC1524BF3B0221115C488128 + 338873C6607C921D261D0591AC894866A4968140107F56375EC8DF73E37DD2D5 + 1D91E0F2AF59790EBBBDA0871361351B106D33822C05644922EB2186E122A4B0 + E86C4DF395E5BB6A1691AE6D4F5E924994BAE8ABB36A95AD8304E70BE6652727 + C695310C4BD10CA32DA6FA5C266BA10A24B12FB49990F2D0B986CA0D076EA929 + EAEC87BFF7D117A09B8A517EB147930C10FC923BD1993163C20393C960A6685A + ABEF1768120295D59988DA6C946D25B5078BCF36E592AEFEC3A5858A6E4B2E32 + A70F03AA3D285734E6A641AF694D6176996378D4224D107EC995B0A03F55AAA8 + A79713966CBCB0B2B99BFF99C0C5376766A1BDBD1D6507F6E3D5733FA2AD5601 + 31538304C56BD3A74C4D4DA8D2E959D3130169A3C82A5CD2246AFE4F5F6DAECB + DFFBF7B28A7DB9D7EE0626213D3D1D8D8D8D9AA4B4A414159515D4733F15C737 + CECC4F4E706CA6C9A5C1C3A1C149FE5BBBBCBE4F775EDBBC7FDBB2EF5ECF180F + DA750DFB6AD3B5BE4FC38716AC079D8AA4EC2C7DECEE254EA79D6C090257D323 + 6B336872FB956F2FDEBB5FF041E6987E781BD7898EFA9358BC69145C2ED780D1 + 0E108C5D658F639D097B28BB699EAC0F5173EF8EC6342B0B83EC415090D1DC6B + 40B1B71E3BDF988948E003042FAF494835458F3A83187DBC64269F024B084EB7 + 191BC6AC874EA7D716F9ECA3D398E571470C7F2248F9D21E65758CBF42459952 + 55B04C42B20621198258E65B8CE5B3F350D375196CD5D121E1C372622FDDDE7D + 3D0B3E740D2998B4766ABECE1CB755B2087D704B509B816C164043441A9582CF + FEB3E0BC2B13EB169E1C00777E35118C8F45DBCD1BEB5CE5AE2D84290E124C5D + FDCE25DA6C4B5753231389569A88C824403190CDC5CAC82CF2E19BA5D3F04375 + 3616C6E76870477E1A184E0FC6AF87CFE5BA59F75BCDBBFDBB7AA060D5DC078C + C93A5A036B70223112B891C07512D63F1C879AEA4A7C3E2511DB4FDCC7B10611 + F6AFC782E175A05501A703D7D1D176ABA82A8330EB060B566454B2C6E133D451 + 6B70123219B9A227A19331E6C848DC6FB88339137C38333B1E7490051D20F000 + ABCD8026A2DED69696BA8397E613E63F8304699FA42DB09A134B688BD9261BC3 + 6931F48D1E243DF24FDD484A4943E3DC6E5022F9848498A7240C823D3D5C53C5 + F5438FEF3CCE1F3245EAE9322CD53CC53A3AE64343B4ED15D66A88A32D8C0D7A + 4A4F91412A6A2BF50813150921084A481164BFC889BD210FD7D1D3ECB9EDBE20 + F8E45384D78267CEE86777324DC248C246C212BE67C3F5EAB1A8FE8B10C21122 + C1872388E71C9BFF03819532AB3875DFD60000000049454E44AE426082} + Name = 'PngImage6' + Background = clWindow end> Left = 232 Top = 16 Bitmap = {} end object ModuleActionList: TActionList - Images = LargeImages + Images = SmallImages Left = 40 Top = 72 object actClientes: TAction @@ -251,6 +300,7 @@ object PluginContactos: TPluginContactos end object actProcedenciasCliente: TAction Caption = 'Procedencias de cliente' + ImageIndex = 6 OnExecute = actProcedenciasClienteExecute end end @@ -443,6 +493,36 @@ object PluginContactos: TPluginContactos 00000049454E44AE426082} Name = 'PngImage7' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000002CA4944415478DA + 7D936B48935118C7FF6717753275F3D2E62CCB0A15115141F14BD2170BC450EC + 1E89A225D9851C5DB0483492402824BC942559604266F8212AD23E885A88A80C + 0761A6D568329D9BBBE82EEFDE77EFDBBB8143B1F5C081C339CFEFC773CE790E + E1380E84106CC4EC9BEAB380F79AC56ADF6134D934DA05C3BD3B5DDA710409B2 + 59A0ED29AF5228E54F9D4EB7C062B1C16CB162C56C770E6B964B3ADFCD0FFD57 + D0A7CE932467EFD3854B42E3280F8DB535070C2B5630B40706936BB6B67D2A87 + CF5F0F2EB89B5FA052440F0A0542B8281A7AA303CA984848C380399D916BEAD1 + 1E9EFF631F0A2A186D2FAE5A5DF774D10C815C1689E45D321096818772C3E972 + E161EF6465F7A0AE3BA860A2B3F86842BCA25F2416FB37BC0C039A2F9FA62850 + 949B6BE89AA8EA1FD3FB05EE4C709F40EA8A355C7340F0B6E9407C56F21E9D38 + 24C46F6059963F3FEDBF03BBDDC194D47F2E583453C33E587CE60AE8DE56F092 + 8F5B5E61BAABF4755444F809DF9CE3055EAFAF0A1AE3338BB3E75A26F2C79FC0 + A8DF3B03D3CC2B08AE376F7FC617EABC84F434C5A43454AC64F975DF31566DEB + 9E9BCFA66B1F5DB5746414B56179EE035E8EE442D5D8886A9E0F0852EB543142 + 95AA239A90E36A6A3F8900DF030E8256CB6FAE25F51BD9807DE358D34EE8F57A + 12A820E3D66EB9203A698C8DE3D218B913A7982294A6946260690087161A100C + 0E08B2EB0FB611B9E412CDC38CDC85B050A030AE0047A6EE6F876DFA58ACC1BC + 459073BB50C7C904898CCC0526CA05AF9442EDB21A99741914C9850158559E0B + DDE8C8C9E51153DF56C18DA29F244294C444B9FD301BEEC165570D2ACA4E43F3 + 5CE4879517B220B249B0F065E4E2CAD7A5C75B0419E7F32A84D28807C2187134 + 2B65091BCAC07CFF7BA0DB1435E9E0ACACC7FEC33833FF5E53091ADA7FFDC6D8 + B044518A54199E088950CAB110701443336EDAC99869BB73D16BE0737EF1C3BA + B995FF02F23E8C514129D4FC0000000049454E44AE426082} + Name = 'PngImage6' + Background = clWindow end> PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] Left = 308 @@ -482,6 +562,64 @@ object PluginContactos: TPluginContactos 6AD20000000049454E44AE426082} Name = 'PngImage2' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D494844520000001C0000001C0806000000720DDF + 94000000097048597300000AC400000AC401666D82D4000006474944415478DA + A5D6796C14551C07F0EFCCECD1DDB2BD0FB1B4288240B15C4DB05AC4832A8A72 + 24A0048F3F3448AB18225E104563221E281E4882518BE295A22287072A72B426 + A05284526D0B2D2D5B5CD8B6D82EDB6E6777E77AFEDE4CB7B6520CD597FCB2B3 + BBEFBDCFFE7EEFEDBC11709EF6D9F2A2C48B47A6153BEDD20C4551B342DDE1AE + 6067775DBDB7A36CE5FB55BBA88B8AFFD084813EDCFFEE9D85970C4B2F7338A4 + 6C590EA35B8E400EF3D730BABA64D6EC0F567CB1A7A97877F59F0DD49DFD2FF0 + EB97674E9C306EC45EB7CB99A4AA2AC29128E41E90E372388230C5C936B9F6DD + AF8ECDAF690E1D1D0CDA0FFCEC764897DD76F7E1F4D4843C81BED1341D544E13 + 0DF7401C8C2A0A18633850D7B1FBE54DB50B6868FB7F02B7BE78D3BC9139999F + DBED36811A745D87AA6A2610E12845FB5919369141920484229AFE6A59EDE2EA + 13C18D34DC1834B8E3959B375376F32451A46F04188641596A6696C1500475CD + 9D484F1E82E47809D1683724EAF65D65CBDED2AF8FCFA7E11D8306B7BF50D49A + 94E0CA107B40466097ACA0F1344D6E73A020F722A4253AA0D38F683A1540734B + 00550DEDADEBB61C9D41C38F0C0AFCE481BCE4E41159BEA8A2BA197D1C08A9E8 + 0C3324277A30E9F24CA42739A968BA993107354DA52C151CF3B607E63D5B3E8B + A6D83710B07DA2C037D48A39556C753F707DC9F88C1BAE9D70D21F883AE5888E + B4E4785C9CEE81CB2199A5E5EBA913C231EBDA424FB70543D31FFB81977427FE + B15B3976DB9D0F416CFE085FEE0B9A682FB8381FF687972D6C4B4AF42489A204 + 81CACA370EDF8DBCB486A1F7623C4B43D7CC57AFAF2330F3A9BD0BFF096EDEF4 + 36B3BF5482D98589F4C73E8B2F9949ADEAB7868737CCAF484B4D9CC6D7D05C47 + 2A00430CA4E09999619595C74FBF9DF22E7AEDC05DD4797F5F6CEA7573D0D2D2 + 822D1F7E80FC3D6FC05FC55062EE8C3EADFCF5198F5C927DD11AC204C104ADD6 + 0BF6A25A6F893FDED9B06FF5A775F752B706738E8D25EC6864220A0A0AE0F57A + 4D7453D9269457940BE7ECD2B78A27644D2B1C5DEB76C525087D7E0B2F6B5F30 + 565EBA03E94BDEFCE5ADCAFAC04AEA16E4D894A22B20FA0E6263558139B62F76 + 0EC8DBF7AB6F7C764476DA3394A1D017E45932666D1EC35C4715076ADAFE58BC + B6F261EAB28D303D86F9E536B4D6EFC0FC55C3E0F3F9FA19E780778FCF8C2F5E + 347967468AE7EA7E602CCB9E1DDA1194A34BD71FDCF0BBB7EB39C2FC17820D08 + F236EDFEAC5B968ECEFD2237CDE3627D328C6D9A6077943DFF556DF5AE7D2D4B + CB4B4B2A2E143B071CB3C4932A65E7AC41DA907B1CDD8A74DF991C4CCE50E076 + 0866391555C7F13306D6D57971669C0BEF5D3A1583C1FA816356E4E4DB53876E + 15925DD9864B81EE5231AE71186E4D9A8170A019727727A2CC8DA3C269FC34BC + 1AA562E1A0B15E70ECF2E1939C49C3F720C191A41366B85518044A11154F391F + C7B553AEA7D341426BB71FF7D52CC64BBED1D8EB9B8DA767EDE88F857D597450 + 9DFE5770D832B8523D53AB258F67248762A06EA20AC6B46463ED35EB00BAC396 + 1C294693DD8FD9EFC85879D75558B37F2E6665DF6162990F4E605D4DC73FAD2F + 3D564CF3769E17CC5B9EBB24CE3D6A1D6524F4622E2B43339C2A52BADC08B964 + 44E30CAC3A72252AF75760C9E44BF1EA374DD8DEA021FDD1719064078C90A235 + 7EF3E3826075781BCE733E0A939E98F683CD955214037AB1381E1A9883EE9B76 + 1A4B377D41173176FD183435D4E1A6BC107616E5400ADB21F604BF6EAD3954E6 + DD7E8267D9352098FFE8F47AC99538CA044C90107EEDD4CC60761D4C32ACD536 + 04D89F543062D45834CDF1438CDA2C2CF237DADE587BF0F8E69AB9D4FBD4C0E0 + B2E9BFDA9C2993AD8CACACCC7058D9319B6181BC33DDF1058D4E11954E13C566 + 81915858E099C6DF0F376EAB9947DD4F0CBC864BF35F88B78F5C4188C041E6B4 + 30C3A15BD91108B1E7D4A1175E5641E3A0049107A142D46EA24204ACE9978A6F + DB7E6E5B44BDFD0382A957C3937E795EA93B25638EE48E77323AD819618689F1 + 60E6FA99253541C10229530E0A0442D159347036D45275AC92B0B7A9E7569CE7 + 4139F62775210E931247C515BA3313726D435C43C5385BB2E8909C9018CD4AA4 + CECC53D8D098C6A2BA6A4499A287A321B533D22EB7854F854FAA7534CF218A7A + FCCB53B930C07B3B451C85B327240AD1CACFDCEA3A85D627D49ED070010FC47F + 017259CFAF05A567900000000049454E44AE426082} + Name = 'PngImage1' + Background = clWindow end> Left = 232 Top = 80 diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index 0e159ef9..05b63180 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -20,44 +20,48 @@ object RptFacturasCliente: TRptFacturasCliente Fields = < item Name = 'ID' - DataType = datAutoInc + DataType = datInteger DictionaryEntry = 'FacturasCliente_ID' InPrimaryKey = True end item - Name = 'ID_EMPRESA' - DataType = datInteger - DictionaryEntry = 'FacturasCliente_ID_EMPRESA' + Name = 'REFERENCIA' + DataType = datString + Size = 255 + DictionaryEntry = 'FacturasCliente_REFERENCIA' end item Name = 'FECHA_FACTURA' DataType = datDateTime DictionaryEntry = 'FacturasCliente_FECHA_FACTURA' end + item + Name = 'IMPORTE_NETO' + DataType = datCurrency + end item Name = 'BASE_IMPONIBLE' - DataType = datFloat + DataType = datCurrency DictionaryEntry = 'FacturasCliente_BASE_IMPONIBLE' end - item - Name = 'REFERENCIA' - DataType = datString - Size = 20 - DictionaryEntry = 'FacturasCliente_REFERENCIA' - end - item - Name = 'IMPORTE_DESCUENTO' - DataType = datFloat - DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO' - end item Name = 'DESCUENTO' DataType = datFloat DictionaryEntry = 'FacturasCliente_DESCUENTO' end item - Name = 'IMPORTE_IVA' + Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency + DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO' + end + item + Name = 'IVA' DataType = datFloat + DictionaryEntry = 'FacturasCliente_IVA' + end + item + Name = 'IMPORTE_IVA' + DataType = datCurrency DictionaryEntry = 'FacturasCliente_IMPORTE_IVA' end item @@ -66,17 +70,17 @@ object RptFacturasCliente: TRptFacturasCliente end item Name = 'IMPORTE_RE' - DataType = datFloat + DataType = datCurrency end item Name = 'IMPORTE_TOTAL' - DataType = datFloat + DataType = datCurrency DictionaryEntry = 'FacturasCliente_IMPORTE_TOTAL' end item - Name = 'IVA' - DataType = datFloat - DictionaryEntry = 'FacturasCliente_IVA' + Name = 'OBSERVACIONES' + DataType = datMemo + DictionaryEntry = 'FacturasCliente_OBSERVACIONES' end item Name = 'FORMA_PAGO' @@ -95,27 +99,22 @@ object RptFacturasCliente: TRptFacturasCliente Size = 15 DictionaryEntry = 'FacturasCliente_NIF_CIF' end - item - Name = 'OBSERVACIONES' - DataType = datMemo - DictionaryEntry = 'FacturasCliente_OBSERVACIONES' - end item Name = 'NOMBRE' DataType = datString - Size = 100 + Size = 255 DictionaryEntry = 'FacturasCliente_NOMBRE' end item Name = 'CALLE' DataType = datString - Size = 150 + Size = 255 DictionaryEntry = 'FacturasCliente_CALLE' end item Name = 'PROVINCIA' DataType = datString - Size = 30 + Size = 255 DictionaryEntry = 'FacturasCliente_PROVINCIA' end item @@ -124,6 +123,12 @@ object RptFacturasCliente: TRptFacturasCliente Size = 10 DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL' end + item + Name = 'POBLACION' + DataType = datString + Size = 255 + DictionaryEntry = 'FacturasCliente_POBLACION' + end item Name = 'TITULAR' DataType = datString @@ -150,10 +155,9 @@ object RptFacturasCliente: TRptFacturasCliente Size = 15 end item - Name = 'POBLACION' - DataType = datString - Size = 150 - DictionaryEntry = 'FacturasCliente_POBLACION' + Name = 'ID_EMPRESA' + DataType = datInteger + DictionaryEntry = 'FacturasCliente_ID_EMPRESA' end item Name = 'NIF_CIF_EMPRESA' @@ -355,43 +359,97 @@ object RptFacturasCliente: TRptFacturasCliente TargetTable = 'FACTURAS_CLIENTE' SQL = 'SELECT'#10' V_FACTURAS_CLIENTE.ID, V_FACTURAS_CLIENTE.REFERENCIA,' + - ' V_FACTURAS_CLIENTE.FECHA_FACTURA,'#10' V_FACTURAS_CLIENTE.BASE_I' + - 'MPONIBLE, V_FACTURAS_CLIENTE.DESCUENTO, V_FACTURAS_CLIENTE.IMPOR' + - 'TE_DESCUENTO,'#10' V_FACTURAS_CLIENTE.IVA, V_FACTURAS_CLIENTE.IMP' + - 'ORTE_IVA,'#10' V_FACTURAS_CLIENTE.RE, V_FACTURAS_CLIENTE.IMPORTE_' + - 'RE,'#10' V_FACTURAS_CLIENTE.IMPORTE_TOTAL,'#10' V_FACTURAS_CLIENTE' + - '.OBSERVACIONES, FORMAS_PAGO.DESCRIPCION AS FORMA_PAGO, V_FACTURA' + - 'S_CLIENTE.ID_CLIENTE,'#10' V_FACTURAS_CLIENTE.NIF_CIF, V_FACTURAS' + - '_CLIENTE.NOMBRE, V_FACTURAS_CLIENTE.CALLE,'#10' V_FACTURAS_CLIENT' + - 'E.PROVINCIA, V_FACTURAS_CLIENTE.CODIGO_POSTAL, V_FACTURAS_CLIENT' + - 'E.POBLACION,'#10' CONTACTOS_DATOS_BANCO.TITULAR,'#10' CONTACTOS_DA' + - 'TOS_BANCO.ENTIDAD,'#10' CONTACTOS_DATOS_BANCO.SUCURSAL,'#10' CONTA' + - 'CTOS_DATOS_BANCO.DC,'#10' CONTACTOS_DATOS_BANCO.CUENTA,'#10' ID_EM' + - 'PRESA, EMPRESAS.NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIA' + - 'L,'#10' EMPRESAS.CALLE as CALLE_EMPRESA, EMPRESAS.POBLACION as PO' + - 'BLACION_EMPRESA,'#10' EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EM' + - 'PRESAS.CODIGO_POSTAL as CODIGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELE' + - 'FONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EM' + - 'PRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIP' + - 'O'#10'FROM V_FACTURAS_CLIENTE'#10'LEFT JOIN EMPRESAS ON EMPRESAS.ID = ID' + - '_EMPRESA'#10'LEFT JOIN FORMAS_PAGO ON (FORMAS_PAGO.ID = V_FACTURAS_C' + - 'LIENTE.ID_FORMA_PAGO)'#10'LEFT JOIN CONTACTOS_DATOS_BANCO ON (CONTAC' + - 'TOS_DATOS_BANCO.ID_CONTACTO = V_FACTURAS_CLIENTE.ID_CLIENTE)'#10'WHE' + - 'RE V_FACTURAS_CLIENTE.ID = :ID' + ' V_FACTURAS_CLIENTE.FECHA_FACTURA,'#10' V_FACTURAS_CLIENTE.IMPORT' + + 'E_NETO,'#10' V_FACTURAS_CLIENTE.BASE_IMPONIBLE, V_FACTURAS_CLIENT' + + 'E.DESCUENTO, V_FACTURAS_CLIENTE.IMPORTE_DESCUENTO,'#10' V_FACTURA' + + 'S_CLIENTE.IVA, V_FACTURAS_CLIENTE.IMPORTE_IVA,'#10' V_FACTURAS_CL' + + 'IENTE.RE, V_FACTURAS_CLIENTE.IMPORTE_RE,'#10' V_FACTURAS_CLIENTE.' + + 'IMPORTE_TOTAL,'#10' V_FACTURAS_CLIENTE.OBSERVACIONES, FORMAS_PAGO' + + '.DESCRIPCION AS FORMA_PAGO, V_FACTURAS_CLIENTE.ID_CLIENTE,'#10' V' + + '_FACTURAS_CLIENTE.NIF_CIF, V_FACTURAS_CLIENTE.NOMBRE, V_FACTURAS' + + '_CLIENTE.CALLE,'#10' V_FACTURAS_CLIENTE.PROVINCIA, V_FACTURAS_CLI' + + 'ENTE.CODIGO_POSTAL, V_FACTURAS_CLIENTE.POBLACION,'#10' CONTACTOS_' + + 'DATOS_BANCO.TITULAR,'#10' CONTACTOS_DATOS_BANCO.ENTIDAD,'#10' CONT' + + 'ACTOS_DATOS_BANCO.SUCURSAL,'#10' CONTACTOS_DATOS_BANCO.DC,'#10' CO' + + 'NTACTOS_DATOS_BANCO.CUENTA,'#10' ID_EMPRESA, EMPRESAS.NIF_CIF as ' + + 'NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS.CALLE as CA' + + 'LLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRESA,'#10' EMPRES' + + 'AS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POSTAL as COD' + + 'IGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRE' + + 'SAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_WEB, EMPRESAS' + + '.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO'#10'FROM V_FACTURAS_CLIENTE'#10'L' + + 'EFT JOIN EMPRESAS ON EMPRESAS.ID = ID_EMPRESA'#10'LEFT JOIN FORMAS_P' + + 'AGO ON (FORMAS_PAGO.ID = V_FACTURAS_CLIENTE.ID_FORMA_PAGO)'#10'LEFT ' + + 'JOIN CONTACTOS_DATOS_BANCO ON (CONTACTOS_DATOS_BANCO.ID_CONTACTO' + + ' = V_FACTURAS_CLIENTE.ID_CLIENTE)'#10'WHERE V_FACTURAS_CLIENTE.ID = ' + + ':ID'#10 StatementType = stSQL ColumnMappings = < + item + DatasetField = 'ID' + TableField = 'ID' + end + item + DatasetField = 'REFERENCIA' + TableField = 'REFERENCIA' + end + item + DatasetField = 'FECHA_FACTURA' + TableField = 'FECHA_FACTURA' + end + item + DatasetField = 'IMPORTE_NETO' + TableField = 'IMPORTE_NETO' + end + item + DatasetField = 'BASE_IMPONIBLE' + TableField = 'BASE_IMPONIBLE' + end item DatasetField = 'DESCUENTO' TableField = 'DESCUENTO' end + item + DatasetField = 'IMPORTE_DESCUENTO' + TableField = 'IMPORTE_DESCUENTO' + end item DatasetField = 'IVA' TableField = 'IVA' end + item + DatasetField = 'IMPORTE_IVA' + TableField = 'IMPORTE_IVA' + end + item + DatasetField = 'RE' + TableField = 'RE' + end + item + DatasetField = 'IMPORTE_RE' + TableField = 'IMPORTE_RE' + end + item + DatasetField = 'IMPORTE_TOTAL' + TableField = 'IMPORTE_TOTAL' + end item DatasetField = 'OBSERVACIONES' TableField = 'OBSERVACIONES' end + item + DatasetField = 'FORMA_PAGO' + TableField = '' + SQLOrigin = 'FORMA_PAGO' + end + item + DatasetField = 'ID_CLIENTE' + TableField = 'ID_CLIENTE' + end + item + DatasetField = 'NIF_CIF' + TableField = 'NIF_CIF' + end item DatasetField = 'NOMBRE' TableField = 'NOMBRE' @@ -404,181 +462,155 @@ object RptFacturasCliente: TRptFacturasCliente DatasetField = 'PROVINCIA' TableField = 'PROVINCIA' end + item + DatasetField = 'CODIGO_POSTAL' + TableField = 'CODIGO_POSTAL' + end item DatasetField = 'POBLACION' TableField = 'POBLACION' end item - DatasetField = 'REFERENCIA' - TableField = 'REFERENCIA' + DatasetField = 'TITULAR' + TableField = '' + SQLOrigin = 'TITULAR' end item - DatasetField = 'ID' - TableField = 'ID' + DatasetField = 'ENTIDAD' + TableField = '' + SQLOrigin = 'ENTIDAD' + end + item + DatasetField = 'SUCURSAL' + TableField = '' + SQLOrigin = 'SUCURSAL' + end + item + DatasetField = 'DC' + TableField = '' + SQLOrigin = 'DC' + end + item + DatasetField = 'CUENTA' + TableField = '' + SQLOrigin = 'CUENTA' end item DatasetField = 'ID_EMPRESA' TableField = 'ID_EMPRESA' end - item - DatasetField = 'FECHA_FACTURA' - TableField = 'FECHA_FACTURA' - end - item - DatasetField = 'BASE_IMPONIBLE' - TableField = 'BASE_IMPONIBLE' - end - item - DatasetField = 'IMPORTE_DESCUENTO' - TableField = 'IMPORTE_DESCUENTO' - end - item - DatasetField = 'IMPORTE_IVA' - TableField = 'IMPORTE_IVA' - end - item - DatasetField = 'IMPORTE_TOTAL' - TableField = 'IMPORTE_TOTAL' - end - item - DatasetField = 'FORMA_PAGO' - TableField = 'FORMA_PAGO' - end - item - DatasetField = 'ID_CLIENTE' - TableField = 'ID_CLIENTE' - end - item - DatasetField = 'NIF_CIF' - TableField = 'NIF_CIF' - end - item - DatasetField = 'CODIGO_POSTAL' - TableField = 'CODIGO_POSTAL' - end item DatasetField = 'NIF_CIF_EMPRESA' - TableField = 'NIF_CIF_EMPRESA' + TableField = '' + SQLOrigin = 'NIF_CIF_EMPRESA' end item DatasetField = 'RAZON_SOCIAL' - TableField = 'RAZON_SOCIAL' + TableField = '' + SQLOrigin = 'RAZON_SOCIAL' end item DatasetField = 'CALLE_EMPRESA' - TableField = 'CALLE_EMPRESA' + TableField = '' + SQLOrigin = 'CALLE_EMPRESA' end item DatasetField = 'POBLACION_EMPRESA' - TableField = 'POBLACION_EMPRESA' + TableField = '' + SQLOrigin = 'POBLACION_EMPRESA' end item DatasetField = 'PROVINCIA_EMPRESA' - TableField = 'PROVINCIA_EMPRESA' + TableField = '' + SQLOrigin = 'PROVINCIA_EMPRESA' end item DatasetField = 'CODIGO_POSTAL_EMPRESA' - TableField = 'CODIGO_POSTAL_EMPRESA' + TableField = '' + SQLOrigin = 'CODIGO_POSTAL_EMPRESA' end item DatasetField = 'TELEFONO_1' - TableField = 'TELEFONO_1' + TableField = '' + SQLOrigin = 'TELEFONO_1' end item DatasetField = 'FAX' - TableField = 'FAX' + TableField = '' + SQLOrigin = 'FAX' end item DatasetField = 'MOVIL_1' - TableField = 'MOVIL_1' + TableField = '' + SQLOrigin = 'MOVIL_1' end item DatasetField = 'EMAIL_1' - TableField = 'EMAIL_1' + TableField = '' + SQLOrigin = 'EMAIL_1' end item DatasetField = 'PAGINA_WEB' - TableField = 'PAGINA_WEB' + TableField = '' + SQLOrigin = 'PAGINA_WEB' end item DatasetField = 'REGISTRO_MERCANTIL' - TableField = 'REGISTRO_MERCANTIL' + TableField = '' + SQLOrigin = 'REGISTRO_MERCANTIL' end item DatasetField = 'LOGOTIPO' - TableField = 'LOGOTIPO' - end - item - DatasetField = 'RE' - TableField = 'RE' - end - item - DatasetField = 'IMPORTE_RE' - TableField = 'IMPORTE_RE' - end - item - DatasetField = 'TITULAR' - TableField = 'TITULAR' - end - item - DatasetField = 'ENTIDAD' - TableField = 'ENTIDAD' - end - item - DatasetField = 'SUCURSAL' - TableField = 'SUCURSAL' - end - item - DatasetField = 'DC' - TableField = 'DC' - end - item - DatasetField = 'CUENTA' - TableField = 'CUENTA' + TableField = '' + SQLOrigin = 'LOGOTIPO' end> end> Name = 'InformeFacturasCliente' Fields = < item Name = 'ID' - DataType = datAutoInc + DataType = datInteger DictionaryEntry = 'FacturasCliente_ID' InPrimaryKey = True end item - Name = 'ID_EMPRESA' - DataType = datInteger - DictionaryEntry = 'FacturasCliente_ID_EMPRESA' + Name = 'REFERENCIA' + DataType = datString + Size = 255 + DictionaryEntry = 'FacturasCliente_REFERENCIA' end item Name = 'FECHA_FACTURA' DataType = datDateTime DictionaryEntry = 'FacturasCliente_FECHA_FACTURA' end + item + Name = 'IMPORTE_NETO' + DataType = datCurrency + end item Name = 'BASE_IMPONIBLE' - DataType = datFloat + DataType = datCurrency DictionaryEntry = 'FacturasCliente_BASE_IMPONIBLE' end - item - Name = 'REFERENCIA' - DataType = datString - Size = 20 - DictionaryEntry = 'FacturasCliente_REFERENCIA' - end - item - Name = 'IMPORTE_DESCUENTO' - DataType = datFloat - DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO' - end item Name = 'DESCUENTO' DataType = datFloat DictionaryEntry = 'FacturasCliente_DESCUENTO' end item - Name = 'IMPORTE_IVA' + Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency + DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO' + end + item + Name = 'IVA' DataType = datFloat + DictionaryEntry = 'FacturasCliente_IVA' + end + item + Name = 'IMPORTE_IVA' + DataType = datCurrency DictionaryEntry = 'FacturasCliente_IMPORTE_IVA' end item @@ -587,17 +619,17 @@ object RptFacturasCliente: TRptFacturasCliente end item Name = 'IMPORTE_RE' - DataType = datFloat + DataType = datCurrency end item Name = 'IMPORTE_TOTAL' - DataType = datFloat + DataType = datCurrency DictionaryEntry = 'FacturasCliente_IMPORTE_TOTAL' end item - Name = 'IVA' - DataType = datFloat - DictionaryEntry = 'FacturasCliente_IVA' + Name = 'OBSERVACIONES' + DataType = datMemo + DictionaryEntry = 'FacturasCliente_OBSERVACIONES' end item Name = 'FORMA_PAGO' @@ -616,27 +648,22 @@ object RptFacturasCliente: TRptFacturasCliente Size = 15 DictionaryEntry = 'FacturasCliente_NIF_CIF' end - item - Name = 'OBSERVACIONES' - DataType = datMemo - DictionaryEntry = 'FacturasCliente_OBSERVACIONES' - end item Name = 'NOMBRE' DataType = datString - Size = 100 + Size = 255 DictionaryEntry = 'FacturasCliente_NOMBRE' end item Name = 'CALLE' DataType = datString - Size = 150 + Size = 255 DictionaryEntry = 'FacturasCliente_CALLE' end item Name = 'PROVINCIA' DataType = datString - Size = 30 + Size = 255 DictionaryEntry = 'FacturasCliente_PROVINCIA' end item @@ -645,6 +672,12 @@ object RptFacturasCliente: TRptFacturasCliente Size = 10 DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL' end + item + Name = 'POBLACION' + DataType = datString + Size = 255 + DictionaryEntry = 'FacturasCliente_POBLACION' + end item Name = 'TITULAR' DataType = datString @@ -671,10 +704,9 @@ object RptFacturasCliente: TRptFacturasCliente Size = 15 end item - Name = 'POBLACION' - DataType = datString - Size = 150 - DictionaryEntry = 'FacturasCliente_POBLACION' + Name = 'ID_EMPRESA' + DataType = datInteger + DictionaryEntry = 'FacturasCliente_ID_EMPRESA' end item Name = 'NIF_CIF_EMPRESA' @@ -1104,7 +1136,7 @@ object RptFacturasCliente: TRptFacturasCliente PrintOptions.Printer = 'Default' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 37871.995398692100000000 - ReportOptions.LastChange = 39290.847101226850000000 + ReportOptions.LastChange = 39455.745879444450000000 ReportOptions.VersionBuild = '1' ReportOptions.VersionMajor = '12' ReportOptions.VersionMinor = '13' @@ -1178,27 +1210,29 @@ object RptFacturasCliente: TRptFacturasCliente 'begin' ' DatosEmpresa.Lines.Clear;' ' DatosEmpresa.Lines.Add();' - ' DatosEmpresa.Lines.Add();' '' + + ' Cadena := + '#39' - '#39' + + '#39' '#39' + ;' + ' DatosEmpresa.Lines.Add(Cadena);' + ' ' ' Cadena := '#39#39';' ' if ( <> '#39#39') then' - ' Cadena := '#39'TLF: '#39' + ;' - ' if ( <> '#39#39') then' - ' Cadena := Cadena + '#39' FAX: '#39' + ;' + ' Cadena := '#39'Telf: '#39' + ;' + ' if ( <> '#39#39') then' + ' Cadena := Cadena + '#39' / '#39' + ;' ' DatosEmpresa.Lines.Add(Cadena);' '' - ' Cadena := '#39#39';' - ' if ( <> '#39#39') then' - ' Cadena := ;' - ' if ( <> '#39#39') then' - - ' Cadena := Cadena + '#39' '#39' + ;' - ' if ( <> '#39#39') then' - - ' Cadena := Cadena + '#39' - '#39' + ;' + ' Cadena := '#39#39'; ' + ' if ( <> '#39#39') then' + ' Cadena := '#39'E-Mail: '#39' + ;' ' DatosEmpresa.Lines.Add(Cadena);' + '' + ' Cadena := '#39#39'; ' + ' if ( <> '#39#39') then' + ' Cadena := '#39'Web: '#39' + ;' + ' DatosEmpresa.Lines.Add(Cadena); ' 'end;' '' 'procedure Memo15OnBeforePrint(Sender: TfrxComponent);' @@ -1222,19 +1256,6 @@ object RptFacturasCliente: TRptFacturasCliente '' 'end;' '' - 'procedure Memo11OnBeforePrint(Sender: TfrxComponent);' - 'var' - ' Cadena : String;' - 'begin' - ' if ( <> '#39#39') then' - ' begin' - ' Cadena := Memo11.Lines.Text;' - ' Memo11.Lines.Clear;' - ' Memo11.Lines.Add();' - ' Memo11.Lines.Add(Cadena);' - ' end' - 'end;' - '' 'procedure Band2OnBeforePrint(Sender: TfrxComponent);' 'begin' ' if not Engine.FinalPass then' diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index 21476fe7..aa0d5fdd 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -26,10 +26,10 @@ type DADataVencimientos: TDADataSource; tbl_Vencimientos: TDAMemDataTable; frxDBDataset1: TfrxDBDataset; - schReport: TDASchema; DataDictionary: TDADataDictionary; frxReport: TfrxReport; Bin2DataStreamer: TDABin2DataStreamer; + schReport: TDASchema; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index aa07de36..12da2746 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -455,15 +455,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited dxLayoutControl1Item10: TdxLayoutItem Visible = False end - inherited dxLayoutControl1Group7: TdxLayoutGroup - Visible = False - inherited dxLayoutControl1Item4: TdxLayoutItem - Visible = False - end - inherited dxLayoutControl1Item1: TdxLayoutItem - Visible = False - end - end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas index 9d5c09b2..dfc15645 100644 --- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas +++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteReportController.pas @@ -66,9 +66,9 @@ begin if Assigned(AEditor) then with AEditor do begin - AEditor.LoadFromStream(AStream); - AEditor.Preview; - AEditor.Release; + LoadFromStream(AStream); + Preview; + Release; end; finally FreeAndNil(AStream); diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas index 3ac5f4de..505c9bca 100644 --- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas @@ -71,7 +71,7 @@ uses function TDataModuleRecibosCliente.GetReport(const ID: String): Binary; begin -// Result := (RORemoteService as IsrvRecibosCliente).GenerateReport(ID); + Result := (RORemoteService as IsrvRecibosCliente).GenerateReport(ID); end; procedure TDataModuleRecibosCliente.DAClientDataModuleCreate(Sender: TObject); diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm index 0e6b65c9..3ba27d0c 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm @@ -4,33 +4,211 @@ object RptRecibosCliente: TRptRecibosCliente Height = 405 Width = 447 object DADataCabecera: TDADataSource + DataSet = tbl_Cabecera.Dataset DataTable = tbl_Cabecera Left = 264 Top = 72 end - object tbl_Cabecera: TDACDSDataTable + object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'ID_RECIBO_COMPENSADO' + DataType = datInteger + end + item + Name = 'REFERENCIA_REC_COMPENSADO' + DataType = datString + Size = 255 + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'SITUACION' + DataType = datString + Size = 9 + end + item + Name = 'ID_FACTURA' + DataType = datInteger + end + item + Name = 'ID_REMESA' + DataType = datInteger + end + item + Name = 'REFERENCIA_REMESA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_EMISION' + DataType = datDateTime + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'OBSERVACIONES' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE' + DataType = datFloat + end + item + Name = 'OTROS_GASTOS' + DataType = datFloat + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'FECHA_FACTURA' + DataType = datDateTime + end + item + Name = 'FORMA_PAGO_FACTURA' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_FACTURA' + DataType = datFloat + end + item + Name = 'NOMBRE_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'ENTIDAD_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'DC_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'NIF_CIF_EMPRESA' + DataType = datString + Size = 15 + end + item + Name = 'RAZON_SOCIAL' + DataType = datString + Size = 255 + end + item + Name = 'CALLE_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'POBLACION_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'PROVINCIA_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'CODIGO_POSTAL_EMPRESA' + DataType = datString + Size = 10 + end + item + Name = 'TELEFONO_1' + DataType = datString + Size = 25 + end + item + Name = 'FAX' + DataType = datString + Size = 25 + end + item + Name = 'MOVIL_1' + DataType = datString + Size = 25 + end + item + Name = 'EMAIL_1' + DataType = datString + Size = 255 + end + item + Name = 'PAGINA_WEB' + DataType = datString + Size = 255 + end + item + Name = 'REGISTRO_MERCANTIL' + DataType = datString + Size = 255 + end + item + Name = 'LOGOTIPO' + DataType = datBlob + end> + Params = < + item + Name = 'ID' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 Top = 128 end - object DABINAdapter: TDABINAdapter - Left = 48 - Top = 80 - end object frxRichObject1: TfrxRichObject Left = 48 Top = 296 @@ -67,7 +245,6 @@ object RptRecibosCliente: TRptRecibosCliente Params = < item Name = 'ID_RECIBO' - BlobType = dabtUnknown Value = '' ParamType = daptInput end> @@ -99,46 +276,22 @@ object RptRecibosCliente: TRptRecibosCliente Name = 'REFERENCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DESCRIPCION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end> - BusinessRulesClient.ScriptLanguage = rslPascalScript - BusinessRulesServer.ScriptLanguage = rslPascalScript end item Params = < item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown Value = '' ParamType = daptInput end> @@ -330,452 +483,187 @@ object RptRecibosCliente: TRptRecibosCliente item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_RECIBO_COMPENSADO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA_REC_COMPENSADO' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_EMPRESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'SITUACION' DataType = datString Size = 9 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_FACTURA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_REMESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA_REMESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_EMISION' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_VENCIMIENTO' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DESCRIPCION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'OBSERVACIONES' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'OTROS_GASTOS' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_FACTURA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FORMA_PAGO_FACTURA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE_FACTURA' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NOMBRE_CLIENTE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ENTIDAD_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'SUCURSAL_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DC_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CUENTA_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF_EMPRESA' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'RAZON_SOCIAL' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CALLE_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'POBLACION_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PROVINCIA_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CODIGO_POSTAL_EMPRESA' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'TELEFONO_1' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FAX' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'MOVIL_1' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'EMAIL_1' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PAGINA_WEB' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REGISTRO_MERCANTIL' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'LOGOTIPO' DataType = datBlob - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end> - BusinessRulesClient.ScriptLanguage = rslPascalScript - BusinessRulesServer.ScriptLanguage = rslPascalScript end> + JoinDataTables = <> + UnionDataTables = <> Commands = <> RelationShips = <> UpdateRules = <> + Version = 0 Left = 48 Top = 16 end @@ -785,7 +673,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 158 end object frxReport: TfrxReport - Version = '3.23.7' + Version = '4.3' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -793,6 +681,7 @@ object RptRecibosCliente: TRptRecibosCliente PreviewOptions.OutlineWidth = 180 PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Default' + PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 37871.995398692100000000 ReportOptions.Description.Strings = ( 'Demonstrates how to create simple list report.') @@ -851,17 +740,6 @@ object RptRecibosCliente: TRptRecibosCliente StoreInDFM = False Left = 169 Top = 16 - Datasets = < - item - DataSet = frxDBCabecera - DataSetName = 'frxDBCabecera' - end - item - DataSet = frxDBCompensados - DataSetName = 'frxDBCompensados' - end> - Variables = <> - Style = <> end object frxDBCabecera: TfrxDBDataset UserName = 'frxDBCabecera' @@ -871,6 +749,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 16 end object DADataCompensados: TDADataSource + DataSet = tbl_Compensados.Dataset DataTable = tbl_Compensados Left = 360 Top = 72 @@ -882,23 +761,44 @@ object RptRecibosCliente: TRptRecibosCliente Left = 360 Top = 16 end - object tbl_Compensados: TDACDSDataTable + object tbl_Compensados: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end> + Params = < + item + Name = 'ID_RECIBO' + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Compensados' IndexDefs = <> Left = 360 Top = 128 end + object Bin2DataStreamer: TDABin2DataStreamer + Left = 48 + Top = 88 + end end diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas index de45331b..723940d7 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas @@ -7,13 +7,12 @@ uses Dialogs, frxClass, frxDBSet, uDAScriptingProvider, uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, - uDAInterfaces; + uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable; type TRptRecibosCliente = class(TDataModule) DADataCabecera: TDADataSource; - tbl_Cabecera: TDACDSDataTable; - DABINAdapter: TDABINAdapter; + tbl_Cabecera: TDAMemDataTable; frxRichObject1: TfrxRichObject; frxBarCodeObject1: TfrxBarCodeObject; frxOLEObject1: TfrxOLEObject; @@ -24,10 +23,11 @@ type frxDBCabecera: TfrxDBDataset; DADataCompensados: TDADataSource; frxDBCompensados: TfrxDBDataset; - tbl_Compensados: TDACDSDataTable; + tbl_Compensados: TDAMemDataTable; schReport: TDASchema; DataDictionary: TDADataDictionary; frxReport: TfrxReport; + Bin2DataStreamer: TDABin2DataStreamer; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; @@ -91,27 +91,32 @@ var AStream: TMemoryStream; begin - AStream := TMemoryStream.Create; +// AStream := TMemoryStream.Create; try - dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]); - dsCompensados := schReport.NewDataset(FConnection, ds_InformeCompensados, ['ID_RECIBO'], [ID], False); +// dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]); +// dsCompensados := schReport.NewDataset(FConnection, ds_InformeCompensados, ['ID_RECIBO'], [ID], False); - AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_Cabecera, TRUE, '', TRUE, TRUE); +// AStream.Clear; +// DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); +// DABINAdapter.ReadDataset(AStream, tbl_Cabecera, TRUE, '', TRUE, TRUE); - AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsCompensados, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_Compensados, TRUE, '', TRUE, TRUE); +// AStream.Clear; +// DABINAdapter.WriteDataset(AStream, dsCompensados, [woRows, woSchema], -1); +// DABINAdapter.ReadDataset(AStream, tbl_Compensados, TRUE, '', TRUE, TRUE); + + tbl_Cabecera.ParamByName('ID').AsInteger := ID; + tbl_Compensados.ParamByName('ID_RECIBO').AsInteger := ID; + tbl_Cabecera.Active := True; + tbl_Compensados.Active := True; frxReport.LoadFromFile(DarRutaInformes + rptInforme, True); frxReport.PrepareReport(False); finally - AStream.Free; - dsMaster := Nil; - dsCompensados := Nil; +// AStream.Free; +// dsMaster := Nil; +// dsCompensados := Nil; end; end; diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas index bbdf9d34..e69ca88a 100644 --- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas +++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas @@ -42,8 +42,8 @@ implementation uses Dialogs, {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils, - schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils, uBizPagosClienteServer; -// uRptRecibosCliente_Server; + schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils, uBizPagosClienteServer, + uRptRecibosCliente_Server; procedure Create_srvRecibosCliente(out anInstance : IUnknown); @@ -78,17 +78,15 @@ begin end; function TsrvRecibosCliente.GenerateReport(const ID: String): Binary; -//var -// AReportGenerator : TRptRecibosCliente; +var + AReportGenerator : TRptRecibosCliente; begin -{ AReportGenerator := TRptRecibosCliente.Create(nil); + AReportGenerator := TRptRecibosCliente.Create(nil); try Result := AReportGenerator.GenerarRecibo(ID); finally FreeAndNIL(AReportGenerator); end; -} - Result := NIL; end; initialization diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm index 02509410..182cd840 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm @@ -49,19 +49,19 @@ inherited fEditorReciboCliente: TfEditorReciboCliente end end inherited pgPaginas: TPageControl - Width = 691 - Height = 335 - ExplicitWidth = 691 - ExplicitHeight = 335 + Width = 685 + Height = 329 + ExplicitWidth = 685 + ExplicitHeight = 329 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inline frViewReciboCliente1: TfrViewReciboCliente Left = 0 Top = 0 - Width = 683 + Width = 677 Height = 335 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -72,15 +72,15 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 + ExplicitWidth = 677 ExplicitHeight = 335 inherited dxLayoutControl1: TdxLayoutControl - Width = 683 + Width = 677 Height = 335 - ExplicitWidth = 683 + ExplicitWidth = 677 ExplicitHeight = 335 DesignSize = ( - 683 + 677 335) inherited eReferencia: TcxDBTextEdit ExplicitWidth = 217 @@ -138,14 +138,14 @@ inherited fEditorReciboCliente: TfEditorReciboCliente Width = 84 end inherited eSucursal: TcxDBTextEdit - Left = 544 - ExplicitLeft = 544 + Left = 540 + ExplicitLeft = 540 ExplicitWidth = 81 Width = 81 end inherited eDC: TcxDBTextEdit - Left = 624 - ExplicitLeft = 624 + Left = 618 + ExplicitLeft = 618 ExplicitWidth = 37 Width = 37 end @@ -177,8 +177,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inline frViewPagosCliente1: TfrViewPagosCliente Left = 0 Top = 0 - Width = 683 - Height = 307 + Width = 677 + Height = 301 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -188,19 +188,19 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited dxLayoutControl1: TdxLayoutControl - Width = 683 - Height = 307 - ExplicitWidth = 683 - ExplicitHeight = 307 + Width = 677 + Height = 301 + ExplicitWidth = 677 + ExplicitHeight = 301 end inherited dxLayoutControl2: TdxLayoutControl - Width = 683 - Height = 307 - ExplicitWidth = 683 - ExplicitHeight = 307 + Width = 677 + Height = 301 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited ToolBar1: TToolBar Width = 666 ExplicitWidth = 666 @@ -239,8 +239,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inline frViewRecibosCliCompensados1: TfrViewRecibosCliCompensados Left = 0 Top = 0 - Width = 683 - Height = 307 + Width = 677 + Height = 301 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -250,13 +250,13 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited cxGrid: TcxGrid - Width = 683 - Height = 282 - ExplicitWidth = 683 - ExplicitHeight = 282 + Width = 677 + Height = 276 + ExplicitWidth = 677 + ExplicitHeight = 276 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -268,7 +268,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente end end inherited ToolBar1: TToolBar - Width = 683 + Width = 677 ExplicitWidth = 683 inherited ToolButton1: TToolButton ExplicitWidth = 113 @@ -324,6 +324,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inherited eImporte: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable Properties.OnEditValueChanged = frViewReciboCliImportes1eImportePropertiesEditValueChanged + ExplicitWidth = 150 + Width = 150 end inherited eOtrosGastos: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas index 0dcc524e..8d8ae369 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas @@ -264,11 +264,8 @@ end; procedure TfEditorReciboCliente.ImprimirInterno; begin -AppFactuGES.ShowCapado; -{ inherited; FController.Print(FRecibo); -} end; procedure TfEditorReciboCliente.JvFormStorageRestorePlacement(Sender: TObject); @@ -306,11 +303,8 @@ end; procedure TfEditorReciboCliente.PrevisualizarInterno; begin -AppFactuGES.ShowCapado; -{ inherited; FController.Preview(FRecibo); -} end; procedure TfEditorReciboCliente.SetController(const Value: IRecibosClienteController); diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.dfm index bc264513..ec3adee6 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.dfm @@ -1,10 +1,6 @@ inherited fEditorReciboClientePreview: TfEditorReciboClientePreview Caption = 'Previsualizar el recibo' + ExplicitHeight = 485 PixelsPerInch = 96 TextHeight = 13 - inherited frxReport1: TfrxReport - Datasets = <> - Variables = <> - Style = <> - end end diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.pas index 729935ba..bfd08ea1 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboClienteReport.pas @@ -14,7 +14,8 @@ uses TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorRecibosClientePreview, JvExComCtrls, JvStatusBar, frxExportImage, frxExportPDF, frxDCtrl, frxClass, - frxDMPExport, frxGradient, frxChBox, frxCross, frxRich, frxOLE, frxBarcode; + frxDMPExport, frxGradient, frxChBox, frxCross, frxRich, frxOLE, frxBarcode, + frxExportText, frxExportRTF, frxExportMail, frxExportXLS; type TfEditorReciboClientePreview = class(TfEditorPreview, IEditorRecibosClientePreview) diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas index 7df295c4..ee7c4fea 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas @@ -136,8 +136,6 @@ var ARecibosCliente: IBizRecibosCliente; AllItems: Boolean; begin -AppFactuGES.ShowCapado; -{ ARecibosCliente := Nil; AllItems := False; @@ -171,7 +169,6 @@ AppFactuGES.ShowCapado; end; end; end; -} end; procedure TfEditorRecibosCliente.ModificarInterno; @@ -201,8 +198,6 @@ var ARecibosCliente: IBizRecibosCliente; AllItems: Boolean; begin -AppFactuGES.ShowCapado; -{ ARecibosCliente := Nil; AllItems := False; @@ -236,7 +231,6 @@ AppFactuGES.ShowCapado; end; end; end; -} end; procedure TfEditorRecibosCliente.SetController(const Value: IRecibosClienteController); diff --git a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm index e9294e2e..ed4f4671 100644 --- a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm +++ b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm @@ -48,7 +48,7 @@ object PluginTiposIVA: TPluginTiposIVA end end object MainMenu: TMainMenu - Images = LargeImages + Images = SmallImages Left = 40 Top = 16 object Ventas1: TMenuItem diff --git a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm index 6b2d0506..814bee06 100644 --- a/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm +++ b/Source/Modulos/Unidades de medida/Plugin/uPluginUnidadesMedida.dfm @@ -47,7 +47,7 @@ object PluginUnidadesMedida: TPluginUnidadesMedida end end object MainMenu: TMainMenu - Images = LargeImages + Images = SmallImages Left = 40 Top = 16 object Ventas1: TMenuItem diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 8e5387a383a1c4ae65203d0234fdd86cba0fe1f2..1a8573bb582ba6df5dc928e5793239571ca67e5c 100644 GIT binary patch delta 21 ccmZ3mm2tsV#tlJH?3N5x45kc*lOv;?>048{zmlOv + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - - - Delphi.Personality - - -FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 - - - RemObjects Pascal Script - RemObjects SDK 3.0 Integration - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEjercicios
- TDataAbstractService - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - -
srvContabilidad
- TDataAbstractService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - - -
RptFacturasCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
srvPresupuestosCliente
- TDataAbstractService - - - - - -
srvRecibosCliente
- TDataAbstractService - - - - - -
srvRecibosProveedor
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
srvReferencias
- TDataAbstractService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + + + Delphi.Personality + + + FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 + RemObjects Pascal Script - RemObjects SDK 3.0 Integration + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEjercicios
+ TDataAbstractService + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + +
srvContabilidad
+ TDataAbstractService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + + +
RptFacturasCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
srvPresupuestosCliente
+ TDataAbstractService + + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + + +
srvRecibosProveedor
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
srvReferencias
+ TDataAbstractService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + +