diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml index 44dca40..824b087 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_positionen.xhtml @@ -19,7 +19,8 @@ Positionsnummer * Buchungsperiode Steuer - Betrag + Netto + Brutto @@ -37,7 +38,7 @@ - + @@ -48,19 +49,24 @@ - + + + + - + + + @@ -71,6 +77,7 @@ + @@ -118,23 +125,47 @@ //Rechnet die Preise zusammen function calculateSummary() { - var price = 0, amount = 0, sum = 0, total = 0; + var price = 0, amount = 0, sum = 0, total = 0, brutto = 0; var summaryItems = $("[data-id='orderitem_amount']"); $(summaryItems).each(function(index, value) { var tableRow = $(this).closest('tr'); var inputamount = $("[data-id='orderitem_amount']", tableRow); + var inputtax = $("[data-id='orderitem_tax']", tableRow); if (inputamount ) { + amount = convertToNumber(inputamount.val()); //console.log('amount=' + amount); if (!isNaN(amount) ) { - sum = amount ; + // round - sum = Math.round(sum * 100) / 100; - total = total + sum; - //$("[data-id='orderitem_total']",tableRow).val(sum); - sum = convertToCurrency(sum); - //console.log('sum=' + sum); - $("[data-id='orderitem_amount']",tableRow).val(sum); + amount = Math.round(amount * 100) / 100; + + // is tax a number? + if (!isNaN(inputtax.val())) { + tax=convertToNumber(inputtax.val()); + console.log('tax=' +tax); + brutto=amount + amount*(tax/100); + console.log('brutto=' +brutto); + } else { + brutto=amount; + } + // round + brutto = Math.round(brutto * 100) / 100; + total = total + brutto; + + + // update netto column + $("[data-id='orderitem_amount']",tableRow).val(convertToCurrency(amount)); + + // update burtto column + brutto=convertToCurrency(brutto); + $("[data-id='orderitem_total']",tableRow).val(brutto); // hidden field + // update display column + $("[data-id='orderitem_summary']", tableRow).empty(); + $("[data-id='orderitem_summary']", tableRow).append(brutto); + + + } } }); diff --git a/workflow/rechnungseingang-de-1.0.1.bpmn b/workflow/rechnungseingang-de-1.0.1.bpmn index 9b533ec..7a59f4b 100644 --- a/workflow/rechnungseingang-de-1.0.1.bpmn +++ b/workflow/rechnungseingang-de-1.0.1.bpmn @@ -105,7 +105,7 @@ - + txtlastcomment]]> @@ -721,7 +721,7 @@ result.isValid=true; - + txtlastcomment]]>