diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 6f3df86b..e9a6bf9b 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -45,8 +45,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components Base.dpk @@ -56,51 +54,58 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm @@ -113,13 +118,6 @@
fEditorConexiones
TfEditorConexiones - - - - - - -
dmConfiguracion
TDataModule 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/Base/Utiles/uStringsUtils.pas b/Source/Base/Utiles/uStringsUtils.pas index 68ad7557..e1a3afe6 100644 --- a/Source/Base/Utiles/uStringsUtils.pas +++ b/Source/Base/Utiles/uStringsUtils.pas @@ -6,6 +6,7 @@ uses Classes; const + DISPLAY_EUROS4 = '#,0.0000 €'; DISPLAY_EUROS2 = '#,0.00 €'; DISPLAY_PORCENTAJE = '#,0.00%'; diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index bda06aa6..59cf4c93 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -320,6 +320,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase DataBinding.FieldName = 'IMPORTE_UNIDAD' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 BestFitMaxWidth = 120 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -332,6 +334,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase DataBinding.FieldName = 'IMPORTE_TOTAL' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 BestFitMaxWidth = 120 HeaderAlignmentHorz = taRightJustify MinWidth = 50 diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index 35e92b29..85494739 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -1,50 +1,98 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO inherited ToolBar1: TToolBar + Height = 100 + ExplicitHeight = 100 inherited ToolButton1: TToolButton ExplicitWidth = 109 end - inherited ToolButton14: TToolButton [1] + inherited ToolButton2: TToolButton Left = 109 - Wrap = False - end - inherited ToolButton4: TToolButton [2] - Left = 174 - end - inherited ToolButton3: TToolButton [3] - Left = 230 - ExplicitLeft = 230 - end - inherited ToolButton2: TToolButton [4] - Left = 285 - ExplicitLeft = 285 + ExplicitLeft = 109 ExplicitWidth = 114 end - inherited FontSize: TEdit - Width = 41 - ExplicitWidth = 41 + inherited ToolButton3: TToolButton + Left = 223 + ExplicitLeft = 223 + end + inherited ToolButton14: TToolButton + Wrap = False + end + inherited ToolButton9: TToolButton [5] + Left = 121 + Top = 22 + ExplicitLeft = 121 + ExplicitTop = 22 + end + inherited FontName: TJvFontComboBox [6] + Left = 266 + Top = 22 + ExplicitLeft = 266 + ExplicitTop = 22 end inherited UpDown1: TUpDown - Left = 186 - ExplicitLeft = 186 + Left = 411 + Top = 22 + ExplicitLeft = 411 + ExplicitTop = 22 end inherited ToolButton13: TToolButton - Left = 202 - ExplicitLeft = 202 + Left = 0 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 27 end inherited ToolButton6: TToolButton - Left = 210 - ExplicitLeft = 210 + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 end inherited ToolButton7: TToolButton - Left = 276 - ExplicitLeft = 276 + Left = 66 + Top = 49 + ExplicitLeft = 66 + ExplicitTop = 49 end - inherited ToolButton8: TToolButton - Left = 343 - ExplicitLeft = 343 + inherited FontSize: TEdit [11] + Left = 133 + Top = 49 + Width = 41 + ExplicitLeft = 133 + ExplicitTop = 49 + ExplicitWidth = 41 + end + inherited ToolButton11: TToolButton [12] + Left = 174 + Top = 49 + ExplicitLeft = 174 + ExplicitTop = 49 + end + inherited ToolButton12: TToolButton [13] + Left = 0 + Top = 49 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 49 + ExplicitHeight = 27 + end + inherited ToolButton10: TToolButton + Left = 0 + Top = 76 + ExplicitLeft = 0 + ExplicitTop = 76 + end + inherited ToolButton8: TToolButton [15] + Left = 125 + Top = 76 + ExplicitLeft = 125 + ExplicitTop = 76 end end inherited cxGrid: TcxGrid + Top = 126 + Height = 178 inherited cxGridView: TcxGridDBTableView object cxGridViewDESCUENTO: TcxGridDBColumn [7] Caption = 'Dto' @@ -62,8 +110,9 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO DataBinding.ValueType = 'Currency' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify - Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364 - Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364 + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364 Properties.ReadOnly = True Properties.OnValidate = cxGridViewIMPORTENETOPropertiesValidate Visible = False @@ -84,6 +133,9 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end end + inherited TBXDock1: TTBXDock + Top = 100 + end inherited ActionListContenido: TActionList inherited actAnadir: TAction Caption = 'A'#241'adir concepto' diff --git a/Source/GUIBase/uViewDetallesDTO.pas b/Source/GUIBase/uViewDetallesDTO.pas index 924a877c..27143244 100644 --- a/Source/GUIBase/uViewDetallesDTO.pas +++ b/Source/GUIBase/uViewDetallesDTO.pas @@ -51,7 +51,7 @@ begin if (ImporteNeto <> -1) then begin - AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteNeto)) + AText := FormatCurr(',0.0000 €;-,0.0000 €', FloatToCurr(ImporteNeto)) end; end; diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index 91c94916..aeeb95fb 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -32,8 +32,8 @@ - - + + diff --git a/Source/Informes/1/InfAlbaranProveedor.fr3 b/Source/Informes/1/InfAlbaranProveedor.fr3 index b5e568ff..a129eddc 100644 --- a/Source/Informes/1/InfAlbaranProveedor.fr3 +++ b/Source/Informes/1/InfAlbaranProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -29,8 +29,8 @@ - - + + diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 0b17f560..53dfb06f 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -59,8 +59,8 @@ - - + + @@ -70,7 +70,7 @@ - + diff --git a/Source/Informes/1/InfPedidoProveedor.fr3 b/Source/Informes/1/InfPedidoProveedor.fr3 index 3ed5d6dd..4b4f5a47 100644 --- a/Source/Informes/1/InfPedidoProveedor.fr3 +++ b/Source/Informes/1/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -30,8 +30,8 @@ - - + + diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 index de6ae0bf..db62ad7f 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -58,8 +58,8 @@ - - + + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index 70774227..d47ec94f 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -35,8 +35,8 @@ - - + + diff --git a/Source/Informes/2/InfAlbaranProveedor.fr3 b/Source/Informes/2/InfAlbaranProveedor.fr3 index 392bca29..4b1238a5 100644 --- a/Source/Informes/2/InfAlbaranProveedor.fr3 +++ b/Source/Informes/2/InfAlbaranProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -39,8 +39,8 @@ - - + + diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index 00e72444..cf49773d 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -56,8 +56,8 @@ - - + + diff --git a/Source/Informes/2/InfPedidoProveedor.fr3 b/Source/Informes/2/InfPedidoProveedor.fr3 index a7066c0c..53ba52bd 100644 --- a/Source/Informes/2/InfPedidoProveedor.fr3 +++ b/Source/Informes/2/InfPedidoProveedor.fr3 @@ -1,5 +1,5 @@ - + @@ -42,8 +42,8 @@ - - + + diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3 index e4161c3f..802e5e0b 100644 --- a/Source/Informes/2/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -67,14 +67,14 @@ - + - - + + @@ -85,7 +85,7 @@ - + diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas index b1d69621..ccb1fd19 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas @@ -206,12 +206,12 @@ begin if (FieldByName('IMPORTE_UNIDAD').AsFloat = 0) then Cell(iRowCount, 4).Range.Text := '' else - Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat); + Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat); if (FieldByName('IMPORTE_TOTAL').AsFloat = 0) then Cell(iRowCount, 5).Range.Text := '' else - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat); + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat); Next; Inc (iRowCount); end; diff --git a/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas index c87fa388..d195179a 100644 --- a/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas @@ -150,13 +150,13 @@ begin if ImprimirPrecio and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat) + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat) else Cell(iRowCount, 5).Range.Text := ''; if ImprimirPrecio and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then - Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat) + Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat) else Cell(iRowCount, 6).Range.Text := ''; diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.dfm index 42f00698..bdbccd2a 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.dfm @@ -1,101 +1,82 @@ inherited frViewDetallesArticulosParaVenta: TfrViewDetallesArticulosParaVenta inherited ToolBar1: TToolBar Height = 95 - ExplicitHeight = 95 - inherited ToolButton14: TToolButton [1] - Left = 0 - Top = 22 + inherited ToolButton14: TToolButton Wrap = False - ExplicitLeft = 0 + end + inherited ToolButton10: TToolButton [5] + Left = 121 + Top = 22 + ExplicitLeft = 121 ExplicitTop = 22 end - inherited ToolButton12: TToolButton [2] - Left = 65 - Wrap = False - ExplicitLeft = 65 - ExplicitHeight = 22 - end - inherited ToolButton13: TToolButton [3] + inherited ToolButton13: TToolButton [6] Left = 0 + Top = 22 Wrap = True ExplicitLeft = 0 + ExplicitTop = 22 ExplicitHeight = 27 end - inherited ToolButton2: TToolButton [4] - Left = 0 + inherited FontName: TJvFontComboBox [7] Top = 49 - ExplicitLeft = 0 ExplicitTop = 49 end - inherited ToolButton3: TToolButton [5] - Left = 114 + inherited ToolButton6: TToolButton [8] + Left = 145 Top = 49 - ExplicitLeft = 114 + ExplicitLeft = 145 ExplicitTop = 49 end - inherited ToolButton4: TToolButton [6] - Left = 169 + inherited FontSize: TEdit [9] + Left = 211 Top = 49 - ExplicitLeft = 169 + ExplicitLeft = 211 ExplicitTop = 49 end - inherited ToolButton7: TToolButton [7] - Left = 225 + inherited UpDown1: TUpDown [10] + Left = 253 Top = 49 - ExplicitLeft = 225 + ExplicitLeft = 253 ExplicitTop = 49 end - inherited FontName: TJvFontComboBox [8] - Left = 292 - Top = 49 - ExplicitLeft = 292 - ExplicitTop = 49 - end - inherited ToolButton9: TToolButton [9] - Left = 437 - ExplicitLeft = 437 - end - inherited ToolButton8: TToolButton [10] - Left = 582 + inherited ToolButton8: TToolButton + Left = 270 Top = 49 Wrap = True - ExplicitLeft = 582 + ExplicitLeft = 270 ExplicitTop = 49 end - inherited FontSize: TEdit [11] + inherited ToolButton7: TToolButton [12] Left = 0 Top = 71 ExplicitLeft = 0 ExplicitTop = 71 end - inherited UpDown1: TUpDown [12] - Left = 42 + inherited ToolButton9: TToolButton + Left = 67 Top = 71 - ExplicitLeft = 42 + ExplicitLeft = 67 ExplicitTop = 71 end - inherited ToolButton6: TToolButton [13] - Left = 59 + inherited ToolButton11: TToolButton [14] + Left = 212 Top = 71 - ExplicitLeft = 59 + ExplicitLeft = 212 ExplicitTop = 71 end - inherited ToolButton10: TToolButton - Left = 125 + inherited ToolButton12: TToolButton [15] + Left = 353 Top = 71 - ExplicitLeft = 125 - ExplicitTop = 71 - end - inherited ToolButton11: TToolButton - Left = 250 - Top = 71 - ExplicitLeft = 250 + ExplicitLeft = 353 ExplicitTop = 71 end end inherited cxGrid: TcxGrid Top = 121 Height = 183 + ExplicitTop = 121 + ExplicitHeight = 183 inherited cxGridView: TcxGridDBTableView inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn Visible = False @@ -109,5 +90,6 @@ inherited frViewDetallesArticulosParaVenta: TfrViewDetallesArticulosParaVenta end inherited TBXDock1: TTBXDock Top = 95 + ExplicitTop = 68 end end diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.pas index 67329fc5..fde3b9e4 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.pas +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulosParaVenta.pas @@ -61,6 +61,7 @@ procedure TfrViewDetallesArticulosParaVenta.OnIMPORTEUNIDADGetProperties( var Aux_IDArticulo: Variant; begin + Aux_IDArticulo := Null; cxEditRepositoryComboBox_IMPORTEUNIDAD.Properties.Items.Clear; @@ -84,10 +85,11 @@ begin AProperties := cxEditRepositoryComboBox_IMPORTEUNIDAD.Properties; end else begin + cxEditRepositoryCurrencyItem_IMPORTEUNIDAD.Properties.DecimalPlaces := 4; AProperties := cxEditRepositoryCurrencyItem_IMPORTEUNIDAD.Properties; - end; end; + end; end. diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index 13abae7a..b4d2e6a5 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -384,10 +384,10 @@ begin Cell(iRowCount, 3).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; if FieldByName('IMPORTE_UNIDAD').AsFloat <> 0 then - Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat); + Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat); if FieldByName('IMPORTE_TOTAL').AsFloat <> 0 then - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat); + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat); TotalCapitulo := TotalCapitulo + FieldByName('IMPORTE_TOTAL').AsFloat; end; diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas index c71ea824..a0639e4c 100644 --- a/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas @@ -149,13 +149,13 @@ begin if ImprimirPrecio and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat) + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat) else Cell(iRowCount, 5).Range.Text := ''; if ImprimirPrecio and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then - Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat) + Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat) else Cell(iRowCount, 6).Range.Text := ''; diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm index cb1c77f0..fec450f4 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm @@ -81,6 +81,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor inherited pgPaginas: TPageControl Width = 873 Height = 531 + ActivePage = pagContenido TabOrder = 1 OnChanging = pgPaginasChanging ExplicitWidth = 873 @@ -114,45 +115,32 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitHeight = 503 inherited ToolBar1: TToolBar Width = 865 - Height = 46 + Height = 78 ExplicitWidth = 865 - ExplicitHeight = 46 + ExplicitHeight = 78 inherited ToolButton3: TToolButton Wrap = False end inherited ToolButton4: TToolButton Left = 278 Top = 0 - Wrap = True ExplicitLeft = 278 ExplicitTop = 0 end inherited ToolButton14: TToolButton - Left = 0 + Left = 334 + Top = 0 Wrap = False - ExplicitLeft = 0 + ExplicitLeft = 334 + ExplicitTop = 0 end inherited FontName: TJvFontComboBox - Left = 65 - Top = 22 + Left = 399 + Top = 0 ExplicitLeft = 399 ExplicitTop = 0 end - inherited FontSize: TEdit - Left = 544 - Top = 0 - Width = 294 - ExplicitLeft = 544 - ExplicitTop = 0 - ExplicitWidth = 294 - end - inherited UpDown1: TUpDown - Left = 838 - Top = 0 - ExplicitLeft = 838 - ExplicitTop = 0 - end - inherited ToolButton13: TToolButton + inherited ToolButton13: TToolButton [6] Left = 0 Top = 0 Wrap = True @@ -160,61 +148,77 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor ExplicitTop = 0 ExplicitHeight = 27 end - inherited ToolButton6: TToolButton + inherited FontSize: TEdit [7] Left = 0 Top = 27 + Width = 294 ExplicitLeft = 0 ExplicitTop = 27 + ExplicitWidth = 294 + end + inherited UpDown1: TUpDown [8] + Left = 294 + Top = 27 + ExplicitLeft = 294 + ExplicitTop = 27 + end + inherited ToolButton6: TToolButton + Left = 311 + Top = 27 + ExplicitLeft = 311 + ExplicitTop = 27 end inherited ToolButton7: TToolButton - Left = 66 + Left = 377 Top = 27 - ExplicitLeft = 66 + ExplicitLeft = 377 ExplicitTop = 27 end inherited ToolButton8: TToolButton - Left = 133 + Left = 444 Top = 27 - ExplicitLeft = 133 + ExplicitLeft = 444 ExplicitTop = 27 end inherited ToolButton12: TToolButton - Left = 216 + Left = 0 Top = 27 - ExplicitLeft = 216 + Wrap = True + ExplicitLeft = 0 ExplicitTop = 27 + ExplicitHeight = 27 end inherited ToolButton9: TToolButton - Left = 224 - Top = 27 - ExplicitLeft = 224 - ExplicitTop = 27 + Left = 0 + Top = 54 + ExplicitLeft = 0 + ExplicitTop = 54 end inherited ToolButton10: TToolButton - Left = 369 - Top = 27 - ExplicitLeft = 369 - ExplicitTop = 27 + Left = 145 + Top = 54 + ExplicitLeft = 145 + ExplicitTop = 54 end inherited ToolButton11: TToolButton - Left = 494 - Top = 27 - ExplicitLeft = 494 - ExplicitTop = 27 + Left = 270 + Top = 54 + ExplicitLeft = 270 + ExplicitTop = 54 end end inherited cxGrid: TcxGrid - Top = 77 + Top = 104 Width = 865 - Height = 426 - ExplicitTop = 77 + Height = 399 + ExplicitTop = 104 ExplicitWidth = 865 - ExplicitHeight = 429 + ExplicitHeight = 399 end inherited TBXDock1: TTBXDock - Top = 51 + Top = 78 Width = 865 - ExplicitTop = 51 + ExplicitTop = 78 ExplicitWidth = 865 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 865 @@ -261,7 +265,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor Width = 865 Height = 475 ExplicitWidth = 865 - ExplicitHeight = 478 + ExplicitHeight = 475 inherited eIncidencias: TcxDBMemo ExplicitWidth = 848 ExplicitHeight = 448 diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas index 955c8f4c..1e4976b2 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas @@ -185,13 +185,13 @@ begin if FImportes and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then - Cell(iContador, 3).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat) + Cell(iContador, 3).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat) else Cell(iContador, 3).Range.Text := ''; if FImportes and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then - Cell(iContador, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat) + Cell(iContador, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat) else Cell(iContador, 4).Range.Text := ''; @@ -344,8 +344,8 @@ begin begin First; - FieldByName('IMPORTE_UNIDAD').DisplayFormat := DISPLAY_EUROS2; - FieldByName('IMPORTE_TOTAL').DisplayFormat := DISPLAY_EUROS2; + FieldByName('IMPORTE_UNIDAD').DisplayFormat := DISPLAY_EUROS4; + FieldByName('IMPORTE_TOTAL').DisplayFormat := DISPLAY_EUROS4; GoToSection(3); diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 2f3b8b84..1ba5700f 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,334 +1,335 @@ - + - - {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_D11R;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 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1940FalseFalseFalseFalseFalse308212521.9.4.01.9.4.0martes, 22 de noviembre de 2011 10:27 - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
RptAlbaranesProveedor
- TDataModule - - -
RptWordAlbaranProveedor
- TDataModule - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - -
srvTiposIVA
- 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_D11R;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 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1940FalseFalseFalseFalseFalse308212521.9.4.01.9.4.0martes, 22 de noviembre de 2011 10:27 + + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
RptAlbaranesProveedor
+ TDataModule + + +
RptWordAlbaranProveedor
+ TDataModule + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + + +