[14501] Cleanup

bundles/es.core.connector.elexis/META-INF/MANIFEST.MF

@@ -35,6 +35,5 @@ Export-Package: info.elexis.server.core.connector.elexis,
  info.elexis.server.core.connector.elexis.common,
  info.elexis.server.core.connector.elexis.instances,
  info.elexis.server.core.connector.elexis.locking,
- info.elexis.server.core.connector.elexis.services,
- info.elexis.server.core.connector.elexis.services.util
+ info.elexis.server.core.connector.elexis.services
 Bundle-Activator: info.elexis.server.core.connector.elexis.internal.Activator

bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder.xml → bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder">
    <reference bind="setModelService" interface="ch.elexis.core.services.IModelService" name="ModelService" target="(service.model.name=ch.elexis.core.model)"/>
-   <implementation class="info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder"/>
+   <implementation class="info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder"/>
 </scr:component>
\ No newline at end of file

bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.services.LocalLockService.xml → bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.internal.services.LocalLockService.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="info.elexis.server.core.connector.elexis.services.LocalLockService">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="info.elexis.server.core.connector.elexis.internal.services.LocalLockService">
    <service>
       <provide interface="ch.elexis.core.services.ILocalLockService"/>
    </service>
    <reference cardinality="1..1" field="contextService" interface="ch.elexis.core.services.IContextService" name="contextService"/>
    <reference cardinality="1..1" field="lockService" interface="info.elexis.server.core.connector.elexis.locking.ILockService" name="lockService"/>
    <reference cardinality="1..1" field="storeToStringService" interface="ch.elexis.core.services.IStoreToStringService" name="storeToStringService"/>
-   <implementation class="info.elexis.server.core.connector.elexis.services.LocalLockService"/>
+   <implementation class="info.elexis.server.core.connector.elexis.internal.services.LocalLockService"/>
 </scr:component>
\ No newline at end of file

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/VerrechenbarEigenleistung.java

-//package info.elexis.server.core.connector.elexis.billable;
-//
-//import java.util.List;
-//
-//import org.eclipse.core.runtime.IStatus;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import ch.rgw.tools.Money;
-//import ch.rgw.tools.TimeTool;
-//import info.elexis.server.core.connector.elexis.billable.optifier.DefaultOptifier;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Behandlung;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Eigenleistung;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Fall;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Kontakt;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;
-//
-//public class VerrechenbarEigenleistung implements IBillable<Eigenleistung> {
-//
-//	protected Logger log = LoggerFactory.getLogger(VerrechenbarEigenleistung.class);
-//
-//	private final Eigenleistung eigenleistung;
-//
-//	public VerrechenbarEigenleistung(Eigenleistung eigenleistung) {
-//		this.eigenleistung = eigenleistung;
-//	}
-//
-//	@Override
-//	public List<Object> getActions(Object arg0) {
-//		return null;
-//	}
-//
-//	@Override
-//	public String getCode() {
-//		return eigenleistung.getCode();
-//	}
-//
-//	@Override
-//	public String getCodeSystemCode() {
-//		return "999";
-//	}
-//
-//	@Override
-//	public String getCodeSystemName() {
-//		return "Eigenleistung";
-//	}
-//
-//	@Override
-//	public String getId() {
-//		return eigenleistung.getId();
-//	}
-//
-//	@Override
-//	public String getText() {
-//		return eigenleistung.getDescription();
-//	}
-//
-//	@Override
-//	public IStatus add(Behandlung kons, Kontakt userContact, Kontakt mandatorContact, float count) {
-//		return new DefaultOptifier().add(this, kons, userContact, mandatorContact, count);
-//	}
-//
-//	@Override
-//	public IStatus removeFromConsultation(Verrechnet vr, Kontakt mandatorContact) {
-//		return new DefaultOptifier().remove(vr);
-//	}
-//
-//	@Override
-//	public Eigenleistung getEntity() {
-//		return eigenleistung;
-//	}
-//
-//	@Override
-//	public int getTP(TimeTool date, Fall fall) {
-//		String salePrice = eigenleistung.getSalePrice();
-//		Money m = new Money();
-//		m.addCent(salePrice);
-//		return m.getCents();
-//	}
-//
-//	@Override
-//	public double getFactor(TimeTool dat, Fall fall) {
-//		return 1.0;
-//	}
-//
-//	@Override
-//	public VatInfo getVatInfo() {
-//		return VatInfo.VAT_DEFAULT;
-//	}
-//
-//}

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/VerrechenbarPhysioLeistung.java

