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

Arreglo para que en presupuestos, albaranes y facturas de cliente se coja el precioPVP para el precio unidad de los detalles. Se desactivan los descuentos de cliente por proveedor

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@450 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-06-11 10:42:33 +00:00
parent 67aeac2920
commit 01279e66df
14 changed files with 466 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Source/Base/Base.dproj
View File

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

BIN
Source/Base/Base.res
View File

Binary file not shown.

11
Source/Modulos/Albaranes de cliente/Controller/uDetallesAlbaranClienteController.pas
View File

@ -136,10 +136,11 @@ end;
procedure TDetallesAlbaranClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesAlbaranClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then //En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO // if Assigned(AArticulos) then
else // ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; // else
// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0;
end; end;
procedure TDetallesAlbaranClienteController.ValidarCampos(DataTable: TDADataTable); procedure TDetallesAlbaranClienteController.ValidarCampos(DataTable: TDADataTable);
@ -151,7 +152,7 @@ end;
procedure TDetallesAlbaranClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesAlbaranClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
else else
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null; ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
end; end;

20
Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.dfm
View File

@ -1,6 +1,14 @@
inherited frViewElegirArticulosAlbaranesCliente: TfrViewElegirArticulosAlbaranesCliente inherited frViewElegirArticulosAlbaranesCliente: TfrViewElegirArticulosAlbaranesCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
Visible = False Visible = False
end end
@ -12,18 +20,22 @@ inherited frViewElegirArticulosAlbaranesCliente: TfrViewElegirArticulosAlbaranes
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 225
ExplicitLeft = 225
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
end end
inherited eLista: TcxComboBox
Left = 383
ExplicitLeft = 383
ExplicitWidth = 322
Width = 322
end
end end
end end
end end

BIN
Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas
View File

Binary file not shown.

138
Source/Modulos/Contactos/Views/uEditorCliente.dfm
View File

