Skip to content
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.

Sign up for GitHub

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

Fix Bugs in Backup und BuchungImpl #672

Merged
merged 5 commits into from
Feb 18, 2025
Merged

Fix Bugs in Backup und BuchungImpl #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7bdb8e
Fix Bugs in Backup und BuchungImpl
Feb 14, 2025
4343246
Fix getProjektID und plausi Check
Feb 15, 2025
22f55ac
Fix Diagnose Backup Import
Feb 15, 2025
1db01df
Auch Sollbuchungpositionen exportieren
Feb 15, 2025
0fc2820
Fix 50 Jahre
Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/de/jost_net/JVerein/gui/action/BackupCreateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@
import de.jost_net.JVerein.server.ProjektImpl;
import de.jost_net.JVerein.server.QIFImportHeadImpl;
import de.jost_net.JVerein.server.QIFImportPosImpl;
import de.jost_net.JVerein.server.RechnungImpl;
import de.jost_net.JVerein.server.SekundaereBeitragsgruppeImpl;
import de.jost_net.JVerein.server.SollbuchungPositionImpl;
import de.jost_net.JVerein.server.SpendenbescheinigungImpl;
import de.jost_net.JVerein.server.SuchprofilImpl;
import de.jost_net.JVerein.server.VersionImpl;
Expand Down Expand Up @@ -263,10 +265,18 @@ public void run(ProgressMonitor monitor) throws ApplicationException
backup(MitgliedNextBGruppeImpl.class, writer, monitor);
monitor.addPercentComplete(1);

monitor.setStatusText("Speichere Rechnungen");
backup(RechnungImpl.class, writer, monitor);
monitor.addPercentComplete(1);

monitor.setStatusText("Speichere Mitgliedskonten");
backup(MitgliedskontoImpl.class, writer, monitor);
monitor.addPercentComplete(1);

monitor.setStatusText("Speichere Sollbuchungpositionen");
backup(SollbuchungPositionImpl.class, writer, monitor);
monitor.addPercentComplete(1);

monitor.setStatusText("Speichere Spendenbescheinigungen");
backup(SpendenbescheinigungImpl.class, writer, monitor);
monitor.addPercentComplete(1);
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/server/BeitragsgruppeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public void setBeitragsArt(int art) throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsklasse");
Object l = (Object) super.getAttribute("buchungsklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down Expand Up @@ -348,7 +348,7 @@ public void setBuchungsart(Buchungsart buchungsart) throws RemoteException
@Override
public Buchungsart getBuchungsart() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsart");
Object l = (Object) super.getAttribute("buchungsart");
if (l == null)
{
return null; // Keine Buchungsart zugeordnet
Expand Down
29 changes: 23 additions & 6 deletions src/de/jost_net/JVerein/server/BuchungImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,11 @@ public void plausi() throws RemoteException, ApplicationException
{
throw new ApplicationException("Buchungsdatum liegt mehr als 10 Jahre in der Zukunft");
}
cal2.add(Calendar.YEAR, -20);
cal2.add(Calendar.YEAR, -60);
if (cal1.before(cal2))
{
throw new ApplicationException("Buchungsdatum liegt mehr als 10 Jahre zur�ck");
throw new ApplicationException(
"Buchungsdatum liegt mehr als 50 Jahre zur�ck");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Das sind dann aber 40 Jahre. Erst wird 10 Jahr in die Zukunft gegangen und dann 50 Jahre von da in die Vergangeneheit.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Habe oben auf 60 geändert

}

/* Pr�fung des Projektes */
Expand Down Expand Up @@ -386,7 +387,7 @@ public void setKommentar(String kommentar) throws RemoteException
@Override
public Buchungsart getBuchungsart() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsart");
Object l = (Object) super.getAttribute("buchungsart");
if (l == null)
{
return null; // Keine Buchungsart zugeordnet
Expand All @@ -411,7 +412,7 @@ public void setBuchungsartId(Long buchungsartId) throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsklasse");
Object l = (Object) super.getAttribute("buchungsklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down Expand Up @@ -442,7 +443,15 @@ public Abrechnungslauf getAbrechnungslauf() throws RemoteException
@Override
public Long getAbrechnungslaufID() throws RemoteException
{
return (Long) super.getAttribute("abrechnungslauf");
Abrechnungslauf lauf = getAbrechnungslauf();
if (lauf != null)
{
return Long.parseLong(lauf.getID());
}
else
{
return null;
}
}

@Override
Expand Down Expand Up @@ -544,7 +553,15 @@ public Projekt getProjekt() throws RemoteException
@Override
public Long getProjektID() throws RemoteException
{
return (Long) super.getAttribute("project");
Projekt projekt = getProjekt();
if (projekt != null)
{
return Long.parseLong(projekt.getID());
}
else
{
return null;
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/server/BuchungsartImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void setStatus(int status) throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsklasse");
Object l = (Object) super.getAttribute("buchungsklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/server/KontoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public void store() throws RemoteException, ApplicationException
@Override
public Buchungsart getBuchungsart() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsart");
Object l = (Object) super.getAttribute("buchungsart");
if (l == null)
{
return null; // Keine Buchungsart zugeordnet
Expand Down Expand Up @@ -337,7 +337,7 @@ public void setAnlagenartId(Long anlagenartId) throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("anlagenklasse");
Object l = (Object) super.getAttribute("anlagenklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/server/ZusatzbetragImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public Long getBuchungsartId() throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsklasse");
Object l = (Object) super.getAttribute("buchungsklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/server/ZusatzbetragVorlageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public Buchungsart getBuchungsart() throws RemoteException
@Override
public Buchungsklasse getBuchungsklasse() throws RemoteException
{
Long l = (Long) super.getAttribute("buchungsklasse");
Object l = (Object) super.getAttribute("buchungsklasse");
if (l == null)
{
return null; // Keine Buchungsklasse zugeordnet
Expand Down