-//package info.elexis.server.core.connector.elexis.billable;
-//
-//import java.util.List;
-//
-//import org.eclipse.core.runtime.IStatus;
-//
-//import ch.rgw.tools.TimeTool;
-//import info.elexis.server.core.connector.elexis.billable.optifier.DefaultOptifier;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Behandlung;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Fall;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Kontakt;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.PhysioLeistung;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;
-//import info.elexis.server.core.connector.elexis.services.FallService;
-//import info.elexis.server.core.connector.elexis.services.VerrechnetService;
-//
-//public class VerrechenbarPhysioLeistung implements IBillable<PhysioLeistung> {
-//
-//	private final PhysioLeistung physioLeistung;
-//
-//	public VerrechenbarPhysioLeistung(PhysioLeistung physioLeistung) {
-//		this.physioLeistung = physioLeistung;
-//	}
-//
-//	@Override
-//	public String getCodeSystemName() {
-//		return "Physiotherapie";
-//	}
-//
-//	@Override
-//	public String getCodeSystemCode() {
-//		return "311";
-//	}
-//
-//	@Override
-//	public String getId() {
-//		return physioLeistung.getId();
-//	}
-//
-//	@Override
-//	public String getCode() {
-//		return physioLeistung.getZiffer();
-//	}
-//
-//	@Override
-//	public String getText() {
-//		return physioLeistung.getTitel();
-//	}
-//
-//	@Override
-//	public List<Object> getActions(Object context) {
-//		return null;
-//	}
-//
-//	@Override
-//	public PhysioLeistung getEntity() {
-//		return physioLeistung;
-//	}
-//
-//	@Override
-//	public int getTP(TimeTool date, Fall fall) {
-//		return Integer.parseInt(physioLeistung.getTp());
-//	}
-//
-//	@Override
-//	public double getFactor(TimeTool date, Fall fall) {
-//		String billingSystem = FallService.getAbrechnungsSystem(fall);
-//		return VerrechnetService.getVKMultiplikator(date, billingSystem);
-//	}
-//
-//	@Override
-//	public IStatus add(Behandlung kons, Kontakt userContact, Kontakt mandatorContact, float count) {
-//		return new DefaultOptifier().add(this, kons, userContact, mandatorContact, count);
-//	}
-//
-//	@Override
-//	public IStatus removeFromConsultation(Verrechnet vr, Kontakt mandatorContact) {
-//		return new DefaultOptifier().remove(vr);
-//	}
-//
-//	@Override
-//	public VatInfo getVatInfo() {
-//		return VatInfo.VAT_DEFAULT;
-//	}
-//}

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/adjuster/IBillableAdjuster.java

-//package info.elexis.server.core.connector.elexis.billable.adjuster;
-//
-//import ch.rgw.tools.Money;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;
-//
-///**
-// * Implementations of {@link IVerrechnetAdjuster} can adjust a
-// * {@link Verrechnet} as it is created.
-// * 
-// * @author thomas
-// * 
-// */
-//public interface IBillableAdjuster {
-//	/**
-//	 * Adjust the created {@link Verrechnet}.
-//	 * 
-//	 * @param verrechnet
-//	 *            the Verrechnet object to adjust
-//	 */
-//	public void adjust(Verrechnet verrechnet);
-//
-//	/**
-//	 * Adjust netto price of {@link Verrechnet}.
-//	 * 
-//	 * @param verrechnet
-//	 *            the Verrechnet object this price belongs to
-//	 * @param price
-//	 *            the price to adjust
-//	 */
-//	public void adjustGetNettoPreis(Verrechnet verrechnet, Money price);
-//}

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/adjuster/VatVerrechnetAdjuster.java

