OFBiz › OFBiz - Commits

svn commit: r465360 - in /incubator/ofbiz/trunk: applications/order/config/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/WEB-INF/actions/order/ applications/order/webapp/ordermgr/order/ applications/order/widget/orde...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r465360 - in /incubator/ofbiz/trunk: applications/order/config/ applications/order/src/org/ofbiz/order/order/ applications/order/webapp/ordermgr/WEB-INF/actions/order/ applications/order/webapp/ordermgr/order/ applications/order/widget/orde...

jleroux@apache.org
Author: jleroux
Date: Wed Oct 18 13:16:25 2006
New Revision: 465360

URL: http://svn.apache.org/viewvc?view=rev&rev=465360
Log:
This commit add filters on Inventory Problems and Authorization Problems in Order List Screen and filter on Inventory Problems in Find order screen

Inventory Problems are:
1. Partially Received POs
2. POs open past their ETA
3. POs with rejected items

Modified:
    incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
    incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=465360&r1=465359&r2=465360
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Oct 18 13:16:25 2006
@@ -14,683 +14,673 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #####################################################################
-
 # ========================================
 # UiLabels for the order Component
 # ========================================
-FacilityBillingAddressSameShipping = Billing address is the same as the shipping address
+FacilityBillingAddressSameShipping=Billing address is the same as the shipping address
 FacilityDeliveryOrder=Delivery order
-FacilityFacility = Facility
-FacilityInventory = Inventory
-FacilityNoFacility = No Facility
-FacilityNoOtherShippingMethods = Use Default: No other shipping methods available.
-FacilityShipAvailable = Please ship items I ordered as they become available (you may incur additional shipping charges).
-FacilityShipOnceOrAvailable = Ship all at once, or 'as available'?
+FacilityFacility=Facility
+FacilityInventory=Inventory
+FacilityNoFacility=No Facility
+FacilityNoOtherShippingMethods=Use Default: No other shipping methods available.
+FacilityShipAvailable=Please ship items I ordered as they become available (you may incur additional shipping charges).
+FacilityShipOnceOrAvailable=Ship all at once, or 'as available'?
 FacilityShipmentDatas=Shipment Data
-FacilityShipments = Shipments
-FacilityShipping = Shipping
-FacilityShippingAndHandling = Shipping and Handling
-FacilitySpecialInstructions = Special Instructions
-FacilityWaitEntireOrderReady = Please wait until the entire order is ready before shipping.
-OrderAddCode = Add Code
-OrderAddNote = Add Note
-OrderAddToOrder = Add To Order
-OrderAddress = Address
-OrderAddOrderToShoppingList = Add Order Items to Shopping List
-OrderAdjustment = Adjustment
-OrderAdjustmentType = Adjustment Type
-OrderAdjustments = Adjustments
+FacilityShipments=Shipments
+FacilityShipping=Shipping
+FacilityShippingAndHandling=Shipping and Handling
+FacilitySpecialInstructions=Special Instructions
+FacilityWaitEntireOrderReady=Please wait until the entire order is ready before shipping.
+FormFieldTitle_billingAccountId=Billing Account Id
+FormFieldTitle_carrierPartyId=Carrier Party Id
+FormFieldTitle_carrierRoleTypeId=Carrier Role Type Id
+FormFieldTitle_cartons=Cartons
+FormFieldTitle_city=City
+FormFieldTitle_contactMechId=Contact Mech Id
+FormFieldTitle_countryGeoId=Country Geo Id
+FormFieldTitle_createdBy=Created By
+FormFieldTitle_createdByUserLogin=Created By User Login
+FormFieldTitle_createdDate=Created Date
+FormFieldTitle_currencyUom=Currency Uom
+FormFieldTitle_custRequestId=Cust Request Id
+FormFieldTitle_custRequestItemSeqId=Cust Request Item Seq Id
+FormFieldTitle_custRequestName=Cust Request Name
+FormFieldTitle_custRequestResolutionId=Cust Request Resolution Id
+FormFieldTitle_custRequestTypeId=Cust Request Type Id
+FormFieldTitle_deleteLink=Delete Link
+FormFieldTitle_deliverableId=Deliverable Id
+FormFieldTitle_entryDate=Entry Date
+FormFieldTitle_estimatedBudget=Estimated Budget
+FormFieldTitle_estimatedReadyDate=Estimated Ready Date
+FormFieldTitle_externalId=External Id
+FormFieldTitle_facilityId=Facility Id
+FormFieldTitle_firstAttemptOrderId=First Attempt Order Id
+FormFieldTitle_fixedAssetId=Fixed Asset Id
+FormFieldTitle_grandTotal=Grand Total
+FormFieldTitle_internalCode=Internal Code
+FormFieldTitle_isActive=Is Active
+FormFieldTitle_isPromo=Is Promo
+FormFieldTitle_isPublic=Is Public
+FormFieldTitle_isRushOrder=Is Rush Order
+FormFieldTitle_lastAdminModified=Last Admin Modified
+FormFieldTitle_lastModifiedByUserLogin=Last Modified By User Login
+FormFieldTitle_lastModifiedDate=Last Modified Date
+FormFieldTitle_lastOrderedDate=Last Ordered Date
+FormFieldTitle_listName=List Name
+FormFieldTitle_maximumAmount=Maximum Amount
+FormFieldTitle_needsInventoryIssuance=Needs Inventory Issuance
+FormFieldTitle_noteDateTime=Note Date Time
+FormFieldTitle_noteInfo=Note Info
+FormFieldTitle_orderDate=Order Date
+FormFieldTitle_orderHeaderId=Order Header Id
+FormFieldTitle_orderId=Order Id
+FormFieldTitle_orderStatusId=Order Status Id
+FormFieldTitle_orderTypeId=Order Type Id
+FormFieldTitle_ordersLink=Orders Link
+FormFieldTitle_originFacilityId=Origin Facility Id
+FormFieldTitle_parentShoppingListId=Parent Shopping List Id
+FormFieldTitle_partyId=Party Id
+FormFieldTitle_paymentMethodId=Payment Method Id
+FormFieldTitle_postalCode=Postal Code
+FormFieldTitle_priority=Priority
+FormFieldTitle_productFeatureId=Product Feature Id
+FormFieldTitle_productId=Product Id
+FormFieldTitle_productStoreId=Product Store Id
+FormFieldTitle_quoteId=Quote Id
+FormFieldTitle_reason=Reason
+FormFieldTitle_recurrenceInfoId=Recurrence Info Id
+FormFieldTitle_remainingSubTotal=Remaining Sub Total
+FormFieldTitle_remove=remove
+FormFieldTitle_requestsLink=Requests Link
+FormFieldTitle_requiredByDate=Required By Date
+FormFieldTitle_requirementId=Requirement Id
+FormFieldTitle_requirementTypeId=Requirement Type Id
+FormFieldTitle_responseRequiredDate=Response Required Date
+FormFieldTitle_roleTypeId=Role Type Id
+FormFieldTitle_salesChannelEnumId=Sales Channel Enum Id
+FormFieldTitle_selectedAmount=Selected Amount
+FormFieldTitle_sendCc=Send Cc
+FormFieldTitle_sendTo=Send To
+FormFieldTitle_shipAfterDate=Ship After Date
+FormFieldTitle_shipByDate=Ship By Date
+FormFieldTitle_shipmentMethodTypeId=Shipment Method Type Id
+FormFieldTitle_shoppingListId=Shopping List Id
+FormFieldTitle_shoppingListTypeId=Shopping List Type Id
+FormFieldTitle_skidsPallets=Skids Pallets
+FormFieldTitle_stateProvinceGeoId=State Province Geo Id
+FormFieldTitle_statusId=Status Id
+FormFieldTitle_story=Story
+FormFieldTitle_syncStatusId=Sync Status Id
+FormFieldTitle_terminalId=Terminal Id
+FormFieldTitle_totalCubicSize=Total Cubic Size
+FormFieldTitle_totalCubicUomId=Cubic Measurement
+FormFieldTitle_totalWeight=Total Weight
+FormFieldTitle_totalWeightUomId=Weight Measurement
+FormFieldTitle_transactionId=Transaction Id
+FormFieldTitle_unitsPieces=Units Pieces
+FormFieldTitle_useCase=Use Case
+FormFieldTitle_visitId=Visit Id
+FormFieldTitle_visitorId=Visitor Id
+FormFieldTitle_webSiteId=Web Site Id
+OrderAddCode=Add Code
+OrderAddNote=Add Note
+OrderAddOrderToShoppingList=Add Order Items to Shopping List
+OrderAddToOrder=Add To Order
+OrderAddress=Address
+OrderAdjustment=Adjustment
+OrderAdjustmentType=Adjustment Type
+OrderAdjustments=Adjustments
 OrderAgent=Order Agent
