* Ticket #166 -> Arreglo en informes y repaso
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@786 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
parent
2085bbc048
commit
5beea7b2b5
@ -54,58 +54,58 @@
|
||||
<DelphiCompile Include="Base.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\adortl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxDataD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxExportD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxExtEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxGridD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxIntl6D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxIntlPrintSys3D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxLibraryD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\cxPageControlD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\DataAbstract_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dbrtl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dclIndyCore.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\designide.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dsnap.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dxGDIPlusD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dxPSCoreD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\dxThemeD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\GUISDK_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\IndyCore.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\IndyProtocols.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\IndySystem.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\Jcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JclVcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JSDialog100.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvCmpD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvCoreD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvDlgsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvMMD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvNetD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvPageCompsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvStdCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\JvSystemD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\pckMD5.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\pckUCDataConnector.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\pckUserControl_RT.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\PngComponentsD10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\PNG_D10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\RemObjects_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\RemObjects_Indy_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\rtl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\TB2k_D10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\tbx_d10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\vcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\vclactnband.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\vcldb.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\vcljpg.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\VclSmp.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\vclx.dcp" />
|
||||
<DCCReference Include="..\Modulos\Remesas de cliente\Plugin\xmlrtl.dcp" />
|
||||
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Indy_D11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
|
||||
<DCCReference Include="Conexion\uConfigurarConexion.pas">
|
||||
<Form>fConfigurarConexion</Form>
|
||||
<DesignClass>TForm</DesignClass>
|
||||
|
||||
Binary file not shown.
@ -168,20 +168,21 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
'SELECT'#10' PEDIDOS_PROVEEDOR.ID,'#10' PEDIDOS_PROVEEDOR.ID_EMPRESA,'#10' ' +
|
||||
' PEDIDOS_PROVEEDOR.REFERENCIA,'#10' PEDIDOS_PROVEEDOR.FECHA_PEDIDO,' +
|
||||
#10' PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' PEDIDOS_PROVEEDOR.OBSERVAC' +
|
||||
'IONES,'#10' CONTACTOS.NOMBRE,'#10' CONTACTOS.FAX,'#10' CONTACTOS.PERSONA_' +
|
||||
'CONTACTO,'#10' PROVEEDORES_DATOS.CODIGO_ASIGNADO AS CODIGO_CLIENTE,' +
|
||||
#10' PEDIDOS_PROVEEDOR.ID_ALMACEN,'#10' COALESCE(ALMACENES.CALLE, PED' +
|
||||
'IDOS_PROVEEDOR.CALLE) AS CALLE,'#10' COALESCE(ALMACENES.POBLACION, ' +
|
||||
'PEDIDOS_PROVEEDOR.POBLACION) AS POBLACION,'#10' COALESCE(ALMACENES.' +
|
||||
'PROVINCIA, PEDIDOS_PROVEEDOR.PROVINCIA) AS PROVINCIA,'#10' COALESCE' +
|
||||
'(ALMACENES.CODIGO_POSTAL, PEDIDOS_PROVEEDOR.CODIGO_POSTAL) AS CO' +
|
||||
'DIGO_POSTAL,'#10' PEDIDOS_PROVEEDOR.PERSONA_CONTACTO AS ENTREGAR_A,' +
|
||||
#10' PEDIDOS_PROVEEDOR.IMPORTE_TOTAL'#10'FROM'#10' PEDIDOS_PROVEEDOR'#10' IN' +
|
||||
'NER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_PROVEEDOR.ID_PROVE' +
|
||||
'EDOR)'#10' LEFT OUTER JOIN PROVEEDORES_DATOS ON (PROVEEDORES_DATOS.' +
|
||||
'ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN' +
|
||||
' ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHER' +
|
||||
'E PEDIDOS_PROVEEDOR.ID = :ID'#10#10#10#10
|
||||
'IONES,'#10' CONTACTOS.NOMBRE,'#10' CONTACTOS.FAX,'#10' PEDIDOS_PROVEEDOR.' +
|
||||
'PERSONA_CONTACTO_PROV AS PERSONA_CONTACTO,'#10' PROVEEDORES_DATOS.C' +
|
||||
'ODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' PEDIDOS_PROVEEDOR.ID_ALMACEN' +
|
||||
','#10' COALESCE(ALMACENES.CALLE, PEDIDOS_PROVEEDOR.CALLE) AS CALLE,' +
|
||||
#10' COALESCE(ALMACENES.POBLACION, PEDIDOS_PROVEEDOR.POBLACION) AS' +
|
||||
' POBLACION,'#10' COALESCE(ALMACENES.PROVINCIA, PEDIDOS_PROVEEDOR.PR' +
|
||||
'OVINCIA) AS PROVINCIA,'#10' COALESCE(ALMACENES.CODIGO_POSTAL, PEDID' +
|
||||
'OS_PROVEEDOR.CODIGO_POSTAL) AS CODIGO_POSTAL,'#10' PEDIDOS_PROVEEDO' +
|
||||
'R.PERSONA_CONTACTO AS ENTREGAR_A,'#10' PEDIDOS_PROVEEDOR.IMPORTE_TO' +
|
||||
'TAL'#10'FROM'#10' PEDIDOS_PROVEEDOR'#10' INNER JOIN CONTACTOS ON (CONTACTO' +
|
||||
'S.ID = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN PROVEED' +
|
||||
'ORES_DATOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = PEDIDOS_PROVEEDO' +
|
||||
'R.ID_PROVEEDOR)'#10' LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = P' +
|
||||
'EDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10#10#10 +
|
||||
#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
|
||||
@ -22,21 +22,21 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
'SELECT'#10' PEDIDOS_PROVEEDOR.ID,'#10' PEDIDOS_PROVEEDOR.ID_EMPRESA,'#10' ' +
|
||||
' PEDIDOS_PROVEEDOR.REFERENCIA,'#10' PEDIDOS_PROVEEDOR.FECHA_PEDIDO,' +
|
||||
#10' PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' PEDIDOS_PROVEEDOR.OBSERVAC' +
|
||||
'IONES,'#10' CONTACTOS.NOMBRE,'#10' CONTACTOS.FAX,'#10' CONTACTOS.PERSONA_' +
|
||||
'CONTACTO,'#10' PROVEEDORES_DATOS.CODIGO_ASIGNADO AS CODIGO_CLIENTE,' +
|
||||
#10' PEDIDOS_PROVEEDOR.ID_ALMACEN,'#10' COALESCE(ALMACENES.CALLE, PED' +
|
||||
'IDOS_PROVEEDOR.CALLE) AS CALLE_ALMACEN,'#10' COALESCE(ALMACENES.POB' +
|
||||
'LACION, PEDIDOS_PROVEEDOR.POBLACION) AS POBLACION_ALMACEN,'#10' COA' +
|
||||
'LESCE(ALMACENES.PROVINCIA, PEDIDOS_PROVEEDOR.PROVINCIA) AS PROVI' +
|
||||
'NCIA_ALMACEN,'#10' COALESCE(ALMACENES.CODIGO_POSTAL, PEDIDOS_PROVEE' +
|
||||
'DOR.CODIGO_POSTAL) AS CODIGO_POSTAL_ALMACEN,'#10' PEDIDOS_PROVEEDOR' +
|
||||
'.PERSONA_CONTACTO AS PERSONA_CONTACTO_ALMACEN,'#10' PEDIDOS_PROVEED' +
|
||||
'OR.IMPORTE_TOTAL'#10'FROM'#10' PEDIDOS_PROVEEDOR'#10' INNER JOIN CONTACTOS' +
|
||||
' ON (CONTACTOS.ID = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER' +
|
||||
' JOIN PROVEEDORES_DATOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = PED' +
|
||||
'IDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN ALMACENES ON (ALM' +
|
||||
'ACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHERE PEDIDOS_PROVEEDO' +
|
||||
'R.ID = :ID'#10#10#10#10#10
|
||||
'IONES,'#10' CONTACTOS.NOMBRE,'#10' CONTACTOS.FAX,'#10' PEDIDOS_PROVEEDOR.' +
|
||||
'PERSONA_CONTACTO_PROV AS PERSONA_CONTACTO,'#10' PROVEEDORES_DATOS.C' +
|
||||
'ODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' PEDIDOS_PROVEEDOR.ID_ALMACEN' +
|
||||
','#10' COALESCE(ALMACENES.CALLE, PEDIDOS_PROVEEDOR.CALLE) AS CALLE_' +
|
||||
'ALMACEN,'#10' COALESCE(ALMACENES.POBLACION, PEDIDOS_PROVEEDOR.POBLA' +
|
||||
'CION) AS POBLACION_ALMACEN,'#10' COALESCE(ALMACENES.PROVINCIA, PEDI' +
|
||||
'DOS_PROVEEDOR.PROVINCIA) AS PROVINCIA_ALMACEN,'#10' COALESCE(ALMACE' +
|
||||
'NES.CODIGO_POSTAL, PEDIDOS_PROVEEDOR.CODIGO_POSTAL) AS CODIGO_PO' +
|
||||
'STAL_ALMACEN,'#10' PEDIDOS_PROVEEDOR.PERSONA_CONTACTO AS PERSONA_CO' +
|
||||
'NTACTO_ALMACEN,'#10' PEDIDOS_PROVEEDOR.IMPORTE_TOTAL'#10'FROM'#10' PEDIDOS' +
|
||||
'_PROVEEDOR'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_PRO' +
|
||||
'VEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN PROVEEDORES_DATOS ON (PRO' +
|
||||
'VEEDORES_DATOS.ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' ' +
|
||||
'LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.I' +
|
||||
'D_ALMACEN)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10#10#10#10#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
|
||||
@ -261,8 +261,9 @@ begin
|
||||
else begin
|
||||
FPedido.ID_DIRECCION := FDireccion.ID;
|
||||
FPedido.IMPORTE_PORTE := FDireccion.PORTE;
|
||||
FPedido.PERSONA_CONTACTO_PROV := FDireccion.PERSONA_CONTACTO;
|
||||
end;
|
||||
FPedido.PERSONA_CONTACTO_PROV := FDireccion.PERSONA_CONTACTO;
|
||||
|
||||
EscribirTextoDireccion;
|
||||
end;
|
||||
end;
|
||||
@ -318,7 +319,14 @@ begin
|
||||
FProveedor.DataTable.Active := True;
|
||||
|
||||
edtPersonaContacto.Enabled := True;
|
||||
RefrescarDireccion;
|
||||
|
||||
if FProveedor.Direcciones.RecordCount > 0 then
|
||||
ElegirDireccionProveedor
|
||||
else begin
|
||||
FPedido.Edit;
|
||||
FPedido.PERSONA_CONTACTO_PROV := FProveedor.PERSONA_CONTACTO;
|
||||
RefrescarDireccion;
|
||||
end;
|
||||
end
|
||||
else begin
|
||||
dsProveedor.DataTable := NIL;
|
||||
@ -379,6 +387,7 @@ begin
|
||||
if not FProveedor.DataTable.Active then
|
||||
FProveedor.DataTable.Active := True;
|
||||
|
||||
edtPersonaContacto.Enabled := True;
|
||||
RefrescarDireccion;
|
||||
end
|
||||
else begin
|
||||
@ -394,9 +403,10 @@ begin
|
||||
|
||||
if (csLoading in Self.ComponentState) then
|
||||
Exit;
|
||||
|
||||
|
||||
actAnadirContacto.Enabled := not ReadOnly;
|
||||
actElegirContacto.Enabled := not ReadOnly;
|
||||
edtPersonaContacto.Enabled := not ReadOnly;
|
||||
end;
|
||||
|
||||
procedure TfrViewDatosYSeleccionProveedorPedido.VerFichaProveedor;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user