-//package info.elexis.server.core.connector.elexis.billable.adjuster;
-//
-//import static ch.elexis.core.constants.Preferences.*;
-//
-//import java.util.EnumSet;
-//import java.util.List;
-//import java.util.Optional;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import ch.elexis.core.constants.StringConstants;
-//import ch.rgw.tools.Money;
-//import info.elexis.server.core.connector.elexis.billable.IBillable;
-//import info.elexis.server.core.connector.elexis.billable.IBillable.VatInfo;
-//import info.elexis.server.core.connector.elexis.billable.VerrechenbarArtikel;
-//import info.elexis.server.core.connector.elexis.billable.VerrechenbarArtikelstammItem;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.ObjVatInfo;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.ObjVatInfo_;
-//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;
-//import info.elexis.server.core.connector.elexis.services.ConfigService;
-//import info.elexis.server.core.connector.elexis.services.JPAQuery;
-//import info.elexis.server.core.connector.elexis.services.JPAQuery.QUERY;
-//import info.elexis.server.core.connector.elexis.services.VerrechnetService;
-//
-///**
-// * from at.medevit.medelexis.vat_ch.VatVerrechnetAdjuster
-// */
-//public class VatVerrechnetAdjuster implements IBillableAdjuster {
-//
-//	private Logger log = LoggerFactory.getLogger(VatVerrechnetAdjuster.class);
-//
-//	private final SettingsPreferenceStore globalConf = new SettingsPreferenceStore();
-//
-//	@Override
-//	public void adjust(Verrechnet verrechnet) {
-//		Optional<IBillable> verrechenbar = VerrechnetService.getVerrechenbar(verrechnet);
-//
-//		if (!verrechenbar.isPresent()) {
-//			log.warn("IBillable could not be found for Verrechnet " + verrechnet.getId() + ", returning.");
-//			return;
-//		}
-//
-//		if (verrechenbar.get() instanceof VerrechenbarArtikelstammItem
-//				|| verrechenbar.get() instanceof VerrechenbarArtikel) {
-//			handleArtikel(verrechenbar.get(), verrechnet);
-//		} else {
-//			handleLeistung(verrechenbar.get(), verrechnet);
-//		}
-//	}
-//
-//	private void handleArtikel(IBillable artikel, Verrechnet verrechnet) {
-//		EnumSet<VatInfo> info = getInfo(artikel);
-//		// first match will determine value !
-//		if (info.contains(VatInfo.VAT_CH_ISMEDICAMENT)) {
-//			setReduced(verrechnet);
-//		} else if (info.contains(VatInfo.VAT_CH_NOTMEDICAMENT)) {
-//			setNormal(verrechnet);
-//		} else if (info.contains(VatInfo.VAT_DEFAULT)) {
-//			setDefault(verrechnet);
-//		} else if (info.contains(VatInfo.VAT_NONE)) {
-//			setNoVat(verrechnet);
-//		}
-//	}
-//
-//	private void handleLeistung(IBillable leistung, Verrechnet verrechnet) {
-//		EnumSet<VatInfo> info = getInfo(leistung);
-//		// first match will determine value !
-//		if (info.contains(VatInfo.VAT_NONE) || info.contains(VatInfo.VAT_CH_ISTREATMENT)) {
-//			setNoVat(verrechnet);
-//		} else if (info.contains(VatInfo.VAT_CH_NOTTREATMENT)) {
-//			setNormal(verrechnet);
-//		} else if (info.contains(VatInfo.VAT_DEFAULT)) {
-//			setDefault(verrechnet);
-//		}
-//	}
-//
-//	/**
-//	 * Get the {@link VatInfo} for the {@link IVerrechenbar}. If the
-//	 * {@link IVerrechenbar} returns {@link VatInfo#VAT_DEFAULT} a lookup is
-//	 * performed in the mapping {@link ObjVatInfo}.
-//	 * 
-//	 * @param verrechenbar
-//	 * @return
-//	 */
-//	private EnumSet<VatInfo> getInfo(IBillable verrechenbar) {
-//		EnumSet<VatInfo> info = EnumSet.of(verrechenbar.getVatInfo());
-//		// if default is returned check if there is a mapping available
-//		if (info.contains(VatInfo.VAT_DEFAULT)) {
-//			JPAQuery<ObjVatInfo> query = new JPAQuery<ObjVatInfo>(ObjVatInfo.class);
-//			query.add(ObjVatInfo_.objectId, QUERY.EQUALS, verrechenbar.getEntity().getId());
-//			List<ObjVatInfo> infos = query.execute();
-//
-//			if (infos.size() > 0) {
-//				info.clear();
-//				info.addAll(VatInfo.decodeFromString(infos.get(0).getVatinfo()));
-//			}
-//		}
-//		return info;
-//	}
-//
-//	private void setDefault(Verrechnet verrechnet) {
-//		String defaultValue = globalConf.getString(PreferenceConstants.VAT_DEFAULTVALUE);
-//		if (PreferenceConstants.VAT_NORMALVALUE.equalsIgnoreCase(defaultValue))
-//			setNormal(verrechnet);
-//		else if (PreferenceConstants.VAT_REDUCEDVALUE.equalsIgnoreCase(defaultValue))
-//			setReduced(verrechnet);
-//		else if (PreferenceConstants.VAT_NOVATVALUE.equalsIgnoreCase(defaultValue))
-//			setNoVat(verrechnet);
-//	}
-//
-//	private void setNoVat(Verrechnet verrechnet) {
-//		verrechnet.setDetail("vat_scale", Double.toString(0.0));
-//	}
-//
-//	private void setReduced(Verrechnet verrechnet) {
-//		String reduziert = globalConf.getString(PreferenceConstants.VAT_REDUCEDVALUE);
-//		verrechnet.setDetail("vat_scale", reduziert);
-//	}
-//
-//	private void setNormal(Verrechnet verrechnet) {
-//		String normal = globalConf.getString(PreferenceConstants.VAT_NORMALVALUE);
-//		verrechnet.setDetail("vat_scale", normal);
-//	}
-//
-//	@Override
-//	public void adjustGetNettoPreis(Verrechnet verrechnet, Money price) {
-//		// do not change netto price
-//	}
-//
-//	private class SettingsPreferenceStore {
-//
-//		public String getString(String field) {
-//			String z = ConfigService.INSTANCE.get(field, null);
-//			if (z == null) {
-//				z = ConfigService.INSTANCE.get(field + SETTINGS_PREFERENCE_STORE_DEFAULT, null);
-//				if (z == null) {
-//					z = StringConstants.EMPTY;
-//				}
-//			}
-//			return z;
-//		}
-//
-//	}
-//
-//	private class PreferenceConstants {
-//		/**
-//		 * from at.medevit.medelexis.vat_ch.preferences.PreferenceConstants
-//		 */
-//		public static final String VAT_NORMALVALUE = "at.medevit.medelexis.vat_ch/NormalValue";
-//		public static final String VAT_REDUCEDVALUE = "at.medevit.medelexis.vat_ch/ReducedValue";
-//		public static final String VAT_NOVATVALUE = "at.medevit.medelexis.vat_ch/NoVatValue";
-//
-//		public static final String VAT_DEFAULTVALUE = "at.medevit.medelexis.vat_ch/DefaultValue";
-//
-//		public static final String VAT_ISMANDANTVAT = "at.medevit.medelexis.vat_ch/IsMandantVat";
-//		public static final String VAT_MANDANTVATNUMBER = "at.medevit.medelexis.vat_ch/MandantVatNumber";
-//	}
-//
-//}

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/common/ElexisDBConnection.java

