Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix datumsberechnung fälligkeit und Sammelgutschrift Cargosoft

Browse source
This commit is contained in:
Ralph Soika 2024-07-31 12:50:23 +02:00
parent 123c3a052c
commit 2ed89cbf45
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java
View file

@ -673,14 +673,19 @@ public class CargosoftXMLInvoiceImportService {
} }
/** /**
* Bei G = Gutschrift oder SR = Stornorechnung müssen wir das vorzeichen ändern * G = Gutschrift
* SR = Stornorechnung
* GK = Sammelgutschrift
* SS = Sammelrechnung Storno
*
* müssen wir das vorzeichen ändern
* dies wird über den Invoice.Type geprüft * dies wird über den Invoice.Type geprüft
* *
* @return * @return
*/ */
private boolean isGutschrift(ItemCollection workitem) { private boolean isGutschrift(ItemCollection workitem) {
String type = workitem.getItemValueString("invoice.type"); String type = workitem.getItemValueString("invoice.type");
return ("G".equals(type) || "SR".equals(type)); return ("G".equals(type) || "SR".equals(type) || "GK".equals(type) || "SS".equals(type));
} }
/** /**

16
office-alexander-logistics-app/src/main/webapp/js/imixs-office.workitem.custom.js
View file

@ -25,18 +25,12 @@ function initFaelligkeit(ajax_event) {
var basisDateString = $("input[id$='date_invoice']").val(); var basisDateString = $("input[id$='date_invoice']").val();
const parts = basisDateString.split("."); const parts = basisDateString.split(".");
var basisDay = parts[0]; var basisDay = parts[0];
var basisMonth=parts[1]; var basisMonth = (parts[1]) - 1;
var basisYear = parts[2]; var basisYear = parts[2];
var basisDate = new Date(basisYear, basisMonth, basisDay);
var newDate = new Date(basisYear, basisMonth, basisDay);
var basisDate = new Date(); let tageVerschiebung = 10;
basisDate.setFullYear(basisYear); newDate.setDate(newDate.getDate() + tageVerschiebung);
basisDate.setMonth(basisMonth-1);
basisDate.setDate(basisDay);
// get days,month,year from
var newDate = new Date(basisDate.getTime() + (days * 24 * 60 * 60 * 1000));
var day = '' + newDate.getDate(); var day = '' + newDate.getDate();
if (day.length == 1) { if (day.length == 1) {