-OrderAllowSplit = Allow Split
+OrderAllowSplit=Allow Split
 OrderAmount=Amount
+OrderApproveOrder=Approve Order
+OrderApproveRequirements=Approve Requirements
 OrderApproved=Approved
-OrderApproveOrder = Approve Order
 OrderApprovedProductRequirements=Approved Product Requirements
-OrderApproveRequirements=Approve Requirements
 OrderAutoCreateQuoteAdjustments=Auto Create Adjustments
 OrderAvs=AVS
 OrderBackOrdered=Backordered
 OrderBackOrders=Backorders
-OrderBeSureIncludeOrder = Be sure to include your order
-OrderCancelAllItems = Cancel all Items
-OrderCancelled = Cancelled
-OrderCannotBeChanged = (cannot be changed without clearing order.)
+OrderBeSureIncludeOrder=Be sure to include your order
+OrderCancelAllItems=Cancel all Items
+OrderCancelled=Cancelled
+OrderCannotBeChanged=(cannot be changed without clearing order.)
 OrderCardSecurityCode=Card Security Code
-OrderCartTotal = Cart Total
-OrderChooseFacilityDifferentDefault = You may choose a facility instead of the default one
-OrderChooseFollowingForGift = You may also choose one of the following for your gift
-OrderClearOrder = Clear Order
-OrderCompanyName = OFBiz: Order Manager
-OrderCompanySubtitle = Part of the Open For Business Family of Open Source Software
+OrderCartTotal=Cart Total
+OrderChooseFacilityDifferentDefault=You may choose a facility instead of the default one
+OrderChooseFollowingForGift=You may also choose one of the following for your gift
+OrderClearOrder=Clear Order
+OrderCompanyName=OFBiz: Order Manager
+OrderCompanySubtitle=Part of the Open For Business Family of Open Source Software
+OrderCompleteOrder=Complete Order
 OrderCompleted=Completed
-OrderCompleteOrder = Complete Order
-OrderContactInformation = Contact Information
+OrderContactInformation=Contact Information
 OrderContainsBackOrders=Contains BackOrders
 OrderCopyCustRequestItem=Duplicate Request Item
 OrderCopyQuote=Duplicate Quote
 OrderCreateCustRequestFromCart=Create a Request For Quote
 OrderCreateCustRequestFromShoppingList=Create a Request For Quote
-OrderCreateNewReturn = Create new return
-OrderCreateOrder = Create Order
-OrderCreateOrderQuote = Create New Quote
+OrderCreateNewReturn=Create new return
+OrderCreateOrder=Create Order
+OrderCreateOrderQuote=Create New Quote
 OrderCreateOrderQuoteAdjustment=Create Manual Adjustment
-OrderCreateOrderQuoteAttribute = Create New Quote Attribute
-OrderCreateOrderQuoteCoefficient = Create New Quote Coefficient
-OrderCreateOrderQuoteItem = Create New Quote Item
-OrderCreateOrderQuoteRole = Create New Quote Role
+OrderCreateOrderQuoteAttribute=Create New Quote Attribute
+OrderCreateOrderQuoteCoefficient=Create New Quote Coefficient
+OrderCreateOrderQuoteItem=Create New Quote Item
+OrderCreateOrderQuoteRole=Create New Quote Role
 OrderCreateOrderQuoteWorkEfforts=Create Quote Work Efforts
 OrderCreateQuoteFromCart=Create New Quote From Cart
 OrderCreateQuoteFromShoppingList=Create New Quote
 OrderCreateQuoteWorkEffort=Create new Quote Workeffort
-OrderCreateReturn = Create return
-OrderCreatedBy = Created by
-OrderCurrentStatus = Current Status
-OrderCustomerPo = Custumer PO#
+OrderCreateReturn=Create return
+OrderCreatedBy=Created by
+OrderCurrentStatus=Current Status
+OrderCustomerPo=Custumer PO#
 OrderCustomerTaxId=Customer Tax ID
-OrderDate = Order Date
-OrderDateOrdered = Date Ordered
-OrderDesiredDeliveryDate = Desired Delivery Date
-OrderDestination = Destination
+OrderDate=Order Date
+OrderDateOrdered=Date Ordered
+OrderDesiredDeliveryDate=Desired Delivery Date
+OrderDestination=Destination
 OrderDoPromotions=Run Promotions
-OrderEditItems = Edit Items
-OrderEnteredPromoCodes = Entered Codes
-OrderEntryDate = Entry Date
+OrderEditItems=Edit Items
+OrderEditShipmentInfo=Edit Shipment Info
+OrderEnteredPromoCodes=Entered Codes
+OrderEntryDate=Entry Date
 OrderErrorFacilityHaveNoAdress=Error : the facility does not have addresses
 OrderExemptAmount=Exempt Amount
-OrderExternalId = External ID
-OrderFinalizeOrder = Finalize Order
-OrderFinalizeOrderDefault = Finalize Order With Default Options
-OrderFindOrder = Find Orders
-OrderFindReturn = Find Returns
-OrderFindRequests=Find Requests
+OrderExternalId=External ID
+OrderFilterOnInventoryProblems=Filter on inventory problems
+OrderFinalizeOrder=Finalize Order
+OrderFinalizeOrderDefault=Finalize Order With Default Options
+OrderFindOrder=Find Orders
 OrderFindQuote=Find Quote
-OrderGift = Gift?
-OrderGiftCard = Gift Card
-OrderGiftMessage = Gift Message
-OrderGiftWrapAllItems = Gift Wrap All Items?
-OrderGrandTotal = Grand Total
+OrderFindRequests=Find Requests
+OrderFindReturn=Find Returns
+OrderGift=Gift?
+OrderGiftCard=Gift Card
+OrderGiftMessage=Gift Message
+OrderGiftWrapAllItems=Gift Wrap All Items?
+OrderGrandTotal=Grand Total
 OrderGrossDollarAmountsIncludesAdjustmentsAndPendingOrders=Gross Dollar Amounts (includes adjustments and pending orders)
 OrderGrossItemsSoldIncludesPromotionsAndPendingOrders=Gross Items Sold (includes promotions and pending orders)
 OrderHold=Hold Order
-OrderImage = Image
-OrderInProduction = In Production
-OrderInProgress = In Progress
+OrderImage=Image
+OrderInProduction=In Production
+OrderInProgress=In Progress
 OrderInputQuickPurchaseOrder=Purchase Order Quick Entry
-OrderInternalCode = Internal Code
-OrderInternalNote = Internal Note
-OrderInternalNoteMessage = If yes is selected, this note doesn't appear on the print documents
-OrderInvoiced = Invoiced
-OrderInvoices = Invoices
-OrderIsThisGift = Is This a Gift?
-OrderIssuedToShipmentItem = Issued to Shipment Item
-OrderEditShipmentInfo = Edit Shipment Info
-OrderShipGroupSeqId = Ship Group Seq Id
+OrderInternalCode=Internal Code
+OrderInternalNote=Internal Note
+OrderInternalNoteMessage=If yes is selected, this note doesn't appear on the print documents
+OrderInvoiced=Invoiced
+OrderInvoices=Invoices
+OrderIsThisGift=Is This a Gift?
+OrderIssuedToShipmentItem=Issued to Shipment Item
 OrderIssuedWithoutShipment=Issued Without a Shipment (Immediate, Physical Store)
-OrderItemStatus = Item Status
-OrderItemTotal = Item Total
-OrderItemsBackOrdered = Items Backordered
-OrderItemsOrdered = Items Ordered
-OrderItemsReturned = Items Returned
-OrderItemsSubTotal = Items SubTotal
-OrderJurisdiction = Jurisdiction
+OrderItemStatus=Item Status
+OrderItemTotal=Item Total
+OrderItemsBackOrdered=Items Backordered
+OrderItemsOrdered=Items Ordered
+OrderItemsReturned=Items Returned
+OrderItemsSubTotal=Items SubTotal
+OrderJurisdiction=Jurisdiction
 OrderLinkedToOrderItem=Linked to order item
-OrderLinkedToRequirement=Linked to requirement
 OrderLinkedToQuote=Linked to quote
-OrderLookupOrder = Lookup Order(s)
-OrderLookupReturn = Lookup Return(s)
-OrderManagerApplication = Order Manager Application
+OrderLinkedToRequirement=Linked to requirement
+OrderLookupOrder=Lookup Order(s)
+OrderLookupReturn=Lookup Return(s)
+OrderMTD=MTD
+OrderManagerApplication=Order Manager Application
 OrderManualPromotions=Manual Promotions
 OrderMoreOptionsAvailable=More options available in drop down
-OrderMTD=MTD
-OrderNbr = #
+OrderNbr=#
+OrderNewDropShipmentForShipGroup=New Drop Shipment For Ship Group
 OrderNewQuantity=New quantity
