diff --git a/.vs/DPM2016/v16/.suo b/.vs/DPM2016/v16/.suo index 452ce99..4ab5e1d 100644 Binary files a/.vs/DPM2016/v16/.suo and b/.vs/DPM2016/v16/.suo differ diff --git a/DPM2016/Behandlung/Behandlung.Designer.vb b/DPM2016/Behandlung/Behandlung.Designer.vb index 2680f1d..40037ba 100644 --- a/DPM2016/Behandlung/Behandlung.Designer.vb +++ b/DPM2016/Behandlung/Behandlung.Designer.vb @@ -75,9 +75,6 @@ Partial Class Behandlung Me.KostenvoranschlagAbschliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KostenvoranschlagLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl() - Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.STLeistung = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.c1akonto = New C1.Win.C1TrueDBGrid.C1TrueDBGrid() @@ -85,6 +82,7 @@ Partial Class Behandlung Me.NeueAkontoZahlungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AkontoRechnungVorschauToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AkontoRechnungErstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AkontoRechnungPDFPerMailToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AkontoRechnungLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem28 = New System.Windows.Forms.ToolStripSeparator() Me.RechnungsDokumentErsetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -92,10 +90,14 @@ Partial Class Behandlung Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() Me.STAkonto = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.Panel2 = New System.Windows.Forms.Panel() Me.STBehandlung = New DevComponents.DotNetBar.SuperTabItem() + Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.STLeistung = New DevComponents.DotNetBar.SuperTabItem() Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel() Me.tsbtnnew = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() @@ -157,14 +159,14 @@ Partial Class Behandlung Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.Behandungdetail1 = New DPM2016.Benhandungdetail() Me.Leistungen1 = New DPM2016.Leistungen() + Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel() + Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() Me.tsbtndelete.SuspendLayout() Me.GroupBox1.SuspendLayout() CType(Me.treebehandlungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.ctxmenubehandlung.SuspendLayout() CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuperTabControl1.SuspendLayout() - Me.SuperTabControlPanel2.SuspendLayout() - Me.Panel1.SuspendLayout() Me.SuperTabControlPanel4.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.c1akonto, System.ComponentModel.ISupportInitialize).BeginInit() @@ -172,6 +174,8 @@ Partial Class Behandlung Me.ToolStrip1.SuspendLayout() Me.SuperTabControlPanel1.SuspendLayout() Me.Panel2.SuspendLayout() + Me.SuperTabControlPanel2.SuspendLayout() + Me.Panel1.SuspendLayout() Me.tsbtnbehandlungdelete.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.ctxMenuAuftragsamanagement.SuspendLayout() @@ -184,7 +188,7 @@ Partial Class Behandlung Me.tsbtndelete.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnnewbehandlung, Me.tsbtndeletebehandlung, Me.ToolStripButton2}) Me.tsbtndelete.Location = New System.Drawing.Point(0, 0) Me.tsbtndelete.Name = "tsbtndelete" - Me.tsbtndelete.Size = New System.Drawing.Size(1713, 27) + Me.tsbtndelete.Size = New System.Drawing.Size(1713, 31) Me.tsbtndelete.TabIndex = 1 Me.tsbtndelete.Text = "ToolStrip1" ' @@ -194,7 +198,7 @@ Partial Class Behandlung Me.tsbtnnewbehandlung.Image = CType(resources.GetObject("tsbtnnewbehandlung.Image"), System.Drawing.Image) Me.tsbtnnewbehandlung.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbtnnewbehandlung.Name = "tsbtnnewbehandlung" - Me.tsbtnnewbehandlung.Size = New System.Drawing.Size(29, 24) + Me.tsbtnnewbehandlung.Size = New System.Drawing.Size(29, 28) Me.tsbtnnewbehandlung.Text = "Neue Behandlung" ' 'tsbtndeletebehandlung @@ -203,7 +207,7 @@ Partial Class Behandlung Me.tsbtndeletebehandlung.Image = CType(resources.GetObject("tsbtndeletebehandlung.Image"), System.Drawing.Image) Me.tsbtndeletebehandlung.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsbtndeletebehandlung.Name = "tsbtndeletebehandlung" - Me.tsbtndeletebehandlung.Size = New System.Drawing.Size(29, 24) + Me.tsbtndeletebehandlung.Size = New System.Drawing.Size(29, 28) Me.tsbtndeletebehandlung.Text = "Behandlung löschen" ' 'ToolStripButton2 @@ -212,18 +216,18 @@ Partial Class Behandlung Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image) Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(29, 24) + Me.ToolStripButton2.Size = New System.Drawing.Size(29, 28) Me.ToolStripButton2.Text = "Aktualisieren" ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.treebehandlungen) Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Left - Me.GroupBox1.Location = New System.Drawing.Point(0, 27) + Me.GroupBox1.Location = New System.Drawing.Point(0, 31) Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) - Me.GroupBox1.Size = New System.Drawing.Size(273, 1004) + Me.GroupBox1.Size = New System.Drawing.Size(273, 1000) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Behandlungen" @@ -252,7 +256,7 @@ Partial Class Behandlung Me.treebehandlungen.NodesConnector = Me.NodeConnector1 Me.treebehandlungen.NodeStyle = Me.ElementStyle1 Me.treebehandlungen.PathSeparator = ";" - Me.treebehandlungen.Size = New System.Drawing.Size(265, 981) + Me.treebehandlungen.Size = New System.Drawing.Size(265, 977) Me.treebehandlungen.Styles.Add(Me.ElementStyle1) Me.treebehandlungen.TabIndex = 0 Me.treebehandlungen.Text = "AdvTree1" @@ -532,58 +536,30 @@ Partial Class Behandlung Me.SuperTabControl1.ControlBox.MenuBox.Name = "" Me.SuperTabControl1.ControlBox.Name = "" Me.SuperTabControl1.ControlBox.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.SuperTabControl1.ControlBox.MenuBox, Me.SuperTabControl1.ControlBox.CloseBox}) + Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2) - Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4) Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3) Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SuperTabControl1.Location = New System.Drawing.Point(273, 27) + Me.SuperTabControl1.Location = New System.Drawing.Point(273, 31) Me.SuperTabControl1.Margin = New System.Windows.Forms.Padding(4) Me.SuperTabControl1.Name = "SuperTabControl1" Me.SuperTabControl1.ReorderTabsEnabled = True Me.SuperTabControl1.SelectedTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold) Me.SuperTabControl1.SelectedTabIndex = 0 - Me.SuperTabControl1.Size = New System.Drawing.Size(1440, 1004) + Me.SuperTabControl1.Size = New System.Drawing.Size(1440, 1000) Me.SuperTabControl1.TabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SuperTabControl1.TabIndex = 9 Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.STBehandlung, Me.STLeistung, Me.STAkonto}) Me.SuperTabControl1.Text = "Rechnungstext" ' - 'SuperTabControlPanel2 - ' - Me.SuperTabControlPanel2.Controls.Add(Me.Panel1) - Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 28) - Me.SuperTabControlPanel2.Margin = New System.Windows.Forms.Padding(4) - Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2" - Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1440, 972) - Me.SuperTabControlPanel2.TabIndex = 0 - Me.SuperTabControlPanel2.TabItem = Me.STLeistung - ' - 'Panel1 - ' - Me.Panel1.Controls.Add(Me.Leistungen1) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Margin = New System.Windows.Forms.Padding(4) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1440, 972) - Me.Panel1.TabIndex = 1 - ' - 'STLeistung - ' - Me.STLeistung.AttachedControl = Me.SuperTabControlPanel2 - Me.STLeistung.GlobalItem = False - Me.STLeistung.Name = "STLeistung" - Me.STLeistung.Text = "Leistungen" - ' 'SuperTabControlPanel4 ' Me.SuperTabControlPanel4.Controls.Add(Me.GroupBox2) Me.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControlPanel4.Location = New System.Drawing.Point(0, 28) Me.SuperTabControlPanel4.Name = "SuperTabControlPanel4" - Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1440, 976) + Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1440, 972) Me.SuperTabControlPanel4.TabIndex = 0 Me.SuperTabControlPanel4.TabItem = Me.STAkonto ' @@ -626,9 +602,9 @@ Partial Class Behandlung 'ctxmenuakonto ' Me.ctxmenuakonto.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ctxmenuakonto.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueAkontoZahlungToolStripMenuItem, Me.AkontoRechnungVorschauToolStripMenuItem, Me.AkontoRechnungErstellenToolStripMenuItem, Me.AkontoRechnungLöschenToolStripMenuItem, Me.ToolStripMenuItem28, Me.RechnungsDokumentErsetzenToolStripMenuItem, Me.RechnungsdokumentAnzeigenToolStripMenuItem}) + Me.ctxmenuakonto.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueAkontoZahlungToolStripMenuItem, Me.AkontoRechnungVorschauToolStripMenuItem, Me.AkontoRechnungErstellenToolStripMenuItem, Me.AkontoRechnungPDFPerMailToolStripMenuItem, Me.AkontoRechnungLöschenToolStripMenuItem, Me.ToolStripMenuItem28, Me.RechnungsDokumentErsetzenToolStripMenuItem, Me.RechnungsdokumentAnzeigenToolStripMenuItem}) Me.ctxmenuakonto.Name = "ctxmenuakonto" - Me.ctxmenuakonto.Size = New System.Drawing.Size(289, 154) + Me.ctxmenuakonto.Size = New System.Drawing.Size(289, 178) ' 'NeueAkontoZahlungToolStripMenuItem ' @@ -646,7 +622,13 @@ Partial Class Behandlung ' Me.AkontoRechnungErstellenToolStripMenuItem.Name = "AkontoRechnungErstellenToolStripMenuItem" Me.AkontoRechnungErstellenToolStripMenuItem.Size = New System.Drawing.Size(288, 24) - Me.AkontoRechnungErstellenToolStripMenuItem.Text = "Akonto-Rechnung erstellen" + Me.AkontoRechnungErstellenToolStripMenuItem.Text = "Akonto-Rechnung PDF" + ' + 'AkontoRechnungPDFPerMailToolStripMenuItem + ' + Me.AkontoRechnungPDFPerMailToolStripMenuItem.Name = "AkontoRechnungPDFPerMailToolStripMenuItem" + Me.AkontoRechnungPDFPerMailToolStripMenuItem.Size = New System.Drawing.Size(288, 24) + Me.AkontoRechnungPDFPerMailToolStripMenuItem.Text = "Akonto-Rechnung PDF per Mail" ' 'AkontoRechnungLöschenToolStripMenuItem ' @@ -674,7 +656,7 @@ Partial Class Behandlung 'ToolStrip1 ' Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton3, Me.ToolStripButton4, Me.ToolStripSeparator8, Me.ToolStripLabel2, Me.ToolStripLabel1}) Me.ToolStrip1.Location = New System.Drawing.Point(3, 18) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Size = New System.Drawing.Size(1365, 27) @@ -687,7 +669,7 @@ Partial Class Behandlung Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image) Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton3.Name = "ToolStripButton3" - Me.ToolStripButton3.Size = New System.Drawing.Size(29, 24) + Me.ToolStripButton3.Size = New System.Drawing.Size(29, 28) Me.ToolStripButton3.Text = "Neu" ' 'ToolStripButton4 @@ -696,9 +678,15 @@ Partial Class Behandlung Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image) Me.ToolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton4.Name = "ToolStripButton4" - Me.ToolStripButton4.Size = New System.Drawing.Size(29, 24) + Me.ToolStripButton4.Size = New System.Drawing.Size(29, 28) Me.ToolStripButton4.Text = "Tabelle aktualisieren" ' + 'ToolStripLabel1 + ' + Me.ToolStripLabel1.Name = "ToolStripLabel1" + Me.ToolStripLabel1.Size = New System.Drawing.Size(36, 28) + Me.ToolStripLabel1.Text = "0.00" + ' 'STAkonto ' Me.STAkonto.AttachedControl = Me.SuperTabControlPanel4 @@ -713,7 +701,7 @@ Partial Class Behandlung Me.SuperTabControlPanel1.Location = New System.Drawing.Point(0, 28) Me.SuperTabControlPanel1.Margin = New System.Windows.Forms.Padding(4) Me.SuperTabControlPanel1.Name = "SuperTabControlPanel1" - Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1440, 976) + Me.SuperTabControlPanel1.Size = New System.Drawing.Size(1440, 972) Me.SuperTabControlPanel1.TabIndex = 1 Me.SuperTabControlPanel1.TabItem = Me.STBehandlung ' @@ -733,13 +721,41 @@ Partial Class Behandlung Me.STBehandlung.Name = "STBehandlung" Me.STBehandlung.Text = "Behandlung" ' + 'SuperTabControlPanel2 + ' + Me.SuperTabControlPanel2.Controls.Add(Me.Panel1) + Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 28) + Me.SuperTabControlPanel2.Margin = New System.Windows.Forms.Padding(4) + Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2" + Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1440, 972) + Me.SuperTabControlPanel2.TabIndex = 0 + Me.SuperTabControlPanel2.TabItem = Me.STLeistung + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.Leistungen1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Margin = New System.Windows.Forms.Padding(4) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1440, 972) + Me.Panel1.TabIndex = 1 + ' + 'STLeistung + ' + Me.STLeistung.AttachedControl = Me.SuperTabControlPanel2 + Me.STLeistung.GlobalItem = False + Me.STLeistung.Name = "STLeistung" + Me.STLeistung.Text = "Leistungen" + ' 'SuperTabControlPanel3 ' Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 0) Me.SuperTabControlPanel3.Margin = New System.Windows.Forms.Padding(4) Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3" - Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1440, 1004) + Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1440, 1000) Me.SuperTabControlPanel3.TabIndex = 0 ' 'tsbtnnew @@ -1140,6 +1156,17 @@ Partial Class Behandlung Me.Leistungen1.Size = New System.Drawing.Size(1440, 972) Me.Leistungen1.TabIndex = 0 ' + 'ToolStripLabel2 + ' + Me.ToolStripLabel2.Name = "ToolStripLabel2" + Me.ToolStripLabel2.Size = New System.Drawing.Size(262, 28) + Me.ToolStripLabel2.Text = "Total verrechnete Akonto-Rechnungen" + ' + 'ToolStripSeparator8 + ' + Me.ToolStripSeparator8.Name = "ToolStripSeparator8" + Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 27) + ' 'Behandlung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) @@ -1157,8 +1184,6 @@ Partial Class Behandlung Me.ctxmenubehandlung.ResumeLayout(False) CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SuperTabControl1.ResumeLayout(False) - Me.SuperTabControlPanel2.ResumeLayout(False) - Me.Panel1.ResumeLayout(False) Me.SuperTabControlPanel4.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() @@ -1168,6 +1193,8 @@ Partial Class Behandlung Me.ToolStrip1.PerformLayout() Me.SuperTabControlPanel1.ResumeLayout(False) Me.Panel2.ResumeLayout(False) + Me.SuperTabControlPanel2.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) Me.tsbtnbehandlungdelete.ResumeLayout(False) Me.tsbtnbehandlungdelete.PerformLayout() Me.ContextMenuStrip1.ResumeLayout(False) @@ -1310,4 +1337,8 @@ Partial Class Behandlung Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents AkontoRechnungVorschauToolStripMenuItem As ToolStripMenuItem Friend WithEvents NeueAkontoZahlungToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AkontoRechnungPDFPerMailToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripLabel1 As ToolStripLabel + Friend WithEvents ToolStripLabel2 As ToolStripLabel + Friend WithEvents ToolStripSeparator8 As ToolStripSeparator End Class diff --git a/DPM2016/Behandlung/Behandlung.resx b/DPM2016/Behandlung/Behandlung.resx index e671195..35d187f 100644 --- a/DPM2016/Behandlung/Behandlung.resx +++ b/DPM2016/Behandlung/Behandlung.resx @@ -236,7 +236,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO - DQAAAk1TRnQBSQFMAgEBBQEAAWgBBgFoAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBQEAAZgBBgGYAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -295,9 +295,6 @@ AQMBgAECAYABAAH4AQABgAEHAYABBwHAAT8C/wEAAQ8BAAEPAfkD/wGAAR8BgAEfCP8L - - 662, 17 - 788, 17 @@ -338,7 +335,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1363, 444</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1363, 444</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FetchRowStyles="True" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1363, 444</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1363, 444</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 662, 17 @@ -509,7 +506,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1363, 444</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1363, 444</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;Wrap:True;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1363, 444</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1363, 444</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> 950, 17 diff --git a/DPM2016/Behandlung/Behandlung.vb b/DPM2016/Behandlung/Behandlung.vb index a4bf8d6..b564906 100644 --- a/DPM2016/Behandlung/Behandlung.vb +++ b/DPM2016/Behandlung/Behandlung.vb @@ -1626,14 +1626,31 @@ Public Class Behandlung Me.c1akonto.DataMember = db.dsDaten.Tables(0).TableName Dim spalten As New Tabellenspalte spalten.Spaltentitel_aktualisieren(c1akonto, "Akonto", db.dsDaten.Tables(0)) + Dim total As Double = 0 + For Each r As DataRow In db.dsDaten.Tables(0).Rows + If r("aktiv") = True And r("nrfaktura").ToString <> "0" Then + total = total + r("betrag") + + End If + + Next + Me.ToolStripLabel1.Text = total.ToString("F2") Catch Me.SuperTabControl1.Tabs(2).Visible = False End Try End Sub Private Sub RechnungsdokumentAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RechnungsdokumentAnzeigenToolStripMenuItem.Click - Dim d As New clsDok - Process.Start(d.Get_Aktono_Dokument(c1akonto.Columns(0).Value.ToString)) + Try + Dim d As New clsDok + Process.Start(d.Get_Aktono_Dokument(c1akonto.Columns(0).Value.ToString)) + Catch + Dim d As New clsDok + If d.Get_Aktono_Dokument(c1akonto.Columns(0).Value.ToString) = "" Then + MsgBox("Es ist kein Rechnungsdokument für die Anzeige vorhanden.", vbExclamation) + End If + End Try + End Sub @@ -1698,6 +1715,32 @@ Public Class Behandlung ToolStripButton3_Click(sender, e) End Sub + Private Sub AkontoRechnungPDFPerMailToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AkontoRechnungPDFPerMailToolStripMenuItem.Click + Try + Globals.akontobuchung = True + Globals.akontoid = c1akonto.Columns(0).Value + + Behandungdetail1.Sofortrechnung(True, True, 1) + Globals.akontobuchung = False + load_data() + Catch + Globals.akontobuchung = False + End Try + End Sub + + Private Sub ctxmenuakonto_Opening(sender As Object, e As CancelEventArgs) Handles ctxmenuakonto.Opening + Me.AkontoRechnungErstellenToolStripMenuItem.Enabled = True + Me.AkontoRechnungPDFPerMailToolStripMenuItem.Enabled = True + Me.RechnungsDokumentErsetzenToolStripMenuItem.Enabled = True + + If c1akonto.Columns("nrfaktura").Value <> 0 Then + Me.AkontoRechnungErstellenToolStripMenuItem.Enabled = False + Me.AkontoRechnungPDFPerMailToolStripMenuItem.Enabled = False + Me.RechnungsDokumentErsetzenToolStripMenuItem.Enabled = False + + End If + End Sub + diff --git a/DPM2016/Behandlung/Leistungen.Designer.vb b/DPM2016/Behandlung/Leistungen.Designer.vb index 988621d..066a981 100644 --- a/DPM2016/Behandlung/Leistungen.Designer.vb +++ b/DPM2016/Behandlung/Leistungen.Designer.vb @@ -165,7 +165,6 @@ Partial Class Leistungen ' Me.lbtarif1.BackgroundStyle.Class = "ListBoxAdv" Me.lbtarif1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.lbtarif1.CheckStateMember = Nothing Me.lbtarif1.ContainerControlProcessDialogKey = True Me.lbtarif1.ContextMenuStrip = Me.ContextMenuStrip1 Me.lbtarif1.DragDropSupport = True @@ -313,7 +312,6 @@ Partial Class Leistungen ' Me.lbPakete.BackgroundStyle.Class = "ListBoxAdv" Me.lbPakete.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square - Me.lbPakete.CheckStateMember = Nothing Me.lbPakete.ContainerControlProcessDialogKey = True Me.lbPakete.Dock = System.Windows.Forms.DockStyle.Fill Me.lbPakete.DragDropSupport = True diff --git a/DPM2016/Behandlung/Leistungen.resx b/DPM2016/Behandlung/Leistungen.resx index 6a6e193..f10c690 100644 --- a/DPM2016/Behandlung/Leistungen.resx +++ b/DPM2016/Behandlung/Leistungen.resx @@ -197,6 +197,6 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}Heading{ForeColor:ControlText;Border:Flat,ControlDark,0, 1, 0, 1;AlignVert:Center;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}FilterBar{BackColor:Info;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1429, 169</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1429, 175</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Style4{}OddRow{BackColor:ControlLight;}Style3{}Footer{}Style14{}FilterBar{BackColor:Info;}Heading{AlignVert:Center;Border:Flat,ControlDark,0, 1, 0, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{}Style16{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style9{}FilterWatermark{ForeColor:InfoText;BackColor:Info;}Style1{}Caption{AlignHorz:Center;}Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" FilterBar="True" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="21" DefRecSelWidth="21" VerticalScrollGroup="1" HorizontalScrollGroup="1"><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FilterWatermarkStyle parent="FilterWatermark" me="Style14" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 1429, 169</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="FilterBar" me="FilterWatermark" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>21</DefaultRecSelWidth><ClientArea>0, 0, 1429, 175</ClientArea><PrintPageHeaderStyle parent="" me="Style15" /><PrintPageFooterStyle parent="" me="Style16" /></Blob> \ No newline at end of file diff --git a/DPM2016/DPM2016.vbproj b/DPM2016/DPM2016.vbproj index 789ff41..7bb27b0 100644 --- a/DPM2016/DPM2016.vbproj +++ b/DPM2016/DPM2016.vbproj @@ -8,7 +8,7 @@ WinExe DPM2016.Program DPM2016 - DPM2018 + PADM 512 WindowsFormsWithCustomSubMain v4.6 @@ -37,7 +37,7 @@ true true bin\Debug\ - DPM2018.xml + PADM.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 false @@ -48,7 +48,7 @@ true true bin\Release\ - DPM2018.xml + PADM.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 false diff --git a/DPM2016/bin/Debug/DPM2018.application b/DPM2016/bin/Debug/PADM.application similarity index 62% rename from DPM2016/bin/Debug/DPM2018.application rename to DPM2016/bin/Debug/PADM.application index 7f69968..466fe18 100644 --- a/DPM2016/bin/Debug/DPM2018.application +++ b/DPM2016/bin/Debug/PADM.application @@ -1,20 +1,20 @@  - - + + - - + + - LHyq7KMGoojL2AdfKOkqO0Va8Aw2QzAUU7I68AfxmqU= + Pg9JLYKf6GVJgk0qHWJVDcgppxnMv3myeT9SeO2iJko= diff --git a/DPM2016/bin/Debug/app.publish/DPM2018.exe b/DPM2016/bin/Debug/PADM.exe similarity index 89% rename from DPM2016/bin/Debug/app.publish/DPM2018.exe rename to DPM2016/bin/Debug/PADM.exe index 51433e8..69db49f 100644 Binary files a/DPM2016/bin/Debug/app.publish/DPM2018.exe and b/DPM2016/bin/Debug/PADM.exe differ diff --git a/DPM2016/bin/Debug/DPM2018.exe.config b/DPM2016/bin/Debug/PADM.exe.config similarity index 100% rename from DPM2016/bin/Debug/DPM2018.exe.config rename to DPM2016/bin/Debug/PADM.exe.config diff --git a/DPM2016/obj/Debug/DPM2018.exe.manifest b/DPM2016/bin/Debug/PADM.exe.manifest similarity index 97% rename from DPM2016/obj/Debug/DPM2018.exe.manifest rename to DPM2016/bin/Debug/PADM.exe.manifest index 5a6f118..2ab5fd4 100644 --- a/DPM2016/obj/Debug/DPM2018.exe.manifest +++ b/DPM2016/bin/Debug/PADM.exe.manifest @@ -1,11 +1,11 @@  - + - - + + @@ -162,18 +162,6 @@ - - - - - - - - - QBR3HRpgq3YIGv054fuH0g8LIL8go+a0vs+l+HUqVfk= - - - @@ -474,6 +462,18 @@ + + + + + + + + + pj1Lv24wMXbk8bjGf/CDdoSkM9kk8oKyF/aZqnNZabc= + + + @@ -1512,22 +1512,22 @@ T92PpISzKuFvoRCaXDKcSaiMyMOICRIrhQVQN101KX8= - + - IaVDJykS3T+/E78HSobZb/PRwAUull+7KpQZYT2d52E= + NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q= - + - NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q= + IaVDJykS3T+/E78HSobZb/PRwAUull+7KpQZYT2d52E= diff --git a/DPM2016/obj/Debug/DPM2018.pdb b/DPM2016/bin/Debug/PADM.pdb similarity index 57% rename from DPM2016/obj/Debug/DPM2018.pdb rename to DPM2016/bin/Debug/PADM.pdb index 25a8106..e75175a 100644 Binary files a/DPM2016/obj/Debug/DPM2018.pdb and b/DPM2016/bin/Debug/PADM.pdb differ diff --git a/DPM2016/bin/Debug/DPM2018.xml b/DPM2016/bin/Debug/PADM.xml similarity index 97% rename from DPM2016/bin/Debug/DPM2018.xml rename to DPM2016/bin/Debug/PADM.xml index f3482ff..591b38d 100644 --- a/DPM2016/bin/Debug/DPM2018.xml +++ b/DPM2016/bin/Debug/PADM.xml @@ -2,7 +2,7 @@ -DPM2018 +PADM diff --git a/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065500_166573050071665_QR.png b/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065500_166573050071665_QR.png new file mode 100644 index 0000000..6a361c1 Binary files /dev/null and b/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065500_166573050071665_QR.png differ diff --git a/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065521_166573052254452_QR.png b/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065521_166573052254452_QR.png new file mode 100644 index 0000000..616c42e Binary files /dev/null and b/DPM2016/bin/Debug/SHUB_PADM/QR_Images/233_20225514065521_166573052254452_QR.png differ diff --git a/DPM2016/bin/Debug/DPM2018.exe b/DPM2016/bin/Debug/app.publish/PADM.exe similarity index 89% rename from DPM2016/bin/Debug/DPM2018.exe rename to DPM2016/bin/Debug/app.publish/PADM.exe index 51433e8..69db49f 100644 Binary files a/DPM2016/bin/Debug/DPM2018.exe and b/DPM2016/bin/Debug/app.publish/PADM.exe differ diff --git a/DPM2016/bin/Debug/stschweiz/QR_Images/1_20221415071428_166581806971665_QR.png b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20221415071428_166581806971665_QR.png new file mode 100644 index 0000000..cb5a8c5 Binary files /dev/null and b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20221415071428_166581806971665_QR.png differ diff --git a/DPM2016/bin/Debug/stschweiz/QR_Images/1_20222615072612_166581877271665_QR.png b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20222615072612_166581877271665_QR.png new file mode 100644 index 0000000..8db3012 Binary files /dev/null and b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20222615072612_166581877271665_QR.png differ diff --git a/DPM2016/bin/Debug/stschweiz/QR_Images/1_20223715103728_166583024971665_QR.png b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20223715103728_166583024971665_QR.png new file mode 100644 index 0000000..51e24dc Binary files /dev/null and b/DPM2016/bin/Debug/stschweiz/QR_Images/1_20223715103728_166583024971665_QR.png differ diff --git a/DPM2016/obj/Debug/DPM2016.Behandlung.resources b/DPM2016/obj/Debug/DPM2016.Behandlung.resources index 1ec8c37..0306aae 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Behandlung.resources and b/DPM2016/obj/Debug/DPM2016.Behandlung.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.Leistungen.resources b/DPM2016/obj/Debug/DPM2016.Leistungen.resources index 2be2fb3..fbc559a 100644 Binary files a/DPM2016/obj/Debug/DPM2016.Leistungen.resources and b/DPM2016/obj/Debug/DPM2016.Leistungen.resources differ diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.AssemblyReference.cache b/DPM2016/obj/Debug/DPM2016.vbproj.AssemblyReference.cache new file mode 100644 index 0000000..42b297d Binary files /dev/null and b/DPM2016/obj/Debug/DPM2016.vbproj.AssemblyReference.cache differ diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt index f579e30..8e1a140 100644 --- a/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt +++ b/DPM2016/obj/Debug/DPM2016.vbproj.FileListAbsolute.txt @@ -63,15 +63,8 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmSuche.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.SplashForm.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmZahlung.resources E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.GenerateResource.cache -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.exe.licenses E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1.mdf E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Database1_log.ldf -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe.config -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe.manifest -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.application -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.exe -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.pdb -E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DPM2018.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Aga.Controls.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar.Schedule.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\DevComponents.DotNetBar2.dll @@ -110,12 +103,7 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\pt\MsgReader.resources.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\zh-CN\MsgReader.resources.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\zh-TW\MsgReader.resources.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.CoreCompileInputs.cache -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.exe.manifest -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.application E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.CopyComplete -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.exe -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.xml -E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2018.pdb E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\RichTextBoxExtended.dll E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\RichTextBoxExtended.pdb E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.frmrtf.resources @@ -275,3 +263,16 @@ E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.Tools.Windows.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.TreeMap.Windows.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.XlsIO.Base.xml E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\Syncfusion.XlsIO.Windows.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\DPM2016.vbproj.AssemblyReference.cache +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.exe.config +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.exe.manifest +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.application +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.exe +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.pdb +E:\Software-Projekte\DPM\DPM2016\DPM2016\bin\Debug\PADM.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.exe.licenses +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.exe.manifest +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.application +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.exe +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.xml +E:\Software-Projekte\DPM\DPM2016\DPM2016\obj\Debug\PADM.pdb diff --git a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache index 63a5879..66d4a6a 100644 Binary files a/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache and b/DPM2016/obj/Debug/DPM2016.vbproj.GenerateResource.Cache differ diff --git a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache index bf26166..7a4e93d 100644 Binary files a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d46003d..cf5364d 100644 Binary files a/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/DPM2016/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/DPM2016/obj/Debug/DPM2018.application b/DPM2016/obj/Debug/PADM.application similarity index 62% rename from DPM2016/obj/Debug/DPM2018.application rename to DPM2016/obj/Debug/PADM.application index 7f69968..466fe18 100644 --- a/DPM2016/obj/Debug/DPM2018.application +++ b/DPM2016/obj/Debug/PADM.application @@ -1,20 +1,20 @@  - - + + - - + + - LHyq7KMGoojL2AdfKOkqO0Va8Aw2QzAUU7I68AfxmqU= + Pg9JLYKf6GVJgk0qHWJVDcgppxnMv3myeT9SeO2iJko= diff --git a/DPM2016/obj/Debug/DPM2018.exe b/DPM2016/obj/Debug/PADM.exe similarity index 89% rename from DPM2016/obj/Debug/DPM2018.exe rename to DPM2016/obj/Debug/PADM.exe index 51433e8..69db49f 100644 Binary files a/DPM2016/obj/Debug/DPM2018.exe and b/DPM2016/obj/Debug/PADM.exe differ diff --git a/DPM2016/bin/Debug/DPM2018.exe.manifest b/DPM2016/obj/Debug/PADM.exe.manifest similarity index 97% rename from DPM2016/bin/Debug/DPM2018.exe.manifest rename to DPM2016/obj/Debug/PADM.exe.manifest index 5a6f118..2ab5fd4 100644 --- a/DPM2016/bin/Debug/DPM2018.exe.manifest +++ b/DPM2016/obj/Debug/PADM.exe.manifest @@ -1,11 +1,11 @@  - + - - + + @@ -162,18 +162,6 @@ - - - - - - - - - QBR3HRpgq3YIGv054fuH0g8LIL8go+a0vs+l+HUqVfk= - - - @@ -474,6 +462,18 @@ + + + + + + + + + pj1Lv24wMXbk8bjGf/CDdoSkM9kk8oKyF/aZqnNZabc= + + + @@ -1512,22 +1512,22 @@ T92PpISzKuFvoRCaXDKcSaiMyMOICRIrhQVQN101KX8= - + - IaVDJykS3T+/E78HSobZb/PRwAUull+7KpQZYT2d52E= + NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q= - + - NLnqVMsy3w9jN63XtqsXl3zuDEd+8S6tWSYv9gZKS4Q= + IaVDJykS3T+/E78HSobZb/PRwAUull+7KpQZYT2d52E= diff --git a/DPM2016/bin/Debug/DPM2018.pdb b/DPM2016/obj/Debug/PADM.pdb similarity index 57% rename from DPM2016/bin/Debug/DPM2018.pdb rename to DPM2016/obj/Debug/PADM.pdb index 25a8106..e75175a 100644 Binary files a/DPM2016/bin/Debug/DPM2018.pdb and b/DPM2016/obj/Debug/PADM.pdb differ diff --git a/DPM2016/obj/Debug/DPM2018.xml b/DPM2016/obj/Debug/PADM.xml similarity index 97% rename from DPM2016/obj/Debug/DPM2018.xml rename to DPM2016/obj/Debug/PADM.xml index f3482ff..591b38d 100644 --- a/DPM2016/obj/Debug/DPM2018.xml +++ b/DPM2016/obj/Debug/PADM.xml @@ -2,7 +2,7 @@ -DPM2018 +PADM diff --git a/DPM2016/obj/Debug/dpm2018.exe.licenses b/DPM2016/obj/Debug/dpm2018.exe.licenses deleted file mode 100644 index 91212b6..0000000 Binary files a/DPM2016/obj/Debug/dpm2018.exe.licenses and /dev/null differ diff --git a/DPM2016/obj/Debug/padm.exe.licenses b/DPM2016/obj/Debug/padm.exe.licenses new file mode 100644 index 0000000..8f43ea3 Binary files /dev/null and b/DPM2016/obj/Debug/padm.exe.licenses differ