diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0593145..37923ad 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,7 +1,10 @@ # Versionen +### 1.2.21 (Development) -### 1.2.20 (Development) + - Beim XML Invoice Import wird nun auch die Sprache für das Mahnwesen ermittelt (fehlte) + +### 1.2.20 - Optimierung OP-Liste nach KW diff --git a/docker-compose.yml b/docker-compose.yml index 48709d5..8aa60c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -116,7 +116,7 @@ services: image: imixs/exim4 environment: EXIM_SMARTHOST: "www149.your-server.de:25" - EXIM_PASSWORD: "www149.your-server.de:webmaster@imixs.com:webmaster4Imixsmail" + EXIM_PASSWORD: "www149.your-server.de:webmaster@imixs.com:WH5y38VFruehling1pnT3RK34x0LG36BP2x57e7dX" EXIM_ALLOWED_SENDERS: "10.0.0.0/8:172.16.0.0/12:192.168.0.0/16" diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java index 0de624e..06e8c39 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLConfigController.java @@ -23,7 +23,7 @@ *******************************************************************************/ package com.alexanderlogistics; -import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.imixs.workflow.office.config.ConfigController; @@ -37,7 +37,8 @@ import org.imixs.workflow.office.config.ConfigController; */ @Named("aglConfigController") -@RequestScoped +// @RequestScoped +@ApplicationScoped public class AGLConfigController extends ConfigController { private static final long serialVersionUID = 1L; diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java index bb60a46..44b52d8 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java @@ -106,7 +106,7 @@ public class CargosoftController implements Serializable { if (result != null) { for (ItemCollection cdtr : result) { - // Aenderugn 22. Jun wir geben das K/D direkt witer + // Aenderugn 22. Jun wir geben das K/D direkt weiter String cdtrNo = cdtr.getItemValueString("_VENDOR_NUM"); String display = cdtrNo + " - " + cdtr.getItemValueString("_VENDOR_Name"); @@ -248,6 +248,7 @@ public class CargosoftController implements Serializable { JsonObjectBuilder objectBuilder = Json.createObjectBuilder(). // add("no", jsonVal(cdtr.getItemValueString("_VENDOR_NUM"))). // add("name", jsonVal(cdtr.getItemValueString("_VENDOR_Name"))). // + add("country", jsonVal(cdtr.getItemValueString("_VENDOR_COUNTRY"))). // add("creditperiod", jsonVal(cdtr.getItemValueString("cdtr.creditperiod"))). // // add("mail", jsonVal(cdtr.getItemValue("cdtr.mail"))). // diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java index c479b8e..b4f4feb 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java @@ -453,6 +453,16 @@ public class CargosoftXMLInvoiceImportService { ItemCollection dbtr = kreditorDebitorService.findDebitor(dbtrNumber); if (dbtr != null) { workitem.setItemValue("dbtr.name", dbtr.getItemValueString("_vendor_name")); + // Anhand der Creditoren Stammdaten errrechnen wir die Sprache für diese + // Rechnung + String country = dbtr.getItemValueString("_VENDOR_COUNTRY"); + workitem.setItemValue("dbtr.country", country); + if (country.equalsIgnoreCase("de") || country.equalsIgnoreCase("ch") + || country.equalsIgnoreCase("at")) { + workitem.setItemValue("invoice.language", "DE"); + } else { + workitem.setItemValue("invoice.language", "EN"); + } } } catch (PluginException e) { // e.printStackTrace(); diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml index 9ab94e1..611ab2a 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml @@ -23,29 +23,59 @@
| Offener Saldo | Mahnen | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ |
- |
- |
-
- |
+
+ |
+
+ |
+
+
+ |
+
+
+ |
- |
-
- |
-
+ |
+ |
+
+ |
- |
+
-
+ |
+
- |
@@ -107,37 +109,38 @@
- |
+ |
+ |
+ |
+ |
| Summary |
-
+
- |
+ |
+
-
- | |
+
-
+ |
+
| |
++description +
+Debitor:
| Rechnungsnummer | +Datum | +Fälligkeit | +Rechnungsbetrag | +Saldo | +Mahnstufe | +
|---|---|---|---|---|---|
| Saldo |
++description +
+Debitor:
| Invoice No. | +Date | +Expiry Date | +Invoice Amount | +Balance | +Dunning Level | +
|---|---|---|---|---|---|
| Saldo |