-OrderNewQuote = New quote
-OrderNewQuoteAttribute = New Quote Attribute
-OrderNewQuoteItem = New Quote Item
-OrderNewReceipt = New Receipt
-OrderNewRequest = New Request
-OrderNewRequestItem = New Request Item
-OrderNewRequirement = New Requirement
-OrderNewShipment = New Shipment
-OrderNewDropShipmentForShipGroup = New Drop Shipment For Ship Group
-OrderNewShipmentForShipGroup = New Shipment For Ship Group
-OrderNoChannel = No Channel
-OrderNoGiftWrap = No Gift Wrap
-OrderNoNotes = No notes for this order
-OrderNoNotesForThisRequestItem = No Notes For This Request Item
+OrderNewQuote=New quote
+OrderNewQuoteAttribute=New Quote Attribute
+OrderNewQuoteItem=New Quote Item
+OrderNewReceipt=New Receipt
+OrderNewRequest=New Request
+OrderNewRequestItem=New Request Item
+OrderNewRequirement=New Requirement
+OrderNewShipment=New Shipment
+OrderNewShipmentForShipGroup=New Shipment For Ship Group
+OrderNoChannel=No Channel
+OrderNoGiftWrap=No Gift Wrap
+OrderNoNotes=No notes for this order
+OrderNoNotesForThisRequestItem=No Notes For This Request Item
 OrderNoOrderAdjustments=No adjustments on this order.
-OrderNoOrderFound = No Order Found
+OrderNoOrderFound=No Order Found
 OrderNoOrderFoundForParty=No orders found for partyId
-OrderNoOrderItemsToDisplay = No order items to display.
-OrderNoOrderPaymentPreferences = No payment preferences associated with this order.
+OrderNoOrderItemsToDisplay=No order items to display.
+OrderNoOrderPaymentPreferences=No payment preferences associated with this order.
 OrderNoPurchasePaymentMethod=No Purchase Payment Method Information Found.
 OrderNoPurchaseProduct=No Purchased Product Information Found.
 OrderNoPurchaseSpecified=No Purchase Order was specified
-OrderNoRequestFound = No Request Found
-OrderNoReturnFound = No return found.
-OrderNoReturnFoundWithId = No return found with return ID
+OrderNoQuoteFound=No Quote Found.
+OrderNoRequestFound=No Request Found
+OrderNoReturnFound=No return found.
+OrderNoReturnFoundWithId=No return found with return ID
 OrderNoReturnItemsFound=No item(s) in return.
-OrderNoRolesAssociatedRequest = No Roles Associated With This Customer Request
-OrderNoQuoteFound = No Quote Found.
-OrderNotPrintableNote = Internal Note (Not Printed)
-OrderNotShipped = Not Shipped
-OrderNotUsedForPurchase = Not Used For Purchase Orders
-OrderNotUsedForSales = Not Used For Sales Orders
-OrderNote = Note
-OrderNotes = Notes
-OrderNotesCreateNew = Create New
-OrderNotesForRequestItem = Notes For Request Item
+OrderNoRolesAssociatedRequest=No Roles Associated With This Customer Request
+OrderNotPrintableNote=Internal Note (Not Printed)
+OrderNotShipped=Not Shipped
+OrderNotUsedForPurchase=Not Used For Purchase Orders
+OrderNotUsedForSales=Not Used For Sales Orders
 OrderNotYetKnown=Not Yet Known
+OrderNote=Note
+OrderNotes=Notes
+OrderNotesCreateNew=Create New
+OrderNotesForRequestItem=Notes For Request Item
+OrderNotesPrivate=Make Private
+OrderNotesPublic=Make Public
 OrderNumberOfPersons=Number of persons
-OrderOfflineCheckMoney = Offline: Check/Money Order
-OrderOnOrder = On Order
-OrderOrder = Order
-OrderOrderBillFromParty = Bill From Party
-OrderOrderBillToParty = Bill To Party
-OrderOrderConfirmation = Order Confirmation
-OrderOrderDate = Order Date
-OrderOrdered = Ordered
-OrderOrderEntry = Order Entry
-OrderOrderEntryCurrencyAgreementShipDates = Enter Order Currency, Agreements, and Ship Dates
-OrderOrderEntryCustomerInfo = Order Entry Customer Info
-OrderOrderEntryOrderTerms = Order Entry Order Terms
-OrderOrderEntryPaymentSettings = Order Entry Payment Settings
-OrderOrderEntryShipToSettings = Order Entry Ship-To Settings
-OrderOrderEntryInternalOrganziation = Internal Organization
-OrderOrderFor = Order for
-OrderOrderFound = Order(s) Found
-OrderOrderHeaderInfo = Order Header Info
-OrderOrderId = Order Id
+OrderOfflineCheckMoney=Offline: Check/Money Order
+OrderOnOrder=On Order
+OrderOrder=Order
+OrderOrderBillFromParty=Bill From Party
+OrderOrderBillToParty=Bill To Party
+OrderOrderConfirmation=Order Confirmation
+OrderOrderDate=Order Date
+OrderOrderEntry=Order Entry
+OrderOrderEntryCurrencyAgreementShipDates=Enter Order Currency, Agreements, and Ship Dates
+OrderOrderEntryCustomerInfo=Order Entry Customer Info
+OrderOrderEntryInternalOrganziation=Internal Organization
+OrderOrderEntryOrderTerms=Order Entry Order Terms
+OrderOrderEntryPaymentSettings=Order Entry Payment Settings
+OrderOrderEntryShipToSettings=Order Entry Ship-To Settings
+OrderOrderFor=Order for
+OrderOrderFound=Order(s) Found
+OrderOrderHeaderInfo=Order Header Info
+OrderOrderId=Order Id
 OrderOrderInclude=Include
-OrderOrderItems = Order Items
-OrderOrderItemType = Item Type
-OrderOrderList = Order List
-OrderOrderManagerApplication = Order Manager Application
-OrderOrderName = Order Name
-OrderOrderNeedingAttention = Orders Needing Attention
-OrderOrderNumber = Order Number
-OrderOrderOptionSettings = Order Option Settings
-OrderOrderPurchaseToBeScheduled = Order Purchase To Be Scheluded
+OrderOrderItemType=Item Type
+OrderOrderItems=Order Items
+OrderOrderList=Order List
+OrderOrderManagerApplication=Order Manager Application
+OrderOrderName=Order Name
+OrderOrderNeedingAttention=Orders Needing Attention
+OrderOrderNumber=Order Number
+OrderOrderOptionSettings=Order Option Settings
+OrderOrderPurchaseToBeScheduled=Order Purchase To Be Scheluded
 OrderOrderQty=Order Qty
-OrderOrderQuote = Quote
+OrderOrderQuote=Quote
 OrderOrderQuoteAdjustmentId=OrderOrderQuoteAdjustmentId
-OrderOrderQuoteAdjustments=Adjustments
 OrderOrderQuoteAdjustmentType=OrderOrderQuoteAdjustmentType
-OrderOrderQuoteAttributeName = Attribute Name
-OrderOrderQuoteAttributeValue = Attribute Value
-OrderOrderQuoteAttributes = Quote Attributes
-OrderOrderQuoteAverageCost = Average Cost
-OrderOrderQuoteCoeffName = Coeff. Name
-OrderOrderQuoteCoeffValue = Coeff. Value
-OrderOrderQuoteCoefficients = Quote Coefficients
-OrderOrderQuoteCostToPrice = Cost to Price
-OrderOrderQuoteDefaultUnitPrice = Default Unit Price
-OrderOrderQuoteDeliverableTypeId = Deliverable Type Id
+OrderOrderQuoteAdjustments=Adjustments
+OrderOrderQuoteAttributeName=Attribute Name
+OrderOrderQuoteAttributeValue=Attribute Value
+OrderOrderQuoteAttributes=Quote Attributes
+OrderOrderQuoteAverageCost=Average Cost
+OrderOrderQuoteCoeffName=Coeff. Name
+OrderOrderQuoteCoeffValue=Coeff. Value
+OrderOrderQuoteCoefficients=Quote Coefficients
+OrderOrderQuoteCostToPrice=Cost to Price
+OrderOrderQuoteDefaultUnitPrice=Default Unit Price
+OrderOrderQuoteDeliverableTypeId=Deliverable Type Id
 OrderOrderQuoteEdit=Edit Quote
 OrderOrderQuoteEditAdjustments=Edit Quote Adjustments
 OrderOrderQuoteEditAttributes=Edit Quote Attributes
 OrderOrderQuoteEditCoefficients=Edit Quote Coefficients
-OrderOrderQuoteEditRoles=Edit Quote Roles
 OrderOrderQuoteEditItems=Edit Quote Items
 OrderOrderQuoteEditReportMail=Edit Quote Report Mail
