diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 2f82293..5124999 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index 7eb63bd..bebebe7 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -1,6 +1,6 @@ - {154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{789902B1-5E64-4FD9-80BF-6113B13BFE12},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{C61122F3-C791-4A88-8A9F-53A4F282AC6F},{E8E8671F-894B-4049-B4A6-905B57207637} + {154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{E8E8671F-894B-4049-B4A6-905B57207637} @@ -14,8 +14,8 @@ - 00:28:48 - 17/09/2010 19:01:29 - False + 00:00:01 + 01/10/2010 18:26:31 + True diff --git a/Build/Build.fbz6 b/Build/Build.fbz6 index e768426..e30a358 100644 Binary files a/Build/Build.fbz6 and b/Build/Build.fbz6 differ diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 6df9029..0199316 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -1102,7 +1102,9 @@ CREATE TABLE PROVEEDORES_DATOS ( SUBCONTRATA TIPO_BOOLEANO, VENCIMIENTO_FACTURAS_1 SMALLINT, VENCIMIENTO_FACTURAS_2 SMALLINT, - VENCIMIENTO_FACTURAS_3 SMALLINT + VENCIMIENTO_FACTURAS_3 SMALLINT, + VENCIMIENTO_FACTURAS_3 SMALLINT, + PAIS VARCHAR(255) COLLATE ES_ES ); CREATE TABLE PROVEEDORES_GRUPOS ( @@ -3306,8 +3308,6 @@ FROM LEFT OUTER JOIN FACTURAS_CLIENTE ON (FACTURAS_CLIENTE.ID = PRESUPUESTOS_CLIENTE.ID_FACTURA) ; - - /* View: V_PROVEEDORES */ CREATE VIEW V_PROVEEDORES( ID, @@ -3347,7 +3347,8 @@ CREATE VIEW V_PROVEEDORES( EMAIL_ADMINISTRACION, VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2, - VENCIMIENTO_FACTURAS_3) + VENCIMIENTO_FACTURAS_3, + PAIS) AS SELECT V_CONTACTOS.ID, @@ -3387,7 +3388,8 @@ SELECT PROVEEDORES_DATOS.EMAIL_ADMINISTRACION, PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_1, PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_2, - PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_3 + PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_3, + PROVEEDORES_DATOS.PAIS FROM V_CONTACTOS @@ -3396,8 +3398,6 @@ WHERE V_CONTACTOS.ID_CATEGORIA = 2 ; - - /* View: V_REC_CLI_COMPENSADOS */ CREATE VIEW V_REC_CLI_COMPENSADOS( ID_RECIBO, diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 305ee45..a93dc0f 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -58,63 +58,63 @@
DataModuleImpresiones
TDataModule + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DataModuleRegistroCorreos
TDataModule - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 7255bae..b609b59 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4000FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.0.0FactuGESFactuGES4.0.0.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4030FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.3.0FactuGESFactuGES4.0.3.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index f2b8471..ca19764 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,0,0,0 -PRODUCTVERSION 4,0,0,0 +FILEVERSION 4,0,3,0 +PRODUCTVERSION 4,0,3,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "4.0.0.0\0" + VALUE "FileVersion", "4.0.3.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.0.0.0\0" + VALUE "ProductVersion", "4.0.3.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 96e35ec..a676ef1 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index cb07ed8..44da7ac 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -54,7 +54,7 @@ begin // LoadModule('GestorInformes_plugin.bpl'); LoadModule('Comisiones_plugin.bpl'); - + LoadModule('BancaElectronica_plugin.bpl'); LoadModule('TiendaWeb_plugin.bpl'); end; end; diff --git a/Source/Informes/1/InfPedidoProveedor.fr3 b/Source/Informes/1/InfPedidoProveedor.fr3 index 7c2f945..248a665 100644 --- a/Source/Informes/1/InfPedidoProveedor.fr3 +++ b/Source/Informes/1/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index 189662a..482d8be 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,46 +1,43 @@ - + - - - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - + + + + + - - - - - - + + + + - - - + + + + + + diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas index 4cc0371..a6f9f19 100644 --- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas +++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas @@ -3,7 +3,7 @@ unit schAlbaranesClienteClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -179,7 +179,7 @@ type end; { TListaAnosAlbaranesDataTableRules } - TListaAnosAlbaranesDataTableRules = class(TDADataTableRules, IListaAnosAlbaranes) + TListaAnosAlbaranesDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosAlbaranes) private protected { Property getters and setters } @@ -500,7 +500,7 @@ type end; { TAlbaranesClienteDataTableRules } - TAlbaranesClienteDataTableRules = class(TDADataTableRules, IAlbaranesCliente) + TAlbaranesClienteDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente) private f_OBSERVACIONES: IROStrings; f_INCIDENCIAS: IROStrings; @@ -915,7 +915,7 @@ type end; { TAlbaranesCliente_DetallesDataTableRules } - TAlbaranesCliente_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesCliente_Detalles) + TAlbaranesCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente_Detalles) private protected { Property getters and setters } diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm index aa60e0c..0b6ebe1 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm @@ -9,8 +9,7 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente Top = 139 Width = 790 Visible = False - ExplicitLeft = -8 - ExplicitTop = 280 + ExplicitTop = 139 ExplicitWidth = 790 inherited Image1: TImage Left = 763 @@ -20,12 +19,12 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente inherited TBXDock: TTBXDock Top = 64 Width = 790 - ExplicitTop = 91 + ExplicitTop = 64 ExplicitWidth = 790 inherited tbxMain: TTBXToolbar Left = 359 ExplicitLeft = 359 - ExplicitWidth = 263 + ExplicitWidth = 126 inherited TBXItem2: TTBXItem Visible = False end @@ -86,9 +85,10 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente ExplicitWidth = 790 end inherited TBXTMain2: TTBXToolbar - Left = 318 + Left = 96 Visible = False - ExplicitLeft = 318 + ExplicitLeft = 96 + ExplicitWidth = 694 end end inherited StatusBar: TJvStatusBar @@ -109,7 +109,6 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente Padding.Bottom = 8 ParentBackground = False TabOrder = 4 - ExplicitTop = 27 object lblTitle: TLabel AlignWithMargins = True Left = 25 @@ -190,6 +189,10 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente end end inherited EditorActionList: TActionList [5] + inherited actEnviarEMail: TAction + Enabled = False + Visible = False + end end inherited SmallImages: TPngImageList [6] end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index 0c86085..32cebf5 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -254,6 +254,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 638 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -272,6 +274,7 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente end inherited pnlAgrupaciones: TTBXDockablePanel Top = 464 + Visible = True ExplicitTop = 464 ExplicitWidth = 802 inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -290,6 +293,11 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente object TBXItem2: TTBXItem Action = actAlmacenes end + object TBXSeparatorItem3: TTBXSeparatorItem + end + object TBXItem4: TTBXItem + Action = actAgentes + end end end end @@ -342,6 +350,11 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente OnExecute = actAlmacenesExecute OnUpdate = actAlmacenesUpdate end + object actAgentes: TAction + Caption = 'Agentes' + OnExecute = actAgentesExecute + OnUpdate = actAgentesUpdate + end end inherited GridPNGImageList: TPngImageList PngImages = < diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index f73b908..28a12bf 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -64,6 +64,9 @@ type cxGridViewBLOQUEADO: TcxGridDBColumn; cxGridViewAGENTE: TcxGridDBColumn; cxGridLevelBloqueados: TcxGridLevel; + actAgentes: TAction; + TBXSeparatorItem3: TTBXSeparatorItem; + TBXItem4: TTBXItem; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; @@ -88,6 +91,8 @@ type procedure cxGridViewNUM_CORREOSCustomDrawHeader(Sender: TcxGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; var ADone: Boolean); + procedure actAgentesExecute(Sender: TObject); + procedure actAgentesUpdate(Sender: TObject); private //Filtros relativos a la vista @@ -111,6 +116,26 @@ uses {$R *.dfm} +procedure TfrViewAlbaranesCliente.actAgentesExecute(Sender: TObject); +begin + if (cxGridViewAGENTE.GroupIndex < 0) then + begin + cxGridViewAGENTE.GroupIndex := cxGridView.GroupedColumnCount; + cxGridViewAGENTE.Visible := False; + end + else + begin + cxGridViewAGENTE.GroupIndex := -1; + cxGridViewAGENTE.Visible := True; + end; +end; + +procedure TfrViewAlbaranesCliente.actAgentesUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Checked := not (cxGridViewAGENTE.GroupIndex < 0); +end; + procedure TfrViewAlbaranesCliente.actAlmacenesExecute(Sender: TObject); begin if (cxGridViewNOMBRE_ALMACEN.GroupIndex < 0) then diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.dfm index 4c90ea7..f95c6b3 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.dfm @@ -4,6 +4,7 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran inherited cxGrid: TcxGrid Height = 286 RootLevelOptions.DetailTabsPosition = dtpTop + OnActiveTabChanged = cxGridActiveTabChanged ExplicitHeight = 286 inherited cxGridView: TcxGridDBTableView inherited cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn @@ -17,24 +18,42 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran Caption = '' end object cxGridLevel1: TcxGridLevel - Caption = 'Generales' + Caption = 'Otros proveedores' end end inherited frViewFiltroBase1: TfrViewFiltroBase inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 225 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 225 ExplicitWidth = 121 Width = 121 end inherited eLista: TcxComboBox Left = 383 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 383 ExplicitWidth = 322 Width = 322 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas index 0975a9a..75928c5 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas @@ -12,7 +12,7 @@ uses uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, uBizContactos, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, - uViewFiltroBase, uDAInterfaces, uViewArticulos; + uViewFiltroBase, uDAInterfaces, uViewArticulos, uCustomView, uViewBase; type IViewElegirArticulosAlbaranesProveedor = interface(IViewArticulos) @@ -57,7 +57,7 @@ begin 0 : if Assigned(FProveedor) then FFiltro.AddItem(cxGridViewID_PROVEEDOR, foEqual, FProveedor.ID, FProveedor.NOMBRE); 1 : if Assigned(FProveedor) then - FFiltro.AddItem(cxGridViewID_PROVEEDOR, foEqual, Null, 'ARTICULOS SIN PROVEEDOR'); + FFiltro.AddItem(cxGridViewID_PROVEEDOR, foNotEqual, FProveedor.ID, FProveedor.NOMBRE); end; end; diff --git a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas index c828475..f7c17a8 100644 --- a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas +++ b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas @@ -90,8 +90,20 @@ begin end; procedure TfrViewProveedorArticulo.PrecioNetoChanged(Sender: TObject); +var + APrecioCoste: Double; + ADescuento: Double; begin - ePrecioNeto.EditValue := ePrecioCoste.EditValue - ((ePrecioCoste.EditValue * eDescuento.EditValue)/100) + APrecioCoste := 0; + ADescuento := 0; + + if not varIsNull(ePrecioCoste.EditValue) then + APrecioCoste := ePrecioCoste.EditValue; + + if not varIsNull(eDescuento.EditValue) then + ADescuento := eDescuento.EditValue; + + ePrecioNeto.EditValue := APrecioCoste - ((APrecioCoste * ADescuento)/100) end; end. diff --git a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk index 7a9d496..4630911 100644 Binary files a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk and b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk differ diff --git a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dproj b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dproj index fc7cd11..1dde002 100644 --- a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dproj +++ b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dproj @@ -1,4 +1,5 @@ - + + {d465978e-860e-4eb2-9a25-2afb559e8e07} BancaElectronica_controller.dpk @@ -39,72 +40,35 @@ 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 - - - - BancaElectronica_controller.dpk - - +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0BancaElectronica_controller.dpk MainSource - - - - - - - + + + + + + + + + + + -