diff --git a/Output/Debug/Cliente/AlbaranesCliente_view.bpl b/Output/Debug/Cliente/AlbaranesCliente_view.bpl index fe130702..dec4fb26 100644 Binary files a/Output/Debug/Cliente/AlbaranesCliente_view.bpl and b/Output/Debug/Cliente/AlbaranesCliente_view.bpl differ diff --git a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl index 16fa43cc..7851288c 100644 Binary files a/Output/Debug/Cliente/AlbaranesProveedor_view.bpl and b/Output/Debug/Cliente/AlbaranesProveedor_view.bpl differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 5d8c3f29..635a99a2 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -116,10 +116,36 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente ExplicitTop = 28 inherited dxLayoutControl1: TdxLayoutControl Align = alTop + inherited edtlNombre: TcxDBTextEdit + ExplicitWidth = 224 + Width = 224 + end + inherited edtNIFCIF: TcxDBTextEdit + ExplicitWidth = 562 + Width = 562 + end + inherited edtCalle: TcxDBTextEdit + ExplicitWidth = 562 + Width = 562 + end + inherited edtPoblacion: TcxDBTextEdit + ExplicitWidth = 177 + Width = 177 + end + inherited edtProvincia: TcxDBTextEdit + ExplicitWidth = 327 + Width = 327 + end inherited edtCodigoPostal: TcxDBTextEdit Left = 268 ExplicitLeft = 268 end + inherited Button1: TBitBtn + OnClick = frViewClienteAlbaranButton1Click + end + inherited Button2: TBitBtn + OnClick = frViewClienteAlbaranButton2Click + end inherited Button3: TBitBtn Left = 158 ExplicitLeft = 158 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas index ed3975a6..e0538a6d 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas @@ -112,6 +112,8 @@ type procedure frViewClienteAlbaranactElegirContactoUpdate(Sender: TObject); procedure actElegirDireccionUpdate(Sender: TObject); procedure actVerPedidoCliUpdate(Sender: TObject); + procedure frViewClienteAlbaranButton1Click(Sender: TObject); + procedure frViewClienteAlbaranButton2Click(Sender: TObject); protected FAlbaran : IBizAlbaranCliente; @@ -310,6 +312,28 @@ begin (Sender as TAction).Enabled := not Assigned(FPedidoAsociado); end; +procedure TfrViewAlbaranCliente.frViewClienteAlbaranButton1Click(Sender: TObject); +begin + if Assigned(Albaran) and Assigned(Albaran.Cliente) and + Assigned (Albaran.Detalles) and (Albaran.Detalles.RecordCount > 0) then + begin + if (Application.MessageBox('Los descuentos de los artículos del albarán serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then + Exit; + end; + frViewClienteAlbaran.actElegirContacto.Execute; +end; + +procedure TfrViewAlbaranCliente.frViewClienteAlbaranButton2Click(Sender: TObject); +begin + if Assigned(Albaran) and Assigned(Albaran.Cliente) and + Assigned (Albaran.Detalles) and (Albaran.Detalles.RecordCount > 0) then + begin + if (Application.MessageBox('Los descuentos de los artículos del albarán serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then + Exit; + end; + frViewClienteAlbaran.actAnadirContacto.Execute; +end; + function TfrViewAlbaranCliente.GetAlbaran: IBizAlbaranCliente; begin Result := FAlbaran; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 35461a38..08bbfa22 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -14,8 +14,6 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 688 - ExplicitHeight = 461 DesignSize = ( 827 585) @@ -122,6 +120,12 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Left = 239 ExplicitLeft = 239 end + inherited Button1: TBitBtn + OnClick = frViewProveedorAlbaranButton1Click + end + inherited Button2: TBitBtn + OnClick = frViewProveedorAlbaranButton2Click + end inherited Button3: TBitBtn Left = 123 ExplicitLeft = 123 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas index 6b25805a..e0c80218 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas @@ -214,7 +214,7 @@ begin if (Application.MessageBox('Si cambia de proveedor, se eliminarán todos sus artículos del la orden de devolución actual, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then Exit; end; - frViewProveedorAlbaran.actElegirContacto.Execute; + frViewProveedorAlbaran.actAnadirContacto.Execute; end; function TfrViewAlbaranProveedor.GetAlbaran: IBizAlbaranProveedor; diff --git a/Source/Modulos/Lib/AlbaranesCliente_view.dcp b/Source/Modulos/Lib/AlbaranesCliente_view.dcp index b135073b..fc9e21c5 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_view.dcp and b/Source/Modulos/Lib/AlbaranesCliente_view.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp index 97e87cad..547c8eba 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp differ