+OrderOrderQuoteEditRoles=Edit Quote Roles
 OrderOrderQuoteEditWorkEfforts=Edit Quote Work Efforts
 OrderOrderQuoteEnterWorkEffortId=Enter existing WorkEffort Id below
 OrderOrderQuoteEnterWorkEffortIdNew=OR add new WorkEffort data below to create new entity (leave WorkEffort Id empty)
-OrderOrderQuoteEstimatedDeliveryDate = Estimated Delivery Date
-OrderOrderQuoteId = Quote Id
-OrderOrderQuoteIssueDate = Quote Issue Date
-OrderOrderQuoteItem = Quote Item
-OrderOrderQuoteItemSeqId = Quote Item Seq Id
-OrderOrderQuoteItems = Quote Items
+OrderOrderQuoteEstimatedDeliveryDate=Estimated Delivery Date
+OrderOrderQuoteId=Quote Id
+OrderOrderQuoteIssueDate=Quote Issue Date
+OrderOrderQuoteItem=Quote Item
+OrderOrderQuoteItemSeqId=Quote Item Seq Id
+OrderOrderQuoteItems=Quote Items
 OrderOrderQuoteListAdjustments=List Quote Adjustments
 OrderOrderQuoteListAttributes=List Quote Attributes
 OrderOrderQuoteListCoefficients=List Quote Coefficients
-OrderOrderQuoteListRoles=List Quote Roles
 OrderOrderQuoteListItems=List Quote Items
-OrderOrderQuoteManualUnitPrice = Manual Unit Price
-OrderOrderQuoteName = Quote Name
-OrderOrderQuotePercent = Quote Percent
+OrderOrderQuoteListRoles=List Quote Roles
+OrderOrderQuoteManualUnitPrice=Manual Unit Price
+OrderOrderQuoteName=Quote Name
 OrderOrderQuotePercProfit=OrderOrderQuotePercProfit
-OrderOrderQuotePrices = Quote Prices
+OrderOrderQuotePercent=Quote Percent
+OrderOrderQuotePrices=Quote Prices
 OrderOrderQuoteProfit=OrderOrderQuoteProfit
 OrderOrderQuoteReport=Quote Report
-OrderOrderQuoteRoles = Quote Roles
-OrderOrderQuoteSkillTypeId = Quote Skill Type Id
-OrderOrderQuoteTypeId = Quote Type Id
-OrderOrderQuoteUnitPrice = Quote Unit Price
+OrderOrderQuoteRoles=Quote Roles
+OrderOrderQuoteSkillTypeId=Quote Skill Type Id
+OrderOrderQuoteTypeId=Quote Type Id
+OrderOrderQuoteUnitPrice=Quote Unit Price
 OrderOrderQuoteViewProfit=View Quote Profit
-OrderOrderQuoteViewRequest = View Request
-OrderOrderQuoteWorkEffortId = QuoteWorkEffortId
+OrderOrderQuoteViewRequest=View Request
+OrderOrderQuoteWorkEffortId=QuoteWorkEffortId
 OrderOrderQuoteWorkEfforts=Quote Work Efforts
-OrderOrderQuotes = Quotes
-OrderOrderQuoteuomId = Quote Uom Id
-OrderOrderReturn = Return
-OrderOrderReturns = Returns
+OrderOrderQuotes=Quotes
+OrderOrderQuoteuomId=Quote Uom Id
+OrderOrderReturn=Return
+OrderOrderReturns=Returns
+OrderOrderShortcuts=Shortcuts
+OrderOrderStatisticsPage=Order Statistics Page
+OrderOrderTasks=Order Tasks
+OrderOrderTermDays=Term Days
+OrderOrderTermType=Term Type
+OrderOrderTermValue=Term Value
+OrderOrderTerms=Order Terms
+OrderOrderTotal=Order Total
+OrderOrderType=Order Type
+OrderOrdered=Ordered
 OrderOrdersItemCounts=Orders Item Counts
-OrderOrderShortcuts = Shortcuts
 OrderOrdersPending=Orders Pending
-OrderOrderStatisticsPage=Order Statistics Page
 OrderOrdersTotals=Orders Totals
-OrderOrderTasks = Order Tasks
-OrderOrderTermDays = Term Days
-OrderOrderTermType = Term Type
-OrderOrderTermValue = Term Value
-OrderOrderTerms = Order Terms
-OrderOrderTotal = Order Total
-OrderOrderType = Order Type
-OrderOriginFacility = Origin Facility
-OrderOtherOrders = Other Orders
-OrderOutstanding = Outstanding
+OrderOriginFacility=Origin Facility
+OrderOtherOrders=Other Orders
+OrderOutstanding=Outstanding
 OrderOverridePrice=Override Price
-OrderPONumber = PO Number
+OrderPONumber=PO Number
 OrderPackShipmentForShipGroup=Pack Shipment For Ship Group
 OrderPaidDollarAmountsIncludesAdjustments=Paid Dollar Amounts (includes adjustments)
 OrderPaidItemsSoldIncludesPromotions=Paid Items Sold (includes promotions)
-OrderPartyNameNotFound=Name Not Found
 OrderPartyDontWish=I do not wish to add additional parties.
+OrderPartyNameNotFound=Name Not Found
 OrderPartySelectRoleForParty=Select Role For Party
-OrderPaymentOfflineCheckMoney = Offline Payment: Check/Money Order
+OrderPaymentMaximumAmount=Max Amount
+OrderPaymentOfflineCheckMoney=Offline Payment: Check/Money Order
 OrderPaymentType=Payment Type
-OrderPaymentMaximumAmount =Max Amount
 OrderPendingPaymentDollarAmountsIncludesAdjustments=Pending Payment Dollar Amounts (includes adjustments)
 OrderPendingPaymentItemsSoldIncludesPromotions=Pending Payment Items Sold (includes promotions)
 OrderPickOrders=Pick Orders
 OrderPlannedInReceive=Received quantity
 OrderPlannedInShipment=Planned in Shipment
 OrderPlannedRejected=Rejected quantity
-OrderPrice = Price
-OrderPrintableNote = Public Note (Printed)
-OrderProcessingStatus=Processing Status
-OrderProcessingTransitions=Processing Transitions
+OrderPrice=Price
+OrderPrintableNote=Public Note (Printed)
 OrderProcessingInActive=This order is currently in a 'Active' state.
 OrderProcessingInHold=This order is currently in a 'Hold' state. The activity has been suspended.
 OrderProcessingInHoldNote=** Note: If this state is a result of an automated activity, releasing may not have an effect until all conditions are met.
-OrderProductStore = Product Store
-OrderPromotionCouponCodes = Promotion/Coupon Codes
-OrderPurchasedFrom = Purchased From
-OrderPurchaseOrder = Purchase Order
+OrderProcessingStatus=Processing Status
+OrderProcessingTransitions=Processing Transitions
+OrderProductStore=Product Store
+OrderPromotionCouponCodes=Promotion/Coupon Codes
+OrderPurchaseOrder=Purchase Order
 OrderPurchaseReportOptions=Order Purchase Report Options
+OrderPurchasedFrom=Purchased From
 OrderQty=Qty
-OrderQuantity = Quantity
+OrderQuantity=Quantity
 OrderQuantityCancelled=Qty Cncld
-OrderQuantitySold=Qty Sold
 OrderQuantityPurchase=Qty Purch
-OrderQuantityUom = Unity of measure
+OrderQuantitySold=Qty Sold
+OrderQuantityUom=Unity of measure
 OrderQuickAddOrderItem=Order Item Quick Add
 OrderQuickFinalizeOrder=Quick Finalize Order
 OrderQuickLookup=Quick Lookup
-OrderQuickReceivePurchaseOrder = Quick Receive Purchase Order
-OrderQuickRefundEntireOrder = Quick Refund Entire Order
-OrderQuickShipEntireOrder = Quick Ship Entire Order
+OrderQuickReceivePurchaseOrder=Quick Receive Purchase Order
+OrderQuickRefundEntireOrder=Quick Refund Entire Order
+OrderQuickShipEntireOrder=Quick Ship Entire Order
 OrderRate=Rate
-OrderRecalculateOrder = Recalculate Order
+OrderRecalculateOrder=Recalculate Order
 OrderReceiptInformation=Receipt Information
-OrderReceivedInOtherReceive=On Other Delivery Order
 OrderReceiveOfflinePayments=Receive Offline Payment(s)
-OrderReceiveReturn = Receive Return
+OrderReceiveReturn=Receive Return
+OrderReceivedInOtherReceive=On Other Delivery Order
 OrderReference=Reference
 OrderRejected=Rejected
 OrderRelease=Release Hold
-OrderRemaining = Remaining
-OrderRemainingSubTotal = Remaining SubTotal
+OrderRemaining=Remaining
+OrderRemainingSubTotal=Remaining SubTotal
 OrderRemoveSelected=Remove Selected
