diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 34b6aca9..91f13e4e 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,57 +53,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f31..1641339f 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Informes/FacturaCliente.rdx b/Source/Informes/FacturaCliente.rdx index 1fdaac0f..e5d602fd 100644 Binary files a/Source/Informes/FacturaCliente.rdx and b/Source/Informes/FacturaCliente.rdx differ diff --git a/Source/Informes/InfFacturaCliente.fr3 b/Source/Informes/InfFacturaCliente.fr3 index 12c71a49..9350b276 100644 --- a/Source/Informes/InfFacturaCliente.fr3 +++ b/Source/Informes/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -23,6 +23,7 @@ + diff --git a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm index 8a8f8ccd..b98d2488 100644 --- a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm @@ -175,7 +175,9 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente object actAlbaranesDevCliente: TAction Category = 'Ventas' Caption = 'Ordenes de devoluci'#243'n' + Enabled = False ImageIndex = 1 + Visible = False OnExecute = actAlbaranesDevClienteExecute end end diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index 9b8f6d98..0d45ff87 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -204,7 +204,10 @@ begin //Activamos cabecera 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('VencimientoCab', ''{FieldByName('FECHAVENCIMIENTO').AsString}); ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString); diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 31cff11a..c17751f0 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -203,82 +203,90 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Height = 51 ExplicitWidth = 815 ExplicitHeight = 51 - inherited FontName: TJvFontComboBox [3] - Left = 279 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 278 Top = 0 - ExplicitLeft = 279 + ExplicitLeft = 278 ExplicitTop = 0 end - inherited ToolButton14: TToolButton [4] - Left = 424 + inherited ToolButton14: TToolButton + Left = 334 Top = 0 - ExplicitLeft = 424 + Wrap = False + ExplicitLeft = 334 ExplicitTop = 0 end - inherited FontSize: TEdit [5] - Left = 489 + inherited FontName: TJvFontComboBox + Left = 399 + Top = 0 + ExplicitLeft = 399 + ExplicitTop = 0 + end + inherited FontSize: TEdit + Left = 544 Top = 0 Width = 104 - ExplicitLeft = 489 + ExplicitLeft = 544 ExplicitTop = 0 ExplicitWidth = 104 end - inherited UpDown1: TUpDown [6] - Left = 593 + inherited UpDown1: TUpDown + Left = 648 Top = 0 - ExplicitLeft = 593 + ExplicitLeft = 648 ExplicitTop = 0 end - inherited ToolButton13: TToolButton [7] + inherited ToolButton13: TToolButton + Left = 0 Top = 0 + Wrap = True + ExplicitLeft = 0 ExplicitTop = 0 + ExplicitHeight = 27 end - inherited ToolButton11: TToolButton [8] + inherited ToolButton6: TToolButton Left = 0 Top = 27 - Wrap = False ExplicitLeft = 0 ExplicitTop = 27 end - inherited ToolButton3: TToolButton [9] - Left = 141 + inherited ToolButton7: TToolButton + Left = 66 Top = 27 - Wrap = False - end - inherited ToolButton12: TToolButton [10] - Left = 196 - Top = 27 - ExplicitLeft = 196 + ExplicitLeft = 66 ExplicitTop = 27 end - inherited ToolButton9: TToolButton [11] - Left = 204 + inherited ToolButton8: TToolButton + Left = 133 Top = 27 - ExplicitLeft = 204 + ExplicitLeft = 133 ExplicitTop = 27 end - inherited ToolButton10: TToolButton [12] - Left = 349 + inherited ToolButton12: TToolButton + Left = 216 Top = 27 - ExplicitLeft = 349 + ExplicitLeft = 216 ExplicitTop = 27 end - inherited ToolButton6: TToolButton [13] - Left = 474 + inherited ToolButton9: TToolButton + Left = 224 Top = 27 - ExplicitLeft = 474 + ExplicitLeft = 224 ExplicitTop = 27 end - inherited ToolButton7: TToolButton [14] - Left = 540 + inherited ToolButton10: TToolButton + Left = 369 Top = 27 - ExplicitLeft = 540 + ExplicitLeft = 369 ExplicitTop = 27 end - inherited ToolButton8: TToolButton [15] - Left = 607 + inherited ToolButton11: TToolButton + Left = 494 Top = 27 - ExplicitLeft = 607 + ExplicitLeft = 494 ExplicitTop = 27 end end @@ -344,7 +352,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 829 inherited Bevel1: TBevel Top = 111 + Width = 73 ExplicitTop = 111 + ExplicitWidth = 73 end inherited Bevel3: TBevel Left = 375 @@ -357,8 +367,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited Bevel4: TBevel Left = 487 Top = 111 + Width = 192 ExplicitLeft = 487 ExplicitTop = 111 + ExplicitWidth = 192 end inherited ImporteDto: TcxDBCurrencyEdit Top = 131 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index b755a898..6a89e3eb 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -276,7 +276,7 @@ begin begin ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA); //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); end; end; diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index b67b4065..c04561bf 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,280 +1,280 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr - - - - - MainSource - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr + + + + + MainSource + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + +