Se adaptan los informes b para que no salgan datos de la empresa y no pregunte si imprimir con logotipo, se cambia lógica de forma de pago para presupuestos y contratos y que al cambiar de cliente que cambie de forma de pago
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@83 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
parent
8f2d982ebd
commit
ec5eeb3fb0
BIN
Build/Build.fbl6
BIN
Build/Build.fbl6
Binary file not shown.
@ -621,7 +621,7 @@ CREATE TABLE CLIENTES_DATOS (
|
||||
CREATE TABLE CLIENTES_DTOS_PROVEEDORES (
|
||||
ID TIPO_ID NOT NULL,
|
||||
ID_CLIENTE TIPO_ID DEFAULT 0 NOT NULL,
|
||||
ID_PROVEEDOR SMALLINT DEFAULT 0 NOT NULL,
|
||||
ID_PROVEEDOR TIPO_ID DEFAULT 0 NOT NULL,
|
||||
DESCUENTO TIPO_PORCENTAJE DEFAULT 0
|
||||
);
|
||||
|
||||
@ -839,8 +839,8 @@ CREATE TABLE EMPRESAS (
|
||||
USUARIO TIPO_USUARIO,
|
||||
LOGOTIPO TIPO_BINARIO,
|
||||
REGISTRO_MERCANTIL VARCHAR(255),
|
||||
ID_TIPO_IVA SMALLINT,
|
||||
ID_FORMA_PAGO SMALLINT,
|
||||
ID_TIPO_IVA TIPO_ID,
|
||||
ID_FORMA_PAGO TIPO_ID,
|
||||
VALIDEZ_PRESUPUESTOS SMALLINT,
|
||||
PRECIO_PUNTO TIPO_IMPORTE
|
||||
);
|
||||
@ -1550,6 +1550,46 @@ CREATE TABLE USUARIOS_LOGON (
|
||||
/**** Views ****/
|
||||
/******************************************************************************/
|
||||
|
||||
CREATE VIEW V_EMPRESAS(
|
||||
ID,
|
||||
NIF_CIF,
|
||||
NOMBRE,
|
||||
RAZON_SOCIAL,
|
||||
CALLE,
|
||||
POBLACION,
|
||||
PROVINCIA,
|
||||
CODIGO_POSTAL,
|
||||
TELEFONO_1,
|
||||
TELEFONO_2,
|
||||
MOVIL_1,
|
||||
MOVIL_2,
|
||||
FAX,
|
||||
EMAIL_1,
|
||||
EMAIL_2,
|
||||
PAGINA_WEB,
|
||||
NOTAS,
|
||||
FECHA_ALTA,
|
||||
FECHA_MODIFICACION,
|
||||
USUARIO,
|
||||
LOGOTIPO,
|
||||
REGISTRO_MERCANTIL,
|
||||
ID_TIPO_IVA,
|
||||
IVA,
|
||||
ID_FORMA_PAGO,
|
||||
VALIDEZ_PRESUPUESTOS,
|
||||
PRECIO_PUNTO)
|
||||
AS
|
||||
SELECT
|
||||
E.ID, E.NIF_CIF, E.NOMBRE, E.RAZON_SOCIAL, E.CALLE, E.POBLACION,
|
||||
E.PROVINCIA, E.CODIGO_POSTAL, E.TELEFONO_1, E.TELEFONO_2, E.MOVIL_1,
|
||||
E.MOVIL_2, E.FAX, E.EMAIL_1, E.EMAIL_2, E.PAGINA_WEB, E.NOTAS,
|
||||
E.FECHA_ALTA, E.FECHA_MODIFICACION, E.USUARIO, E.LOGOTIPO,
|
||||
E.REGISTRO_MERCANTIL, E.ID_TIPO_IVA, T.IVA, E.ID_FORMA_PAGO, E.VALIDEZ_PRESUPUESTOS,
|
||||
E.PRECIO_PUNTO
|
||||
FROM
|
||||
EMPRESAS E
|
||||
left join TIPOS_IVA T on (T.ID = E.ID_TIPO_IVA)
|
||||
;
|
||||
|
||||
/* View: V_ALB_CLI_SITUACION */
|
||||
CREATE VIEW V_ALB_CLI_SITUACION(
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="41422,4975132523" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent); begin if Engine.FinalPass then begin if (<Page#> = <TotalPages#>) then begin mContinua.Visible := False; end else begin mContinua.Visible := True; end end; end; begin end. " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C2A00000020446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
|
||||
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="41536,7259066898" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent); begin if Engine.FinalPass then begin if (<Page#> = <TotalPages#>) then begin mContinua.Visible := False; end else begin mContinua.Visible := True; end end; end; begin end. " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
|
||||
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
|
||||
<TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" Columns="1" ColumnWidth="180,001333333333" ColumnPositions.Text="0" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
|
||||
<TfrxPageHeader Name="Band1" Height="107,10235" Left="0" Top="16" Width="680,321226775416" OnBeforePrint="Band1OnBeforePrint">
|
||||
@ -26,11 +26,11 @@
|
||||
<TfrxMemoView Name="Memo7" Align="baLeft" Left="0" Top="3,77953" Width="339,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Facturas de [frxDBInformeListadoFacturas."NOMBRE"]"/>
|
||||
<TfrxMemoView Name="Memo5" Align="baLeft" Left="140" Top="25" Width="60" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
|
||||
</TfrxGroupHeader>
|
||||
<TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="76" Width="680,321226775416" Columns="1" ColumnWidth="200" ColumnGap="0" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
|
||||
<TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="76" Width="680,321226775416" Columns="1" ColumnWidth="200" ColumnGap="0" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
|
||||
<TfrxMemoView Name="Memo21" Align="baLeft" Left="80" Top="0" Width="60" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas."FECHA_FACTURA"]"/>
|
||||
<TfrxMemoView Name="Memo18" Align="baLeft" Left="0" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas."REFERENCIA"]"/>
|
||||
<TfrxMemoView Name="Memo31" Align="baLeft" Left="200" Top="0" Width="85" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas."IMPORTE_TOTAL"]"/>
|
||||
<TfrxMemoView Name="Memo22" Align="baLeft" Left="140" Top="0" Width="60" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturas."SITUACION"]"/>
|
||||
<TfrxMemoView Name="Memo22" Align="baLeft" Left="140" Top="0" Width="60" Height="17,00787402" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturas."SITUACION"]"/>
|
||||
</TfrxMasterData>
|
||||
<TfrxGroupFooter Name="GroupFooter1" Height="20,78740402" Left="0" Top="113" Width="680,321226775416">
|
||||
<TfrxMemoView Name="Memo53" Align="baLeft" Left="0" Top="0,37774772" Width="185" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTAL :"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user