-OrderReports=Order Reports
 OrderReportOpenOrderItems=Open Order Items Report
 OrderReportPurchasesByOrganization=Purchases by Organization Report
 OrderReportPurchasesByPaymentMethod=Purchases by Payment Method Report
 OrderReportPurchasesByProduct=Purchases by Product Report
 OrderReportSalesByStore=Sales by Store Report
-OrderRequest = Request
+OrderReports=Order Reports
+OrderRequest=Request
 OrderRequestCreatedDate=Created Date
 OrderRequestDate=Request Date
 OrderRequestItem=Request Item
-OrderRequestItems = Request Items
+OrderRequestItems=Request Items
 OrderRequestLastModifiedDate=Last Modified Date
-OrderRequestList = Request List
-OrderRequestManager = Request Manager
+OrderRequestList=Request List
+OrderRequestManager=Request Manager
 OrderRequestMaximumAmount=Maximum Amount
-OrderRequestName = Request Name
-OrderRequestRoles = Request Roles
-OrderRequestTaker = Request Taker
-OrderRequestingParty = Requesting Party
-OrderRequests = Requests
-OrderRequiredForSO = Required for SO
-OrderRequirement = Requirement
-OrderRequirementByDate = Manufacturing Requirement By Date
-OrderRequirementId = RequirementId
-OrderRequirementStartDate = Manufacturing Requirement Start Date
-OrderRequirements = Requirements
-OrderRequirementsForRequestItem = Requirements For Request Item
+OrderRequestName=Request Name
+OrderRequestRoles=Request Roles
+OrderRequestTaker=Request Taker
+OrderRequestingParty=Requesting Party
+OrderRequests=Requests
+OrderRequiredForSO=Required for SO
+OrderRequirement=Requirement
+OrderRequirementByDate=Manufacturing Requirement By Date
+OrderRequirementId=RequirementId
+OrderRequirementStartDate=Manufacturing Requirement Start Date
 OrderRequirementStatusId=Order Requirement Status Id
+OrderRequirements=Requirements
+OrderRequirementsForRequestItem=Requirements For Request Item
 OrderReturnAccept=Accept Return
 OrderReturnAdjustments=Return Order Adjustment(s) From Order
 OrderReturnCreate=Create Return
-OrderReturnFound = Return(s) Found
-OrderReturnFromAddress = Return From Address
+OrderReturnDestinationFacility=Destination Facility
+OrderReturnFound=Return(s) Found
+OrderReturnFromAddress=Return From Address
 OrderReturnFromOrder=Return Item(s) From Order
-OrderReturnFromParty = Return From Party
-OrderReturnDestinationFacility = Destination Facility
-OrderReturnHeader = Return Header
-OrderReturnId = Return ID
-OrderReturnItems = Return Items
-OrderReturnItemInventoryStatus = Inventory Status
+OrderReturnFromParty=Return From Party
+OrderReturnHeader=Return Header
+OrderReturnId=Return ID
+OrderReturnItemInventoryStatus=Inventory Status
+OrderReturnItems=Return Items
 OrderReturnLoadItems=Load order items for return
 OrderReturnManualAdjustment=Manual Return Adjustment For Order
 OrderReturnNeedsAutoReceive=Needs Auto-Receive (On ACCEPT)
 OrderReturnNoReturnableItems=No returnable items found for order
 OrderReturnPrice=Return Price
 OrderReturnPriceNotIncludeTax=Price not includes tax & adjustments
-OrderReturnReason=Return Reason
+OrderReturnQty=Return Qty
+OrderReturnReason=Reason
 OrderReturnReceive=Receive Return
+OrderReturnResponse=Response
 OrderReturnSelectedItems=Return Selected Item(s)
 OrderReturnShipFromAddress=Please select a ship from address
-OrderReturnType=Return Type
-OrderReturnToAddress = Return To Address
-OrderReturnToFacility = Return To Facility
-OrderReturnTotal = Return Total
-OrderReturned = Returned
-OrderReturnQty=Return Qty
-OrderReturnReason = Reason
-OrderReturnResponse = Response
 OrderReturnSummary=Return Summary
-OrderReturnType = Type
-OrderReviewOrder = Review Order
+OrderReturnToAddress=Return To Address
+OrderReturnToFacility=Return To Facility
+OrderReturnTotal=Return Total
+OrderReturnType=Type
+OrderReturned=Returned
+OrderReviewOrder=Review Order
 OrderRunAction=Run Action
 OrderRunStorePromotions=OrderRunStorePromotions
-OrderSalesChannel = Sales Channel
-OrderSalesOrder = Sales Order
-OrderSalesTax = Sales Tax
-OrderStatusChanges=Status Changes
-OrderScheduleDelivery = Schedule Delivery
+OrderSalesChannel=Sales Channel
+OrderSalesOrder=Sales Order
+OrderSalesTax=Sales Tax
+OrderScheduleDelivery=Schedule Delivery
 OrderScore=Score
-OrderSelectAgreement = Select an agreement for this order
-OrderSelectCurrency = Set a currency for this order
-OrderSelectCurrencyOr = Or set a currency for this order
-OrderSelectPartyToOrder = Select type of party to associate to order
-OrderSelectedGiftNotAvailableForAll = Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged.
-OrderSendEmail = Send Email
-OrderShipAfterDate = Ship After Date
-OrderShipAfterDateDefault = Default Ship After Date
-OrderShipBeforeDate = Ship Before Date
-OrderShipBeforeDateDefault = Default Ship Before Date
-OrderShipGroup = Ship Group
-OrderShipGroups = Ship Groups
-OrderShipRequest = Ship Request
-OrderShipmentInformation = Shipment Information
+OrderSecurityErrorToRunUpdateOrderNote=Error in toggling notes to Private/Public
+OrderSelectAgreement=Select an agreement for this order
+OrderSelectCurrency=Set a currency for this order
+OrderSelectCurrencyOr=Or set a currency for this order
+OrderSelectPartyToOrder=Select type of party to associate to order
+OrderSelectedGiftNotAvailableForAll=Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged.
+OrderSendConfirmationEmail=Send a confirmation email
+OrderSendConfirmationEmailBCCTo=BCC To
+OrderSendConfirmationEmailBody=Body
+OrderSendConfirmationEmailCCTo=CC To
+OrderSendConfirmationEmailContentType=Content-Type
+OrderSendConfirmationEmailNote=Note
+OrderSendConfirmationEmailSendTo=Send To
+OrderSendConfirmationEmailSubject=Subject
+OrderSendEmail=Send Email
+OrderShipAfterDate=Ship After Date
+OrderShipAfterDateDefault=Default Ship After Date
+OrderShipBeforeDate=Ship Before Date
+OrderShipBeforeDateDefault=Default Ship Before Date
+OrderShipGroup=Ship Group
+OrderShipGroupSeqId=Ship Group Seq Id
+OrderShipGroups=Ship Groups
+OrderShipRequest=Ship Request
 OrderShipToAnotherParty=Ship to Another Party
-OrderShortfalled = Shortfalled
-OrderShowAllNotes = Show All Notes
-OrderShowThisItemsNotes = Show This Item's Notes
-OrderSplittingPreference = Splitting Preference
-OrderStartDateTime = Start Date/Time
-OrderStatusHistory = Status History
-OrderStockEventPlanned = Stock event planned
-OrderSubTotal = Sub Total
+OrderShipmentInformation=Shipment Information
+OrderShortfalled=Shortfalled
+OrderShowAllNotes=Show All Notes
+OrderShowThisItemsNotes=Show This Item's Notes
+OrderSplittingPreference=Splitting Preference
+OrderStartDateTime=Start Date/Time
+OrderStatusChanges=Status Changes
+OrderStatusHistory=Status History
+OrderStockEventPlanned=Stock event planned
+OrderSubTotal=Sub Total
 OrderSupplierData=Supplier Data
 OrderSupplierFinancialData=Supplier Financial Data
-OrderSurvey = Survey
-OrderThisOrderGift = This order is a gift
-OrderThisOrderNotGift = This order is not a gift
-OrderTotalDue = Total Due
-OrderTotalOtherOrderAdjustments = Total Other Order Adjustments
-OrderTotalQuantityAccepted= Total quantity accepted
-OrderTotalQuantityRejected = Total quantity rejected
-OrderTotalQuantityReceive = Total quantity received
-OrderTotalQuantityOrdered = Total quantity ordered
-OrderTotalQuantityNotReceived = Total quantity not received
-OrderTotalSalesTax = Total Sales Tax
-OrderTotalShippingAndHandling = Total Shipping and Handling
+OrderSurvey=Survey
+OrderThisOrderGift=This order is a gift
+OrderThisOrderNotGift=This order is not a gift
+OrderTotalDue=Total Due
+OrderTotalOtherOrderAdjustments=Total Other Order Adjustments
+OrderTotalQuantityAccepted=Total quantity accepted
+OrderTotalQuantityNotReceived=Total quantity not received
+OrderTotalQuantityOrdered=Total quantity ordered
+OrderTotalQuantityReceive=Total quantity received
+OrderTotalQuantityRejected=Total quantity rejected
+OrderTotalSalesTax=Total Sales Tax
+OrderTotalShippingAndHandling=Total Shipping and Handling
 OrderTrackingCode=Tracking Code
-OrderTrackingNumber = Tracking Number
-OrderUnitList = Unit / List
-OrderUnitPrice = Unit Price
-OrderUpdateItems = Update Items
-OrderUnplanned = Unplanned
-OrderUseDefaultComment = Use as default comment for next entry
-OrderUseDefaultDesiredDeliveryDate = Use as default desired delivery date for next entry
-OrderValueSold=Value Sold
+OrderTrackingNumber=Tracking Number
+OrderUnitList=Unit / List
+OrderUnitPrice=Unit Price
+OrderUnplanned=Unplanned
+OrderUpdateItems=Update Items
+OrderUseDefaultComment=Use as default comment for next entry
+OrderUseDefaultDesiredDeliveryDate=Use as default desired delivery date for next entry
 OrderValuePurchase=Value Purch
-OrderViewEditDeliveryScheduleInfo = View/Edit Delivery Schedule Info
-OrderViewImage = View Image
-OrderViewOrder = View Order
-OrderViewPermissionError = You do not have permission to view this page.
+OrderValueSold=Value Sold
+OrderViewEditDeliveryScheduleInfo=View/Edit Delivery Schedule Info
+OrderViewImage=View Image
+OrderViewOrder=View Order
+OrderViewPermissionError=You do not have permission to view this page.
 OrderViewQuote=View Quote
 OrderViewQuoteProfit=Profit
 OrderViewRequest=View Request
+OrderWTD=WTD
 OrderWaitingApproval=Waiting Approval
 OrderWaitingCompletion=Waiting Completion
 OrderWaitingPayment=Waiting Payment
 OrderWithPromoCode=with Code
-OrderWTD=WTD
-OrderWorkflow = Workflow
+OrderWorkflow=Workflow
 OrderYTD=YTD
-PageTitleLogin = Login
+OrderfilterAuthProblems=Authorization Problems
+OrderfilterInventoryProblems=Inventory Problems
+PageTitleCreateQuoteForCustRequest=Create a new Quote and QuoteItem for a CustRequest
+PageTitleEditQuoteItemForCustRequest=Edit a QuoteItem For a CustRequest
+PageTitleEditRequestItem=Edit a Request Item
+PageTitleEditRequestItemWorkEffort=Edit a Request Item WorkEffort
+PageTitleEditRequirement=Edit Requirement
+PageTitleFindQuickReturn=Quick Return
+PageTitleFindReturn=Find Return
+PageTitleListRequirementCustRequests=List Requirement Cust Requests
+PageTitleListRequirementOrders=List Requirement Orders
+PageTitleLogin=Login
 PageTitleLookupCustomerRequest=Lookup Customer Request
 PageTitleLookupCustomerRequestItem=Lookup Customer Request Item
 PageTitleLookupOrderHeader=Lookup Order Header
 PageTitleLookupOrderHeaderAndShipInfo=Lookup Order Header and Ship Info
 PageTitleLookupPurchaseOrderHeaderAndShipInfo=Lookup Purchase Order Header and Ship Info
-PageTitleLookupRequirement=Lookup Requirement
 PageTitleLookupQuote=Lookup Quote
 PageTitleLookupQuoteItem=Lookup Quote Item
+PageTitleLookupRequirement=Lookup Requirement
 PageTitleLookupShoppingList=Lookup Shopping List
 PageTitleOrderAgreements=Order Agreements
 PageTitleOrderInits=Order Initis
 PageTitleOrderShowCart=Show Cart
-PageTitleCreateQuoteForCustRequest=Create a new Quote and QuoteItem for a CustRequest
-PageTitleEditRequirement=Edit Requirement
-PageTitleEditRequestItem=Edit a Request Item
-PageTitleEditRequestItemWorkEffort=Edit a Request Item WorkEffort
-PageTitleEditQuoteItemForCustRequest=Edit a QuoteItem For a CustRequest
-PageTitleFindReturn=Find Return
-PageTitleFindQuickReturn=Quick Return
-PageTitleListRequirementCustRequests=List Requirement Cust Requests
-PageTitleListRequirementOrders=List Requirement Orders
-PageTitleReturnHeader=Return Header
-PageTitleReturnList=Return List
-PageTitleReturnItems=Return Items
 PageTitleRequestItemNotes=Request Item Notes
 PageTitleRequestItemQuotes=Request Item Quotes
 PageTitleRequestItemRequirements=Request Item Requirements
 PageTitleRequestItems=Request Items
 PageTitleRequestRoles=Request Roles
+PageTitleReturnHeader=Return Header
+PageTitleReturnItems=Return Items
+PageTitleReturnList=Return List
 PageTitleViewRequest=View Request
