diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index b1d6eba6..59a3917a 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,13 +44,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,56 +58,56 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 9de45575..de211f8c 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,10 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse3610FalseFalseFalseFalseFalse30821252Rodax Software S.L.3.6.1.0FactuGESFactuGES3.6.1.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse3620FalseFalseFalseFalseFalse30821252Rodax Software S.L.3.6.2.0FactuGESFactuGES3.6.2.0 + + + File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 91b24e8c..77c54f3c 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 3,6,1,0 -PRODUCTVERSION 3,6,1,0 +FILEVERSION 3,6,2,0 +PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "3.6.1.0\0" + VALUE "FileVersion", "3.6.2.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "3.6.1.0\0" + VALUE "ProductVersion", "3.6.2.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 8ba6714a..0ce73e21 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 4ea79c50..e209795d 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/Informes/5/InfContratoCliente.fr3 b/Source/Informes/5/InfContratoCliente.fr3 index d101994e..f9ed9b08 100644 --- a/Source/Informes/5/InfContratoCliente.fr3 +++ b/Source/Informes/5/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ - + @@ -64,8 +64,8 @@ - - + + @@ -76,16 +76,18 @@ - - + + + - - + + + @@ -99,14 +101,11 @@ - - - - + - + diff --git a/Source/Informes/6/InfContratoCliente.fr3 b/Source/Informes/6/InfContratoCliente.fr3 new file mode 100644 index 00000000..ed4e787d --- /dev/null +++ b/Source/Informes/6/InfContratoCliente.fr3 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/6/InfPedidoProveedor.fr3 b/Source/Informes/6/InfPedidoProveedor.fr3 new file mode 100644 index 00000000..da80bedf --- /dev/null +++ b/Source/Informes/6/InfPedidoProveedor.fr3 @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/6/InfPresupuestoCliente.fr3 b/Source/Informes/6/InfPresupuestoCliente.fr3 index 82a84864..2b060285 100644 --- a/Source/Informes/6/InfPresupuestoCliente.fr3 +++ b/Source/Informes/6/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -54,34 +54,29 @@ - - - + - + - - - - - - - - + + + + + + - - - - - + + + + diff --git a/Source/Informes/InfContratoCliente.fr3 b/Source/Informes/InfContratoCliente.fr3 deleted file mode 100644 index 9ed129a6..00000000 --- a/Source/Informes/InfContratoCliente.fr3 +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas index 643d7274..93bb6209 100644 --- a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas +++ b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas @@ -111,13 +111,13 @@ end;} function TAlmacenesController.Buscar(const ID: Integer): IBizAlmacen; begin Result := (FDataModule as IDataModuleAlmacenes).GetItem(ID); - FiltrarEmpresa(Result); +// FiltrarEmpresa(Result); end; function TAlmacenesController.BuscarTodos: IBizAlmacen; begin Result := FDataModule.GetItems; - FiltrarEmpresa(Result); +// FiltrarEmpresa(Result); end; constructor TAlmacenesController.Create; @@ -373,7 +373,7 @@ var AAlmacen : IBizAlmacen; begin AAlmacen := FDataModule.NewItem; - FiltrarEmpresa(AAlmacen); +// FiltrarEmpresa(AAlmacen); AAlmacen.DataTable.Active := True; AAlmacen.Insert; Result := AAlmacen; diff --git a/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm index 21093918..2d5047f1 100644 --- a/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uViewAlmacenes.dfm @@ -11,10 +11,12 @@ inherited frViewAlmacenes: TfrViewAlmacenes OptionsBehavior.PullFocusing = True object cxGridViewID: TcxGridDBColumn DataBinding.FieldName = 'ID' + Visible = False OnCustomDrawCell = cxGridViewIDCustomDrawCell BestFitMaxWidth = 22 MinWidth = 22 Options.HorzSizing = False + VisibleForCustomization = False Width = 22 IsCaptionAssigned = True end @@ -58,6 +60,44 @@ inherited frViewAlmacenes: TfrViewAlmacenes end 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 = '' + ExplicitWidth = 250 + Width = 250 + end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 250 + Width = 250 + end + inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 250 + Width = 250 + end + inherited txtFiltroTodo2: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 250 + Width = 250 + end + end + end + end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.842406053240000000 diff --git a/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas b/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas index ca51b71c..012b0d32 100644 --- a/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas +++ b/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas @@ -13,7 +13,8 @@ uses dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView, + uViewBase; type IViewAlmacenes = interface(IViewGrid) diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm index f06cd75a..f32db3e4 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm @@ -1,6 +1,6 @@ inherited frViewArticulo: TfrViewArticulo - Width = 451 - Height = 304 + Width = 814 + Height = 450 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -10,18 +10,19 @@ inherited frViewArticulo: TfrViewArticulo object dxLayoutControlArticulo: TdxLayoutControl Left = 0 Top = 0 - Width = 451 + Width = 814 Height = 393 Align = alTop ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth] + ExplicitWidth = 451 DesignSize = ( - 451 + 814 393) object PngSpeedButton2: TPngSpeedButton - Left = 546 + Left = 752 Top = 28 Width = 23 Height = 22 @@ -48,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object PngSpeedButton1: TPngSpeedButton - Left = 546 + Left = 752 Top = 56 Width = 23 Height = 22 @@ -98,7 +99,7 @@ inherited frViewArticulo: TfrViewArticulo end object eNoComisionable: TcxDBCheckBox Left = 103 - Top = 109 + Top = 136 Caption = 'Art'#237'culo no comisionable' DataBinding.DataField = 'COMISIONABLE' DataBinding.DataSource = dsViewArticulo @@ -117,11 +118,11 @@ inherited frViewArticulo: TfrViewArticulo StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 3 + TabOrder = 4 Width = 144 end object eImagen: TcxImage - Left = 409 + Left = 477 Top = 28 Properties.GraphicClassName = 'TJPEGImage' Properties.PopupMenuLayout.MenuItems = [] @@ -167,8 +168,8 @@ inherited frViewArticulo: TfrViewArticulo Width = 70 end inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor - Left = 219 - Top = 166 + Left = 425 + Top = 193 Width = 350 Height = 202 Font.Charset = DEFAULT_CHARSET @@ -179,8 +180,8 @@ inherited frViewArticulo: TfrViewArticulo ParentFont = False TabOrder = 12 ReadOnly = False - ExplicitLeft = 219 - ExplicitTop = 166 + ExplicitLeft = 425 + ExplicitTop = 193 inherited dxLayoutControl1: TdxLayoutControl inherited edtNIFCIF: TcxDBTextEdit ExplicitWidth = 562 @@ -202,7 +203,7 @@ inherited frViewArticulo: TfrViewArticulo end object eReferenciaProv: TcxDBTextEdit Left = 103 - Top = 166 + Top = 193 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_PROV' DataBinding.DataSource = dsViewArticulo @@ -219,7 +220,7 @@ inherited frViewArticulo: TfrViewArticulo end object ePrecioCoste: TcxDBCurrencyEdit Left = 103 - Top = 193 + Top = 220 DataBinding.DataField = 'PRECIO_COSTE' DataBinding.DataSource = dsViewArticulo Properties.Alignment.Horz = taRightJustify @@ -239,7 +240,7 @@ inherited frViewArticulo: TfrViewArticulo end object eDescuento: TcxDBSpinEdit Left = 103 - Top = 220 + Top = 247 DataBinding.DataField = 'DESCUENTO' DataBinding.DataSource = dsViewArticulo Properties.Alignment.Horz = taRightJustify @@ -262,7 +263,7 @@ inherited frViewArticulo: TfrViewArticulo end object ePrecioNeto: TcxDBCurrencyEdit Left = 103 - Top = 247 + Top = 274 DataBinding.DataField = 'PRECIO_NETO' DataBinding.DataSource = dsViewArticulo Enabled = False @@ -287,7 +288,7 @@ inherited frViewArticulo: TfrViewArticulo end object ePrecioPorte: TcxDBCurrencyEdit Left = 103 - Top = 274 + Top = 301 DataBinding.DataField = 'PRECIO_PORTE' DataBinding.DataSource = dsViewArticulo Properties.Alignment.Horz = taRightJustify @@ -306,7 +307,7 @@ inherited frViewArticulo: TfrViewArticulo Width = 86 end object cbNoInventariable: TcxDBCheckBox - Left = 242 + Left = 103 Top = 109 Caption = 'Art'#237'culo no inventariable' DataBinding.DataField = 'INVENTARIABLE' @@ -326,12 +327,12 @@ inherited frViewArticulo: TfrViewArticulo StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 4 + TabOrder = 3 Width = 144 end object ePrecioPVP: TcxDBCurrencyEdit Left = 103 - Top = 301 + Top = 328 DataBinding.DataField = 'PRECIO_PVP' DataBinding.DataSource = dsViewArticulo Properties.Alignment.Horz = taRightJustify @@ -392,28 +393,20 @@ inherited frViewArticulo: TfrViewArticulo Control = cbFamilia ControlOptions.ShowBorder = False end - object dxLayoutControlArticuloGroup8: TdxLayoutGroup - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControlArticuloItem1: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = ' ' - Visible = False - Control = eNoComisionable - ControlOptions.ShowBorder = False - end - object dxLayoutControlArticuloItem7: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = ' ' - ShowCaption = False - Visible = False - Control = cbNoInventariable - ControlOptions.ShowBorder = False - end + object dxLayoutControlArticuloItem7: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = ' ' + Control = cbNoInventariable + ControlOptions.ShowBorder = False + end + object dxLayoutControlArticuloItem1: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = ' ' + Visible = False + Control = eNoComisionable + ControlOptions.ShowBorder = False end end end diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.pas b/Source/Modulos/Articulos/Views/uViewArticulo.pas index 50b99f5e..2880b16f 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulo.pas @@ -70,7 +70,6 @@ type dxLayoutControlArticuloGroup12: TdxLayoutGroup; dxLayoutControlArticuloItem7: TdxLayoutItem; cbNoInventariable: TcxDBCheckBox; - dxLayoutControlArticuloGroup8: TdxLayoutGroup; dxLayoutControlArticuloItem9: TdxLayoutItem; ePrecioPVP: TcxDBCurrencyEdit; procedure actEliminarExecute(Sender: TObject); diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorElegirContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorElegirContratosCliente.dfm index 0a2c00d3..bae3118e 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorElegirContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorElegirContratosCliente.dfm @@ -51,9 +51,9 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente ExplicitTop = 87 ExplicitWidth = 656 inherited tbxMain: TTBXToolbar - Left = 431 - ExplicitLeft = 431 - ExplicitWidth = 225 + Left = 481 + ExplicitLeft = 481 + ExplicitWidth = 175 inherited TBXItem5: TTBXItem Visible = False end @@ -83,10 +83,10 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente ExplicitWidth = 656 end inherited TBXTMain2: TTBXToolbar - Left = 343 + Left = 123 Visible = False - ExplicitLeft = 343 - ExplicitWidth = 221 + ExplicitLeft = 123 + ExplicitWidth = 533 end end inherited StatusBar: TJvStatusBar @@ -152,9 +152,21 @@ inherited fEditorElegirContratosCliente: TfEditorElegirContratosCliente inherited actDuplicar: TAction Visible = False end + inherited actExportarExcel: TAction + Enabled = False + Visible = False + end inherited actGenerarAlbaranCli: TAction Visible = False end + inherited actEnviarEMail: TAction + Enabled = False + Visible = False + end + inherited ActDuplicarAPresupuesto: TAction + Enabled = False + Visible = False + end end inherited JvAppRegistryStorage: TJvAppRegistryStorage [9] end diff --git a/Source/Modulos/Inventario/Controller/uInventarioController.pas b/Source/Modulos/Inventario/Controller/uInventarioController.pas index f51d4981..cc8b7d3d 100644 --- a/Source/Modulos/Inventario/Controller/uInventarioController.pas +++ b/Source/Modulos/Inventario/Controller/uInventarioController.pas @@ -180,19 +180,19 @@ end; function TInventarioController.Buscar(const ID_ALMACEN: Integer): IBizInventario; begin Result := (FDataModule as IDataModuleInventario).GetItems(ID_ALMACEN); - FiltrarEmpresa(Result); +// FiltrarEmpresa(Result); end; function TInventarioController.BuscarDetalleReservas: IBizDetalleReservas; begin Result := FDataModule.GetDetalleReservas; - FiltrarEmpresa(Result); +// FiltrarEmpresa(Result); end; function TInventarioController.BuscarTodos: IBizInventario; begin Result := FDataModule.GetItems; - FiltrarEmpresa(Result); +// FiltrarEmpresa(Result); end; procedure TInventarioController.Copiar(AArticulos: IBizInventario; ADetalles: IDAStronglyTypedDataTable; AInventario: IBizInventario); diff --git a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas index 9eb87ffc..96f35041 100644 --- a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas +++ b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas @@ -60,6 +60,7 @@ type function ExtraerSeleccionados(APedido: IBizPedidoProveedor) : IBizPedidoProveedor; function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor; procedure RecuperarProveedor(APedido: IBizPedidoProveedor); + Procedure AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String); end; TPedidosProveedorController = class(TControllerBase, IPedidosProveedorController) @@ -133,6 +134,7 @@ type function ExtraerSeleccionados(APedido: IBizPedidoProveedor) : IBizPedidoProveedor; function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor; + Procedure AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String); function DarListaAnosPedidos: TStringList; procedure FiltrarAno(APedido: IBizPedidoProveedor; ADynWhereDataTable: WideString; const Ano: String); @@ -159,6 +161,29 @@ begin APedido.Insert; end; +procedure TPedidosProveedorController.AsignarContrato(APedido: IBizPedidoProveedor; const ID_CONTRATO: Integer; AReferencia, ANombreCliente: String); +begin +//Asignaremos el ID de contrato a capón así como la refencia, con el fin de no tener que añadir relación con modulo contratos, evitando redundancia ciclica + if not Assigned(APedido) then + raise Exception.Create ('Pedido no asignado (CambiarSituacion)'); + + if not APedido.DataTable.Active then + APedido.DataTable.Active := True; + + ShowHourglassCursor; + APedido.DataTable.DisableControls; + try + APedido.Edit; + APedido.ID_CONTRATO_CLIENTE := ID_CONTRATO; + APedido.REF_CON_CLIENTE := AReferencia; + APedido.NOMBRE_CLIENTE := ANombreCliente; +// APedido.Post; + finally + APedido.DataTable.EnableControls; + HideHourglassCursor; + end; +end; + procedure TPedidosProveedorController.AsignarDataModule; begin FDataModule := TDataModulePedidosProveedor.Create(Nil); diff --git a/Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj b/Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj index f1bbc588..2d28b6fa 100644 --- a/Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj +++ b/Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj @@ -25,6 +25,7 @@ + @@ -138,6 +139,24 @@ + + + + + + + + + + + + + + + + + + @@ -273,32 +292,23 @@ - - + + - - + + - - - - - - - - - - - + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm index 5db76fb4..62ad43ec 100644 --- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm +++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm @@ -480,7 +480,7 @@ object RptPedidosProveedor: TRptPedidosProveedor PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 39065.872423495400000000 - ReportOptions.LastChange = 43591.572818969910000000 + ReportOptions.LastChange = 44812.496929317130000000 ScriptLanguage = 'PascalScript' ShowProgress = False StoreInDFM = False diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas index aa507565..745a34b5 100644 --- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas +++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas @@ -44,7 +44,7 @@ implementation {$R *.dfm} uses - uDataModuleServer, schPedidosProveedorClient_Intf; + uSistemaFunc, uDataModuleServer, schPedidosProveedorClient_Intf; const rptInforme = 'InfPedidoProveedor.fr3'; @@ -119,6 +119,8 @@ var AStream: TMemoryStream; dsMaster: IDADataset; dsDetail: IDADataset; + AInforme: Variant; + begin AStream := TMemoryStream.Create; @@ -134,7 +136,11 @@ begin DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1); DABINAdapter.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE); - frxReport.LoadFromFile(DarRutaInformes + rptInforme, True); + AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString); + if VarIsNull(AInforme) then + raise Exception.Create (('Error Servidor: _GenerarContrato, no encuentra informe ' + rptInforme)); + + frxReport.LoadFromFile(AInforme, True); frxReport.PrepareReport(False); finally diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm index e61e2ec8..9893980b 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm @@ -29,7 +29,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 14 + TabOrder = 15 ReadOnly = False ExplicitLeft = 577 ExplicitTop = 28 @@ -114,7 +114,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + TabOrder = 13 Width = 158 end object edtFechaEntrega: TcxDBDateEdit @@ -169,7 +169,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 13 + TabOrder = 14 ReadOnly = False ExplicitLeft = 22 ExplicitTop = 456 @@ -188,14 +188,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 287 ExplicitWidth = 287 end - inherited cbLista: TcxDBLookupComboBox - ExplicitWidth = 425 - Width = 425 - end inherited bModificar: TBitBtn - Left = 318 + Left = 529 Top = 159 - ExplicitLeft = 318 + ExplicitLeft = 529 ExplicitTop = 159 end inherited txtDireccion: TStaticText @@ -212,6 +208,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor ExplicitWidth = 551 Width = 551 end + inherited cbUbicacion: TcxDBComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 183 + Width = 183 + end + inherited eNumBultos: TcxDBSpinEdit + Left = 588 + ExplicitLeft = 588 + end end inherited ActionList1: TActionList Left = 32 @@ -282,7 +290,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 + TabOrder = 12 Width = 158 end object eReferenciaContratoCli: TcxTextEdit @@ -308,12 +316,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Width = 20 end object Button1: TButton - Left = 415 + Left = 447 Top = 190 - Width = 132 + Width = 100 Height = 23 Action = actVerContratoCli - TabOrder = 8 + TabOrder = 9 end inline frViewTienda1: TfrViewTienda Left = 577 @@ -328,7 +336,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 15 + TabOrder = 16 ReadOnly = False ExplicitLeft = 577 ExplicitTop = 279 @@ -352,7 +360,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 10 + TabOrder = 11 ReadOnly = False ExplicitLeft = 158 ExplicitTop = 246 @@ -439,9 +447,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + TabOrder = 10 Width = 250 end + object Button2: TButton + Left = 341 + Top = 190 + Width = 100 + Height = 23 + Action = actAsignarContratoCli + TabOrder = 8 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -524,6 +540,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Control = eReferenciaContratoCli ControlOptions.ShowBorder = False end + object dxLayoutControl1Item17: TdxLayoutItem + ShowCaption = False + Control = Button2 + ControlOptions.ShowBorder = False + end object dxLayoutControl1Item12: TdxLayoutItem AutoAligns = [aaVertical] AlignHorz = ahRight @@ -624,10 +645,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor Left = 120 Top = 8 object actVerContratoCli: TAction - Caption = 'Ver contrato de cliente...' + Caption = 'Ver contrato' OnExecute = actVerContratoCliExecute OnUpdate = actVerContratoCliUpdate end + object actAsignarContratoCli: TAction + Caption = 'Asignar contrato' + OnExecute = actAsignarContratoCliExecute + OnUpdate = actAsignarContratoCliUpdate + end end object dsVendedor: TDADataSource Left = 88 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas index 362e4fe4..56f646dc 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas @@ -82,6 +82,9 @@ type cbVendedor: TcxDBLookupComboBox; dxLayoutControl1Group7: TdxLayoutGroup; dsVendedor: TDADataSource; + actAsignarContratoCli: TAction; + dxLayoutControl1Item17: TdxLayoutItem; + Button2: TButton; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure bFormasPagoClick(Sender: TObject); @@ -89,6 +92,8 @@ type procedure actVerContratoCliUpdate(Sender: TObject); procedure frViewProveedorPedidoButton1Click(Sender: TObject); procedure frViewProveedorPedidoButton2Click(Sender: TObject); + procedure actAsignarContratoCliExecute(Sender: TObject); + procedure actAsignarContratoCliUpdate(Sender: TObject); protected FPedido : IBizPedidoProveedor; FController : IPedidosProveedorController; @@ -102,6 +107,9 @@ type function GetPedido: IBizPedidoProveedor; procedure SetPedido(const Value: IBizPedidoProveedor); virtual; + function GetContratoCliAsociado: IBizContratoCliente; + procedure SetContratoCliAsociado(const Value: IBizContratoCliente); + function GetController : IPedidosProveedorController; procedure SetController (const Value : IPedidosProveedorController); function GetViewProveedorPedido: TfrViewDatosYSeleccionProveedor; @@ -109,6 +117,7 @@ type public property Pedido: IBizPedidoProveedor read GetPedido write SetPedido; + property ContratoCliAsociado: IBizContratoCliente read GetContratoCliAsociado write SetContratoCliAsociado; property Controller : IPedidosProveedorController read GetController write SetController; property ViewProveedorPedido: TfrViewDatosYSeleccionProveedor read GetViewProveedorPedido; end; @@ -119,6 +128,29 @@ implementation { TfrViewPedidoProveedor } +procedure TfrViewPedidoProveedor.actAsignarContratoCliExecute(Sender: TObject); +var + AContrato : IBizContratoCliente; +begin + inherited; + AContrato := FContratoCliController.ElegirContratos(FContratoCliController.BuscarTodos, + 'Elija el contrato de cliente que desea utilizar para dar de alta el albarán.', False); + if Assigned(AContrato) then + begin + FController.AsignarContrato(Pedido, AContrato.ID, AContrato.REFERENCIA, AContrato.NOMBRE_CLIENTE); + ContratoCliAsociado := AContrato; + end; +end; + +procedure TfrViewPedidoProveedor.actAsignarContratoCliUpdate(Sender: TObject); +begin + inherited; + //Lo modificamos para que el pedido de proveedor este asociado al contrato de cliente + if (Sender as TAction).Enabled then + (Sender as TAction).Enabled := not Assigned(FContratoCliAsociado) + +end; + procedure TfrViewPedidoProveedor.actVerContratoCliExecute(Sender: TObject); begin inherited; @@ -130,8 +162,7 @@ procedure TfrViewPedidoProveedor.actVerContratoCliUpdate(Sender: TObject); begin inherited; //Lo modificamos para que el pedido de proveedor este asociado al contrato de cliente - if (Sender as TAction).Enabled then - (Sender as TAction).Enabled := Assigned(FContratoCliAsociado) + (Sender as TAction).Enabled := Assigned(FContratoCliAsociado) end; procedure TfrViewPedidoProveedor.bFormasPagoClick(Sender: TObject); @@ -188,6 +219,11 @@ begin frViewProveedorPedido.actAnadirContacto.Execute; end; +function TfrViewPedidoProveedor.GetContratoCliAsociado: IBizContratoCliente; +begin + Result := FContratoCliAsociado; +end; + function TfrViewPedidoProveedor.GetController: IPedidosProveedorController; begin Result := FController; @@ -203,6 +239,19 @@ begin Result := FViewProveedorPedido; end; +procedure TfrViewPedidoProveedor.SetContratoCliAsociado(const Value: IBizContratoCliente); +begin + FContratoCliAsociado := Value; + if Assigned(FContratoCliAsociado) then + begin + if not FContratoCliAsociado.DataTable.Active then + FContratoCliAsociado.DataTable.Active := True; + eReferenciaContratoCli.Text := FContratoCliAsociado.REFERENCIA + end + else + eReferenciaContratoCli.Text := ''; +end; + procedure TfrViewPedidoProveedor.SetController(const Value: IPedidosProveedorController); begin FController := Value; @@ -229,16 +278,7 @@ begin FContratoCliAsociado := NIL; if (FPedido.ID_CONTRATO_CLIENTE > 0) then - begin - FContratoCliAsociado := FContratoCliController.Buscar(FPedido.ID_CONTRATO_CLIENTE); - if Assigned(FContratoCliAsociado) then - begin - FContratoCliAsociado.DataTable.Active := True; - eReferenciaContratoCli.Text := FContratoCliAsociado.REFERENCIA - end - else - eReferenciaContratoCli.Text := ''; - end + ContratoCliAsociado := FContratoCliController.Buscar(FPedido.ID_CONTRATO_CLIENTE) else eReferenciaContratoCli.Text := 'No hay contrato asociado'; end diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 11a98073..5b95255a 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse3610FalseFalseFalseFalseFalse30821252Rodax Software S.L.3.6.1.0FactuGES (Servidor)3.6.1.0viernes, 24 de junio de 2022 12:51 + FalseTrueFalseTrueFalse3620FalseFalseFalseFalseFalse30821252Rodax Software S.L.3.6.2.0FactuGES (Servidor)3.6.2.0martes, 23 de agosto de 2022 12:45 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index b650d961..d1818560 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 3,6,1,0 -PRODUCTVERSION 3,6,1,0 +FILEVERSION 3,6,2,0 +PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "3.6.1.0\0" + VALUE "FileVersion", "3.6.2.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "3.6.1.0\0" - VALUE "CompileDate", "martes, 23 de agosto de 2022 12:45\0" + VALUE "ProductVersion", "3.6.2.0\0" + VALUE "CompileDate", "viernes, 09 de septiembre de 2022 11:04\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index fddddd24..6db5ae19 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