@ -65,7 +65,6 @@ inherited fEditorCliente: TfEditorCliente
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 708 Width = 708
Height = 530 Height = 530
ActivePage = pagGeneral
ExplicitWidth = 708 ExplicitWidth = 708
ExplicitHeight = 530 ExplicitHeight = 530
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
@ -122,20 +121,20 @@ inherited fEditorCliente: TfEditorCliente
inherited eCalle: TcxDBTextEdit inherited eCalle: TcxDBTextEdit
Top = 267 Top = 267
ExplicitTop = 267 ExplicitTop = 267
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end end
inherited cbProvincia: TcxDBComboBox inherited cbProvincia: TcxDBComboBox
Top = 294 Top = 294
ExplicitTop = 294 ExplicitTop = 294
ExplicitWidth = 87 ExplicitWidth = 145
Width = 87 Width = 145
end end
inherited cbPoblacion: TcxDBComboBox inherited cbPoblacion: TcxDBComboBox
Top = 321 Top = 321
ExplicitTop = 321 ExplicitTop = 321
ExplicitWidth = 112 ExplicitWidth = 246
Width = 112 Width = 246
end end
inherited eCodigoPostal: TcxDBTextEdit inherited eCodigoPostal: TcxDBTextEdit
Left = 313 Left = 313
@ -154,78 +153,86 @@ inherited fEditorCliente: TfEditorCliente
inherited eNombreComercial: TcxDBTextEdit inherited eNombreComercial: TcxDBTextEdit
Top = 84 Top = 84
ExplicitTop = 84 ExplicitTop = 84
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end end
inherited cbClienteBloqueado: TcxDBCheckBox inherited cbClienteBloqueado: TcxDBCheckBox
Top = 189 Top = 189
ExplicitTop = 189 ExplicitTop = 189
ExplicitWidth = 419 ExplicitWidth = 356
Width = 419 Width = 356
end end
inherited cbGrupoCliente: TcxDBComboBox inherited cbGrupoCliente: TcxDBComboBox
Top = 138 Top = 138
ExplicitTop = 138 ExplicitTop = 138
ExplicitWidth = 87 ExplicitWidth = 246
Width = 87 Width = 246
end end
inherited eBloqueo: TcxDBTextEdit inherited eBloqueo: TcxDBTextEdit
Top = 216 Top = 216
ExplicitTop = 216 ExplicitTop = 216
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end end
inherited eCodigoAsignado: TcxDBTextEdit inherited eCodigoAsignado: TcxDBTextEdit
Top = 111 Top = 111
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end end
inherited eTlfParticular: TcxDBTextEdit inherited eTlfParticular: TcxDBTextEdit
Left = 501 Left = 501
Top = 57 Top = 57
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 57 ExplicitTop = 57
ExplicitWidth = 204 ExplicitWidth = 177
Width = 204 Width = 177
end end
inherited eTlfTrabajo: TcxDBTextEdit inherited eTlfTrabajo: TcxDBTextEdit
Left = 501 Left = 501
Top = 30 Top = 30
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 176 ExplicitWidth = 177
Width = 176 Width = 177
end end
inherited eTlfMovil: TcxDBTextEdit inherited eTlfMovil: TcxDBTextEdit
Left = 501 Left = 501
Top = 84 Top = 84
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 84 ExplicitTop = 84
ExplicitWidth = 179 ExplicitWidth = 177
Width = 179 Width = 177
end end
inherited eFax: TcxDBTextEdit inherited eFax: TcxDBTextEdit
Left = 501 Left = 501
Top = 111 Top = 111
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 196 ExplicitWidth = 177
Width = 196 Width = 177
end end
inherited eNombre: TcxDBTextEdit inherited eNombre: TcxDBTextEdit
Top = 57 Top = 57
ExplicitTop = 57 ExplicitTop = 57
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end
inherited cxDBCheckBox1: TcxDBCheckBox
Left = 395
Top = 322
ExplicitLeft = 395
ExplicitTop = 322
ExplicitWidth = 294
Width = 294
end end
inherited eNIFCIF: TcxDBTextEdit inherited eNIFCIF: TcxDBTextEdit
Left = 216 Left = 216
Top = 30 Top = 30
ExplicitLeft = 216 ExplicitLeft = 216
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 200 ExplicitWidth = 162
Width = 200 Width = 162
end end
inherited eMailTrabajo: TcxDBHyperLinkEdit inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 501 Left = 501
@ -233,8 +240,8 @@ inherited fEditorCliente: TfEditorCliente
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 162 ExplicitTop = 162
ExplicitWidth = 180 ExplicitWidth = 148
Width = 180 Width = 148
end end
inherited eMailParticular: TcxDBHyperLinkEdit inherited eMailParticular: TcxDBHyperLinkEdit
Left = 501 Left = 501
@ -242,36 +249,28 @@ inherited fEditorCliente: TfEditorCliente
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 190 ExplicitTop = 190
ExplicitWidth = 196 ExplicitWidth = 148
Width = 196 Width = 148
end
inherited cxDBCheckBox1: TcxDBCheckBox
Left = 395
Top = 322
ExplicitLeft = 395
ExplicitTop = 322
ExplicitWidth = 262
Width = 262
end end
inherited ePaginaWeb: TcxDBHyperLinkEdit inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 501 Left = 501
Top = 217 Top = 217
ExplicitLeft = 501 ExplicitLeft = 501
ExplicitTop = 217 ExplicitTop = 217
ExplicitWidth = 196 ExplicitWidth = 148
Width = 196 Width = 148
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Top = 30 Top = 30
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 56 ExplicitWidth = 31
Width = 56 Width = 31
end end
inherited ePersonaContacto: TcxDBTextEdit inherited ePersonaContacto: TcxDBTextEdit
Top = 348 Top = 348
ExplicitTop = 348 ExplicitTop = 348
ExplicitWidth = 309 ExplicitWidth = 246
Width = 309 Width = 246
end end
end end
inherited dsContacto: TDADataSource inherited dsContacto: TDADataSource
@ -336,10 +335,10 @@ inherited fEditorCliente: TfEditorCliente
LookAndFeel = dxLayoutOfficeLookAndFeel LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 700 ExplicitWidth = 700
inherited Label1: TLabel inherited Label1: TLabel
Left = 446 Left = 452
Top = 30 Top = 30
Width = 196 Width = 196
ExplicitLeft = 446 ExplicitLeft = 452
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 196 ExplicitWidth = 196
end end
@ -350,9 +349,9 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 263 ExplicitWidth = 263
end end
inherited eDiasVencimiento: TcxDBSpinEdit inherited eDiasVencimiento: TcxDBSpinEdit
Left = 509 Left = 515
Top = 62 Top = 62
ExplicitLeft = 509 ExplicitLeft = 515
ExplicitTop = 62 ExplicitTop = 62
ExplicitWidth = 160 ExplicitWidth = 160
Width = 160 Width = 160
@ -360,37 +359,37 @@ inherited fEditorCliente: TfEditorCliente
inherited cbRegimenIVA: TcxDBComboBox inherited cbRegimenIVA: TcxDBComboBox
Top = 30 Top = 30
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 293 ExplicitWidth = 307
Width = 293 Width = 307
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 111 Top = 111
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 293 ExplicitWidth = 307
Width = 293 Width = 307
end end
inherited cbFormaPago: TcxDBLookupComboBox inherited cbFormaPago: TcxDBLookupComboBox
Top = 57 Top = 57
ExplicitTop = 57 ExplicitTop = 57
ExplicitWidth = 155 ExplicitWidth = 169
Width = 155 Width = 169
end end
inherited bFormasPago: TButton inherited bFormasPago: TButton
Left = 286 Left = 292
Top = 57 Top = 57
ExplicitLeft = 286 ExplicitLeft = 292
ExplicitTop = 57 ExplicitTop = 57
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
Top = 84 Top = 84
ExplicitTop = 84 ExplicitTop = 84
ExplicitWidth = 155 ExplicitWidth = 169
Width = 155 Width = 169
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 286 Left = 292
Top = 84 Top = 84
ExplicitLeft = 286 ExplicitLeft = 292
ExplicitTop = 84 ExplicitTop = 84
end end
inherited eDescuento: TcxDBSpinEdit inherited eDescuento: TcxDBSpinEdit
@ -434,12 +433,25 @@ inherited fEditorCliente: TfEditorCliente
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 700 Width = 700
ExplicitWidth = 700 ExplicitWidth = 700
inherited ToolButton1: TToolButton
ExplicitWidth = 113
end
inherited ToolButton4: TToolButton
ExplicitWidth = 113
end
inherited ToolButton2: TToolButton
ExplicitWidth = 113
end
inherited ToolButton7: TToolButton
ExplicitWidth = 113
end
end end
end end
end end
object pagDescuentos: TTabSheet [4] object pagDescuentos: TTabSheet [4]
Caption = 'Descuentos' Caption = 'Descuentos'
ImageIndex = 2 ImageIndex = 2
TabVisible = False
inline frViewClienteDescuentos1: TfrViewClienteDescuentos inline frViewClienteDescuentos1: TfrViewClienteDescuentos
Left = 0 Left = 0
Top = 0 Top = 0

