forked from jverein/jverein
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update_mittelverwendung
- Loading branch information
Showing
58 changed files
with
2,582 additions
and
1,801 deletions.
There are no files selected for viewing
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
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,52 @@ | ||
| /********************************************************************** | ||
| * 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/>. | ||
| * | ||
| * [email protected] | ||
| * www.jverein.de | ||
| **********************************************************************/ | ||
| package de.jost_net.JVerein.Variable; | ||
|
|
||
| import java.rmi.RemoteException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import de.jost_net.JVerein.rmi.Mitgliedskonto; | ||
|
|
||
| public class SollbuchungMap | ||
| { | ||
|
|
||
| public SollbuchungMap() | ||
| { | ||
| } | ||
|
|
||
| public Map<String, Object> getMap(Mitgliedskonto mk, Map<String, Object> inma) | ||
| throws RemoteException | ||
| { | ||
| Map<String, Object> map = null; | ||
| if (inma == null) | ||
| { | ||
| map = new HashMap<>(); | ||
| } | ||
| else | ||
| { | ||
| map = inma; | ||
| } | ||
| map.put(SollbuchungVar.BUCHUNGSDATUM.getName(), mk.getDatum()); | ||
| map.put(SollbuchungVar.ZAHLUNGSGRUND.getName(), mk.getZweck1()); | ||
| map.put(SollbuchungVar.BETRAG.getName(), mk.getBetrag()); | ||
| map.put(SollbuchungVar.IST.getName(), mk.getIstSumme()); | ||
| map.put(SollbuchungVar.DIFFERENZ.getName(), | ||
| mk.getBetrag() - mk.getIstSumme()); | ||
| return map; | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -14,20 +14,25 @@ | |
| * [email protected] | ||
| * www.jverein.de | ||
| **********************************************************************/ | ||
| package de.jost_net.JVerein.gui.action; | ||
| package de.jost_net.JVerein.Variable; | ||
|
|
||
| import de.jost_net.JVerein.gui.view.RechnungAutoNeuView; | ||
| import de.willuhn.jameica.gui.Action; | ||
| import de.willuhn.jameica.gui.GUI; | ||
| import de.willuhn.util.ApplicationException; | ||
|
|
||
| public class RechnungAutoNeuAction implements Action | ||
| public enum SollbuchungVar | ||
| { | ||
| ZAHLUNGSGRUND("sollbuchung_zahlungsgrund"), // | ||
| BUCHUNGSDATUM("sollbuchung_buchungsdatum"), | ||
| BETRAG("sollbuchung_betrag"), // | ||
| IST("sollbuchung_ist"), // | ||
| DIFFERENZ("sollbuchung_differenz"); | ||
|
|
||
| private String name; | ||
|
|
||
| @Override | ||
| public void handleAction(Object context) throws ApplicationException | ||
| SollbuchungVar(String name) | ||
| { | ||
| GUI.startView(RechnungAutoNeuView.class.getName(), null); | ||
| this.name = name; | ||
| } | ||
|
|
||
| public String getName() | ||
| { | ||
| return name; | ||
| } | ||
| } | ||
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.