From d6e8d1a4402bf9b0783a05ef193f6a5e1330b4bc Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 29 Feb 2008 18:10:08 +0000 Subject: [PATCH] Generacion automatica de subcuenta para el pago de recibos y remesas de cliente, falta repaso de facturas de cliente. Tambien se ha incluido la directiva de compilacion para el modulo de contabilidad git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@164 f4e31baf-9722-1c47-927c-6f952f962d4b --- .../Empresas/Views/uEditorEmpresa.dfm | 8 +- .../Empresas/Views/uEditorEmpresa.pas | 12 +- .../Empresas/Views/uEditorTiendaEmpresa.dfm | 2 - .../Empresas/Views/uEditorTiendaEmpresa.pas | 13 +- .../Empresas/Views/uViewTiendas.dfm | 1 + .../Empresas/Views/uViewTiendas.pas | 16 +- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Cliente/uBootStrap.pas | 15 +- Source/FactuGES.inc | 3 +- Source/GUIBase/GUIBase.dproj | 34 +- Source/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes Source/GUIBase/uEditorBase.dfm | 16 +- Source/GUIBase/uEditorDBBase.dfm | 20 +- Source/GUIBase/uEditorDBItem.dfm | 22 +- .../Contabilidad/Views/uViewCajasBancos.dfm | 23 +- .../Contabilidad/Views/uViewCajasBancos.pas | 8 +- .../Modulos/Contactos/Model/uBizContactos.pas | 16 +- .../Contactos/Views/uEditorCliente.dfm | 7 +- .../Contactos/Views/uEditorCliente.pas | 12 +- .../Contactos/Views/uEditorContacto.dfm | 2 +- .../Contactos/Views/uEditorProveedor.dfm | 6 +- .../Contactos/Views/uEditorProveedor.pas | 8 +- .../RecibosCliente_controller.dproj | 51 +- .../Controller/RecibosCliente_controller.rc | 22 + .../Controller/RecibosCliente_controller.res | Bin 32 -> 384 bytes .../Controller/uPagosClienteController.pas | 13 +- .../Controller/uRecibosClienteController.pas | 90 +--- .../Model/uBizPagosClienteServer.pas | 5 +- .../Views/uEditorFechaPago.dfm | 6 +- .../Views/uEditorFechaPago.pas | 53 +- .../Views/uEditorReciboCliente.dfm | 76 ++- .../Views/uEditorReciboCliente.pas | 56 +- .../Views/uViewPagosCliente.dfm | 1 + .../Controller/uRemesasClienteController.pas | 16 +- .../RemesasCliente_Group.groupproj | 36 +- .../Views/RemesasCliente_view.dpk | 3 +- .../Views/RemesasCliente_view.dproj | 64 +-- .../Views/RemesasCliente_view.rc | 22 + .../Views/RemesasCliente_view.res | Bin 32 -> 384 bytes .../Views/uEditorRemesaCliente.dfm | 157 +++--- .../Views/uEditorRemesaCliente.pas | 12 +- .../Views/uViewRemesaCliente.dfm | 55 +- .../Views/uViewRemesaCliente.pas | 19 +- Source/Servidor/FactuGES_Server.RES | Bin 23204 -> 23208 bytes Source/Servidor/FactuGES_Server.dproj | 501 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 46 files changed, 831 insertions(+), 673 deletions(-) diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index 58a24f84..ad2ef82a 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -77,6 +77,7 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited pgPaginas: TPageControl Width = 668 Height = 453 + ActivePage = pagTiendas ExplicitLeft = 3 ExplicitTop = 79 ExplicitWidth = 668 @@ -243,7 +244,7 @@ inherited fEditorEmpresa: TfEditorEmpresa end end end - object TabSheet1: TTabSheet + object pagDatosBancarios: TTabSheet Caption = 'Datos bancarios' ImageIndex = 1 inline frViewDatosBancarios1: TfrViewDatosBancarios @@ -310,6 +311,11 @@ inherited fEditorEmpresa: TfEditorEmpresa Height = 400 ExplicitWidth = 660 ExplicitHeight = 400 + inherited cxGridView: TcxGridDBTableView + inherited cxGridViewCODIGO_CONTABLE: TcxGridDBColumn + VisibleForCustomization = False + end + end end inherited ToolBar1: TToolBar Width = 660 diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas index 83bed8f3..63f10b5c 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas @@ -20,7 +20,7 @@ type frViewEmpresa1: TfrViewEmpresa; dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; - TabSheet1: TTabSheet; + pagDatosBancarios: TTabSheet; frViewDatosBancarios1: TfrViewDatosBancarios; pagTiendas: TTabSheet; frViewTiendas1: TfrViewTiendas; @@ -54,8 +54,8 @@ type end; implementation - {$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} uses uCustomEditor, uDataModuleEmpresas; @@ -142,7 +142,7 @@ begin raise Exception.Create('No hay ningún Empresa asignado'); Empresa.DataTable.Active := True; -// FViewEmpresa.ShowEmbedded(pagGeneral); + pgPaginas.ActivePage := pagGeneral; FViewEmpresa.SetFocus; end; @@ -161,6 +161,12 @@ constructor TfEditorEmpresa.Create(AOwner: TComponent); begin inherited; FViewEmpresa := frViewEmpresa1; + + {$IFDEF CONTABILIDAD} + pagDatosBancarios.TabVisible := false; + {$ELSE} + pagDatosBancarios.TabVisible := true; + {$ENDIF} end; destructor TfEditorEmpresa.Destroy; diff --git a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm index 0a865130..0724c56a 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm @@ -162,7 +162,6 @@ object fEditorTiendaEmpresa: TfEditorTiendaEmpresa Caption = '&Aceptar' ModalResult = 1 TabOrder = 0 - ExplicitLeft = 343 end object CancelBtn: TButton Left = 349 @@ -174,7 +173,6 @@ object fEditorTiendaEmpresa: TfEditorTiendaEmpresa Caption = '&Cancelar' ModalResult = 2 TabOrder = 1 - ExplicitLeft = 343 end object eDireccion: TDBEdit Left = 135 diff --git a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas index 2b8266df..17232973 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas @@ -60,11 +60,12 @@ type end; implementation +{$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} uses Variants; -{$R *.dfm} type THackcxDBHyperLinkEdit = class(TcxDBHyperLinkEdit); @@ -75,6 +76,16 @@ constructor TfEditorTiendaEmpresa.Create(AOwner: TComponent); begin inherited; FController := NIL; + + {$IFDEF CONTABILIDAD} + Bevel2.Visible := True; + Label10.Visible := True; + eCodigoContable.Visible := True; + {$ELSE} + Bevel2.Visible := False; + Label10.Visible := False; + eCodigoContable.Visible := False; + {$ENDIF} end; destructor TfEditorTiendaEmpresa.Destroy; diff --git a/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm b/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm index d39208eb..ce0d44a7 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm +++ b/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm @@ -1,6 +1,7 @@ inherited frViewTiendas: TfrViewTiendas Width = 583 Height = 464 + OnCreate = CustomViewCreate ExplicitWidth = 583 ExplicitHeight = 464 inherited cxGrid: TcxGrid diff --git a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas index b284e095..980a15a8 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas @@ -26,6 +26,7 @@ type cxGridViewCODIGO_CONTABLE: TcxGridDBColumn; procedure cxGridViewDblClick(Sender: TObject); procedure actEliminarExecute(Sender: TObject); + procedure CustomViewCreate(Sender: TObject); protected procedure AnadirInterno; override; procedure ModificarInterno; override; @@ -34,8 +35,8 @@ type end; implementation - {$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} uses uDialogUtils, uTiendasEmpresaController, uBizEmpresasTiendas; @@ -63,6 +64,19 @@ begin end; end; +procedure TfrViewTiendas.CustomViewCreate(Sender: TObject); +begin + inherited; + + {$IFDEF CONTABILIDAD} + cxGridViewCODIGO_CONTABLE.VisibleForCustomization := true; + cxGridViewCODIGO_CONTABLE.Visible := true; + {$ELSE} + cxGridViewCODIGO_CONTABLE.VisibleForCustomization := false; + cxGridViewCODIGO_CONTABLE.Visible := false; + {$ENDIF} +end; + procedure TfrViewTiendas.cxGridViewDblClick(Sender: TObject); begin inherited; 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/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 4f9db0a3..7df51fa0 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -25,14 +25,13 @@ begin LoadModule('TiposVenta_plugin.bpl'); LoadModule('FormasPago_plugin.bpl'); LoadModule('TiposIVA_plugin.bpl'); - LoadModule('Contactos_plugin.bpl'); {$IFDEF ALMACEN} -{ LoadModule('Familias_plugin.bpl'); + LoadModule('Familias_plugin.bpl'); LoadModule('UnidadesMedida_plugin.bpl'); LoadModule('Almacenes_plugin.bpl'); - LoadModule('Articulos_plugin.bpl');} + LoadModule('Articulos_plugin.bpl'); {$ENDIF} LoadModule('PresupuestosCliente_plugin.bpl'); @@ -42,8 +41,8 @@ begin LoadModule('FacturasCliente_plugin.bpl'); {$IFDEF PEDIDOSPROVEEDOR} -{ LoadModule('PedidosProveedor_plugin.bpl'); - LoadModule('AlbaranesProveedor_plugin.bpl');} + LoadModule('PedidosProveedor_plugin.bpl'); + LoadModule('AlbaranesProveedor_plugin.bpl'); {$ENDIF} LoadModule('RecibosProveedor_plugin.bpl'); @@ -53,12 +52,14 @@ begin LoadModule('RemesasProveedor_plugin.bpl'); {$IFDEF ALMACEN} -{ LoadModule('Inventario_plugin.bpl'); - LoadModule('HistoricoMovimientos_plugin.bpl');} + LoadModule('Inventario_plugin.bpl'); + LoadModule('HistoricoMovimientos_plugin.bpl'); {$ENDIF} + {$IFDEF CONTABILIDAD} LoadModule('Ejercicios_plugin.bpl'); LoadModule('Contabilidad_plugin.bpl'); + {$ENDIF} end; end; diff --git a/Source/FactuGES.inc b/Source/FactuGES.inc index 08af9c18..6b29364c 100644 --- a/Source/FactuGES.inc +++ b/Source/FactuGES.inc @@ -1,2 +1,3 @@ {DEFINE ALMACEN} -{DEFINE PEDIDOSPROVEEDOR} \ No newline at end of file +{DEFINE PEDIDOSPROVEEDOR} +{$DEFINE CONTABILIDAD} \ No newline at end of file diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index cc0edfd5..b4bbe1e1 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -57,23 +57,23 @@ MainSource - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm index 99526794..1d32df43 100644 --- a/Source/GUIBase/uEditorBase.dfm +++ b/Source/GUIBase/uEditorBase.dfm @@ -2,8 +2,8 @@ object fEditorBase: TfEditorBase Left = 222 Top = 127 Caption = 'EditorBase' - ClientHeight = 458 - ClientWidth = 795 + ClientHeight = 456 + ClientWidth = 793 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -23,7 +23,7 @@ object fEditorBase: TfEditorBase object JvNavPanelHeader: TJvNavPanelHeader Left = 0 Top = 49 - Width = 795 + Width = 793 Align = alTop Caption = 'Editor' Font.Charset = DEFAULT_CHARSET @@ -37,6 +37,7 @@ object fEditorBase: TfEditorBase ImageIndex = 0 StyleManager = dmBase.StyleManager ParentStyleManager = False + ExplicitWidth = 795 object Image1: TImage Left = 768 Top = 0 @@ -70,8 +71,9 @@ object fEditorBase: TfEditorBase object TBXDock: TTBXDock Left = 0 Top = 0 - Width = 795 + Width = 793 Height = 49 + ExplicitWidth = 795 object tbxMain: TTBXToolbar Left = 0 Top = 23 @@ -244,10 +246,12 @@ object fEditorBase: TfEditorBase end object StatusBar: TJvStatusBar Left = 0 - Top = 439 - Width = 795 + Top = 437 + Width = 793 Height = 19 Panels = <> + ExplicitTop = 439 + ExplicitWidth = 795 end object EditorActionList: TActionList Images = SmallImages diff --git a/Source/GUIBase/uEditorDBBase.dfm b/Source/GUIBase/uEditorDBBase.dfm index 170fdac7..17a586d2 100644 --- a/Source/GUIBase/uEditorDBBase.dfm +++ b/Source/GUIBase/uEditorDBBase.dfm @@ -2,14 +2,14 @@ inherited fEditorDBBase: TfEditorDBBase Left = 295 Top = 247 Caption = 'fEditorDBBase' - ClientHeight = 456 - ClientWidth = 648 - ExplicitWidth = 656 - ExplicitHeight = 490 + ClientHeight = 454 + ClientWidth = 646 + ExplicitWidth = 654 + ExplicitHeight = 488 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 648 + Width = 646 ExplicitWidth = 648 inherited Image1: TImage Left = 621 @@ -17,18 +17,18 @@ inherited fEditorDBBase: TfEditorDBBase end end inherited TBXDock: TTBXDock - Width = 648 + Width = 646 ExplicitWidth = 648 inherited tbxMain: TTBXToolbar - ExplicitWidth = 648 + ExplicitWidth = 646 end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 648 + ExplicitWidth = 646 end end inherited StatusBar: TJvStatusBar - Top = 437 - Width = 648 + Top = 435 + Width = 646 ExplicitTop = 437 ExplicitWidth = 648 end diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index a7205946..82afd13a 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -2,14 +2,14 @@ inherited fEditorDBItem: TfEditorDBItem Left = 450 Top = 321 Caption = 'fEditorDBItem' - ClientHeight = 461 - ClientWidth = 652 - ExplicitWidth = 660 - ExplicitHeight = 495 + ClientHeight = 459 + ClientWidth = 650 + ExplicitWidth = 658 + ExplicitHeight = 493 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 652 + Width = 650 ExplicitWidth = 652 inherited Image1: TImage Left = 625 @@ -18,7 +18,7 @@ inherited fEditorDBItem: TfEditorDBItem end end inherited TBXDock: TTBXDock - Width = 652 + Width = 650 ExplicitWidth = 652 inherited tbxMain: TTBXToolbar ExplicitWidth = 605 @@ -30,7 +30,7 @@ inherited fEditorDBItem: TfEditorDBItem end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 652 + ExplicitWidth = 650 inherited TBXSubmenuItem1: TTBXSubmenuItem Visible = False end @@ -40,8 +40,8 @@ inherited fEditorDBItem: TfEditorDBItem AlignWithMargins = True Left = 3 Top = 79 - Width = 646 - Height = 360 + Width = 644 + Height = 358 ActivePage = pagGeneral Align = alClient TabOrder = 2 @@ -58,8 +58,8 @@ inherited fEditorDBItem: TfEditorDBItem end end inherited StatusBar: TJvStatusBar - Top = 442 - Width = 652 + Top = 440 + Width = 650 Panels = < item Width = 200 diff --git a/Source/Modulos/Contabilidad/Views/uViewCajasBancos.dfm b/Source/Modulos/Contabilidad/Views/uViewCajasBancos.dfm index 87cb8796..e6209ebb 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCajasBancos.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewCajasBancos.dfm @@ -23,7 +23,7 @@ inherited frViewCajasBancos: TfrViewCajasBancos 73) object cbCajasBancos: TcxComboBox Left = 80 - Top = 37 + Top = 10 Anchors = [akLeft, akTop, akRight] Properties.DropDownListStyle = lsFixedList Properties.ImmediatePost = True @@ -41,33 +41,38 @@ inherited frViewCajasBancos: TfrViewCajasBancos StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 1 + TabOrder = 0 Width = 376 end object eContabilizar: TcxCheckBox - Left = 10 + Left = 309 Top = 10 Caption = 'Ignorar en contabiliad' Properties.ValueChecked = 1 Properties.ValueUnchecked = 0 Properties.OnEditValueChanged = eContabilizarPropertiesEditValueChanged - TabOrder = 0 + TabOrder = 1 Width = 203 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Item2: TdxLayoutItem - ShowCaption = False - Control = eContabilizar - ControlOptions.ShowBorder = False - end object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient Caption = 'Caja / Banco:' Control = cbCajasBancos ControlOptions.ShowBorder = False end + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + ShowCaption = False + Control = eContabilizar + ControlOptions.ShowBorder = False + end end end end diff --git a/Source/Modulos/Contabilidad/Views/uViewCajasBancos.pas b/Source/Modulos/Contabilidad/Views/uViewCajasBancos.pas index d7fd7bca..6e9de99e 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCajasBancos.pas +++ b/Source/Modulos/Contabilidad/Views/uViewCajasBancos.pas @@ -35,8 +35,8 @@ type implementation - {$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} uses uFactuGES_App, uSubCuentasController; @@ -69,6 +69,12 @@ begin end; Free; end; + + {$IFDEF CONTABILIDAD} + eContabilizar.Checked := false; + {$ELSE} + eContabilizar.Checked := true; + {$ENDIF} end; procedure TfrViewCajasBancos.CustomViewDestroy(Sender: TObject); diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index 8d464b90..11afc399 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -391,6 +391,8 @@ type implementation +{$INCLUDE ..\..\..\FactuGES.inc} + uses uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App, uBizEmpresasTiendas; @@ -646,7 +648,12 @@ begin BLOQUEADO := 0; RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA; REGIMEN_IVA := CLIENTE_REGIMEN_IVA; - IGNORAR_CONTABILIDAD := 0; + + {$IFDEF CONTABILIDAD} + IGNORAR_CONTABILIDAD := 0; + {$ELSE} + IGNORAR_CONTABILIDAD := 1; + {$ENDIF} end; { TBizProveedor } @@ -696,7 +703,12 @@ begin inherited; ID_CATEGORIA := CATEGORIA_PROVEEDOR; REGIMEN_IVA := PROVEEDOR_REGIMEN_IVA; - IGNORAR_CONTABILIDAD := 0; + + {$IFDEF CONTABILIDAD} + IGNORAR_CONTABILIDAD := 0; + {$ELSE} + IGNORAR_CONTABILIDAD := 1; + {$ENDIF} end; constructor TBizProveedor.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index 364f8eb6..96b46959 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -5,7 +5,7 @@ inherited fEditorCliente: TfEditorCliente ClientHeight = 645 ClientWidth = 896 ExplicitWidth = 904 - ExplicitHeight = 679 + ExplicitHeight = 672 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -65,6 +65,7 @@ inherited fEditorCliente: TfEditorCliente inherited pgPaginas: TPageControl Width = 890 Height = 544 + ActivePage = pagContabilidad ExplicitWidth = 890 ExplicitHeight = 544 inherited pagGeneral: TTabSheet @@ -285,8 +286,8 @@ inherited fEditorCliente: TfEditorCliente ExplicitTop = 270 inherited dxLayoutControl1: TdxLayoutControl inherited cbTienda: TcxComboBox - ExplicitWidth = 376 - Width = 376 + ExplicitWidth = 250 + Width = 250 end end end diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas index 2310a9ed..58099d15 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas @@ -40,14 +40,13 @@ type end; implementation +{$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} uses uEditorItem, uEditorBase, uDataModuleUsuarios, uEditorDBItem, uGruposClienteController, uBizGruposCliente, uEditorDBBase, uDialogUtils; - -{$R *.dfm} - procedure TfEditorCliente.actGruposClienteExecute(Sender: TObject); var AGruposController : IGruposClienteController; @@ -67,6 +66,12 @@ constructor TfEditorCliente.Create(AOwner: TComponent); begin inherited; ViewContacto := frViewCliente1; + + {$IFDEF CONTABILIDAD} + pagContabilidad.TabVisible := true; + {$ELSE} + pagContabilidad.TabVisible := false; + {$ENDIF} end; procedure TfEditorCliente.EliminarInterno; @@ -79,6 +84,7 @@ procedure TfEditorCliente.FormShow(Sender: TObject); begin inherited; pgPaginas.ActivePageIndex := 0; + end; procedure TfEditorCliente.PonerTitulos(const ATitulo: string); diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm index b6dd475e..2a47dc99 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm @@ -7,7 +7,7 @@ inherited fEditorContacto: TfEditorContacto ClientWidth = 632 Scaled = False ExplicitWidth = 640 - ExplicitHeight = 240 + ExplicitHeight = 488 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index cd5e29ec..99fe1d9e 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -3,7 +3,7 @@ inherited fEditorProveedor: TfEditorProveedor ClientHeight = 590 ClientWidth = 648 ExplicitWidth = 656 - ExplicitHeight = 624 + ExplicitHeight = 617 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -289,10 +289,6 @@ inherited fEditorProveedor: TfEditorProveedor Width = 634 LookAndFeel = dxLayoutOfficeLookAndFeel ExplicitWidth = 634 - inherited eEntidad: TcxDBTextEdit - ExplicitWidth = 114 - Width = 114 - end inherited eSucursal: TcxDBTextEdit Left = 323 ExplicitLeft = 323 diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.pas b/Source/Modulos/Contactos/Views/uEditorProveedor.pas index 78ab67df..02dd9513 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.pas @@ -36,8 +36,8 @@ type end; implementation - {$R *.dfm} +{$INCLUDE ..\..\..\FactuGES.inc} { TfEditorProveedor } @@ -63,6 +63,12 @@ constructor TfEditorProveedor.Create(AOwner: TComponent); begin inherited; ViewContacto := frViewProveedor1; + + {$IFDEF CONTABILIDAD} + pagContabilidad.TabVisible := true; + {$ELSE} + pagContabilidad.TabVisible := false; + {$ENDIF} end; procedure TfEditorProveedor.EliminarInterno; diff --git a/Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.dproj b/Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.dproj index 3b3b1a74..fb1783cd 100644 --- a/Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.dproj +++ b/Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.dproj @@ -39,57 +39,17 @@ Delphi.Personality Package - - False - True - False - - - True - False - False - - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3082 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - RecibosCliente_controller.dpk - - +FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0RecibosCliente_controller.dpk MainSource - - - - + + + + @@ -100,7 +60,6 @@ -