Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arreglo para que los informes de facturas cuando sea un abono ponga abono y cuando sea factura ponga factura

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@451 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-06-11 11:51:50 +00:00
parent 01279e66df
commit a7a4fb22f9
9 changed files with 387 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Source/Base/Base.dproj
View File

@ -53,57 +53,57 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contactos\adortl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\designide.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Contactos\dsnap.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contactos\GUISDK_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contactos\Jcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Contactos\rtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcldb.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contactos\vclx.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

BIN
Source/Base/Base.res
View File

Binary file not shown.

BIN
Source/Informes/FacturaCliente.rdx
View File

Binary file not shown.

5
Source/Informes/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

2
Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
View File

@ -175,7 +175,9 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente
object actAlbaranesDevCliente: TAction object actAlbaranesDevCliente: TAction
Category = 'Ventas' Category = 'Ventas'
Caption = 'Ordenes de devoluci'#243'n' Caption = 'Ordenes de devoluci'#243'n'
Enabled = False
ImageIndex = 1 ImageIndex = 1
Visible = False
OnExecute = actAlbaranesDevClienteExecute OnExecute = actAlbaranesDevClienteExecute
end end
end end

5
Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
View File

@ -204,7 +204,10 @@ begin
//Activamos cabecera //Activamos cabecera
FWordApp.Application.ActiveWindow.ActivePane.View.SeekView := wdSeekCurrentPageHeader; FWordApp.Application.ActiveWindow.ActivePane.View.SeekView := wdSeekCurrentPageHeader;
ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').AsString); if (FieldByName('TIPO').AsString = 'F') then
ReplaceBookmark('CodigoFacturaCab', 'FACTURA ' + FieldByName('REFERENCIA').AsString)
else
ReplaceBookmark('CodigoFacturaCab', 'ABONO ' + FieldByName('REFERENCIA').AsString);
ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString); ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString);
ReplaceBookmark('VencimientoCab', ''{FieldByName('FECHAVENCIMIENTO').AsString}); ReplaceBookmark('VencimientoCab', ''{FieldByName('FECHAVENCIMIENTO').AsString});
ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString); ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString);

88
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -203,82 +203,90 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Height = 51 Height = 51
ExplicitWidth = 815 ExplicitWidth = 815
ExplicitHeight = 51 ExplicitHeight = 51
inherited FontName: TJvFontComboBox [3] inherited ToolButton3: TToolButton
Left = 279 Wrap = False
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0 Top = 0
ExplicitLeft = 279 ExplicitLeft = 278
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton14: TToolButton [4] inherited ToolButton14: TToolButton
Left = 424 Left = 334
Top = 0 Top = 0
ExplicitLeft = 424 Wrap = False
ExplicitLeft = 334
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontSize: TEdit [5] inherited FontName: TJvFontComboBox
Left = 489 Left = 399
Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 544
Top = 0 Top = 0
Width = 104 Width = 104
ExplicitLeft = 489 ExplicitLeft = 544
ExplicitTop = 0 ExplicitTop = 0
ExplicitWidth = 104 ExplicitWidth = 104
end end
inherited UpDown1: TUpDown [6] inherited UpDown1: TUpDown
Left = 593 Left = 648
Top = 0 Top = 0
ExplicitLeft = 593 ExplicitLeft = 648
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton [7] inherited ToolButton13: TToolButton
Left = 0
Top = 0 Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0 ExplicitTop = 0
ExplicitHeight = 27
end end
inherited ToolButton11: TToolButton [8] inherited ToolButton6: TToolButton
Left = 0 Left = 0
Top = 27 Top = 27
Wrap = False
ExplicitLeft = 0 ExplicitLeft = 0
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton3: TToolButton [9] inherited ToolButton7: TToolButton
Left = 141 Left = 66
Top = 27 Top = 27
Wrap = False ExplicitLeft = 66
end
inherited ToolButton12: TToolButton [10]
Left = 196
Top = 27
ExplicitLeft = 196
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton9: TToolButton [11] inherited ToolButton8: TToolButton
Left = 204 Left = 133
Top = 27 Top = 27
ExplicitLeft = 204 ExplicitLeft = 133
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton10: TToolButton [12] inherited ToolButton12: TToolButton
Left = 349 Left = 216
Top = 27 Top = 27
ExplicitLeft = 349 ExplicitLeft = 216
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton6: TToolButton [13] inherited ToolButton9: TToolButton
Left = 474 Left = 224
Top = 27 Top = 27
ExplicitLeft = 474 ExplicitLeft = 224
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton7: TToolButton [14] inherited ToolButton10: TToolButton
Left = 540 Left = 369
Top = 27 Top = 27
ExplicitLeft = 540 ExplicitLeft = 369
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton8: TToolButton [15] inherited ToolButton11: TToolButton
Left = 607 Left = 494
Top = 27 Top = 27
ExplicitLeft = 607 ExplicitLeft = 494
ExplicitTop = 27 ExplicitTop = 27
end end
end end
@ -344,7 +352,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 829 ExplicitWidth = 829
inherited Bevel1: TBevel inherited Bevel1: TBevel
Top = 111 Top = 111
Width = 73
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 73
end end
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 375 Left = 375
@ -357,8 +367,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 487 Left = 487
Top = 111 Top = 111
Width = 192
ExplicitLeft = 487 ExplicitLeft = 487
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 192
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Top = 131 Top = 131

2
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -276,7 +276,7 @@ begin
begin begin
ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA); ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA);
//Preguntamos is desea hacer una orden de devolución asociada //Preguntamos is desea hacer una orden de devolución asociada
if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then // if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then
// GenerarAlbaranCli(FFactura); // GenerarAlbaranCli(FFactura);
end; end;
end; end;

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>