-calendar_click_here_for_calendar = Click here For Calendar
-cart.addToCart.noProductInfoPassed = No product information passed, not adding anything to cart.
-cart.addToCart.productConfigurationIsNotValid = Configuration Is Not Valid
-cart.add_category_defaults = Added ${totalQuantity} items to the cart.
-cart.agreement_not_specified_to_add_from = No agreement specified to add from.
-cart.category_not_specified_to_add_from = No category specified to add from.
-cart.could_not_add_product_to_cart = Could NOT add product ${productId} to cart.
-cart.could_not_get_agreement = Could not get agreement through ${agreementId} {read error}: ${message}.
-cart.could_not_get_products_in_category = Could not get products in category ${categorieId} to add to cart {read error}.
-cart.could_not_get_products_in_category_cart = Could not get products in category ${categorieId} to add to cart {read error}: ${message}.
-cart.order_not_specified_to_add_from = No order specified to add from
-cart.price_not_positive_number = Price must be a positive number
-cart.product_not_valid_for_supplier = This product cannot be purchased from the chosen supplier for the given quantity and currency.
-cart.quantity_not_positive_number = Quantity must be a positive number
-checkevents.cannot_cancel_item = Cannot cancel item at this time; please try again.
-checkevents.cart_empty = Cart is empty.
-checkevents.insufficient_credit_available_on_account = Insufficient credit available on accounts.
-checkevents.invalid_amount_set_for_billing_account = Invalid amount set for Billing Account #${billingAccountId}.
-checkevents.invalid_amount_set_for_payment_method = Invalid amount set for Payment method.
-checkevents.not_enough_available_on_account = Not enough available on account #{billingAccountId}.
-checkevents.payment_not_cover_this_order = Selected payment methods will not cover this order.
-checkhelper.could_not_create_order_invoking_service = ERROR: Could not create order (problem invoking the service: ${service})
-checkhelper.could_not_create_order_parsing_totals = ERROR: Could not create order (problem parsing order totals).
-checkhelper.database_error = Database error.
-checkhelper.did_not_complete_order_following_occurred = Did not complete the order, the following occurred:
-checkhelper.enter_amount_to_place_on_gift_card = Please enter the amount to place on your gift card.
-checkhelper.enter_gift_card_number = Please enter your gift card number.
-checkhelper.enter_gift_card_pin_number = Please enter your gift card pin number.
-checkhelper.enter_shipping_address = Please enter a shipping address.
-checkhelper.gift_card_does_not_exist = This gift card does not exist.
-checkhelper.gift_card_has_no_value = This gift card no longer has any value.
-checkhelper.insufficient_credit_available_on_account = Insufficient credit available on account.
-checkhelper.invalid_amount_for_gift_card = Invalid amount for gift card entered.
-checkhelper.no_items_in_cart = There are no items in the cart.
-checkhelper.problem_with_gift_card_information = Problem with gift card information.
-checkhelper.problems_getting_order_header = Problems getting order header. Cannot check external gateways!
-checkhelper.problems_getting_payment_preference = Problems getting payment preference. Cannot check external gateways!
-checkhelper.problems_parsing_amount = Problems parsing amount.
-checkhelper.problems_reading_database = Problems reading the database, please try again.
-checkhelper.select_method_of_payment = Please select a method of payment.
-checkhelper.select_shipping_destination = Please Select a Shipping Destination.
-checkhelper.select_shipping_method = Please Select a Shipping Method.
-checkhelper.select_splitting_preference = Please Select a Splitting Preference.
-checkhelper.specify_if_order_is_gift = Please Specify Whether or Not This Order is a Gift.
-checkhelper.specify_if_shipAfterDate_is_date = Please specify ship after date as a date.
-checkhelper.specify_if_shipBeforeDate_is_date = Please specify a ship before date as a date.
-checkhelper.totals_do_not_match_order_total = Totals do not match order total.
-checkhelper_sales_order_lines_lookup_failed = ERROR: Sales Order Lines lookup failed.
-checkhelpertotalsdonotmatchordertotal = Totals do not match order total.
-help_also_interested_in = You might also be interested in :
-item.product_not_found = Product not found, not adding to cart. [productId: ${productId}]
-item.cannot_add_product_virtual=Tried to add the Virtual Product ${productName} (productId: ${productId}) to the cart, not adding.
+calendar_click_here_for_calendar=Click here For Calendar
+cart.addToCart.noProductInfoPassed=No product information passed, not adding anything to cart.
+cart.addToCart.productConfigurationIsNotValid=Configuration Is Not Valid
+cart.add_category_defaults=Added ${totalQuantity} items to the cart.
+cart.agreement_not_specified_to_add_from=No agreement specified to add from.
+cart.category_not_specified_to_add_from=No category specified to add from.
+cart.could_not_add_product_to_cart=Could NOT add product ${productId} to cart.
+cart.could_not_get_agreement=Could not get agreement through ${agreementId} {read error}: ${message}.
+cart.could_not_get_products_in_category=Could not get products in category ${categorieId} to add to cart {read error}.
+cart.could_not_get_products_in_category_cart=Could not get products in category ${categorieId} to add to cart {read error}: ${message}.
+cart.order_not_specified_to_add_from=No order specified to add from
+cart.price_not_positive_number=Price must be a positive number
+cart.product_not_valid_for_supplier=This product cannot be purchased from the chosen supplier for the given quantity and currency.
+cart.quantity_not_positive_number=Quantity must be a positive number
+checkevents.cannot_cancel_item=Cannot cancel item at this time; please try again.
+checkevents.cart_empty=Cart is empty.
+checkevents.insufficient_credit_available_on_account=Insufficient credit available on accounts.
+checkevents.invalid_amount_set_for_billing_account=Invalid amount set for Billing Account #${billingAccountId}.
+checkevents.invalid_amount_set_for_payment_method=Invalid amount set for Payment method.
+checkevents.not_enough_available_on_account=Not enough available on account #{billingAccountId}.
+checkevents.payment_not_cover_this_order=Selected payment methods will not cover this order.
+checkhelper.could_not_create_order_invoking_service=ERROR: Could not create order (problem invoking the service: ${service})
+checkhelper.could_not_create_order_parsing_totals=ERROR: Could not create order (problem parsing order totals).
+checkhelper.database_error=Database error.
+checkhelper.did_not_complete_order_following_occurred=Did not complete the order, the following occurred:
+checkhelper.enter_amount_to_place_on_gift_card=Please enter the amount to place on your gift card.
+checkhelper.enter_gift_card_number=Please enter your gift card number.
+checkhelper.enter_gift_card_pin_number=Please enter your gift card pin number.
+checkhelper.enter_shipping_address=Please enter a shipping address.
+checkhelper.gift_card_does_not_exist=This gift card does not exist.
+checkhelper.gift_card_has_no_value=This gift card no longer has any value.
+checkhelper.insufficient_credit_available_on_account=Insufficient credit available on account.
+checkhelper.invalid_amount_for_gift_card=Invalid amount for gift card entered.
+checkhelper.no_items_in_cart=There are no items in the cart.
+checkhelper.problem_with_gift_card_information=Problem with gift card information.
+checkhelper.problems_getting_order_header=Problems getting order header. Cannot check external gateways!
+checkhelper.problems_getting_payment_preference=Problems getting payment preference. Cannot check external gateways!
+checkhelper.problems_parsing_amount=Problems parsing amount.
+checkhelper.problems_reading_database=Problems reading the database, please try again.
+checkhelper.select_method_of_payment=Please select a method of payment.
+checkhelper.select_shipping_destination=Please Select a Shipping Destination.
+checkhelper.select_shipping_method=Please Select a Shipping Method.
+checkhelper.select_splitting_preference=Please Select a Splitting Preference.
+checkhelper.specify_if_order_is_gift=Please Specify Whether or Not This Order is a Gift.
+checkhelper.specify_if_shipAfterDate_is_date=Please specify ship after date as a date.
+checkhelper.specify_if_shipBeforeDate_is_date=Please specify a ship before date as a date.
+checkhelper.totals_do_not_match_order_total=Totals do not match order total.
+checkhelper_sales_order_lines_lookup_failed=ERROR: Sales Order Lines lookup failed.
+checkhelpertotalsdonotmatchordertotal=Totals do not match order total.
+fixed_asset_product_not_found=Could not find a related rental fixed asset for the product with ID [{0}], cannot be rented.
+help_also_interested_in=You might also be interested in :
+item.availableOk=OK
+item.availableQnt=Quantity requested: ${quantityReq} Quantity available: ${quantityAvail}
+item.cannot_add_product_no_longer_available=Tried to add the Product ${productName} (productId: ${productId}) to the cart. This product is no longer available for sale, so not adding.
 item.cannot_add_product_not_configured_correctly=Tried to add the Product ${productName} (productId: ${productId}) to the cart, not adding: the product is not configured correctly.
 item.cannot_add_product_not_yet_available=Tried to add the Product ${productName} (productId: ${productId}) to the cart. This product has not yet been made available for sale, so not adding.
-item.cannot_add_product_no_longer_available=Tried to add the Product ${productName} (productId: ${productId}) to the cart. This product is no longer available for sale, so not adding.
-item.missing_reservation_starting_date=The starting date of the reservation is missing....
-item.reservation_from_tomorrow=You can only make reservation starting tomorrow....
-item.number_of_days=Please enter a number of days, 1, or more....
-item.maximum_number_of_person_renting=The maximum number of persons renting this object is ${reservMaxPersons} however you have requested: ${reservPersons} !
-item.product_not_available=Product not available, ProductId: ${productId} message: ${availableMessage}
+item.cannot_add_product_virtual=Tried to add the Virtual Product ${productName} (productId: ${productId}) to the cart, not adding.
 item.cannot_find_Fixed_Asset=Could not find a related Fixed Asset for the product: ${productId}
 item.fixed_Asset_not_found=fixed_Asset_not_found. Fixed AssetId: ${fixedAssetId}
-item.availableOk=OK
-item.availableQnt=Quantity requested: ${quantityReq} Quantity available: ${quantityAvail}
+item.maximum_number_of_person_renting=The maximum number of persons renting this object is ${reservMaxPersons} however you have requested: ${reservPersons} !
+item.missing_reservation_starting_date=The starting date of the reservation is missing....
 item.notAvailable=I am sorry, not available at these dates: ${resultMessage} item not added to the shopping cart.....
-shoppinglistevents.added_product_to_cart = Added product ${productId} to cart.
-shoppinglistevents.cannot_create_new_shopping_list = Cannot create new shopping list.
-shoppinglistevents.choose_shopping_list = Please choose a shopping list.
-shoppinglistevents.error_adding_item_to_shopping_list = Error adding item to shopping list.
-shoppinglistevents.error_getting_shopping_list_and_items = Error getting shopping list and items.
-shoppinglistevents.no_items_added = No items were added.
-shoppinglistevents.problem_adding_product_to_cart = Could NOT add product ${productId} to cart.
-shoppinglistevents.select_items_to_add_to_list = Please select item(s) to add to the shopping list.
-shoppinglistevents.shoppingListId_is_required_parameter = shoppingListId is a required parameter.
-
-OrderSendConfirmationEmail=Send a confirmation email
-OrderSendConfirmationEmailSendTo=Send To
-OrderSendConfirmationEmailCCTo=CC To
-OrderSendConfirmationEmailSubject=Subject
-OrderSendConfirmationEmailNote=Note
-OrderSendConfirmationEmailBCCTo=BCC To
-OrderSendConfirmationEmailBody=Body
-OrderSendConfirmationEmailContentType=Content-Type
-
-OrderNotesPrivate = Make Private
-OrderNotesPublic = Make Public
-OrderSecurityErrorToRunUpdateOrderNote = Error in toggling notes to Private/Public
-
+item.number_of_days=Please enter a number of days, 1, or more....
+item.product_not_available=Product not available, ProductId: ${productId} message: ${availableMessage}
+item.product_not_found=Product not found, not adding to cart. [productId: ${productId}]
+item.reservation_from_tomorrow=You can only make reservation starting tomorrow....
 # ========================================
 # org.ofbiz.order.order messages
 # ========================================
-
 items.none=ERROR: There are no items to order
