Compare commits

...

1 commit

2 changed files with 32 additions and 33 deletions

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
*
* @return
*/
private boolean isGutschrift(ItemCollection workitem) {
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));
}
/**

View file

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