forked from jverein/jverein
-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature gegenbuchung #138
Merged
dippeal
merged 18 commits into
openjverein:master
from
JohannMaierhofer:feature_gegenbuchung
Feb 8, 2024
Merged
Feature gegenbuchung #138
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
1117cf9
Zwischenstand
JohannMaierhofer 8a1eaba
Feature Gegenbuchung
JohannMaierhofer 688a5f8
kleine Optimierung
JohannMaierhofer 25eb8dd
Auch Mitgliedskonto entfernen
JohannMaierhofer 3c4b339
Resolve comments
JohannMaierhofer 9c4af66
Use DISTINCT
JohannMaierhofer 98a9333
Kommentare gelöst
JohannMaierhofer 569f2a8
Remove Sub-Select
JohannMaierhofer bf24ab7
Change Update Version 429 to 430
JohannMaierhofer 6d8644c
konto aus query entfernt
JohannMaierhofer 5085ce2
Fertige Buchungsartabfrage
JohannMaierhofer db3cc7f
Fix Sort und Formatter
JohannMaierhofer 90e5206
Fix Filter in Combo Box
JohannMaierhofer 13244cb
Neue Buchung bei Action
JohannMaierhofer f7b0779
Verbessere Buchungsart Eingabe
JohannMaierhofer e854964
Update Schleife
JohannMaierhofer 3781580
Update Schleife in KontoKontrol
JohannMaierhofer 8e1c9f4
Entferne Dateien die nicht zum Feature gehören
JohannMaierhofer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
85 changes: 85 additions & 0 deletions
85
src/de/jost_net/JVerein/gui/action/BuchungGegenbuchungAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /********************************************************************** | ||
| * Copyright (c) by Heiner Jostkleigrewe | ||
| * This program is free software: you can redistribute it and/or modify it under the terms of the | ||
| * GNU General Public License as published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without | ||
| * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See | ||
| * the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with this program. If not, | ||
| * see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * heiner@jverein.de | ||
| * www.jverein.de | ||
| **********************************************************************/ | ||
| package de.jost_net.JVerein.gui.action; | ||
|
|
||
| import de.jost_net.JVerein.Einstellungen; | ||
| import de.jost_net.JVerein.gui.dialogs.KontoAuswahlDialog; | ||
| import de.jost_net.JVerein.gui.view.BuchungView; | ||
| import de.jost_net.JVerein.rmi.Buchung; | ||
| import de.jost_net.JVerein.rmi.Konto; | ||
| import de.willuhn.datasource.rmi.DBIterator; | ||
| import de.willuhn.datasource.rmi.DBService; | ||
| import de.willuhn.jameica.gui.Action; | ||
| import de.willuhn.jameica.gui.GUI; | ||
| import de.willuhn.jameica.system.OperationCanceledException; | ||
| import de.willuhn.util.ApplicationException; | ||
|
|
||
| public class BuchungGegenbuchungAction implements Action | ||
| { | ||
|
|
||
| @Override | ||
| public void handleAction(Object context) throws ApplicationException | ||
| { | ||
|
|
||
| if (context == null || !(context instanceof Buchung)) | ||
| { | ||
| throw new ApplicationException("Keine Buchung ausgew�hlt"); | ||
| } | ||
| Buchung b = (Buchung) context; | ||
| Konto konto = null; | ||
| try | ||
| { | ||
| final DBService service = Einstellungen.getDBService(); | ||
| DBIterator<Konto> konten = service.createList(Konto.class); | ||
| konten.addFilter("buchungsart = ?", b.getBuchungsartId()); | ||
| if (konten.size() > 0) | ||
| { | ||
| konto = (Konto) konten.next(); | ||
| } | ||
| if (konto == null) | ||
| { | ||
| KontoAuswahlDialog d = new KontoAuswahlDialog( | ||
| KontoAuswahlDialog.POSITION_CENTER, false, false, true); | ||
| konto = (Konto) d.open(); | ||
| } | ||
| if (konto != null) | ||
| { | ||
| Buchung bu = (Buchung) Einstellungen.getDBService().createObject(Buchung.class, | ||
| null); | ||
| bu.setKonto(konto); | ||
| bu.setName(b.getName()); | ||
| bu.setBetrag(-b.getBetrag()); | ||
| bu.setZweck(b.getZweck()); | ||
| bu.setDatum(b.getDatum()); | ||
| if (b.getBuchungsart() != null) | ||
| bu.setBuchungsart(b.getBuchungsartId()); | ||
| if (b.getProjekt() != null) | ||
| bu.setProjektID(b.getProjektID()); | ||
|
|
||
| GUI.startView(new BuchungView(), bu); | ||
| } | ||
| } | ||
| catch (OperationCanceledException oce) | ||
| { | ||
| throw oce; | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| GUI.getStatusBar().setErrorText("Fehler bei der Gegenbuchung."); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Führt das Setzen des Projekts nicht dazu, dass sich die beiden Buchungen im Projektsaldo annullieren? Mir fällt gerade kein Szenario ein, in dem man das will.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also bei mir heben sich Umbuchungen auch im normalen Buchungsklassen Saldo gegenseitig auf. Dafür sind es ja Umbuchungen und keine Einnahmen oder Ausgaben. Und ich erlaube ja die Aktion nur bei Umbuchungen.
Z. B. Eine Umbuchung von Geld vom Girokonto auf ein Anlagekonto muss sich aufheben weil das weder Einnahmen noch Ausgaben sind. Der Geldbestand bleibt ja gleich.
Oder wenn ich eine Einzahlung für eine Kaution habe ist das auch keine Einnahme sondern ich mache eine Gegenbuchung im Kautionskonto. Ich habe mehr Geld auf dem Girokonto aber gleichzeitig mehr Schulden.
Wenn die Buchungen jetzt einem Projekt zugeordnet sind sollte das doch innerhalb des Projektes genauso sein nehme ich mal an.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hier stimme ich @JohannMaierhofer zu.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Warum sollte die Umbuchung dann überhaupt einem Projekt zugeordnet werden?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ich denke, das hängt dann davon ab ob man auch an anderen Stellen die Buchungen als Teil des Projekts sehen möchte z.B. in den Buchungslisten.
Für das Feature ist das aber egal.
Entweder ist eine Buchung nicht Teil eines Projektes und dann wird auch nichts mit kopiert.
Oder es ist Teil eines Projektes und dann wird es halt mit kopiert. Sollte dann aus irgendeinem Grund das Projekt nicht in der Gegenbuchung gewünscht sein, dann kann man es ja vor dem abspeichern immer noch rauslöschen. Aber das Behalten dürfte in dem Fall wohl der Standard sein.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ich ordne Umbuchungen auch immer einem Projekt zu -zumindest wenn sie zu einem Projekt gehören.
Es ist aber wie schon richtig beschrieben jedem selbst überlassen ob er das macht oder nicht.