-
+# 0=productName, 1=productId
+product.no_longer_for_sale=Tried to order the Product {0} (productId: {1}). This product is no longer available for sale. Please remove from your order.
 # 0=productId
 product.not_found=Could not find the product with ID [{0}], cannot be purchased.
-fixed_asset_product_not_found=Could not find a related rental fixed asset for the product with ID [{0}], cannot be rented.
-
 # 0=productName, 1=productId
 product.not_yet_for_sale=Tried to order the Product {0} (productId: {1}). This product has not yet been made available for sale. Please remove from your order.
-
-# 0=productName, 1=productId
-product.no_longer_for_sale=Tried to order the Product {0} (productId: {1}). This product is no longer available for sale. Please remove from your order.
-
 # 0=productName, 1=productId
 product.out_of_stock=The product {0} with ID {1} is no longer in stock. Please try reducing the quantity or removing the product from this order.
-
-FormFieldTitle_orderId=Order Id
-FormFieldTitle_orderTypeId=Order Type Id
-FormFieldTitle_externalId=External Id
-FormFieldTitle_salesChannelEnumId=Sales Channel Enum Id
-FormFieldTitle_orderDate=Order Date
-FormFieldTitle_entryDate=Entry Date
-FormFieldTitle_visitId=Visit Id
-FormFieldTitle_createdBy=Created By
-FormFieldTitle_firstAttemptOrderId=First Attempt Order Id
-FormFieldTitle_currencyUom=Currency Uom
-FormFieldTitle_syncStatusId=Sync Status Id
-FormFieldTitle_billingAccountId=Billing Account Id
-FormFieldTitle_originFacilityId=Origin Facility Id
-FormFieldTitle_webSiteId=Web Site Id
-FormFieldTitle_productStoreId=Product Store Id
-FormFieldTitle_terminalId=Terminal Id
-FormFieldTitle_transactionId=Transaction Id
-FormFieldTitle_needsInventoryIssuance=Needs Inventory Issuance
-FormFieldTitle_isRushOrder=Is Rush Order
-FormFieldTitle_internalCode=Internal Code
-FormFieldTitle_remainingSubTotal=Remaining Sub Total
-FormFieldTitle_grandTotal=Grand Total
-FormFieldTitle_orderHeaderId=Order Header Id
-FormFieldTitle_shipmentMethodTypeId=Shipment Method Type Id
-FormFieldTitle_carrierPartyId=Carrier Party Id
-FormFieldTitle_shipAfterDate=Ship After Date
-FormFieldTitle_shipByDate=Ship By Date
-FormFieldTitle_city=City
-FormFieldTitle_postalCode=Postal Code
-FormFieldTitle_countryGeoId=Country Geo Id
-FormFieldTitle_stateProvinceGeoId=State Province Geo Id
-FormFieldTitle_partyId=Party Id
-FormFieldTitle_custRequestTypeId=Cust Request Type Id
-FormFieldTitle_roleTypeId=Role Type Id
-FormFieldTitle_partyId=Party Id
-FormFieldTitle_custRequestName=Cust Request Name
-FormFieldTitle_responseRequiredDate=Response Required Date
-FormFieldTitle_custRequestId=Cust Request Id
-FormFieldTitle_priority=Priority
-FormFieldTitle_custRequestItemSeqId=Cust Request Item Seq Id
-FormFieldTitle_custRequestResolutionId=Cust Request Resolution Id
-FormFieldTitle_requiredByDate=Required By Date
-FormFieldTitle_productId=Product Id
-FormFieldTitle_selectedAmount=Selected Amount
-FormFieldTitle_maximumAmount=Maximum Amount
-FormFieldTitle_story=Story
-FormFieldTitle_quoteId=Quote Id
-FormFieldTitle_isPromo=Is Promo
-FormFieldTitle_productFeatureId=Product Feature Id
-FormFieldTitle_requirementId=Requirement Id
-FormFieldTitle_requirementTypeId=Requirement Type Id
-FormFieldTitle_facilityId=Facility Id
-FormFieldTitle_deliverableId=Deliverable Id
-FormFieldTitle_fixedAssetId=Fixed Asset Id
-FormFieldTitle_estimatedBudget=Estimated Budget
-FormFieldTitle_useCase=Use Case
-FormFieldTitle_reason=Reason
-FormFieldTitle_createdDate=Created Date
-FormFieldTitle_createdByUserLogin=Created By User Login
-FormFieldTitle_lastModifiedDate=Last Modified Date
-FormFieldTitle_lastModifiedByUserLogin=Last Modified By User Login
-FormFieldTitle_shoppingListId=Shopping List Id
-FormFieldTitle_shoppingListTypeId=Shopping List Type Id
-FormFieldTitle_parentShoppingListId=Parent Shopping List Id
-FormFieldTitle_visitorId=Visitor Id
-FormFieldTitle_listName=List Name
-FormFieldTitle_isPublic=Is Public
-FormFieldTitle_isActive=Is Active
-FormFieldTitle_carrierRoleTypeId=Carrier Role Type Id
-FormFieldTitle_contactMechId=Contact Mech Id
-FormFieldTitle_paymentMethodId=Payment Method Id
-FormFieldTitle_recurrenceInfoId=Recurrence Info Id
-FormFieldTitle_lastOrderedDate=Last Ordered Date
-FormFieldTitle_lastAdminModified=Last Admin Modified
-FormFieldTitle_statusId=Status Id
-FormFieldTitle_totalCubicUomId=Cubic Measurement
-FormFieldTitle_totalWeightUomId=Weight Measurement
-FormFieldTitle_totalWeight=Total Weight
-FormFieldTitle_totalCubicSize=Total Cubic Size
-FormFieldTitle_unitsPieces=Units Pieces
-FormFieldTitle_skidsPallets=Skids Pallets
-FormFieldTitle_cartons=Cartons
-FormFieldTitle_estimatedReadyDate=Estimated Ready Date
-FormFieldTitle_requestsLink=Requests Link
-FormFieldTitle_ordersLink=Orders Link
-FormFieldTitle_sendTo=Send To
-FormFieldTitle_sendCc=Send Cc
-FormFieldTitle_orderStatusId=Order Status Id
-FormFieldTitle_remove=remove
-FormFieldTitle_noteInfo=Note Info
-FormFieldTitle_noteDateTime=Note Date Time
-FormFieldTitle_deleteLink=Delete Link
+shoppinglistevents.added_product_to_cart=Added product ${productId} to cart.
+shoppinglistevents.cannot_create_new_shopping_list=Cannot create new shopping list.
+shoppinglistevents.choose_shopping_list=Please choose a shopping list.
+shoppinglistevents.error_adding_item_to_shopping_list=Error adding item to shopping list.
+shoppinglistevents.error_getting_shopping_list_and_items=Error getting shopping list and items.
+shoppinglistevents.no_items_added=No items were added.
+shoppinglistevents.problem_adding_product_to_cart=Could NOT add product ${productId} to cart.
+shoppinglistevents.select_items_to_add_to_list=Please select item(s) to add to the shopping list.
+shoppinglistevents.shoppingListId_is_required_parameter=shoppingListId is a required parameter.

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties?view=diff&rev=465360&r1=465359&r2=465360
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_fr.properties Wed Oct 18 13:16:25 2006
@@ -168,6 +168,7 @@
 OrderErrorFacilityHaveNoAdress=Erreur : le magasin n'a pas d'adresses
 OrderExemptAmount=Montant exempt\u00E9
 OrderExternalId=R\u00E9f. externe
+OrderFilterOnInventoryProblems=Filtrer sur les probl\u00E8mes d'inventaire
 OrderFinalizeOrder=Finaliser la commande
 OrderFinalizeOrderDefault=Terminer la commande avec les options par d\u00E9faut
 OrderFindOrder=Recherche de commande(s)
@@ -407,6 +408,8 @@
 OrderWithPromoCode=avec le code promo.
 OrderWorkflow=Workflow (S\u00E9quence de travail)
 OrderYTD=Total annuel
+OrderfilterAuthProblems=Probl\u00E8mes d'autorisation CB
+OrderfilterInventoryProblems=Probl\u00E8mes d'inventaire
 PageTitleListRequirementOrders=
 PageTitleLogin=Connexion
 PageTitleLookupCustomerRequest=Consulter la demande du client

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?view=diff&rev=465360&r1=465359&r2=465360
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Wed Oct 18 13:16:25 2006
@@ -17,6 +17,7 @@
 package org.ofbiz.order.order;
 
 import java.math.BigDecimal;
+import org.ofbiz.base.util.UtilDateTime;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
@@ -1359,6 +1361,60 @@
                 new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED"),
                 new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "ITEM_REJECTED"));
         return EntityUtil.filterByAnd(getOrderItems(), exprs);
+    }
+
+    public boolean getPastEtaOrderItems() {
+        List exprs = UtilMisc.toList(new Enti
Free forum by Nabble Edit this page