11
Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas
View File

@ -145,10 +145,11 @@ end;
procedure TDetallesFacturaClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesFacturaClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then //En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO // if Assigned(AArticulos) then
else // ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; // else
// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0;
end; end;
procedure TDetallesFacturaClienteController.ValidarCampos(DataTable: TDADataTable); procedure TDetallesFacturaClienteController.ValidarCampos(DataTable: TDADataTable);
@ -160,7 +161,7 @@ end;
procedure TDetallesFacturaClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesFacturaClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
else else
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null; ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
end; end;

31
Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm
View File

@ -1,6 +1,13 @@
inherited frViewElegirArticulosFacturasCliente: TfrViewElegirArticulosFacturasCliente inherited frViewElegirArticulosFacturasCliente: TfrViewElegirArticulosFacturasCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
Visible = False
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
Visible = False Visible = False
end end
@ -9,30 +16,6 @@ inherited frViewElegirArticulosFacturasCliente: TfrViewElegirArticulosFacturasCl
end end
end end
end end
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaFinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39231.869697800920000000 ReportDocument.CreationDate = 39231.869697800920000000

11
Source/Modulos/Presupuestos de cliente/Controller/uDetallesPresupuestoClienteController.pas
View File

@ -138,10 +138,11 @@ end;
procedure TDetallesPresupuestoClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesPresupuestoClienteController.RellenarOtros(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then //En Tecsitel no se tiene en cuenta el descuento de cliente para el precio PVP
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO // if Assigned(AArticulos) then
else // ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := AArticulos.DESCUENTO
ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0; // else
// ADetalles.DataTable.FieldByName(CAMPO_DESCUENTO).AsFloat := 0;
end; end;
procedure TDetallesPresupuestoClienteController.ValidarCampos(DataTable: TDADataTable); procedure TDetallesPresupuestoClienteController.ValidarCampos(DataTable: TDADataTable);
@ -153,7 +154,7 @@ end;
procedure TDetallesPresupuestoClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure TDetallesPresupuestoClienteController.RellenarImportes(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
begin begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_COSTE ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := AArticulos.PRECIO_PVP
else else
ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null; ADetalles.DataTable.FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
end; end;

16
Source/Modulos/Presupuestos de cliente/PresupuestosCliente_Group.groupproj
View File

@ -12,6 +12,7 @@
<Projects Include="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" /> <Projects Include="..\Albaranes de cliente\Controller\AlbaranesCliente_controller.dproj" />
<Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" /> <Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
<Projects Include="..\Articulos\Controller\Articulos_controller.dproj" /> <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
<Projects Include="..\Articulos\Data\Articulos_data.dproj" />
<Projects Include="..\Articulos\Views\Articulos_view.dproj" /> <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
<Projects Include="..\Contactos\Controller\Contactos_controller.dproj" /> <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" /> <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
@ -76,6 +77,15 @@
<Target Name="Contactos_view:Make"> <Target Name="Contactos_view:Make">
<MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" /> <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Articulos_data">
<MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="" />
</Target>
<Target Name="Articulos_data:Clean">
<MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="Clean" />
</Target>
<Target Name="Articulos_data:Make">
<MSBuild Projects="..\Articulos\Data\Articulos_data.dproj" Targets="Make" />
</Target>
<Target Name="Articulos_controller"> <Target Name="Articulos_controller">
<MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="" /> <MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="" />
</Target> </Target>
@ -212,13 +222,13 @@
<MSBuild Projects="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Make" /> <MSBuild Projects="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;PresupuestosCliente_model;PresupuestosCliente_data;PresupuestosCliente_controller;PresupuestosCliente_view;PresupuestosCliente_plugin;FactuGES;FactuGES_Server;PreCli_AlbCli_relation;AlbProv_FacProv_relation;AlbaranesProveedor_view;AlbaranesCliente_controller;PreCli_FacCli_relation;FacturasCliente_controller" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PresupuestosCliente_model;PresupuestosCliente_data;PresupuestosCliente_controller;PresupuestosCliente_view;PresupuestosCliente_plugin;FactuGES;FactuGES_Server;PreCli_AlbCli_relation;AlbProv_FacProv_relation;AlbaranesProveedor_view;AlbaranesCliente_controller;PreCli_FacCli_relation;FacturasCliente_controller" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;PresupuestosCliente_model:Clean;PresupuestosCliente_data:Clean;PresupuestosCliente_controller:Clean;PresupuestosCliente_view:Clean;PresupuestosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_AlbCli_relation:Clean;AlbProv_FacProv_relation:Clean;AlbaranesProveedor_view:Clean;AlbaranesCliente_controller:Clean;PreCli_FacCli_relation:Clean;FacturasCliente_controller:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PresupuestosCliente_model:Clean;PresupuestosCliente_data:Clean;PresupuestosCliente_controller:Clean;PresupuestosCliente_view:Clean;PresupuestosCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_AlbCli_relation:Clean;AlbProv_FacProv_relation:Clean;AlbaranesProveedor_view:Clean;AlbaranesCliente_controller:Clean;PreCli_FacCli_relation:Clean;FacturasCliente_controller:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;PresupuestosCliente_model:Make;PresupuestosCliente_data:Make;PresupuestosCliente_controller:Make;PresupuestosCliente_view:Make;PresupuestosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_AlbCli_relation:Make;AlbProv_FacProv_relation:Make;AlbaranesProveedor_view:Make;AlbaranesCliente_controller:Make;PreCli_FacCli_relation:Make;FacturasCliente_controller:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PresupuestosCliente_model:Make;PresupuestosCliente_data:Make;PresupuestosCliente_controller:Make;PresupuestosCliente_view:Make;PresupuestosCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_AlbCli_relation:Make;AlbProv_FacProv_relation:Make;AlbaranesProveedor_view:Make;AlbaranesCliente_controller:Make;PreCli_FacCli_relation:Make;FacturasCliente_controller:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

32
Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm
View File

@ -1,6 +1,14 @@
inherited frViewElegirArticulosPresupuestosCliente: TfrViewElegirArticulosPresupuestosCliente inherited frViewElegirArticulosPresupuestosCliente: TfrViewElegirArticulosPresupuestosCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
Visible = False Visible = False
end end
@ -9,30 +17,6 @@ inherited frViewElegirArticulosPresupuestosCliente: TfrViewElegirArticulosPresup
end end
end end
end end
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel
inherited dxLayoutControl1: TdxLayoutControl
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaFinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
end
end
end
inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink inherited dxComponentPrinterLink: TdxGridReportLink
ReportDocument.CreationDate = 39297.755936412040000000 ReportDocument.CreationDate = 39297.755936412040000000

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

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>

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "1.0.7.0\0" VALUE "FileVersion", "1.0.7.0\0"
VALUE "ProductVersion", "1.0.7.0\0" VALUE "ProductVersion", "1.0.7.0\0"
VALUE "CompileDate", "lunes, 09 de junio de 2008 19:29\0" VALUE "CompileDate", "miércoles, 11 de junio de 2008 12:23\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"