diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 714b6e8..ae0f4a4 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -45,6 +45,8 @@ Package FalseTrueFalseLibreria baseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components Base.dpk @@ -54,58 +56,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/FactuGES_Group.bdsgroup b/Source/FactuGES_Group.bdsgroup deleted file mode 100644 index 28a572b..0000000 --- a/Source/FactuGES_Group.bdsgroup +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - Base\Base.bdsproj - Base\ControllerBase\ControllerBase.bdsproj - GUIBase\GUIBase.bdsproj - Modulos\Empresas\Model\Empresas_model.bdsproj - Modulos\Empresas\Data\Empresas_data.bdsproj - Modulos\Empresas\Controller\Empresas_controller.bdsproj - Base\Usuarios\Usuarios.bdsproj - Modulos\Empresas\Views\Empresas_view.bdsproj - Modulos\Empresas\Plugin\Empresas_plugin.bdsproj - Modulos\Formas de pago\Model\FormasPago_model.bdsproj - Modulos\Formas de pago\Data\FormasPago_data.bdsproj - Modulos\Formas de pago\Controller\FormasPago_controller.bdsproj - Modulos\Formas de pago\Views\FormasPago_view.bdsproj - Modulos\Formas de pago\Plugin\FormasPago_plugin.bdsproj - Modulos\Tipos de IVA\Model\TiposIVA_model.bdsproj - Modulos\Tipos de IVA\Data\TiposIVA_data.bdsproj - Modulos\Tipos de IVA\Controller\TiposIVA_controller.bdsproj - Modulos\Tipos de IVA\Views\TiposIVA_view.bdsproj - Modulos\Tipos de IVA\Plugin\TiposIVA_plugin.bdsproj - Modulos\Contactos\Model\Contactos_model.bdsproj - Modulos\Contactos\Data\Contactos_data.bdsproj - Modulos\Contactos\Controller\Contactos_controller.bdsproj - Modulos\Contactos\Views\Contactos_view.bdsproj - Modulos\Contactos\Plugin\Contactos_plugin.bdsproj - Cliente\FactuGES.bdsproj - Servidor\FactuGES_Server.bdsproj - Base.bpl ControllerBase.bpl GUIBase.bpl Empresas_model.bpl Empresas_data.bpl Empresas_controller.bpl Usuarios.bpl Empresas_view.bpl Empresas_plugin.bpl FormasPago_model.bpl FormasPago_data.bpl FormasPago_controller.bpl FormasPago_view.bpl FormasPago_plugin.bpl TiposIVA_model.bpl TiposIVA_data.bpl TiposIVA_controller.bpl TiposIVA_view.bpl TiposIVA_plugin.bpl Contactos_model.bpl Contactos_data.bpl Contactos_controller.bpl Contactos_view.bpl Contactos_plugin.bpl FactuGES.exe FactuGES_Server.exe - - - - diff --git a/Source/FactuGES_Group.groupproj b/Source/FactuGES_Group.groupproj deleted file mode 100644 index 8457200..0000000 --- a/Source/FactuGES_Group.groupproj +++ /dev/null @@ -1,424 +0,0 @@ - - - {f98b1c11-3200-4f80-b23f-3591938de211} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default.Personality - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index 60acd4e..9d33ab7 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase Left = 0 Top = 0 Width = 451 - Height = 73 + Height = 68 AutoSize = True ButtonWidth = 141 Caption = 'ToolBar1' @@ -42,23 +42,24 @@ inherited frViewDetallesBase: TfrViewDetallesBase Top = 0 Action = actSubir AutoSize = True + Wrap = True end object ToolButton4: TToolButton - Left = 184 - Top = 0 + Left = 0 + Top = 22 Action = actBajar AutoSize = True end object ToolButton14: TToolButton - Left = 240 - Top = 0 + Left = 56 + Top = 22 Action = FontEdit1 AutoSize = True Wrap = True end object FontName: TJvFontComboBox Left = 0 - Top = 22 + Top = 44 Width = 145 Height = 22 DroppedDownWidth = 145 @@ -74,7 +75,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object FontSize: TEdit Left = 145 - Top = 22 + Top = 44 Width = 26 Height = 22 Hint = 'Font Size|Select font size' @@ -85,7 +86,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object UpDown1: TUpDown Left = 171 - Top = 22 + Top = 44 Width = 16 Height = 22 Associate = FontSize @@ -94,7 +95,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton13: TToolButton Left = 187 - Top = 22 + Top = 44 Width = 8 Caption = 'ToolButton13' ImageIndex = 10 @@ -102,55 +103,54 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton6: TToolButton Left = 195 - Top = 22 + Top = 44 Action = RichEditBold1 AutoSize = True end object ToolButton7: TToolButton Left = 261 - Top = 22 + Top = 44 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton Left = 328 - Top = 22 + Top = 44 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 0 - Top = 22 + Left = 411 + Top = 44 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 - Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 0 - Top = 49 + Left = 419 + Top = 44 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 145 - Top = 49 + Left = 564 + Top = 44 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 270 - Top = 49 + Left = 689 + Top = 44 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 99 + Top = 94 Width = 451 - Height = 205 + Height = 210 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -161,6 +161,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase TabOrder = 1 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True + ExplicitTop = 99 + ExplicitHeight = 205 object cxGridView: TcxGridDBTableView OnKeyDown = cxGridViewKeyDown NavigatorButtons.ConfirmDelete = False @@ -344,11 +346,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 73 + Top = 68 Width = 451 Height = 26 BackgroundOnToolbars = False UseParentBackground = True + ExplicitTop = 73 object TBXToolbar1: TTBXToolbar Left = 0 Top = 0 diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index 095cdff..2a2723a 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -594,7 +594,9 @@ begin CurEdit := Nil; FUpdating := False; // cxGridView.OptionsView.RowSeparatorColor := dmBase.StyleManager.Colors.ButtonSeparatorColor; - cxGridViewDESCRIPCION.PropertiesClass := TcxMyRichEditProperties; + +// No quiero RTF para la columna de DESCRIPCION +// cxGridViewDESCRIPCION.PropertiesClass := TcxMyRichEditProperties; end; procedure TfrViewDetallesBase.CustomViewDestroy(Sender: TObject); diff --git a/Source/Medicaciones_Group.groupproj b/Source/Medicaciones_Group.groupproj new file mode 100644 index 0000000..c4dfba2 --- /dev/null +++ b/Source/Medicaciones_Group.groupproj @@ -0,0 +1,274 @@ + + + {f98b1c11-3200-4f80-b23f-3591938de211} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default.Personality + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas index 0de005b..03fbfb4 100644 --- a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas @@ -17,7 +17,7 @@ type function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; const ACantidad: Float = 1): Boolean; overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True); - procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String); + //procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String); end; TControllerDetallesArticulos = class (TControllerDetallesBase, IControllerDetallesArticulos) diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm index e0516f2..0a1777e 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm @@ -2,34 +2,95 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos ParentBiDiMode = False OnShow = CustomViewShow inherited ToolBar1: TToolBar + Height = 73 + ExplicitHeight = 73 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 184 + Top = 0 + ExplicitLeft = 184 + ExplicitTop = 0 + end + inherited ToolButton14: TToolButton + Left = 240 + Top = 0 + ExplicitLeft = 240 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox + Top = 22 + ExplicitTop = 22 + end inherited FontSize: TEdit + Top = 22 Width = 42 + ExplicitTop = 22 ExplicitWidth = 42 end inherited UpDown1: TUpDown Left = 187 + Top = 22 Width = 17 ExplicitLeft = 187 + ExplicitTop = 22 ExplicitWidth = 17 end inherited ToolButton13: TToolButton Left = 204 + Top = 22 ExplicitLeft = 204 + ExplicitTop = 22 end inherited ToolButton6: TToolButton Left = 212 + Top = 22 ExplicitLeft = 212 + ExplicitTop = 22 end inherited ToolButton7: TToolButton Left = 278 + Top = 22 ExplicitLeft = 278 + ExplicitTop = 22 end inherited ToolButton8: TToolButton Left = 345 + Top = 22 ExplicitLeft = 345 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton + Left = 0 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 27 + end + inherited ToolButton9: TToolButton + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 + end + inherited ToolButton10: TToolButton + Left = 145 + Top = 49 + ExplicitLeft = 145 + ExplicitTop = 49 + end + inherited ToolButton11: TToolButton + Left = 270 + Top = 49 + ExplicitLeft = 270 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid + Top = 99 + Height = 205 inherited cxGridView: TcxGridDBTableView inherited cxGridViewTIPO: TcxGridDBColumn MinWidth = 69 @@ -72,6 +133,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos end end inherited TBXDock1: TTBXDock + Top = 73 inherited TBXToolbar1: TTBXToolbar inherited TBXSubmenuItem1: TTBXSubmenuItem object TBXSeparatorItem8: TTBXSeparatorItem [4] diff --git a/Source/Modulos/Medicaciones/Data/Medicacion_data.dproj b/Source/Modulos/Medicaciones/Data/Medicacion_data.dproj new file mode 100644 index 0000000..1b6e54c --- /dev/null +++ b/Source/Modulos/Medicaciones/Data/Medicacion_data.dproj @@ -0,0 +1,108 @@ + + + {38eef566-1895-4bdd-8007-f92f5e32cce6} + Medicaciones_data.dpk + Debug + AnyCPU + DCC32 + ..\..\..\..\Output\Debug\Cliente\Medicacion_data.bpl + + + 7.0 + False + False + 0 + 3 + .\ + .\ + .\ + ..\..\..\..\Output\Debug\Cliente + ..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + RELEASE + + + 7.0 + 3 + .\ + .\ + .\ + ..\..\..\..\Output\Debug\Cliente + ..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + DEBUG + + + Delphi.Personality + Package + + + False + True + False + + + False + False + False + + + True + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 3082 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + Medicaciones_data.dpk + + + + + + + MainSource + + + + + + + + + + + +
DataModuleMedicacion
+ + + + + + \ No newline at end of file diff --git a/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.dfm b/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.dfm index 7bc9da3..185d8fb 100644 --- a/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.dfm +++ b/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.dfm @@ -144,7 +144,7 @@ object RptMedicaciones: TRptMedicaciones 'LO, '#10' REFERENCIA, CONCEPTO, CANTIDAD, POSOLOGIA, FORMA_COLOR,' + ' '#10' LOTE, VISIBLE'#10' FROM'#10' MEDICACION_DETALLES'#10' WHERE (ID_M' + 'EDICACION = :ID_MEDICACION) AND'#10' (TIPO_DETALLE = '#39'En blis' + - 'ter'#39')'#10' ORDER BY POSICION'#10 + 'ter'#39') AND'#10' (VISIBLE = 1)'#10' ORDER BY POSICION'#10 StatementType = stSQL ColumnMappings = < item @@ -281,7 +281,7 @@ object RptMedicaciones: TRptMedicaciones 'LO, '#10' REFERENCIA, CONCEPTO, CANTIDAD, POSOLOGIA, FORMA_COLOR,' + ' '#10' LOTE, VISIBLE'#10' FROM'#10' MEDICACION_DETALLES'#10' WHERE (ID_M' + 'EDICACION = :ID_MEDICACION) AND'#10' (TIPO_DETALLE = '#39'Fuera d' + - 'el blister'#39')'#10' ORDER BY POSICION'#10 + 'el blister'#39') AND'#10' (VISIBLE = 1)'#10' ORDER BY POSICION'#10 StatementType = stSQL ColumnMappings = < item @@ -557,7 +557,6 @@ object RptMedicaciones: TRptMedicaciones Top = 256 end object IBTransaction1: TIBTransaction - Active = True Left = 32 Top = 312 end @@ -574,7 +573,6 @@ object RptMedicaciones: TRptMedicaciones object cabecera: TIBQuery Database = IBDatabase1 Transaction = IBTransaction1 - Active = True SQL.Strings = ( 'SELECT ' @@ -588,7 +586,7 @@ object RptMedicaciones: TRptMedicaciones ' EMPRESAS.MOVIL_1 AS MOVIL_FARM' ' FROM' ' V_MEDICACION, EMPRESAS' - ' WHERE V_MEDICACION.ID = 2') + ' WHERE V_MEDICACION.ID = 7') Left = 120 Top = 256 object cabeceraID: TIntegerField @@ -648,7 +646,7 @@ object RptMedicaciones: TRptMedicaciones ' LOTE, VISIBLE' ' FROM' ' MEDICACION_DETALLES' - ' WHERE (ID_MEDICACION = 2) AND' + ' WHERE (ID_MEDICACION = 7) AND' ' (TIPO_DETALLE = '#39'En blister'#39')' ' ORDER BY POSICION') Left = 120 @@ -719,8 +717,8 @@ object RptMedicaciones: TRptMedicaciones Top = 72 end object DADSDetallesEnBlister: TDADataSource - DataSet = tbl_DetallesFueraBlister.Dataset - DataTable = tbl_DetallesFueraBlister + DataSet = tbl_DetallesEnBlister.Dataset + DataTable = tbl_DetallesEnBlister Left = 360 Top = 72 end @@ -945,7 +943,7 @@ object RptMedicaciones: TRptMedicaciones PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 40861.487419398100000000 - ReportOptions.LastChange = 40878.727654502300000000 + ReportOptions.LastChange = 40886.480848923600000000 ScriptLanguage = 'PascalScript' ScriptText.Strings = ( '' @@ -1073,7 +1071,6 @@ object RptMedicaciones: TRptMedicaciones object detallesfuerablister: TIBQuery Database = IBDatabase1 Transaction = IBTransaction1 - Active = True SQL.Strings = ( 'SELECT ' ' ID, ID_MEDICACION, POSICION, TIPO_DETALLE, ID_ARTICULO, ' @@ -1081,7 +1078,7 @@ object RptMedicaciones: TRptMedicaciones ' LOTE, VISIBLE' ' FROM' ' MEDICACION_DETALLES' - ' WHERE (ID_MEDICACION = 2) AND' + ' WHERE (ID_MEDICACION = 7) AND' ' (TIPO_DETALLE = '#39'Fuera del blister'#39')' ' ORDER BY POSICION ') Left = 120 diff --git a/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.pas b/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.pas index 4e9a65a..7b52956 100644 --- a/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.pas +++ b/Source/Modulos/Medicaciones/Reports/uRptMedicaciones_Server.pas @@ -39,8 +39,6 @@ type DataSource3: TDataSource; frxPDFExport1: TfrxPDFExport; Bin2DataStreamer: TDABin2DataStreamer; - schReport: TDASchema; - DataDictionary: TDADataDictionary; detallesenblisterID: TIntegerField; detallesenblisterID_MEDICACION: TIntegerField; detallesenblisterPOSICION: TIntegerField; @@ -75,6 +73,8 @@ type detallesfuerablisterFORMA_COLOR: TIBStringField; detallesfuerablisterLOTE: TIBStringField; detallesfuerablisterVISIBLE: TSmallintField; + schReport: TDASchema; + DataDictionary: TDADataDictionary; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/Modulos/Medicaciones/Views/Medicaciones_view.dproj b/Source/Modulos/Medicaciones/Views/Medicaciones_view.dproj index 09dc642..92b5123 100644 --- a/Source/Modulos/Medicaciones/Views/Medicaciones_view.dproj +++ b/Source/Modulos/Medicaciones/Views/Medicaciones_view.dproj @@ -47,10 +47,6 @@ - - - - File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found @@ -62,55 +58,62 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorElegirArticulosMedicaciones
TEditor @@ -147,13 +150,6 @@
frViewMedicaciones
TFrame - - - - - - -