svn commit: r465376 - in /incubator/ofbiz/trunk/applications/order: config/OrderEntityLabels_fr.properties webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh

Author: jleroux
Date: Wed Oct 18 14:34:31 2006
New Revision: 465376

URL: http://svn.apache.org/viewvc?view=rev&rev=465376
Log:
This files were missing for "POs Inventory Problems"

Added:
    incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties   (with props)
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh   (with props)

Added: incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties?view=auto&rev=465376
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties (added)
+++ incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties Wed Oct 18 14:34:31 2006
@@ -0,0 +1,18 @@
+#####################################################################
+#
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed 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.
+#####################################################################
+OrderType.description.PURCHASE_ORDER=Achats
+OrderType.description.SALES_ORDER=Ventes

Propchange: incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/order/config/OrderEntityLabels_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh?view=auto&rev=465376
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh (added)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh Wed Oct 18 14:34:31 2006
@@ -0,0 +1,64 @@
+/* $Id: filterorderlist.bsh 9964 2006-08-30 03:34:19Z je $ */
+
+import java.math.BigDecimal;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.order.order.OrderReadHelper;
+import org.ofbiz.product.store.ProductStoreWorker;
+
+
+orderHeaderList = context.remove("orderHeaderList");
+productStore = ProductStoreWorker.getProductStore(request);
+
+if ("Y".equals(requestParameters.get("filterInventoryProblems")) && UtilValidate.isNotEmpty(orderHeaderList)) {
+
+    List filteredList = new ArrayList();
+    for (ohi = orderHeaderList.iterator(); ohi.hasNext();) {
+        orderHeader = (GenericValue) ohi.next();
+        facilityId = orderHeader.getString("originFacilityId");
+        if (facilityId == null) {
+ facilityId = productStore.getString("inventoryFacilityId");
+        }
+        orderReadHelper = OrderReadHelper.getHelper(orderHeader);
+        backorderQty = orderReadHelper.getOrderBackorderQuantityBd();
+        if (backorderQty.compareTo(new BigDecimal("0")) == 1) {
+            filteredList.add(orderHeader);
+            continue;
+        }
+        if ("PURCHASE_ORDER".equals(orderHeader.getString("orderTypeId"))) {                
+            if (orderReadHelper.getRejectedOrderItems()) {
+                filteredList.add(orderHeader);
+                continue;
+            }
+            if (orderReadHelper.getPastEtaOrderItems()) {
+                filteredList.add(orderHeader);
+                continue;
+            }
+            if (orderReadHelper.getPartiallyReceivedItems()) {
+                filteredList.add(orderHeader);
+                continue;
+            }            
+        }
+    }
+    orderHeaderList = filteredList;
+}
+
+if ("Y".equals(requestParameters.get("filterAuthProblems")) && UtilValidate.isNotEmpty(orderHeaderList)) {
+
+    List filteredList = new ArrayList();
+    for (ohi = orderHeaderList.iterator(); ohi.hasNext();) {
+        orderHeader = (GenericValue) ohi.next();
+
+        orderReadHelper = OrderReadHelper.getHelper(orderHeader);
+        List paymentPrefList = orderReadHelper.getPaymentPreferences();
+        for (Iterator ppi = paymentPrefList.iterator(); ppi.hasNext();) {
+            paymentPref = (GenericValue) ppi.next();
+            if ("PAYMENT_NOT_AUTH".equals(paymentPref.getString("statusId"))) {
+                filteredList.add(orderHeader);
+            }
+        }
+    }
+    orderHeaderList = filteredList;
+}
+
+context.put("orderHeaderList", orderHeaderList);

Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/filterorderlist.bsh
------------------------------------------------------------------------------
    svn:mime-type = text/plain