@@ -9,7 +9,7 @@ import ch.elexis.core.common.DBConnection;
 import ch.elexis.core.model.IConfig;
 import ch.elexis.core.services.IModelService;
 import info.elexis.server.core.connector.elexis.internal.BundleConstants;
-import info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder;
+import info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder;
 
 public class ElexisDBConnection {
 	

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/internal/ConsoleCommandProvider.java

@@ -22,8 +22,8 @@ import ch.elexis.core.services.IQuery;
 import ch.elexis.core.services.IQuery.COMPARATOR;
 import info.elexis.server.core.connector.elexis.common.ElexisDBConnection;
 import info.elexis.server.core.connector.elexis.instances.InstanceService;
+import info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder;
 import info.elexis.server.core.connector.elexis.services.LockService;
-import info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder;
 
 @Component(service = CommandProvider.class, immediate = true)
 public class ConsoleCommandProvider extends AbstractConsoleCommandProvider {

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/services/internal/CoreModelServiceHolder.java → bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/internal/services/CoreModelServiceHolder.java

-package info.elexis.server.core.connector.elexis.services.internal;
+package info.elexis.server.core.connector.elexis.internal.services;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/services/LocalLockService.java → bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/internal/services/LocalLockService.java

-package info.elexis.server.core.connector.elexis.services;
+package info.elexis.server.core.connector.elexis.internal.services;
 
 import java.util.List;
 

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/services/PersistenceService2.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import ch.elexis.core.model.Identifiable;
 import ch.elexis.core.services.IModelService;
-import info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder;
+import info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder;
 
 public class PersistenceService2 {
 

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/services/UserService.java

@@ -8,7 +8,7 @@ import ch.elexis.core.model.IUser;
 import ch.elexis.core.model.ModelPackage;
 import ch.elexis.core.services.IQuery;
 import ch.elexis.core.services.IQuery.COMPARATOR;
-import info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder;
+import info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder;
 
 public class UserService extends PersistenceService2 {
 

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/services/util/MultiplikatorList.java

-///*******************************************************************************
-// * Copyright (c) 2013 MEDEVIT <office@medevit.at>.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// * 
-// * Contributors:
-// *     MEDEVIT <office@medevit.at> - initial API and implementation
-// ******************************************************************************/
-//package info.elexis.server.core.connector.elexis.services.util;
-//
-//import java.util.ArrayList;
-//import java.util.Iterator;
-//import java.util.List;
-//
-//import javax.persistence.EntityManager;
-//import javax.persistence.Query;
-//
-//import ch.elexis.core.constants.Preferences;
-//import ch.rgw.tools.ExHandler;
-//import ch.rgw.tools.JdbcLink;
-//import ch.rgw.tools.StringTool;
-//import ch.rgw.tools.TimeTool;
-//import info.elexis.server.core.connector.elexis.internal.ElexisEntityManager;
-//import info.elexis.server.core.connector.elexis.services.ConfigService;
-//
-///**
-// * Class for manipulation of Multiplikator. <br>
-// * 
-// * @author thomashu
-// * 
-// */
-//public class MultiplikatorList {
-//	private java.util.List<MultiplikatorInfo> list = new ArrayList<MultiplikatorList.MultiplikatorInfo>();
-//	private String typ;
-//	private String table;
-//
-//	public MultiplikatorList(String table, String typ) {
-//		this.typ = typ;
-//		this.table = table;
-//	}
-//
-//	/**
-//	 * Update multiRes with ResultSet of all existing Multiplikators
-//	 */
-//	private void fetchResultSet() {
-//		EntityManager em = ElexisEntityManager.createEntityManager();
-//		try {
-//			Query nativeQuery = em.createNativeQuery(
-//					"SELECT DATUM_VON, DATUM_BIS, MULTIPLIKATOR FROM " + table + " WHERE TYP=" + JdbcLink.wrap(typ));
-//			List<Object[]> resultList = nativeQuery.getResultList();
-//			for (Object[] object : resultList) {
-//				list.add(new MultiplikatorInfo(object[0].toString(), object[1].toString(), object[2].toString()));
-//			}
-//		} finally {
-//			em.close();
-//		}
-//	}
-//
-//	public void insertMultiplikator(TimeTool dateFrom, String value) {
-//		TimeTool dateTo = null;
-//
-//		String sqlString;
-//
-//		fetchResultSet();
-//		Iterator<MultiplikatorInfo> iter = list.iterator();
-//		// update existing multiplier for that date
-//		while (iter.hasNext()) {
-//			MultiplikatorInfo info = iter.next();
-//			TimeTool fromDate = new TimeTool(info.validFrom);
-//			TimeTool toDate = new TimeTool(info.validTo);
-//			if (dateFrom.isAfter(fromDate) && dateFrom.isBefore(toDate)) { // if contains
-//																			// update the to
-//																			// value of the
-//																			// existing
-//																			// multiplikator
-//				StringBuilder sql = new StringBuilder();
-//				// update the old to date
-//				TimeTool newToDate = new TimeTool(dateFrom);
-//				newToDate.addDays(-1);
-//				sql.append("UPDATE ").append(table)
-//						.append(" SET DATUM_BIS=" + JdbcLink.wrap(newToDate.toString(TimeTool.DATE_COMPACT))
-//								+ " WHERE DATUM_VON=" + JdbcLink.wrap(fromDate.toString(TimeTool.DATE_COMPACT))
-//								+ " AND TYP=" + JdbcLink.wrap(typ));
-//				executeSqlString(sql.toString());
-//				// set to date of new multiplikator to to date of old multiplikator
-//				dateTo = new TimeTool(toDate);
-//			} else if (dateFrom.isEqual(fromDate)) { // if from equals update the value
-//				StringBuilder sql = new StringBuilder();
-//				// update the value and return
-//				TimeTool newToDate = new TimeTool(dateFrom);
-//				newToDate.addDays(-1);
-//				sql.append("UPDATE ").append(table)
-//						.append(" SET MULTIPLIKATOR=" + JdbcLink.wrap(value) + " WHERE DATUM_VON="
-//								+ JdbcLink.wrap(fromDate.toString(TimeTool.DATE_COMPACT)) + " AND TYP="
-//								+ JdbcLink.wrap(typ));
-//				executeSqlString(sql.toString());
-//				return;
-//			}
-//		}
-//		// if we have not found a to Date yet search for oldest existing
-//		if (dateTo == null) {
-//			fetchResultSet();
-//			iter = list.iterator();
-//			dateTo = new TimeTool("99991231");
-//			while (iter.hasNext()) {
-//				MultiplikatorInfo info = iter.next();
-//				TimeTool fromDate = new TimeTool(info.validFrom);
-//				if (fromDate.isBefore(dateTo)) {
-//					dateTo.set(fromDate);
-//					dateTo.addDays(-1);
-//				}
-//			}
-//		}
-//		// create a new entry
-//		StringBuilder sql = new StringBuilder();
-//		sql.append("INSERT INTO ").append(table)
-//				.append(" (ID,DATUM_VON,DATUM_BIS,MULTIPLIKATOR,TYP) VALUES ("
-//						+ JdbcLink.wrap(StringTool.unique("prso")) + ","
-//						+ JdbcLink.wrap(dateFrom.toString(TimeTool.DATE_COMPACT)) + ","
-//						+ JdbcLink.wrap(dateTo.toString(TimeTool.DATE_COMPACT)) + "," + JdbcLink.wrap(value) + ","
-//						+ JdbcLink.wrap(typ) + ");");
-//		executeSqlString(sql.toString());
-//
-//	}
-//
-//	private void executeSqlString(String string) {
-//		EntityManager em = ElexisEntityManager.createEntityManager();
-//		try {
-//			Query nativeQuery = em.createNativeQuery(string);
-//			em.getTransaction().begin();
-//			nativeQuery.executeUpdate();
-//			em.getTransaction().commit();
-//		} finally {
-//			em.close();
-//		}
-//	}
-//
-//	public void removeMultiplikator(TimeTool dateFrom, String value) {
-//		EntityManager em = ElexisEntityManager.createEntityManager();
-//		try {
-//			Query statement = em.createNativeQuery(getPreparedStatementSql());
-//			em.getTransaction().begin();
-//			statement.setParameter(1, value);
-//			statement.setParameter(2, dateFrom.toString(TimeTool.DATE_COMPACT));
-//			statement.setParameter(3, typ);
-//			statement.executeUpdate();
-//			em.getTransaction().commit();
-//		} finally {
-//			em.close();
-//		}
-//	}
-//
-//	private String getPreparedStatementSql() {
-//		return "DELETE FROM " + table + " WHERE MULTIPLIKATOR=? AND DATUM_VON=? AND TYP=?";
-//	}
-//
-//	public synchronized double getMultiplikator(TimeTool date) {
-//		// get Mutliplikator for date
-//		fetchResultSet();
-//		Iterator<MultiplikatorInfo> iter = list.iterator();
-//		while (iter.hasNext()) {
-//			MultiplikatorInfo info = iter.next();
-//			TimeTool fromDate = new TimeTool(info.validFrom);
-//			TimeTool toDate = new TimeTool(info.validTo);
-//			if (date.isAfterOrEqual(fromDate) && date.isBeforeOrEqual(toDate)) {
-//				String value = info.multiplikator;
-//				if (value != null && !value.isEmpty()) {
-//					try {
-//						return Double.parseDouble(value);
-//					} catch (NumberFormatException nfe) {
-//						ExHandler.handle(nfe);
-//						return 0.0;
-//					}
-//				}
-//			}
-//		}
-//		return 1.0;
-//	}
-//
-//	private static class MultiplikatorInfo {
-//		String validFrom;
-//		String validTo;
-//		String multiplikator;
-//
-//		MultiplikatorInfo(String validFrom, String validTo, String multiplikator) {
-//			this.validFrom = validFrom;
-//			this.validTo = validTo;
-//			this.multiplikator = multiplikator;
-//		}