From ff9107cb250abe58a5052b9d91bdae2566400a32 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 9 Aug 2013 03:08:25 +0000 Subject: [PATCH] replace groovy file with new view and add orderitemSeqId to invoiceitemlist git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512132 13f79535-47bb-0310-9956-ffa450edef68 --- .../accounting/entitydef/entitymodel.xml | 12 +++++ .../invoice/OrderListInvoiceItem.groovy | 54 ------------------- .../accounting/widget/InvoiceForms.xml | 13 +++-- .../accounting/widget/InvoiceScreens.xml | 7 ++- 4 files changed, 23 insertions(+), 63 deletions(-) delete mode 100644 applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy 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. -
+ - + + @@ -156,6 +154,7 @@ under the License. + @@ -208,7 +207,7 @@ under the License. -
diff --git a/applications/accounting/widget/InvoiceScreens.xml b/applications/accounting/widget/InvoiceScreens.xml index 02e92cec2e..b773809f5e 100644 --- a/applications/accounting/widget/InvoiceScreens.xml +++ b/applications/accounting/widget/InvoiceScreens.xml @@ -188,11 +188,14 @@ under the License.