#408: Informe de comisiones de vendedor ordenar por referencia de factura
#409: Sacar en pedidos de cliente y albaranes de cliente la provincia #410: Sacar nombre comercial en etiquetas y albaranes y pedidos #411: Cuando sea un abono que salga en grande en el informe #412: Cuando una factura es más de dos hojas que no repita el pie de importes #413: Poder filtrar por provincia en todos los documentos Version 1.0.8 git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@134 f33bb606-9f5c-448d-9c99-757f00063c96
This commit is contained in:
parent
2cbd8d9c60
commit
f2c4e7954f
BIN
Build/Build.fbl6
BIN
Build/Build.fbl6
Binary file not shown.
Binary file not shown.
@ -53,58 +53,58 @@
|
||||
<DelphiCompile Include="Base.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\adortl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxDataD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxExportD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxExtEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxGridD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxLibraryD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\cxPageControlD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\DataAbstract_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dbrtl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dclIndyCore.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\designide.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dsnap.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dxCoreD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dxGDIPlusD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dxLayoutControlD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dxPSCoreD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\dxThemeD11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\GUISDK_D11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\IndyCore.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\IndyProtocols.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\IndySystem.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\Jcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JclVcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JSDialog100.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvCmpD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvCoreD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvDlgsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvMMD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvNetD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvPageCompsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvStdCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\JvSystemD11R.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\pckMD5.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\pckUCDataConnector.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\pckUserControl_RT.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\PngComponentsD10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\PNG_D10.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\RemObjects_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\RemObjects_Indy_D11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\rtl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\SpTBXLib_d11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\tb2k_d11.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\vcl.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\vclactnband.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\vcldb.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\vcljpg.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\VclSmp.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\vclx.dcp" />
|
||||
<DCCReference Include="..\Modulos\Contactos\Controller\xmlrtl.dcp" />
|
||||
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
|
||||
<DCCReference Include="..\Servidor\adortl.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxDataD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxExportD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxGridD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Servidor\dbrtl.dcp" />
|
||||
<DCCReference Include="..\Servidor\dclIndyCore.dcp" />
|
||||
<DCCReference Include="..\Servidor\designide.dcp" />
|
||||
<DCCReference Include="..\Servidor\dsnap.dcp" />
|
||||
<DCCReference Include="..\Servidor\dxCoreD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\dxThemeD11.dcp" />
|
||||
<DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\IndyCore.dcp" />
|
||||
<DCCReference Include="..\Servidor\IndyProtocols.dcp" />
|
||||
<DCCReference Include="..\Servidor\IndySystem.dcp" />
|
||||
<DCCReference Include="..\Servidor\Jcl.dcp" />
|
||||
<DCCReference Include="..\Servidor\JclVcl.dcp" />
|
||||
<DCCReference Include="..\Servidor\JSDialog100.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvMMD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvNetD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
|
||||
<DCCReference Include="..\Servidor\pckMD5.dcp" />
|
||||
<DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
|
||||
<DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
|
||||
<DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
|
||||
<DCCReference Include="..\Servidor\PNG_D10.dcp" />
|
||||
<DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
|
||||
<DCCReference Include="..\Servidor\RemObjects_Indy_D11.dcp" />
|
||||
<DCCReference Include="..\Servidor\rtl.dcp" />
|
||||
<DCCReference Include="..\Servidor\SpTBXLib_d11.dcp" />
|
||||
<DCCReference Include="..\Servidor\tb2k_d11.dcp" />
|
||||
<DCCReference Include="..\Servidor\vcl.dcp" />
|
||||
<DCCReference Include="..\Servidor\vclactnband.dcp" />
|
||||
<DCCReference Include="..\Servidor\vcldb.dcp" />
|
||||
<DCCReference Include="..\Servidor\vcljpg.dcp" />
|
||||
<DCCReference Include="..\Servidor\VclSmp.dcp" />
|
||||
<DCCReference Include="..\Servidor\vclx.dcp" />
|
||||
<DCCReference Include="..\Servidor\xmlrtl.dcp" />
|
||||
<DCCReference Include="Conexion\uConfigurarConexion.pas">
|
||||
<Form>fConfigurarConexion</Form>
|
||||
<DesignClass>TForm</DesignClass>
|
||||
|
||||
Binary file not shown.
@ -54,7 +54,7 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
|
||||
<BorlandProject>
|
||||
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
|
||||
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
MAINICON ICON "C:\Codigo noviseda\Resources\Iconos\Factuges.ico"
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,6,0
|
||||
PRODUCTVERSION 1,0,6,0
|
||||
FILEVERSION 1,0,7,0
|
||||
PRODUCTVERSION 1,0,7,0
|
||||
FILEFLAGSMASK 0x3FL
|
||||
FILEFLAGS 0x00L
|
||||
FILEOS 0x40004L
|
||||
@ -13,10 +13,10 @@ BEGIN
|
||||
BLOCK "0C0A04E4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Rodax Software S.L.\0"
|
||||
VALUE "FileVersion", "1.0.6.0\0"
|
||||
VALUE "FileVersion", "1.0.7.0\0"
|
||||
VALUE "InternalName", "FactuGES\0"
|
||||
VALUE "ProductName", "FactuGES\0"
|
||||
VALUE "ProductVersion", "1.0.6.0\0"
|
||||
VALUE "ProductVersion", "1.0.7.0\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Binary file not shown.
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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40276,6903403472" ScriptLanguage="PascalScript" ScriptText.Text="var Pagina: Variant; procedure Memo2OnBeforePrint(Sender: TfrxComponent); begin Memo2.Lines.Clear; if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then Memo2.Lines.Add('ORDEN DE DEVOLUCIÓN') else Memo2.Lines.Add('ALBARÁN DE CLIENTE') end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo5.Lines.Clear; Memo5.Lines.Add('Nº orden:'); end; end; procedure Memo9OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo9.Lines.Clear; Memo9.Lines.Add('Fecha orden:'); end; end; procedure PageHeader1OnBeforePrint(Sender: TfrxComponent); begin if not Engine.FinalPass then Set('TotalPaginas', (<TotalPaginas> + 1)); if Engine.FinalPass then Set('Pagina', (<Pagina> + 1)); end; procedure frxReportOnStartReport(Sender: TfrxComponent); begin Set('Pagina', 0); Set('TotalPaginas', 0); end; procedure Memo30OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) then begin Memo29.Visible := False; Memo30.Visible := False; Memo24.Visible := False; Memo25.Visible := False; end else begin Memo29.Visible := True; Memo30.Visible := True; Memo24.Visible := True; Memo25.Visible := True; end; end; procedure Memo34OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo33.Visible := False; Memo34.Visible := False; Memo31.Visible := False; Memo32.Visible := False; end else begin Memo33.Visible := True; Memo34.Visible := True; Memo31.Visible := True; Memo32.Visible := True; end; end; procedure Line3OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) and (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo18.Visible := False; Memo20.Visible := False; end else begin Memo18.Visible := True; Memo20.Visible := True; end; end; begin end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C23000000204E616D653D22436F6E4F62736572766163696F6E6573496E636964656E63696173220000055374796C650100">
|
||||
<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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40365,5537128704" ScriptLanguage="PascalScript" ScriptText.Text="var Pagina: Variant; procedure Memo2OnBeforePrint(Sender: TfrxComponent); begin Memo2.Lines.Clear; if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then Memo2.Lines.Add('ORDEN DE DEVOLUCIÓN') else Memo2.Lines.Add('ALBARÁN DE CLIENTE') end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo5.Lines.Clear; Memo5.Lines.Add('Nº orden:'); end; end; procedure Memo9OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo9.Lines.Clear; Memo9.Lines.Add('Fecha orden:'); end; end; procedure PageHeader1OnBeforePrint(Sender: TfrxComponent); begin if not Engine.FinalPass then Set('TotalPaginas', (<TotalPaginas> + 1)); if Engine.FinalPass then Set('Pagina', (<Pagina> + 1)); end; procedure frxReportOnStartReport(Sender: TfrxComponent); begin Set('Pagina', 0); Set('TotalPaginas', 0); end; procedure Memo30OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) then begin Memo29.Visible := False; Memo30.Visible := False; Memo24.Visible := False; Memo25.Visible := False; end else begin Memo29.Visible := True; Memo30.Visible := True; Memo24.Visible := True; Memo25.Visible := True; end; end; procedure Memo34OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo33.Visible := False; Memo34.Visible := False; Memo31.Visible := False; Memo32.Visible := False; end else begin Memo33.Visible := True; Memo34.Visible := True; Memo31.Visible := True; Memo32.Visible := True; end; end; procedure Line3OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) and (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo18.Visible := False; Memo20.Visible := False; end else begin Memo18.Visible := True; Memo20.Visible := True; end; end; begin end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C23000000204E616D653D22436F6E4F62736572766163696F6E6573496E636964656E63696173220000055374796C650100">
|
||||
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
|
||||
<TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
|
||||
<TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="373" Width="718,101251175" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
|
||||
@ -35,15 +35,15 @@
|
||||
<TfrxLineView Name="Line2" Left="0" Top="269,50406638" Width="0" Height="628" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxLineView Name="Line3" Left="86" Top="269,50406638" Width="0" Height="628" OnBeforePrint="Line3OnBeforePrint" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxLineView Name="Line5" Align="baLeft" Left="506,71653543" Top="269,50406638" Width="0" Height="628" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxShapeView Name="Shape4" Left="353,68243666" Top="121,10760667" Width="362" Height="120,94488433" ShowHint="False" Color="-16777211" Curve="2" Frame.Color="13056"/>
|
||||
<TfrxMemoView Name="Memo19" Left="358,56957333" Top="125,42517" Width="342,2047" Height="111,49612157" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaCenter" Text="<b>[frxDBCabecera."NOMBRE"]</b> [frxDBCabecera."CALLE"] [<frxDBCabecera."CODIGO_POSTAL">] [<frxDBCabecera."POBLACION">] [<frxDBCabecera."PROVINCIA">]"/>
|
||||
<TfrxMemoView Name="Memo21" Left="0" Top="121,84261" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Nº Albarán"/>
|
||||
<TfrxMemoView Name="Memo22" Left="0" Top="142,51979" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REFERENCIA"]"/>
|
||||
<TfrxShapeView Name="Shape4" Left="353,68243666" Top="111,11" Width="362" Height="130,94" ShowHint="False" Color="-16777211" Curve="2" Frame.Color="13056"/>
|
||||
<TfrxMemoView Name="Memo19" Left="358,56957333" Top="113,42517" Width="342,2047" Height="123,49612157" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaCenter" Text="<b>[frxDBCabecera."NOMBRE_COMERCIAL"]</b> [frxDBCabecera."NOMBRE"] [frxDBCabecera."CALLE"] [<frxDBCabecera."CODIGO_POSTAL">] [<frxDBCabecera."POBLACION">] [<frxDBCabecera."PROVINCIA">]"/>
|
||||
<TfrxMemoView Name="Memo21" Left="0" Top="111,84" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Nº Albarán"/>
|
||||
<TfrxMemoView Name="Memo22" Left="0" Top="132,52" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REFERENCIA"]"/>
|
||||
<TfrxMemoView Name="Memo1" Left="60,5906" Top="224,09462" Width="62,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[<Pagina>]/[<TotalPaginas>]"/>
|
||||
<TfrxMemoView Name="Memo2" Left="1" Top="224,09462" Width="60,85807" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="Página nº:"/>
|
||||
<TfrxMemoView Name="Memo28" Left="3,5906" Top="51" Width="183,46444" Height="33,78740157" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-24" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" ParentFont="False" Text="ALBARÁN"/>
|
||||
<TfrxMemoView Name="Memo3" Left="130,44094" Top="121,84261" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Fecha Alb."/>
|
||||
<TfrxMemoView Name="Memo4" Left="130,44094" Top="142,51979" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."FECHA_ALBARAN"]"/>
|
||||
<TfrxMemoView Name="Memo3" Left="130,44094" Top="111,84" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Fecha Alb."/>
|
||||
<TfrxMemoView Name="Memo4" Left="130,44094" Top="132,52" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."FECHA_ALBARAN"]"/>
|
||||
<TfrxMemoView Name="Memo5" Left="47,03154" Top="166,44094" Width="85,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REF_CLIENTE"]"/>
|
||||
<TfrxMemoView Name="Memo6" Left="0,44094" Top="166,44094" Width="45,85807" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="Cliente:"/>
|
||||
<TfrxMemoView Name="Memo7" Left="166,03154" Top="166,44094" Width="93,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."NIF_CIF"]"/>
|
||||
|
||||
@ -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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40227,4339049421" ScriptLanguage="PascalScript" ScriptText.Text="procedure MasterData1OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBEtiquetas."CALLE_ENVIO"> <> '') then begin mCalleFiscal.Visible := False; mPoblacionFiscal.Visible := False; mCodigoPostalFiscal.Visible := False; end else begin mCalleEnvio.Visible := False; mPoblacionEnvio.Visible := False; mCodigoPostalEnvio.Visible := False; end; end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin // Memo5.lines.clear; end; begin end. " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3600000020446174615365743D2266727844424574697175657461732220446174615365744E616D653D226672784442457469717565746173220000095661726961626C657301010C10000000204E616D653D2220496E666F726D652200010C11000000204E616D653D224D657263616E6369612200010C0E000000204E616D653D2242756C746F73220000055374796C650100">
|
||||
<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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40365,554343831" ScriptLanguage="PascalScript" ScriptText.Text="procedure MasterData1OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBEtiquetas."CALLE_ENVIO"> <> '') then begin mCalleFiscal.Visible := False; mPoblacionFiscal.Visible := False; mCodigoPostalFiscal.Visible := False; end else begin mCalleEnvio.Visible := False; mPoblacionEnvio.Visible := False; mCodigoPostalEnvio.Visible := False; end; end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin // Memo5.lines.clear; end; begin end. " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3600000020446174615365743D2266727844424574697175657461732220446174615365744E616D653D226672784442457469717565746173220000095661726961626C657301010C10000000204E616D653D2220496E666F726D652200010C11000000204E616D653D224D657263616E6369612200010C0E000000204E616D653D2242756C746F73220000055374796C650100">
|
||||
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
|
||||
<TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
|
||||
<TfrxMasterData Name="MasterData1" Height="277" Left="0" Top="16" Width="718,1107" OnBeforePrint="MasterData1OnBeforePrint" ColumnWidth="0" ColumnGap="0" DataSet="frxDBEtiquetas" DataSetName="frxDBEtiquetas" RowCount="0">
|
||||
@ -12,6 +12,7 @@
|
||||
<TfrxMemoView Name="mCalleEnvio" Left="176" Top="136" Width="427" Height="18" ShowHint="False" Text="[frxDBEtiquetas."CALLE_ENVIO"]"/>
|
||||
<TfrxMemoView Name="mCodigoPostalEnvio" Left="176" Top="170" Width="427" Height="18" ShowHint="False" Text="[frxDBEtiquetas."CODIGO_POSTAL_ENVIO"] [frxDBEtiquetas."POBLACION_ENVIO"] ([frxDBEtiquetas."PROVINCIA_ENVIO"])"/>
|
||||
<TfrxMemoView Name="Memo1" Left="176" Top="209" Width="427" Height="18" ShowHint="False" DisplayFormat.FormatStr="%g" Text="[Mercancia]"/>
|
||||
<TfrxMemoView Name="Memo3" Left="176" Top="72" Width="427" Height="18" ShowHint="False" Text="[frxDBEtiquetas."NOMBRE_COMERCIAL"]"/>
|
||||
</TfrxMasterData>
|
||||
</TfrxReportPage>
|
||||
</TfrxReport>
|
||||
|
||||
@ -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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40275,6904642245" ScriptLanguage="PascalScript" ScriptText.Text="var Pagina: Variant; procedure Memo2OnBeforePrint(Sender: TfrxComponent); begin Memo2.Lines.Clear; if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then Memo2.Lines.Add('ORDEN DE DEVOLUCIÓN') else Memo2.Lines.Add('ALBARÁN DE CLIENTE') end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo5.Lines.Clear; Memo5.Lines.Add('Nº orden:'); end; end; procedure Memo9OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo9.Lines.Clear; Memo9.Lines.Add('Fecha orden:'); end; end; procedure PageHeader1OnBeforePrint(Sender: TfrxComponent); begin if not Engine.FinalPass then Set('TotalPaginas', (<TotalPaginas> + 1)); if Engine.FinalPass then Set('Pagina', (<Pagina> + 1)); end; procedure frxReportOnStartReport(Sender: TfrxComponent); begin Set('Pagina', 0); Set('TotalPaginas', 0); end; procedure Memo30OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) then begin Memo29.Visible := False; Memo30.Visible := False; Memo24.Visible := False; Memo25.Visible := False; end else begin Memo29.Visible := True; Memo30.Visible := True; Memo24.Visible := True; Memo25.Visible := True; end; end; procedure Memo34OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo33.Visible := False; Memo34.Visible := False; Memo31.Visible := False; Memo32.Visible := False; end else begin Memo33.Visible := True; Memo34.Visible := True; Memo31.Visible := True; Memo32.Visible := True; end; end; procedure Line3OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) and (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo18.Visible := False; Memo20.Visible := False; end else begin Memo18.Visible := True; Memo20.Visible := True; end; end; begin end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C23000000204E616D653D22436F6E4F62736572766163696F6E6573496E636964656E63696173220000055374796C650100">
|
||||
<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="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40365,5526718287" ScriptLanguage="PascalScript" ScriptText.Text="var Pagina: Variant; procedure Memo2OnBeforePrint(Sender: TfrxComponent); begin Memo2.Lines.Clear; if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then Memo2.Lines.Add('ORDEN DE DEVOLUCIÓN') else Memo2.Lines.Add('ALBARÁN DE CLIENTE') end; procedure Memo5OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo5.Lines.Clear; Memo5.Lines.Add('Nº orden:'); end; end; procedure Memo9OnBeforePrint(Sender: TfrxComponent); begin if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then begin Memo9.Lines.Clear; Memo9.Lines.Add('Fecha orden:'); end; end; procedure PageHeader1OnBeforePrint(Sender: TfrxComponent); begin if not Engine.FinalPass then Set('TotalPaginas', (<TotalPaginas> + 1)); if Engine.FinalPass then Set('Pagina', (<Pagina> + 1)); end; procedure frxReportOnStartReport(Sender: TfrxComponent); begin Set('Pagina', 0); Set('TotalPaginas', 0); end; procedure Memo30OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) then begin Memo29.Visible := False; Memo30.Visible := False; Memo24.Visible := False; Memo25.Visible := False; end else begin Memo29.Visible := True; Memo30.Visible := True; Memo24.Visible := True; Memo25.Visible := True; end; end; procedure Memo34OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo33.Visible := False; Memo34.Visible := False; Memo31.Visible := False; Memo32.Visible := False; end else begin Memo33.Visible := True; Memo34.Visible := True; Memo31.Visible := True; Memo32.Visible := True; end; end; procedure Line3OnBeforePrint(Sender: TfrxComponent); begin if (<frxDBCabecera."DESCUENTO"> = 0) and (<frxDBCabecera."DESCUENTO2"> = 0) then begin Memo18.Visible := False; Memo20.Visible := False; end else begin Memo18.Visible := True; Memo20.Visible := True; end; end; begin end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C23000000204E616D653D22436F6E4F62736572766163696F6E6573496E636964656E63696173220000055374796C650100">
|
||||
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
|
||||
<TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
|
||||
<TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="373" Width="718,101251175" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
|
||||
@ -35,15 +35,15 @@
|
||||
<TfrxLineView Name="Line2" Left="0" Top="269,50406638" Width="0" Height="628" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxLineView Name="Line3" Left="86" Top="269,50406638" Width="0" Height="628" OnBeforePrint="Line3OnBeforePrint" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxLineView Name="Line5" Align="baLeft" Left="612,43307086" Top="269,50406638" Width="0" Height="628" ShowHint="False" Frame.Color="8421504" Frame.Typ="1"/>
|
||||
<TfrxShapeView Name="Shape4" Left="353,68243666" Top="121,10760667" Width="362" Height="120,94488433" ShowHint="False" Color="-16777211" Curve="2" Frame.Color="13056"/>
|
||||
<TfrxMemoView Name="Memo19" Left="358,56957333" Top="125,42517" Width="342,2047" Height="111,49612157" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaCenter" Text="<b>[frxDBCabecera."NOMBRE"]</b> [frxDBCabecera."CALLE"] [<frxDBCabecera."CODIGO_POSTAL">] [<frxDBCabecera."POBLACION">] [<frxDBCabecera."PROVINCIA">]"/>
|
||||
<TfrxMemoView Name="Memo21" Left="0" Top="121,84261" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Nº Pedido"/>
|
||||
<TfrxMemoView Name="Memo22" Left="0" Top="142,51979" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REFERENCIA"]"/>
|
||||
<TfrxShapeView Name="Shape4" Left="353,68243666" Top="111,11" Width="362" Height="130,94" ShowHint="False" Color="-16777211" Curve="2" Frame.Color="13056"/>
|
||||
<TfrxMemoView Name="Memo19" Left="358,56957333" Top="111,42517" Width="342,2047" Height="128,49612157" ShowHint="False" AllowHTMLTags="True" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaCenter" Text="<b>[frxDBCabecera."NOMBRE_COMERCIAL"]</b> [frxDBCabecera."NOMBRE"] [frxDBCabecera."CALLE"] [<frxDBCabecera."CODIGO_POSTAL">] [<frxDBCabecera."POBLACION">] [<frxDBCabecera."PROVINCIA">]"/>
|
||||
<TfrxMemoView Name="Memo21" Left="0" Top="111,84" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Nº Pedido"/>
|
||||
<TfrxMemoView Name="Memo22" Left="0" Top="132,52" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REFERENCIA"]"/>
|
||||
<TfrxMemoView Name="Memo1" Left="60,5906" Top="224,09462" Width="62,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[<Pagina>]/[<TotalPaginas>]"/>
|
||||
<TfrxMemoView Name="Memo2" Left="1" Top="224,09462" Width="60,85807" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="Página nº:"/>
|
||||
<TfrxMemoView Name="Memo28" Left="3,5906" Top="51" Width="183,46444" Height="33,78740157" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-24" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" ParentFont="False" Text="PEDIDO"/>
|
||||
<TfrxMemoView Name="Memo3" Left="130,44094" Top="121,84261" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Fecha Ped."/>
|
||||
<TfrxMemoView Name="Memo4" Left="130,44094" Top="142,51979" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."FECHA_PEDIDO"]"/>
|
||||
<TfrxMemoView Name="Memo3" Left="130,44094" Top="111,84" Width="130,05504" Height="20" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Text="Fecha Ped."/>
|
||||
<TfrxMemoView Name="Memo4" Left="130,44094" Top="132,52" Width="129,90538" Height="17,00787157" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" Frame.Color="13056" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."FECHA_PEDIDO"]"/>
|
||||
<TfrxMemoView Name="Memo5" Left="47,03154" Top="166,44094" Width="85,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."REF_CLIENTE"]"/>
|
||||
<TfrxMemoView Name="Memo6" Left="0,44094" Top="166,44094" Width="45,85807" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="Cliente:"/>
|
||||
<TfrxMemoView Name="Memo7" Left="166,03154" Top="166,44094" Width="93,46444" Height="17,00787402" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Color="13056" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera."NIF_CIF"]"/>
|
||||
|
||||
@ -147,15 +147,6 @@
|
||||
<Target Name="AlbaranesCliente_plugin:Make">
|
||||
<MSBuild Projects="Plugin\AlbaranesCliente_plugin.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="FactuGES">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
|
||||
</Target>
|
||||
<Target Name="FactuGES:Clean">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Clean" />
|
||||
</Target>
|
||||
<Target Name="FactuGES:Make">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="FactuGES_Server">
|
||||
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
|
||||
</Target>
|
||||
@ -165,6 +156,15 @@
|
||||
<Target Name="FactuGES_Server:Make">
|
||||
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="FactuGES">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
|
||||
</Target>
|
||||
<Target Name="FactuGES:Clean">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Clean" />
|
||||
</Target>
|
||||
<Target Name="FactuGES:Make">
|
||||
<MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="AlbaranesProveedor_view">
|
||||
<MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="" />
|
||||
</Target>
|
||||
@ -292,13 +292,13 @@
|
||||
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="Build">
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view;FacturasCliente_view;FacturasCliente_data;FacturasCliente_controller;PedidosCliente_view" />
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;AlbaranesCliente_model;AlbaranesCliente_data;AlbaranesCliente_controller;AlbCli_FacCli_relation;AlbaranesCliente_view;AlbaranesCliente_plugin;FactuGES_Server;FactuGES;AlbaranesProveedor_view;AlbProv_FacProv_relation;Contactos_controller;FacturasProveedor_view;PedidosProveedor_view;PresupuestosCliente_view;RecibosCliente_view;RecibosProveedor_view;RemesasCliente_view;RemesasProveedor_view;FacturasCliente_view;FacturasCliente_data;FacturasCliente_controller;PedidosCliente_view" />
|
||||
</Target>
|
||||
<Target Name="Clean">
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view:Clean;FacturasCliente_view:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PedidosCliente_view:Clean" />
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;AlbaranesCliente_model:Clean;AlbaranesCliente_data:Clean;AlbaranesCliente_controller:Clean;AlbCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;AlbaranesCliente_plugin:Clean;FactuGES_Server:Clean;FactuGES:Clean;AlbaranesProveedor_view:Clean;AlbProv_FacProv_relation:Clean;Contactos_controller:Clean;FacturasProveedor_view:Clean;PedidosProveedor_view:Clean;PresupuestosCliente_view:Clean;RecibosCliente_view:Clean;RecibosProveedor_view:Clean;RemesasCliente_view:Clean;RemesasProveedor_view:Clean;FacturasCliente_view:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PedidosCliente_view:Clean" />
|
||||
</Target>
|
||||
<Target Name="Make">
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view:Make;FacturasCliente_view:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PedidosCliente_view:Make" />
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;AlbaranesCliente_model:Make;AlbaranesCliente_data:Make;AlbaranesCliente_controller:Make;AlbCli_FacCli_relation:Make;AlbaranesCliente_view:Make;AlbaranesCliente_plugin:Make;FactuGES_Server:Make;FactuGES:Make;AlbaranesProveedor_view:Make;AlbProv_FacProv_relation:Make;Contactos_controller:Make;FacturasProveedor_view:Make;PedidosProveedor_view:Make;PresupuestosCliente_view:Make;RecibosCliente_view:Make;RecibosProveedor_view:Make;RemesasCliente_view:Make;RemesasProveedor_view:Make;FacturasCliente_view:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PedidosCliente_view:Make" />
|
||||
</Target>
|
||||
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
|
||||
</Project>
|
||||
@ -69,17 +69,14 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
'ESCUENTO,'#10' V_ALBARANES_CLIENTE.IMPORTE_DESCUENTO,'#10' V_ALBARANES' +
|
||||
'_CLIENTE.DESCUENTO2,'#10' V_ALBARANES_CLIENTE.IMPORTE_DESCUENTO2,'#10' ' +
|
||||
' V_ALBARANES_CLIENTE.IMPORTE_TOTAL,'#10' CONTACTOS.REFERENCIA as RE' +
|
||||
'F_CLIENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' V_ALBARANES_CL' +
|
||||
'IENTE.PERSONA_CONTACTO,'#10' COALESCE(CONTACTOS_DIRECCIONES.CALLE, ' +
|
||||
'CONTACTOS.CALLE) AS CALLE,'#10' COALESCE(CONTACTOS_DIRECCIONES.POBL' +
|
||||
'ACION, CONTACTOS.POBLACION) AS POBLACION,'#10' COALESCE(CONTACTOS_D' +
|
||||
'IRECCIONES.PROVINCIA, CONTACTOS.PROVINCIA) AS PROVINCIA,'#10' COALE' +
|
||||
'SCE(CONTACTOS_DIRECCIONES.CODIGO_POSTAL, CONTACTOS.CODIGO_POSTAL' +
|
||||
') AS CODIGO_POSTAL'#10#10'FROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN CONT' +
|
||||
'ACTOS ON (CONTACTOS.ID = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT ' +
|
||||
'OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID = ' +
|
||||
'V_ALBARANES_CLIENTE.ID_DIRECCION)'#10'WHERE V_ALBARANES_CLIENTE.ID =' +
|
||||
' :ID'#10#10
|
||||
'F_CLIENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS' +
|
||||
'.NOMBRE_COMERCIAL,'#10' V_ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' V_A' +
|
||||
'LBARANES_CLIENTE.CALLE,'#10' V_ALBARANES_CLIENTE.POBLACION,'#10' V_ALB' +
|
||||
'ARANES_CLIENTE.PROVINCIA,'#10' V_ALBARANES_CLIENTE.CODIGO_POSTAL'#10#10'F' +
|
||||
'ROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.I' +
|
||||
'D = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT JOIN CLIENTES_DATOS O' +
|
||||
'N (CLIENTES_DATOS.ID_CLIENTE = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10'W' +
|
||||
'HERE V_ALBARANES_CLIENTE.ID = :ID'#10#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -181,6 +178,10 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
item
|
||||
DatasetField = 'DATOS_BANCARIOS'
|
||||
TableField = 'DATOS_BANCARIOS'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_COMERCIAL'
|
||||
TableField = 'NOMBRE_COMERCIAL'
|
||||
end>
|
||||
end>
|
||||
Name = 'Informe_Cabecera'
|
||||
@ -240,7 +241,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO'
|
||||
@ -248,7 +249,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO2'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO2'
|
||||
@ -273,6 +274,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
@ -427,18 +433,20 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
TargetTable = 'ALBARANES_CLIENTE_DETALLES'
|
||||
SQL =
|
||||
'SELECT V_ALBARANES_CLIENTE.ID,'#10' CONTACTOS.REFERENCIA as REF_CLI' +
|
||||
'ENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' V_ALBARANES_CLIENTE' +
|
||||
'.PERSONA_CONTACTO,'#10' CONTACTOS.CALLE AS CALLE_FISCAL,'#10' CONTACTO' +
|
||||
'S_DIRECCIONES.CALLE AS CALLE_ENVIO,'#10' CONTACTOS.POBLACION AS POB' +
|
||||
'LACION_FISCAL,'#10' CONTACTOS_DIRECCIONES.POBLACION AS POBLACION_EN' +
|
||||
'VIO,'#10' CONTACTOS.PROVINCIA AS PROVINCIA_FISCAL,'#10' CONTACTOS_DIRE' +
|
||||
'CCIONES.PROVINCIA AS PROVINCIA_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL ' +
|
||||
'AS CODIGO_POSTAL_FISCAL,'#10' CONTACTOS_DIRECCIONES.CODIGO_POSTAL A' +
|
||||
'S CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' V_ALBARANES_CLIENTE'#10' INNER JOIN C' +
|
||||
'ONTACTOS ON (CONTACTOS.ID = V_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LE' +
|
||||
'FT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID' +
|
||||
'_contacto = V_ALBARANES_CLIENTE.ID_cliente)'#10'WHERE V_ALBARANES_CL' +
|
||||
'IENTE.ID = :ID'#10
|
||||
'ENTE, CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS.NOMB' +
|
||||
'RE_COMERCIAL,'#10' V_ALBARANES_CLIENTE.PERSONA_CONTACTO,'#10' CONTACTO' +
|
||||
'S.CALLE AS CALLE_FISCAL,'#10' CONTACTOS_DIRECCIONES.CALLE AS CALLE_' +
|
||||
'ENVIO,'#10' CONTACTOS.POBLACION AS POBLACION_FISCAL,'#10' CONTACTOS_DI' +
|
||||
'RECCIONES.POBLACION AS POBLACION_ENVIO,'#10' CONTACTOS.PROVINCIA AS' +
|
||||
' PROVINCIA_FISCAL,'#10' CONTACTOS_DIRECCIONES.PROVINCIA AS PROVINCI' +
|
||||
'A_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL AS CODIGO_POSTAL_FISCAL,'#10' CO' +
|
||||
'NTACTOS_DIRECCIONES.CODIGO_POSTAL AS CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' ' +
|
||||
' V_ALBARANES_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = V' +
|
||||
'_ALBARANES_CLIENTE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIREC' +
|
||||
'CIONES ON (CONTACTOS_DIRECCIONES.ID_contacto = V_ALBARANES_CLIEN' +
|
||||
'TE.ID_cliente)'#10' LEFT JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_' +
|
||||
'CLIENTE = V_ALBARANES_CLIENTE.ID_cliente)'#10'WHERE V_ALBARANES_CLIE' +
|
||||
'NTE.ID = :ID'#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -504,6 +512,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
DatasetField = 'CODIGO_POSTAL_ENVIO'
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'CODIGO_POSTAL_ENVIO'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_COMERCIAL'
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'NOMBRE_COMERCIAL'
|
||||
end>
|
||||
end>
|
||||
Name = 'Informe_Etiquetas'
|
||||
@ -527,6 +540,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
@ -883,7 +901,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO'
|
||||
@ -891,7 +909,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO2'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO2'
|
||||
@ -916,6 +934,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
@ -1087,6 +1110,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
|
||||
@ -60,10 +60,10 @@ type
|
||||
tbl_Detalles: TDAMemDataTable;
|
||||
frxPDFExport1: TfrxPDFExport;
|
||||
DABin2DataStreamer1: TDABin2DataStreamer;
|
||||
schReport: TDASchema;
|
||||
frxDBEtiquetas: TfrxDBDataset;
|
||||
DADSEtiquetas: TDADataSource;
|
||||
tbl_Etiquetas: TDAMemDataTable;
|
||||
schReport: TDASchema;
|
||||
procedure DataModuleCreate(Sender: TObject);
|
||||
procedure DataModuleDestroy(Sender: TObject);
|
||||
private
|
||||
|
||||
@ -203,74 +203,77 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
Height = 51
|
||||
ExplicitWidth = 841
|
||||
ExplicitHeight = 51
|
||||
inherited ToolButton14: TToolButton
|
||||
Wrap = False
|
||||
end
|
||||
inherited FontName: TJvFontComboBox
|
||||
Left = 399
|
||||
inherited FontName: TJvFontComboBox [3]
|
||||
Left = 278
|
||||
Top = 0
|
||||
ExplicitLeft = 399
|
||||
ExplicitLeft = 278
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited FontSize: TEdit [4]
|
||||
Left = 423
|
||||
Top = 0
|
||||
Width = 250
|
||||
ExplicitLeft = 423
|
||||
ExplicitTop = 0
|
||||
ExplicitWidth = 250
|
||||
end
|
||||
inherited UpDown1: TUpDown [5]
|
||||
Left = 673
|
||||
Top = 0
|
||||
ExplicitLeft = 673
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton13: TToolButton [6]
|
||||
Left = 544
|
||||
Top = 0
|
||||
Wrap = False
|
||||
ExplicitLeft = 544
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton4: TToolButton [7]
|
||||
end
|
||||
inherited ToolButton6: TToolButton [8]
|
||||
Left = 56
|
||||
Wrap = False
|
||||
ExplicitLeft = 56
|
||||
end
|
||||
inherited ToolButton7: TToolButton
|
||||
Left = 122
|
||||
Top = 27
|
||||
ExplicitLeft = 122
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton8: TToolButton
|
||||
Left = 189
|
||||
Top = 27
|
||||
ExplicitLeft = 189
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton12: TToolButton
|
||||
Left = 272
|
||||
Top = 27
|
||||
Wrap = False
|
||||
ExplicitLeft = 272
|
||||
ExplicitTop = 27
|
||||
ExplicitHeight = 22
|
||||
end
|
||||
inherited ToolButton6: TToolButton [7]
|
||||
Left = 552
|
||||
Top = 0
|
||||
ExplicitLeft = 552
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton7: TToolButton [8]
|
||||
Left = 618
|
||||
Top = 0
|
||||
ExplicitLeft = 618
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton8: TToolButton [9]
|
||||
Left = 0
|
||||
Top = 22
|
||||
ExplicitLeft = 0
|
||||
ExplicitTop = 22
|
||||
end
|
||||
inherited ToolButton12: TToolButton [10]
|
||||
Top = 22
|
||||
ExplicitTop = 22
|
||||
end
|
||||
inherited FontSize: TEdit [11]
|
||||
Left = 0
|
||||
Top = 49
|
||||
Width = 250
|
||||
ExplicitLeft = 0
|
||||
ExplicitTop = 49
|
||||
ExplicitWidth = 250
|
||||
end
|
||||
inherited UpDown1: TUpDown [12]
|
||||
Left = 250
|
||||
ExplicitLeft = 250
|
||||
inherited ToolButton14: TToolButton [12]
|
||||
Left = 280
|
||||
ExplicitLeft = 280
|
||||
end
|
||||
inherited ToolButton9: TToolButton
|
||||
Left = 267
|
||||
Top = 49
|
||||
ExplicitLeft = 267
|
||||
ExplicitTop = 49
|
||||
Left = 345
|
||||
Top = 27
|
||||
ExplicitLeft = 345
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton10: TToolButton
|
||||
Left = 412
|
||||
Top = 49
|
||||
ExplicitLeft = 412
|
||||
ExplicitTop = 49
|
||||
Left = 490
|
||||
Top = 27
|
||||
ExplicitLeft = 490
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton11: TToolButton
|
||||
Left = 537
|
||||
Top = 49
|
||||
ExplicitLeft = 537
|
||||
ExplicitTop = 49
|
||||
Left = 615
|
||||
Top = 27
|
||||
ExplicitLeft = 615
|
||||
ExplicitTop = 27
|
||||
end
|
||||
end
|
||||
inherited cxGrid: TcxGrid
|
||||
@ -339,16 +342,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited StatusBar: TJvStatusBar
|
||||
Top = 607
|
||||
Width = 855
|
||||
Panels = <
|
||||
item
|
||||
Width = 200
|
||||
end>
|
||||
ExplicitTop = 607
|
||||
ExplicitWidth = 855
|
||||
end
|
||||
inline frViewTotalesAlbaran1: TfrViewTotalesAlbaran [4]
|
||||
Left = 0
|
||||
Top = 464
|
||||
@ -372,18 +365,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
ExplicitWidth = 855
|
||||
ExplicitHeight = 143
|
||||
inherited Bevel3: TBevel
|
||||
Left = 338
|
||||
Left = 437
|
||||
Height = 201
|
||||
ExplicitLeft = 338
|
||||
ExplicitLeft = 437
|
||||
ExplicitHeight = 201
|
||||
end
|
||||
inherited Bevel4: TBevel
|
||||
Left = 471
|
||||
Width = 342
|
||||
Height = 9
|
||||
ExplicitLeft = 471
|
||||
ExplicitWidth = 342
|
||||
ExplicitHeight = 9
|
||||
Left = 570
|
||||
ExplicitLeft = 570
|
||||
end
|
||||
inherited ImporteDto: TcxDBCurrencyEdit
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
@ -393,24 +382,22 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
end
|
||||
inherited ImporteIVA: TcxDBCurrencyEdit
|
||||
Left = 542
|
||||
Left = 641
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 542
|
||||
ExplicitLeft = 641
|
||||
end
|
||||
inherited ImporteTotal: TcxDBCurrencyEdit
|
||||
Left = 471
|
||||
Left = 570
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 471
|
||||
ExplicitWidth = 90
|
||||
Width = 90
|
||||
ExplicitLeft = 570
|
||||
end
|
||||
inherited edtDescuento: TcxDBSpinEdit
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
@ -420,41 +407,41 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
end
|
||||
inherited edtIVA: TcxDBSpinEdit
|
||||
Left = 471
|
||||
Left = 570
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 471
|
||||
ExplicitLeft = 570
|
||||
end
|
||||
inherited ImporteBase: TcxDBCurrencyEdit
|
||||
Left = 471
|
||||
Left = 570
|
||||
DataBinding.DataField = 'IMPORTE_NETO'
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 471
|
||||
ExplicitLeft = 570
|
||||
end
|
||||
inherited edtRE: TcxDBSpinEdit
|
||||
Left = 471
|
||||
Left = 570
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 471
|
||||
ExplicitLeft = 570
|
||||
end
|
||||
inherited ImporteRE: TcxDBCurrencyEdit
|
||||
Left = 542
|
||||
Left = 641
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
Style.IsFontAssigned = True
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 542
|
||||
ExplicitLeft = 641
|
||||
end
|
||||
inherited eImporteNeto: TcxDBCurrencyEdit
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
@ -477,37 +464,28 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
end
|
||||
inherited bTiposIVA: TButton
|
||||
Left = 190
|
||||
ExplicitLeft = 190
|
||||
Left = 289
|
||||
ExplicitLeft = 289
|
||||
end
|
||||
inherited cbRecargoEquivalencia: TcxDBCheckBox
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitWidth = 221
|
||||
Width = 221
|
||||
end
|
||||
inherited Panel1: TPanel
|
||||
Width = 185
|
||||
ExplicitWidth = 185
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited EditorActionList: TActionList [5]
|
||||
Left = 32
|
||||
Top = 96
|
||||
object actEnviarEMail: TAction
|
||||
Category = 'Acciones'
|
||||
Caption = 'Enviar por e-mail...'
|
||||
Enabled = False
|
||||
ImageIndex = 21
|
||||
Visible = False
|
||||
OnExecute = actEnviarEMailExecute
|
||||
OnUpdate = actEnviarEMailUpdate
|
||||
end
|
||||
inherited StatusBar: TJvStatusBar [5]
|
||||
Top = 607
|
||||
Width = 855
|
||||
Panels = <
|
||||
item
|
||||
Width = 200
|
||||
end>
|
||||
ExplicitTop = 607
|
||||
ExplicitWidth = 855
|
||||
end
|
||||
inherited SmallImages: TPngImageList [6]
|
||||
inherited SmallImages: TPngImageList
|
||||
PngImages = <
|
||||
item
|
||||
PngImage.Data = {
|
||||
@ -1013,7 +991,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
end>
|
||||
Bitmap = {}
|
||||
end
|
||||
inherited LargeImages: TPngImageList [7]
|
||||
inherited LargeImages: TPngImageList
|
||||
PngImages = <
|
||||
item
|
||||
PngImage.Data = {
|
||||
@ -1809,10 +1787,23 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
|
||||
end>
|
||||
Bitmap = {}
|
||||
end
|
||||
inherited JvFormStorage: TJvFormStorage [8]
|
||||
inherited EditorActionList: TActionList [9]
|
||||
Left = 32
|
||||
Top = 96
|
||||
object actEnviarEMail: TAction
|
||||
Category = 'Acciones'
|
||||
Caption = 'Enviar por e-mail...'
|
||||
Enabled = False
|
||||
ImageIndex = 21
|
||||
Visible = False
|
||||
OnExecute = actEnviarEMailExecute
|
||||
OnUpdate = actEnviarEMailUpdate
|
||||
end
|
||||
end
|
||||
inherited dsDataTable: TDADataSource [10]
|
||||
Left = 24
|
||||
Top = 136
|
||||
end
|
||||
inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
|
||||
end
|
||||
end
|
||||
|
||||
@ -15,7 +15,7 @@ uses
|
||||
uIEditorAlbaranCliente, uBizAlbaranesCliente, uViewAlbaranCliente,
|
||||
uViewDetallesDTO, uViewDetallesArticulos, uDAInterfaces,
|
||||
uViewDetallesArticulosParaVenta, cxLabel, Grids, DBGrids, uViewTotalesAlbaran,
|
||||
cxGraphics, cxLookAndFeels, cxLookAndFeelPainters;
|
||||
cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, JvEnterTab;
|
||||
|
||||
type
|
||||
TfEditorAlbaranCliente = class(TfEditorDBItem, IEditorAlbaranCliente)
|
||||
@ -227,8 +227,8 @@ begin
|
||||
end;
|
||||
|
||||
procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject);
|
||||
{var
|
||||
ADireccion : IBizDireccionesContacto;}
|
||||
var
|
||||
ADireccion : IBizDireccionesContacto;
|
||||
begin
|
||||
if Assigned(FAlbaran) then
|
||||
begin
|
||||
@ -245,7 +245,7 @@ begin
|
||||
end;
|
||||
|
||||
// Elegir la dirección de envio
|
||||
{ case FAlbaran.Cliente.Direcciones.RecordCount of
|
||||
case FAlbaran.Cliente.Direcciones.RecordCount of
|
||||
0 : begin
|
||||
ADireccion := NIL;
|
||||
//ShowWarningMessage('Este cliente no tiene ninguna dirección de envío en su ficha');
|
||||
@ -260,7 +260,7 @@ begin
|
||||
begin
|
||||
try
|
||||
FAlbaran.Edit;
|
||||
FAlbaran.IMPORTE_PORTE := ADireccion.PORTE;
|
||||
// FAlbaran.IMPORTE_PORTE := ADireccion.PORTE;
|
||||
FController.CopiarDireccionEnvio(ADireccion, FAlbaran);
|
||||
finally
|
||||
ADireccion := NIL;
|
||||
@ -268,10 +268,10 @@ begin
|
||||
end
|
||||
else begin
|
||||
FController.QuitarDireccionEnvio(FAlbaran);
|
||||
FAlbaran.Edit;
|
||||
FAlbaran.IMPORTE_PORTE := 0;
|
||||
// FAlbaran.Edit;
|
||||
// FAlbaran.IMPORTE_PORTE := 0;
|
||||
end;
|
||||
}
|
||||
|
||||
|
||||
// Si el pedido tiene detalles hay que mirar si los descuentos
|
||||
// para los artículos hay que cambiarlos.
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
|
||||
Width = 802
|
||||
Height = 490
|
||||
OnCreate = CustomViewCreate
|
||||
OnDestroy = CustomViewDestroy
|
||||
OnShow = CustomViewShow
|
||||
ExplicitWidth = 802
|
||||
ExplicitHeight = 490
|
||||
inherited cxGrid: TcxGrid
|
||||
@ -142,8 +145,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
|
||||
end
|
||||
object cxGridViewPROVINCIA: TcxGridDBColumn
|
||||
DataBinding.FieldName = 'PROVINCIA'
|
||||
Visible = False
|
||||
VisibleForCustomization = False
|
||||
end
|
||||
object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn
|
||||
DataBinding.FieldName = 'PERSONA_CONTACTO'
|
||||
@ -221,25 +222,33 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
|
||||
Width = 228
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 257
|
||||
Left = 252
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 257
|
||||
ExplicitLeft = 252
|
||||
ExplicitWidth = 460
|
||||
Width = 460
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 638
|
||||
Left = 647
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 638
|
||||
ExplicitLeft = 647
|
||||
ExplicitWidth = 215
|
||||
Width = 215
|
||||
end
|
||||
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Group1: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Item4: TdxLayoutItem
|
||||
CaptionOptions.Text = 'Provincia:'
|
||||
Visible = True
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 792
|
||||
|
||||
@ -78,16 +78,25 @@ type
|
||||
procedure cxGridViewDataControllerCompare(
|
||||
ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
|
||||
AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
|
||||
procedure OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
procedure OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
procedure CustomViewCreate(Sender: TObject);
|
||||
procedure CustomViewDestroy(Sender: TObject);
|
||||
procedure CustomViewShow(Sender: TObject);
|
||||
|
||||
private
|
||||
//Filtros relativos a la vista
|
||||
procedure AnadirFiltroSituaciones;
|
||||
procedure AnadirFiltroFechas;
|
||||
procedure AnadirFiltroProvincia;
|
||||
|
||||
protected
|
||||
FProvincias : TStringList;
|
||||
FAlbaranes: IBizAlbaranCliente;
|
||||
function GetAlbaranes: IBizAlbaranCliente;
|
||||
procedure SetAlbaranes(const Value: IBizAlbaranCliente);
|
||||
procedure CargarProvincias;
|
||||
|
||||
public
|
||||
procedure AnadirOtrosFiltros; override;
|
||||
property Albaranes: IBizAlbaranCliente read GetAlbaranes write SetAlbaranes;
|
||||
@ -97,7 +106,7 @@ implementation
|
||||
|
||||
uses
|
||||
SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
|
||||
uViewGridBase, uReferenciasUtils, cxVariants;
|
||||
uViewGridBase, uReferenciasUtils, cxVariants, uProvinciasPoblacionesController, uStringsUtils;
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
@ -166,6 +175,23 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.AnadirFiltroProvincia;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
begin
|
||||
|
||||
//Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro
|
||||
//y sobre la lista de pedidos
|
||||
if frViewFiltroBase1.Visible then
|
||||
begin
|
||||
if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then
|
||||
begin
|
||||
FFiltro := AddFilterGrid(fboAnd);
|
||||
FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue));
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.AnadirFiltroSituaciones;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
@ -192,6 +218,7 @@ begin
|
||||
|
||||
AnadirFiltroSituaciones;
|
||||
AnadirFiltroFechas;
|
||||
AnadirFiltroProvincia;
|
||||
|
||||
//Finalmente activamos el filtro si tenemos algo
|
||||
if cxGridView.DataController.Filter.IsEmpty
|
||||
@ -200,6 +227,57 @@ begin
|
||||
cxGrid.ActiveLevel.GridView := cxGridView;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.CargarProvincias;
|
||||
var
|
||||
i : integer;
|
||||
begin
|
||||
with TProvinciasPoblacionesController.Create do
|
||||
try
|
||||
FProvincias := DarListaProvincias;
|
||||
|
||||
with frViewFiltroBase1.eLista.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
Add('Todos'); //Case 0
|
||||
for i := 0 to FProvincias.Count - 1 do
|
||||
Add(FProvincias.Names[i]);
|
||||
|
||||
frViewFiltroBase1.eLista.ItemIndex := 0;
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.CustomViewCreate(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FProvincias := NIL;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.CustomViewDestroy(Sender: TObject);
|
||||
begin
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := Nil;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil;
|
||||
|
||||
if Assigned(FProvincias) then
|
||||
FreeANDNIL(FProvincias);
|
||||
|
||||
inherited;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.CustomViewShow(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
|
||||
begin
|
||||
inherited;
|
||||
@ -272,6 +350,24 @@ begin
|
||||
Result := FAlbaranes;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
RefrescarFiltro;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
if not Assigned(FProvincias) then
|
||||
CargarProvincias;
|
||||
finally
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewAlbaranesCliente.SetAlbaranes(const Value: IBizAlbaranCliente);
|
||||
begin
|
||||
FAlbaranes := Value;
|
||||
|
||||
@ -134,7 +134,7 @@ object RptComisiones: TRptComisiones
|
||||
'ODIFICACION, USUARIO, ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA, I' +
|
||||
'D_TIPO_IVA, IMPORTE_NETO, IMPORTE_PORTE,'#10' ID_AGENTE, COMISION' +
|
||||
', IMPORTE_COMISION'#10' FROM'#10' V_FACTURAS_CLIENTE'#10' WHERE ID_COMI' +
|
||||
'SION_LIQUIDADA = :ID'#10
|
||||
'SION_LIQUIDADA = :ID'#10' order by referencia'#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
|
||||
@ -10,6 +10,8 @@
|
||||
<Projects Include="..\..\GUIBase\GUIBase.dproj" />
|
||||
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
|
||||
<Projects Include="..\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.dproj" />
|
||||
<Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
|
||||
<Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
|
||||
<Projects Include="..\Pedidos de cliente\Controller\PedidosCliente_controller.dproj" />
|
||||
<Projects Include="..\Pedidos de cliente\Plugin\PedidosCliente_plugin.dproj" />
|
||||
<Projects Include="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" />
|
||||
@ -151,14 +153,32 @@
|
||||
<Target Name="PedidosCliente_view:Make">
|
||||
<MSBuild Projects="..\Pedidos de cliente\Views\PedidosCliente_view.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="AlbaranesCliente_view">
|
||||
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="" />
|
||||
</Target>
|
||||
<Target Name="AlbaranesCliente_view:Clean">
|
||||
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Clean" />
|
||||
</Target>
|
||||
<Target Name="AlbaranesCliente_view:Make">
|
||||
<MSBuild Projects="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="FacturasCliente_view">
|
||||
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="" />
|
||||
</Target>
|
||||
<Target Name="FacturasCliente_view:Clean">
|
||||
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Clean" />
|
||||
</Target>
|
||||
<Target Name="FacturasCliente_view:Make">
|
||||
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="Build">
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Contactos_plugin;FactuGES;FactuGES_Server;AlbaranesCliente_plugin;PedidosCliente_plugin;PedidosCliente_controller;PedidosCliente_view" />
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Contactos_plugin;FactuGES;FactuGES_Server;AlbaranesCliente_plugin;PedidosCliente_plugin;PedidosCliente_controller;PedidosCliente_view;AlbaranesCliente_view;FacturasCliente_view" />
|
||||
</Target>
|
||||
<Target Name="Clean">
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesCliente_plugin:Clean;PedidosCliente_plugin:Clean;PedidosCliente_controller:Clean;PedidosCliente_view:Clean" />
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesCliente_plugin:Clean;PedidosCliente_plugin:Clean;PedidosCliente_controller:Clean;PedidosCliente_view:Clean;AlbaranesCliente_view:Clean;FacturasCliente_view:Clean" />
|
||||
</Target>
|
||||
<Target Name="Make">
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesCliente_plugin:Make;PedidosCliente_plugin:Make;PedidosCliente_controller:Make;PedidosCliente_view:Make" />
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesCliente_plugin:Make;PedidosCliente_plugin:Make;PedidosCliente_controller:Make;PedidosCliente_view:Make;AlbaranesCliente_view:Make;FacturasCliente_view:Make" />
|
||||
</Target>
|
||||
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
|
||||
</Project>
|
||||
@ -73,6 +73,10 @@ inherited fEditorClientes: TfEditorClientes
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited tbxFiltro: TSpTBXToolbar
|
||||
DockPos = -6
|
||||
ExplicitWidth = 396
|
||||
end
|
||||
inherited tbxMenu: TSpTBXToolbar
|
||||
ExplicitWidth = 857
|
||||
inherited TBXSubmenuItemAcciones: TSpTBXSubmenuItem
|
||||
@ -104,7 +108,9 @@ inherited fEditorClientes: TfEditorClientes
|
||||
end
|
||||
end
|
||||
inherited TBXTMain2: TSpTBXToolbar
|
||||
Left = 396
|
||||
DockPos = 275
|
||||
ExplicitLeft = 396
|
||||
end
|
||||
end
|
||||
inherited StatusBar: TJvStatusBar
|
||||
@ -170,22 +176,22 @@ inherited fEditorClientes: TfEditorClientes
|
||||
Width = 460
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 467
|
||||
Left = 458
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 467
|
||||
ExplicitLeft = 458
|
||||
ExplicitWidth = 212
|
||||
Width = 212
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 676
|
||||
Left = 685
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 676
|
||||
ExplicitLeft = 685
|
||||
ExplicitWidth = 215
|
||||
Width = 215
|
||||
end
|
||||
@ -224,6 +230,9 @@ inherited fEditorClientes: TfEditorClientes
|
||||
BuiltInReportLink = True
|
||||
end
|
||||
end
|
||||
inherited dxPSEngineController1: TdxPSEngineController
|
||||
Active = True
|
||||
end
|
||||
inherited cxViewGridPopupMenu: TcxGridPopupMenu
|
||||
PopupMenus = <
|
||||
item
|
||||
|
||||
@ -11,10 +11,7 @@ inherited fEditorContactos: TfEditorContactos
|
||||
end
|
||||
inherited TBXDock: TSpTBXDock
|
||||
inherited tbxFiltro: TSpTBXToolbar
|
||||
ExplicitWidth = 328
|
||||
inherited TBXItem37: TSpTBXItem
|
||||
Visible = False
|
||||
end
|
||||
DockPos = -6
|
||||
end
|
||||
inherited tbxMenu: TSpTBXToolbar
|
||||
object TBXSubmenuItemAcciones: TSpTBXSubmenuItem [4]
|
||||
@ -22,9 +19,7 @@ inherited fEditorContactos: TfEditorContactos
|
||||
end
|
||||
end
|
||||
inherited TBXTMain2: TSpTBXToolbar
|
||||
Left = 328
|
||||
DockPos = 286
|
||||
ExplicitLeft = 328
|
||||
end
|
||||
end
|
||||
inherited EditorActionList: TActionList
|
||||
|
||||
@ -104,29 +104,36 @@ inherited frViewClientes: TfrViewClientes
|
||||
Width = 154
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 214
|
||||
Left = 210
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 214
|
||||
ExplicitLeft = 210
|
||||
ExplicitWidth = 525
|
||||
Width = 525
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 675
|
||||
Left = 683
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 675
|
||||
ExplicitLeft = 683
|
||||
ExplicitWidth = 140
|
||||
Width = 140
|
||||
end
|
||||
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Group1: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Item4: TdxLayoutItem
|
||||
CaptionOptions.Text = 'Provincia:'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 783
|
||||
ExplicitWidth = 793
|
||||
ExplicitWidth = 783
|
||||
inherited tbxBotones: TSpTBXToolbar
|
||||
Width = 783
|
||||
ExplicitWidth = 783
|
||||
@ -137,7 +144,7 @@ inherited frViewClientes: TfrViewClientes
|
||||
inherited pnlAgrupaciones: TSpTBXDockablePanel
|
||||
Top = 423
|
||||
Width = 793
|
||||
ExplicitTop = 422
|
||||
ExplicitTop = 423
|
||||
ExplicitWidth = 793
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 793
|
||||
@ -145,7 +152,7 @@ inherited frViewClientes: TfrViewClientes
|
||||
inherited TBXToolbar1: TSpTBXToolbar
|
||||
Width = 793
|
||||
Visible = False
|
||||
ExplicitWidth = 783
|
||||
ExplicitWidth = 793
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -37,6 +37,7 @@ type
|
||||
ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
|
||||
const AMousePos: TPoint; var AHintText: TCaption;
|
||||
var AIsHintMultiLine: Boolean; var AHintTextRect: TRect);
|
||||
|
||||
end;
|
||||
|
||||
|
||||
@ -47,7 +48,6 @@ uses uViewGridBase;
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
|
||||
procedure TfrViewClientes.cxGridViewFELICITACIONGetCellHint(
|
||||
Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
|
||||
ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
inherited frViewContactos: TfrViewContactos
|
||||
Width = 557
|
||||
Height = 458
|
||||
OnCreate = CustomViewCreate
|
||||
OnDestroy = CustomViewDestroy
|
||||
OnShow = CustomViewShow
|
||||
ExplicitWidth = 557
|
||||
ExplicitHeight = 458
|
||||
inherited cxGrid: TcxGrid
|
||||
@ -133,15 +136,30 @@ inherited frViewContactos: TfrViewContactos
|
||||
Width = 322
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 450
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 450
|
||||
end
|
||||
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Group1: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Item2: TdxLayoutItem
|
||||
Visible = False
|
||||
end
|
||||
inherited dxLayoutControl1Item3: TdxLayoutItem
|
||||
Visible = False
|
||||
end
|
||||
inherited dxLayoutControl1Item4: TdxLayoutItem
|
||||
Visible = True
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 547
|
||||
ExplicitWidth = 557
|
||||
ExplicitWidth = 547
|
||||
inherited tbxBotones: TSpTBXToolbar
|
||||
Width = 547
|
||||
ExplicitWidth = 547
|
||||
@ -152,14 +170,14 @@ inherited frViewContactos: TfrViewContactos
|
||||
inherited pnlAgrupaciones: TSpTBXDockablePanel
|
||||
Top = 432
|
||||
Width = 557
|
||||
ExplicitTop = 431
|
||||
ExplicitTop = 432
|
||||
ExplicitWidth = 557
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 557
|
||||
ExplicitWidth = 557
|
||||
inherited TBXToolbar1: TSpTBXToolbar
|
||||
Width = 557
|
||||
ExplicitWidth = 547
|
||||
ExplicitWidth = 557
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -41,28 +41,138 @@ type
|
||||
cxGridViewEMAIL_2: TcxGridDBColumn;
|
||||
cxGridViewPAGINA_WEB: TcxGridDBColumn;
|
||||
cxGridViewREFERENCIA: TcxGridDBColumn;
|
||||
procedure OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
procedure OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
|
||||
procedure CustomViewCreate(Sender: TObject);
|
||||
procedure CustomViewDestroy(Sender: TObject);
|
||||
procedure CustomViewShow(Sender: TObject);
|
||||
private
|
||||
procedure AnadirFiltroProvincia;
|
||||
|
||||
protected
|
||||
FProvincias : TStringList;
|
||||
FContactos: IBizContacto;
|
||||
function GetContactos: IBizContacto; virtual;
|
||||
procedure SetContactos(const Value: IBizContacto); virtual;
|
||||
procedure CargarProvincias;
|
||||
public
|
||||
procedure AnadirOtrosFiltros; override;
|
||||
property DataSet: IBizContacto read GetContactos write SetContactos;
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
{ TfrViewContactos }
|
||||
|
||||
uses uProvinciasPoblacionesController;
|
||||
|
||||
{
|
||||
******************************* TfrViewContactos *******************************
|
||||
}
|
||||
procedure TfrViewContactos.AnadirFiltroProvincia;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
begin
|
||||
|
||||
//Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro
|
||||
//y sobre la lista de pedidos
|
||||
if frViewFiltroBase1.Visible then
|
||||
begin
|
||||
if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then
|
||||
begin
|
||||
FFiltro := AddFilterGrid(fboAnd);
|
||||
FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue));
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.AnadirOtrosFiltros;
|
||||
begin
|
||||
inherited;
|
||||
AnadirFiltroProvincia;
|
||||
|
||||
//Finalmente activamos el filtro si tenemos algo
|
||||
if cxGridView.DataController.Filter.IsEmpty
|
||||
then cxGridView.DataController.Filter.Active := False
|
||||
else cxGridView.DataController.Filter.Active := True;
|
||||
cxGrid.ActiveLevel.GridView := cxGridView;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.CargarProvincias;
|
||||
var
|
||||
i : integer;
|
||||
begin
|
||||
with TProvinciasPoblacionesController.Create do
|
||||
try
|
||||
FProvincias := DarListaProvincias;
|
||||
|
||||
with frViewFiltroBase1.eLista.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
Add('Todos'); //Case 0
|
||||
for i := 0 to FProvincias.Count - 1 do
|
||||
Add(FProvincias.Names[i]);
|
||||
|
||||
frViewFiltroBase1.eLista.ItemIndex := 0;
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.CustomViewCreate(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FProvincias := NIL;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.CustomViewDestroy(Sender: TObject);
|
||||
begin
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := Nil;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil;
|
||||
|
||||
if Assigned(FProvincias) then
|
||||
FreeANDNIL(FProvincias);
|
||||
|
||||
inherited;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.CustomViewShow(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup;
|
||||
end;
|
||||
|
||||
function TfrViewContactos.GetContactos: IBizContacto;
|
||||
begin
|
||||
Result := FContactos;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
RefrescarFiltro;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
if not Assigned(FProvincias) then
|
||||
CargarProvincias;
|
||||
finally
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewContactos.SetContactos(const Value: IBizContacto);
|
||||
begin
|
||||
FContactos := Value;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
|
||||
Caption = 'Seleccionar facturas de cliente'
|
||||
ClientWidth = 654
|
||||
ExplicitTop = 7
|
||||
ExplicitWidth = 662
|
||||
PixelsPerInch = 96
|
||||
TextHeight = 13
|
||||
@ -70,6 +71,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
|
||||
Top = 23
|
||||
DockPos = 462
|
||||
DockRow = 1
|
||||
Visible = False
|
||||
ExplicitLeft = 462
|
||||
ExplicitTop = 23
|
||||
end
|
||||
@ -267,6 +269,7 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
|
||||
inherited pnlAgrupaciones: TSpTBXDockablePanel
|
||||
Top = 445
|
||||
Width = 654
|
||||
Visible = False
|
||||
ExplicitTop = 445
|
||||
ExplicitWidth = 654
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
inherited frViewFacturasCliente: TfrViewFacturasCliente
|
||||
Width = 665
|
||||
Height = 418
|
||||
OnCreate = CustomViewCreate
|
||||
OnDestroy = CustomViewDestroy
|
||||
OnShow = CustomViewShow
|
||||
ExplicitWidth = 665
|
||||
ExplicitHeight = 418
|
||||
inherited cxGrid: TcxGrid
|
||||
@ -177,25 +180,33 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
|
||||
Width = 144
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 248
|
||||
Left = 241
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 248
|
||||
ExplicitLeft = 241
|
||||
ExplicitWidth = 273
|
||||
Width = 273
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 558
|
||||
Left = 563
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 558
|
||||
ExplicitLeft = 563
|
||||
ExplicitWidth = 97
|
||||
Width = 97
|
||||
end
|
||||
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Group1: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Item4: TdxLayoutItem
|
||||
CaptionOptions.Text = 'Provincia:'
|
||||
Visible = True
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 655
|
||||
|
||||
@ -71,16 +71,24 @@ type
|
||||
procedure cxGridViewDataControllerCompare(
|
||||
ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
|
||||
AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
|
||||
procedure OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
procedure OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
procedure CustomViewShow(Sender: TObject);
|
||||
procedure CustomViewDestroy(Sender: TObject);
|
||||
procedure CustomViewCreate(Sender: TObject);
|
||||
|
||||
private
|
||||
//Filtros relativos a la vista
|
||||
procedure AnadirFiltroSituaciones;
|
||||
procedure AnadirFiltroFechas;
|
||||
procedure AnadirFiltroProvincia;
|
||||
|
||||
protected
|
||||
FProvincias : TStringList;
|
||||
FFacturas: IBizFacturaCliente;
|
||||
function GetFacturas: IBizFacturaCliente;
|
||||
procedure SetFacturas(const Value: IBizFacturaCliente);
|
||||
procedure CargarProvincias;
|
||||
|
||||
public
|
||||
procedure AnadirOtrosFiltros; override;
|
||||
@ -92,7 +100,7 @@ implementation
|
||||
|
||||
uses
|
||||
uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils,
|
||||
cxVariants;
|
||||
cxVariants, uProvinciasPoblacionesController, uStringsUtils;
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
@ -158,6 +166,23 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.AnadirFiltroProvincia;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
begin
|
||||
|
||||
//Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro
|
||||
//y sobre la lista de pedidos
|
||||
if frViewFiltroBase1.Visible then
|
||||
begin
|
||||
if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then
|
||||
begin
|
||||
FFiltro := AddFilterGrid(fboAnd);
|
||||
FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue));
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.AnadirFiltroSituaciones;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
@ -177,6 +202,7 @@ begin
|
||||
|
||||
AnadirFiltroSituaciones;
|
||||
AnadirFiltroFechas;
|
||||
AnadirFiltroProvincia;
|
||||
|
||||
//Finalmente activamos el filtro si tenemos algo
|
||||
if cxGridView.DataController.Filter.IsEmpty
|
||||
@ -185,6 +211,57 @@ begin
|
||||
cxGrid.ActiveLevel.GridView := cxGridView;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.CargarProvincias;
|
||||
var
|
||||
i : integer;
|
||||
begin
|
||||
with TProvinciasPoblacionesController.Create do
|
||||
try
|
||||
FProvincias := DarListaProvincias;
|
||||
|
||||
with frViewFiltroBase1.eLista.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
Add('Todos'); //Case 0
|
||||
for i := 0 to FProvincias.Count - 1 do
|
||||
Add(FProvincias.Names[i]);
|
||||
|
||||
frViewFiltroBase1.eLista.ItemIndex := 0;
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.CustomViewCreate(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FProvincias := NIL;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.CustomViewDestroy(Sender: TObject);
|
||||
begin
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := Nil;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil;
|
||||
|
||||
if Assigned(FProvincias) then
|
||||
FreeANDNIL(FProvincias);
|
||||
|
||||
inherited;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.CustomViewShow(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid;
|
||||
ALevel: TcxGridLevel);
|
||||
begin
|
||||
@ -236,6 +313,24 @@ begin
|
||||
Result := FFacturas;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
RefrescarFiltro;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
if not Assigned(FProvincias) then
|
||||
CargarProvincias;
|
||||
finally
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewFacturasCliente.SetFacturas(const Value: IBizFacturaCliente);
|
||||
begin
|
||||
FFacturas := Value;
|
||||
|
||||
@ -13,4 +13,4 @@ BEGIN
|
||||
END
|
||||
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.res */
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.drf */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E0.tmp */
|
||||
|
||||
@ -14,4 +14,4 @@ END
|
||||
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.res */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBC.tmp */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DE.tmp */
|
||||
|
||||
@ -13,4 +13,4 @@ BEGIN
|
||||
END
|
||||
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.res */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBA.tmp */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1DC.tmp */
|
||||
|
||||
@ -14,4 +14,4 @@ END
|
||||
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
|
||||
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.res */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf132.tmp */
|
||||
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf254.tmp */
|
||||
|
||||
@ -60,24 +60,22 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
Connection = 'IBX'
|
||||
TargetTable = 'PEDIDOS_CLIENTE'
|
||||
SQL =
|
||||
'SELECT'#10' PEDIDOS_CLIENTE.ID, PEDIDOS_CLIENTE.ID_EMPRESA,'#10' PEDID' +
|
||||
'OS_CLIENTE.ID_CLIENTE,'#10' PEDIDOS_CLIENTE.FECHA_PEDIDO,'#10' PEDIDOS' +
|
||||
'_CLIENTE.REFERENCIA,'#10' PEDIDOS_CLIENTE.REFERENCIA_CLIENTE,'#10' PED' +
|
||||
'IDOS_CLIENTE.DATOS_BANCARIOS,'#10' PEDIDOS_CLIENTE.OBSERVACIONES,'#10' ' +
|
||||
' PEDIDOS_CLIENTE.IMPORTE_NETO,'#10' PEDIDOS_CLIENTE.DESCUENTO,'#10' PE' +
|
||||
'DIDOS_CLIENTE.IMPORTE_DESCUENTO,'#10' PEDIDOS_CLIENTE.DESCUENTO2,'#10' ' +
|
||||
' PEDIDOS_CLIENTE.IMPORTE_DESCUENTO2,'#10' PEDIDOS_CLIENTE.IMPORTE_T' +
|
||||
'OTAL,'#10' CONTACTOS.REFERENCIA as REF_CLIENTE, CONTACTOS.NIF_CIF, ' +
|
||||
'CONTACTOS.NOMBRE,'#10' PEDIDOS_CLIENTE.PERSONA_CONTACTO,'#10' COALESCE' +
|
||||
'(CONTACTOS_DIRECCIONES.CALLE, CONTACTOS.CALLE) AS CALLE,'#10' COALE' +
|
||||
'SCE(CONTACTOS_DIRECCIONES.POBLACION, CONTACTOS.POBLACION) AS POB' +
|
||||
'LACION,'#10' COALESCE(CONTACTOS_DIRECCIONES.PROVINCIA, CONTACTOS.PR' +
|
||||
'OVINCIA) AS PROVINCIA,'#10' COALESCE(CONTACTOS_DIRECCIONES.CODIGO_P' +
|
||||
'OSTAL, CONTACTOS.CODIGO_POSTAL) AS CODIGO_POSTAL'#10#10'FROM'#10' PEDIDOS' +
|
||||
'_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_CLIEN' +
|
||||
'TE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTA' +
|
||||
'CTOS_DIRECCIONES.ID = PEDIDOS_CLIENTE.ID_DIRECCION)'#10'WHERE PEDIDO' +
|
||||
'S_CLIENTE.ID = :ID'#10#10
|
||||
'SELECT'#10' V_PEDIDOS_CLIENTE.ID, V_PEDIDOS_CLIENTE.ID_EMPRESA,'#10' V' +
|
||||
'_PEDIDOS_CLIENTE.ID_CLIENTE,'#10' V_PEDIDOS_CLIENTE.FECHA_PEDIDO,'#10' ' +
|
||||
' V_PEDIDOS_CLIENTE.REFERENCIA,'#10' V_PEDIDOS_CLIENTE.REFERENCIA_CL' +
|
||||
'IENTE,'#10' V_PEDIDOS_CLIENTE.DATOS_BANCARIOS,'#10' V_PEDIDOS_CLIENTE.' +
|
||||
'OBSERVACIONES,'#10' V_PEDIDOS_CLIENTE.IMPORTE_NETO,'#10' V_PEDIDOS_CLI' +
|
||||
'ENTE.DESCUENTO,'#10' V_PEDIDOS_CLIENTE.IMPORTE_DESCUENTO,'#10' V_PEDID' +
|
||||
'OS_CLIENTE.DESCUENTO2,'#10' V_PEDIDOS_CLIENTE.IMPORTE_DESCUENTO2,'#10' ' +
|
||||
' V_PEDIDOS_CLIENTE.IMPORTE_TOTAL,'#10' CONTACTOS.NIF_CIF, CONTACTOS' +
|
||||
'.REFERENCIA as REF_ClIENTE,'#10' CLIENTES_DATOS.NOMBRE_COMERCIAL,'#10' ' +
|
||||
' V_PEDIDOS_CLIENTE.NOMBRE,'#10' V_PEDIDOS_CLIENTE.PERSONA_CONTACTO,' +
|
||||
#10' V_PEDIDOS_CLIENTE.CALLE,'#10' V_PEDIDOS_CLIENTE.POBLACION,'#10' V_P' +
|
||||
'EDIDOS_CLIENTE.PROVINCIA,'#10' V_PEDIDOS_CLIENTE.CODIGO_POSTAL'#10#10'FRO' +
|
||||
'M'#10' V_PEDIDOS_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = ' +
|
||||
'V_PEDIDOS_CLIENTE.ID_CLIENTE)'#10' LEFT JOIN CLIENTES_DATOS ON (CLI' +
|
||||
'ENTES_DATOS.ID_CLIENTE = V_PEDIDOS_CLIENTE.ID_CLIENTE)'#10'WHERE V_P' +
|
||||
'EDIDOS_CLIENTE.ID = :ID'#10#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -136,10 +134,6 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
DatasetField = 'NIF_CIF'
|
||||
TableField = 'NIF_CIF'
|
||||
end
|
||||
item
|
||||
DatasetField = 'REF_CLIENTE'
|
||||
TableField = 'REF_CLIENTE'
|
||||
end
|
||||
item
|
||||
DatasetField = 'IMPORTE_NETO'
|
||||
TableField = 'IMPORTE_NETO'
|
||||
@ -167,6 +161,16 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
item
|
||||
DatasetField = 'FECHA_PEDIDO'
|
||||
TableField = 'FECHA_PEDIDO'
|
||||
end
|
||||
item
|
||||
DatasetField = 'REF_CLIENTE'
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'REF_CLIENTE'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_COMERCIAL'
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'NOMBRE_COMERCIAL'
|
||||
end>
|
||||
end>
|
||||
Name = 'Informe_Cabecera'
|
||||
@ -212,7 +216,7 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO'
|
||||
@ -220,7 +224,7 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO2'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO2'
|
||||
@ -230,15 +234,20 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
Name = 'IMPORTE_TOTAL'
|
||||
DataType = datCurrency
|
||||
end
|
||||
item
|
||||
Name = 'NIF_CIF'
|
||||
DataType = datString
|
||||
Size = 15
|
||||
end
|
||||
item
|
||||
Name = 'REF_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NIF_CIF'
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 15
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE'
|
||||
@ -388,17 +397,19 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
TargetTable = 'PEDIDOS_CLIENTE_DETALLES'
|
||||
SQL =
|
||||
'SELECT PEDIDOS_CLIENTE.ID,'#10' CONTACTOS.REFERENCIA as REF_CLIENTE' +
|
||||
', CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' PEDIDOS_CLIENTE.PERSONA' +
|
||||
'_CONTACTO,'#10' CONTACTOS.CALLE AS CALLE_FISCAL,'#10' CONTACTOS_DIRECC' +
|
||||
'IONES.CALLE AS CALLE_ENVIO,'#10' CONTACTOS.POBLACION AS POBLACION_F' +
|
||||
'ISCAL,'#10' CONTACTOS_DIRECCIONES.POBLACION AS POBLACION_ENVIO,'#10' C' +
|
||||
'ONTACTOS.PROVINCIA AS PROVINCIA_FISCAL,'#10' CONTACTOS_DIRECCIONES.' +
|
||||
'PROVINCIA AS PROVINCIA_ENVIO,'#10' CONTACTOS.CODIGO_POSTAL AS CODIG' +
|
||||
'O_POSTAL_FISCAL,'#10' CONTACTOS_DIRECCIONES.CODIGO_POSTAL AS CODIGO' +
|
||||
'_POSTAL_ENVIO'#10#10'FROM'#10' PEDIDOS_CLIENTE'#10' INNER JOIN CONTACTOS ON ' +
|
||||
'(CONTACTOS.ID = PEDIDOS_CLIENTE.ID_CLIENTE)'#10' LEFT OUTER JOIN CO' +
|
||||
'NTACTOS_DIRECCIONES ON (CONTACTOS_DIRECCIONES.ID_contacto = PEDI' +
|
||||
'DOS_CLIENTE.ID_cliente)'#10'WHERE PEDIDOS_CLIENTE.ID = :ID'#10
|
||||
', CONTACTOS.NIF_CIF, CONTACTOS.NOMBRE,'#10' CLIENTES_DATOS.NOMBRE_C' +
|
||||
'OMERCIAL,'#10' PEDIDOS_CLIENTE.PERSONA_CONTACTO,'#10' CONTACTOS.CALLE ' +
|
||||
'AS CALLE_FISCAL,'#10' CONTACTOS_DIRECCIONES.CALLE AS CALLE_ENVIO,'#10' ' +
|
||||
' CONTACTOS.POBLACION AS POBLACION_FISCAL,'#10' CONTACTOS_DIRECCIONE' +
|
||||
'S.POBLACION AS POBLACION_ENVIO,'#10' CONTACTOS.PROVINCIA AS PROVINC' +
|
||||
'IA_FISCAL,'#10' CONTACTOS_DIRECCIONES.PROVINCIA AS PROVINCIA_ENVIO,' +
|
||||
#10' CONTACTOS.CODIGO_POSTAL AS CODIGO_POSTAL_FISCAL,'#10' CONTACTOS_' +
|
||||
'DIRECCIONES.CODIGO_POSTAL AS CODIGO_POSTAL_ENVIO'#10#10'FROM'#10' PEDIDOS' +
|
||||
'_CLIENTE'#10' INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_CLIEN' +
|
||||
'TE.ID_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS_DIRECCIONES ON (CONTA' +
|
||||
'CTOS_DIRECCIONES.ID_contacto = PEDIDOS_CLIENTE.ID_cliente)'#10' LEF' +
|
||||
'T JOIN CLIENTES_DATOS ON (CLIENTES_DATOS.ID_CLIENTE = PEDIDOS_CL' +
|
||||
'IENTE.ID_cliente)'#10'WHERE PEDIDOS_CLIENTE.ID = :ID'#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -420,6 +431,11 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'NOMBRE'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_COMERCIAL'
|
||||
TableField = '<unknown>'
|
||||
SQLOrigin = 'NOMBRE_COMERCIAL'
|
||||
end
|
||||
item
|
||||
DatasetField = 'PERSONA_CONTACTO'
|
||||
TableField = '<unknown>'
|
||||
@ -487,6 +503,11 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
@ -552,7 +573,7 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
PrintOptions.Printer = 'Por defecto'
|
||||
PrintOptions.PrintOnSheet = 0
|
||||
ReportOptions.CreateDate = 39065.872423495400000000
|
||||
ReportOptions.LastChange = 40245.779754583330000000
|
||||
ReportOptions.LastChange = 40365.554343831020000000
|
||||
ScriptLanguage = 'PascalScript'
|
||||
ShowProgress = False
|
||||
StoreInDFM = False
|
||||
@ -829,7 +850,7 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO'
|
||||
@ -837,7 +858,7 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
end
|
||||
item
|
||||
Name = 'DESCUENTO2'
|
||||
DataType = datCurrency
|
||||
DataType = datFloat
|
||||
end
|
||||
item
|
||||
Name = 'IMPORTE_DESCUENTO2'
|
||||
@ -847,15 +868,20 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
Name = 'IMPORTE_TOTAL'
|
||||
DataType = datCurrency
|
||||
end
|
||||
item
|
||||
Name = 'NIF_CIF'
|
||||
DataType = datString
|
||||
Size = 15
|
||||
end
|
||||
item
|
||||
Name = 'REF_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NIF_CIF'
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 15
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE'
|
||||
@ -1026,6 +1052,11 @@ object RptPedidosCliente: TRptPedidosCliente
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_COMERCIAL'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
|
||||
@ -178,18 +178,81 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente
|
||||
ExplicitHeight = 336
|
||||
inherited ToolBar1: TToolBar
|
||||
Width = 618
|
||||
Height = 73
|
||||
ExplicitWidth = 618
|
||||
ExplicitHeight = 73
|
||||
inherited ToolButton3: TToolButton
|
||||
Wrap = False
|
||||
end
|
||||
inherited ToolButton4: TToolButton
|
||||
Left = 278
|
||||
Top = 0
|
||||
ExplicitLeft = 278
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton14: TToolButton [4]
|
||||
Left = 334
|
||||
Top = 0
|
||||
Wrap = True
|
||||
ExplicitLeft = 334
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited FontName: TJvFontComboBox [5]
|
||||
Left = 0
|
||||
ExplicitLeft = 0
|
||||
end
|
||||
inherited FontSize: TEdit
|
||||
Left = 145
|
||||
ExplicitLeft = 145
|
||||
end
|
||||
inherited UpDown1: TUpDown
|
||||
Left = 187
|
||||
ExplicitLeft = 187
|
||||
end
|
||||
inherited ToolButton13: TToolButton
|
||||
Left = 204
|
||||
ExplicitLeft = 204
|
||||
end
|
||||
inherited ToolButton6: TToolButton [9]
|
||||
Left = 212
|
||||
Top = 22
|
||||
ExplicitLeft = 212
|
||||
ExplicitTop = 22
|
||||
end
|
||||
inherited ToolButton7: TToolButton [10]
|
||||
Left = 278
|
||||
Top = 22
|
||||
ExplicitLeft = 278
|
||||
ExplicitTop = 22
|
||||
end
|
||||
inherited ToolButton8: TToolButton [11]
|
||||
Left = 345
|
||||
Top = 22
|
||||
ExplicitLeft = 345
|
||||
ExplicitTop = 22
|
||||
end
|
||||
inherited ToolButton12: TToolButton [12]
|
||||
end
|
||||
inherited ToolButton9: TToolButton [13]
|
||||
end
|
||||
inherited ToolButton10: TToolButton [14]
|
||||
end
|
||||
inherited ToolButton11: TToolButton [15]
|
||||
Left = 270
|
||||
Top = 49
|
||||
ExplicitLeft = 270
|
||||
ExplicitTop = 49
|
||||
end
|
||||
end
|
||||
inherited cxGrid: TcxGrid
|
||||
Top = 99
|
||||
Width = 618
|
||||
Height = 237
|
||||
ExplicitWidth = 618
|
||||
ExplicitHeight = 237
|
||||
inherited cxGridView: TcxGridDBTableView
|
||||
OptionsSelection.InvertSelect = False
|
||||
end
|
||||
end
|
||||
inherited TBXDock1: TSpTBXDock
|
||||
Top = 73
|
||||
Width = 618
|
||||
ExplicitWidth = 618
|
||||
end
|
||||
@ -276,8 +339,10 @@ inherited fEditorPedidoCliente: TfEditorPedidoCliente
|
||||
inherited Bevel4: TBevel
|
||||
Left = 433
|
||||
Width = 206
|
||||
Height = 9
|
||||
ExplicitLeft = 433
|
||||
ExplicitWidth = 206
|
||||
ExplicitHeight = 9
|
||||
end
|
||||
inherited ImporteDto: TcxDBCurrencyEdit
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
|
||||
@ -223,48 +223,47 @@ begin
|
||||
ViewPedido.AsignarCuentaBancaria;
|
||||
end;
|
||||
|
||||
{
|
||||
AClientesController := TClientesController.Create;
|
||||
try
|
||||
if not AClientesController.TieneDatosBancarios(FPedido.Cliente) then
|
||||
MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK);
|
||||
// if not AClientesController.TieneDatosBancarios(FPedido.Cliente) then
|
||||
// MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK);
|
||||
|
||||
case FPedido.Cliente.Direcciones.RecordCount of
|
||||
0 : begin
|
||||
FController.QuitarDireccionEnvio(FPedido);
|
||||
MessageBox(0, '¡Atención! Este cliente no tiene ' + #10#13 + 'ninguna dirección de envío en su ficha', 'Atención', MB_ICONWARNING or MB_OK);
|
||||
FPedido.Edit;
|
||||
FPedido.IMPORTE_PORTE := 0;
|
||||
// FPedido.Edit;
|
||||
// FPedido.IMPORTE_PORTE := 0;
|
||||
end;
|
||||
1 : begin
|
||||
FController.CopiarDireccionEnvio(FPedido.Cliente.Direcciones, FPedido);
|
||||
FPedido.Edit;
|
||||
FPedido.IMPORTE_PORTE := FPedido.Cliente.Direcciones.PORTE;
|
||||
// FPedido.Edit;
|
||||
// FPedido.IMPORTE_PORTE := FPedido.Cliente.Direcciones.PORTE;
|
||||
end
|
||||
else begin
|
||||
ADireccion := AClientesController.ElegirDireccionEntrega(FPedido.Cliente.Direcciones, '');
|
||||
ADireccion := AClientesController.ElegirDireccionEntrega(FPedido.Cliente, '');
|
||||
try
|
||||
if Assigned(ADireccion) then
|
||||
begin
|
||||
FController.CopiarDireccionEnvio(ADireccion, FPedido);
|
||||
FPedido.Edit;
|
||||
FPedido.IMPORTE_PORTE := ADireccion.PORTE;
|
||||
// FPedido.Edit;
|
||||
// FPedido.IMPORTE_PORTE := ADireccion.PORTE;
|
||||
end;
|
||||
finally
|
||||
ADireccion := NIL;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
}
|
||||
|
||||
// Si el pedido tiene detalles hay que mirar si los descuentos y otros campos
|
||||
// para los artículos hay que cambiarlos.
|
||||
if (FPedido.Detalles.RecordCount > 0) then
|
||||
FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Cliente);
|
||||
|
||||
{ finally
|
||||
finally
|
||||
AClientesController := NIL;
|
||||
end;
|
||||
}
|
||||
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
Width = 596
|
||||
Height = 479
|
||||
OnCreate = CustomViewCreate
|
||||
OnDestroy = CustomViewDestroy
|
||||
OnShow = CustomViewShow
|
||||
ExplicitWidth = 596
|
||||
ExplicitHeight = 479
|
||||
inherited cxGrid: TcxGrid
|
||||
@ -9,8 +12,9 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
Height = 388
|
||||
RootLevelOptions.DetailTabsPosition = dtpTop
|
||||
OnActiveTabChanged = cxGridActiveTabChanged
|
||||
ExplicitTop = 65
|
||||
ExplicitWidth = 596
|
||||
ExplicitHeight = 351
|
||||
ExplicitHeight = 388
|
||||
inherited cxGridView: TcxGridDBTableView
|
||||
OnMouseMove = cxGridViewMouseMove
|
||||
DataController.KeyFieldNames = 'ID'
|
||||
@ -141,8 +145,6 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
end
|
||||
object cxGridViewPROVINCIA: TcxGridDBColumn
|
||||
DataBinding.FieldName = 'PROVINCIA'
|
||||
Visible = False
|
||||
VisibleForCustomization = False
|
||||
end
|
||||
object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn
|
||||
DataBinding.FieldName = 'PERSONA_CONTACTO'
|
||||
@ -193,6 +195,7 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
Width = 596
|
||||
Height = 65
|
||||
ExplicitWidth = 596
|
||||
ExplicitHeight = 65
|
||||
inherited dxLayoutControl1: TdxLayoutControl
|
||||
Width = 596
|
||||
ExplicitWidth = 596
|
||||
@ -211,25 +214,33 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
Width = 272
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 265
|
||||
Left = 259
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 265
|
||||
ExplicitLeft = 259
|
||||
ExplicitWidth = 221
|
||||
Width = 221
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 449
|
||||
Left = 460
|
||||
Style.LookAndFeel.SkinName = ''
|
||||
StyleDisabled.LookAndFeel.SkinName = ''
|
||||
StyleFocused.LookAndFeel.SkinName = ''
|
||||
StyleHot.LookAndFeel.SkinName = ''
|
||||
ExplicitLeft = 449
|
||||
ExplicitLeft = 460
|
||||
ExplicitWidth = 215
|
||||
Width = 215
|
||||
end
|
||||
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Group1: TdxLayoutGroup
|
||||
inherited dxLayoutControl1Item4: TdxLayoutItem
|
||||
CaptionOptions.Text = 'Provincia:'
|
||||
Visible = True
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TSpTBXDockablePanel
|
||||
Width = 586
|
||||
@ -266,9 +277,6 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
|
||||
BuiltInReportLink = True
|
||||
end
|
||||
end
|
||||
inherited dxPSEngineController1: TdxPSEngineController
|
||||
Active = True
|
||||
end
|
||||
inherited cxStyleRepository1: TcxStyleRepository
|
||||
Left = 248
|
||||
object cxStylePENDIENTES: TcxStyle
|
||||
|
||||
@ -77,16 +77,25 @@ type
|
||||
ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo;
|
||||
var ADone: Boolean);
|
||||
procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject);
|
||||
procedure CustomViewShow(Sender: TObject);
|
||||
procedure CustomViewDestroy(Sender: TObject);
|
||||
procedure OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
procedure OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
procedure CustomViewCreate(Sender: TObject);
|
||||
|
||||
private
|
||||
//Filtros relativos a la vista
|
||||
procedure AnadirFiltroSituaciones;
|
||||
procedure AnadirFiltroFechas;
|
||||
procedure AnadirFiltroProvincia;
|
||||
|
||||
protected
|
||||
FProvincias : TStringList;
|
||||
FPedidos: IBizPedidoCliente;
|
||||
function GetPedidos: IBizPedidoCliente;
|
||||
procedure SetPedidos(const Value: IBizPedidoCliente);
|
||||
procedure CargarProvincias;
|
||||
|
||||
public
|
||||
procedure AnadirOtrosFiltros; override;
|
||||
property Pedidos: IBizPedidoCliente read GetPedidos write SetPedidos;
|
||||
@ -95,7 +104,7 @@ type
|
||||
implementation
|
||||
|
||||
uses SysUtils, variants, windows, uDataModulePedidosCliente, schPedidosClienteClient_Intf,
|
||||
uViewGridBase;
|
||||
uViewGridBase, uProvinciasPoblacionesController, uStringsUtils;
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
@ -159,6 +168,23 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.AnadirFiltroProvincia;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
begin
|
||||
|
||||
//Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro
|
||||
//y sobre la lista de pedidos
|
||||
if frViewFiltroBase1.Visible then
|
||||
begin
|
||||
if (VarToStr(frViewFiltroBase1.eLista.EditValue) <> 'Todos') then
|
||||
begin
|
||||
FFiltro := AddFilterGrid(fboAnd);
|
||||
FFiltro.AddItem(cxGridViewPROVINCIA, foEqual, VarToStr(frViewFiltroBase1.eLista.EditValue), VarToStr(frViewFiltroBase1.eLista.EditValue));
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.AnadirFiltroSituaciones;
|
||||
var
|
||||
FFiltro : TcxFilterCriteriaItemList;
|
||||
@ -178,7 +204,8 @@ begin
|
||||
|
||||
AnadirFiltroSituaciones;
|
||||
AnadirFiltroFechas;
|
||||
|
||||
AnadirFiltroProvincia;
|
||||
|
||||
//Finalmente activamos el filtro si tenemos algo
|
||||
if cxGridView.DataController.Filter.IsEmpty
|
||||
then cxGridView.DataController.Filter.Active := False
|
||||
@ -186,6 +213,57 @@ begin
|
||||
cxGrid.ActiveLevel.GridView := cxGridView;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.CargarProvincias;
|
||||
var
|
||||
i : integer;
|
||||
begin
|
||||
with TProvinciasPoblacionesController.Create do
|
||||
try
|
||||
FProvincias := DarListaProvincias;
|
||||
|
||||
with frViewFiltroBase1.eLista.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
Add('Todos'); //Case 0
|
||||
for i := 0 to FProvincias.Count - 1 do
|
||||
Add(FProvincias.Names[i]);
|
||||
|
||||
frViewFiltroBase1.eLista.ItemIndex := 0;
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.CustomViewCreate(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FProvincias := NIL;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.CustomViewDestroy(Sender: TObject);
|
||||
begin
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := Nil;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := Nil;
|
||||
|
||||
if Assigned(FProvincias) then
|
||||
FreeANDNIL(FProvincias);
|
||||
|
||||
inherited;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.CustomViewShow(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
frViewFiltroBase1.eLista.Properties.OnChange := OnFiltroListaPropertiesChange;
|
||||
frViewFiltroBase1.eLista.Properties.OnInitPopup := OnFiltroListaPropertiesInitPopup;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
|
||||
begin
|
||||
inherited;
|
||||
@ -330,6 +408,25 @@ begin
|
||||
Result := FPedidos;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.OnFiltroListaPropertiesChange(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
RefrescarFiltro;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.OnFiltroListaPropertiesInitPopup(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
if not Assigned(FProvincias) then
|
||||
CargarProvincias;
|
||||
finally
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewPedidosCliente.SetPedidos(const Value: IBizPedidoCliente);
|
||||
begin
|
||||
FPedidos := Value;
|
||||
|
||||
Binary file not shown.
@ -35,7 +35,7 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType />
|
||||
<BorlandProject>
|
||||
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">7</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 01 de julio de 2010 17:59</VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 01 de julio de 2010 19:29</VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
MAINICON ICON "C:\Codigo noviseda\Resources\Iconos\Servidor.ico"
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,6,0
|
||||
PRODUCTVERSION 1,0,6,0
|
||||
FILEVERSION 1,0,7,0
|
||||
PRODUCTVERSION 1,0,7,0
|
||||
FILEFLAGSMASK 0x3FL
|
||||
FILEFLAGS 0x00L
|
||||
FILEOS 0x40004L
|
||||
@ -13,11 +13,11 @@ BEGIN
|
||||
BLOCK "0C0A04E4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Rodax Software S.L.\0"
|
||||
VALUE "FileVersion", "1.0.6.0\0"
|
||||
VALUE "FileVersion", "1.0.7.0\0"
|
||||
VALUE "InternalName", "FactuGES Servidor\0"
|
||||
VALUE "ProductName", "FactuGES Servidor\0"
|
||||
VALUE "ProductVersion", "1.0.6.0\0"
|
||||
VALUE "CompileDate", "jueves, 01 de julio de 2010 17:59\0"
|
||||
VALUE "ProductVersion", "1.0.7.0\0"
|
||||
VALUE "CompileDate", "jueves, 01 de julio de 2010 19:29\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Reference in New Issue
Block a user