Skip to content

Support SCOR IBAN ISO-References for payments. WIP #899

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

Draft
AlwinEgger wants to merge 3 commits into
base: prod
Choose a base branch
from
Draft

Support SCOR IBAN ISO-References for payments. WIP #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df225dd
Support SCOR IBAN ISO-References for payments. WIP
AlwinEgger Jul 24, 2025
f72c814
Update src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServ…
AlwinEgger Jul 24, 2025
d7769b1
Update src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServ…
AlwinEgger Nov 20, 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
16 changes: 12 additions & 4 deletions src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ import com.typesafe.scalalogging.LazyLogging
import ch.openolitor.core.domain.EntityStore._
import akka.actor.ActorSystem
import ch.openolitor.core.Macros._
import ch.openolitor.stammdaten.models.{ Waehrung, CHF, EUR }
import ch.openolitor.stammdaten.models.{CHF, EUR, Waehrung}
import ch.openolitor.stammdaten.models.KontoDaten
import ch.openolitor.util.ConfigUtil._
import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungWriteRepositoryComponent
import ch.openolitor.buchhaltung.repositories.BuchhaltungWriteRepositoryComponent
import ch.openolitor.core.repositories.EventPublishingImplicits._
import ch.openolitor.stammdaten.models.KundeId
import net.codecrete.qrbill.generator.Payments

object BuchhaltungInsertService {
def apply(implicit sysConfig: SystemConfig, system: ActorSystem): BuchhaltungInsertService = new DefaultBuchhaltungInsertService(sysConfig, system)
Expand Down Expand Up @@ -130,10 +131,17 @@ class BuchhaltungInsertService(override val sysConfig: SystemConfig) extends Eve
def generateReferenzNummer(kontoDaten: KontoDaten, kundeId: KundeId, id: RechnungId): String = {
val referenzNummerPrefix = kontoDaten.referenzNummerPrefix getOrElse ("")

val filled = s"${referenzNummerPrefix}%0${ReferenznummerLength - referenzNummerPrefix.size - RechnungIdLength}d%0${RechnungIdLength}d".format(kundeId.id, id.id)
val checksum = calculateChecksum(filled.toList map (_.asDigit))
if (Payments.isQRIBAN(kontoDaten.iban)) {
val filled = s"${referenzNummerPrefix}%0${ReferenznummerLength - referenzNummerPrefix.size - RechnungIdLength}d%0${RechnungIdLength}d".format(kundeId.id, id.id)
val checksum = calculateChecksum(filled.toList map (_.asDigit))

s"$filled$checksum"
s"$filled$checksum"
} else {
//TODO implement Reference Generation along this https://de.wikipedia.org/wiki/Strukturierte_Kreditorreferenz and https://www.mobilefish.com/services/creditor_reference/creditor_reference.php
val filled = s"${referenzNummerPrefix}%d%d".format(kundeId.id, id.id)
val checksum = calculateChecksum(filled.toList map (_.asDigit))
s"RF$checksum$filled"
}
}

def generateEsrNummer(kontoDaten: KontoDaten, betrag: BigDecimal, waehrung: Waehrung, referenzNummer: String): String = {
Expand Down
6 changes: 5 additions & 1 deletion src/main/scala/ch/openolitor/buchhaltung/reporting/RechnungReportData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ trait RechnungReportData extends AsyncConnectionPoolContextAware with Buchhaltun
// more bill data
bill.setUnstructuredMessage(rechnung.titel)
bill.setReference(rechnung.referenzNummer)
bill.setReferenceType(Bill.REFERENCE_TYPE_QR_REF)
if (Payments.isQRIBAN(iban)) {
bill.setReferenceType(Bill.REFERENCE_TYPE_QR_REF)
} else {
bill.setReferenceType(Bill.REFERENCE_TYPE_CRED_REF)
}

// Set debtor
val debtor = new Address()
Expand Down
Loading