diff --git a/applications/accounting/entitydef/entitymodel.xml b/applications/accounting/entitydef/entitymodel.xml
index 9e463dda17..53134f3ff1 100644
--- a/applications/accounting/entitydef/entitymodel.xml
+++ b/applications/accounting/entitydef/entitymodel.xml
@@ -1670,6 +1670,18 @@ under the License.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy
deleted file mode 100644
index 510bd0d3d1..0000000000
--- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.util.EntityUtil;
-import javolution.util.FastMap;
-
-invoiceId = context.invoiceId;
-if (!invoiceId) return;
-
-List invoiceItems = [];
-invoiceItemList = delegator.findByAnd("InvoiceItem", [invoiceId : invoiceId], ["invoiceItemSeqId"], false);
-if (invoiceItemList) {
- invoiceItemList.each { invoiceItem ->
- invoiceItemSeqId = invoiceItem.invoiceItemSeqId;
- invoiceId = invoiceItem.invoiceId;
- orderItemBilling = EntityUtil.getFirst(delegator.findByAnd("OrderItemBilling", [invoiceId : invoiceId, invoiceItemSeqId : invoiceItemSeqId], null, false));
- Map invoiceItemMap = FastMap.newInstance();
- invoiceItemMap.putAll((Map) invoiceItem);
- if (orderItemBilling) {
- orderId = orderItemBilling.orderId;
- invoiceItemMap.orderId = orderId;
- } else {
- orderAdjustmentBilling = EntityUtil.getFirst(delegator.findByAnd("OrderAdjustmentBilling", [invoiceId : invoiceId, invoiceItemSeqId : invoiceItemSeqId], null, false));
- if (orderAdjustmentBilling) {
- orderAdjustment = EntityUtil.getFirst(delegator.findByAnd("OrderAdjustment", [orderAdjustmentId : orderAdjustmentBilling.orderAdjustmentId], null, false))
- if (orderAdjustment) {
- orderId = orderAdjustment.orderId;
- invoiceItemMap.orderId = orderId;
- }
- }
- }
- invoiceItems.add(invoiceItemMap);
- }
- context.invoiceItems = invoiceItems;
-}
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index cd9af33a92..eeb4214426 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -139,13 +139,11 @@ under the License.
-
-