svn commit: r805012 [10/11] - in /ofbiz/branches/executionconte
Locked
svn commit: r805012 [10/11] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Mon Aug 17 15:42:56 2009 @@ -1305,13 +1305,13 @@ // TODO: The following comparison does not consider the To Name or Attn: lines of the address. // // now compare values. If all fields match, that's our shipping address. Return the related contact mech id. - if ( parameters.get("shippingAddressStreet1").toString().equals((postalAddress.get("address1").toString())) && + if ( parameters.get("shippingAddressStreet1").toString().equals((postalAddress.get("address1").toString())) && parameters.get("shippingAddressStreet2").toString().equals((postalAddress.get("address2").toString())) && parameters.get("city").toString().equals((postalAddress.get("city").toString())) && parameters.get("stateProvinceGeoId").toString().equals((postalAddress.get("stateProvinceGeoId").toString())) && parameters.get("countryGeoId").toString().equals((postalAddress.get("countryGeoId").toString())) && parameters.get("shippingAddressPostalCode").toString().equals((postalAddress.get("postalCode").toString())) - ) { // this is an exact address match!! + ) { // this is an exact address match!! return contactMechId; } } catch (Exception e) { Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoOrderTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoOrderTestData.xml Mon Aug 17 15:42:56 2009 @@ -81,4 +81,159 @@ <OrderContactMech orderId="DEMO10091" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200" lastUpdatedStamp="2008-06-10 13:27:07.294" lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10 13:27:07.294" createdTxStamp="2008-06-10 13:27:07.022"/> <Shipment shipmentId="9999" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_CREATED" primaryOrderId="DEMO10091" primaryShipGroupSeqId="00001" lastUpdatedStamp="2008-06-10 12:59:26.852" lastUpdatedTxStamp="2008-06-10 12:59:26.8" createdStamp="2008-06-10 12:59:26.852" createdTxStamp="2008-06-10 12:59:26.8"/> + + <!--Demo Purchase Order data for Accounting--> + <OrderHeader orderId="Demo1001" orderTypeId="PURCHASE_ORDER" orderName="Demo Purchase Order " salesChannelEnumId="UNKNWN_SALES_CHANNEL" orderDate="2009-08-13 17:45:50.419" priority="2" entryDate="2009-08-13 17:45:50.419" statusId="ORDER_COMPLETED" currencyUom="USD" webSiteId="OrderEntry" remainingSubTotal="48.00" grandTotal="48.00"/> + <OrderItem orderId="Demo1001" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644" prodCatalogId="DemoCatalog" isPromo="N" quantity="2.000000" selectedAmount="0.000000" unitPrice="24.00" unitListPrice="0.00" isModifiedPrice="N" itemDescription="GZ-2644-0 Round Gizmo" statusId="ITEM_COMPLETED" estimatedDeliveryDate="2009-08-13 17:43:53.0"/> + <OrderItemPriceInfo orderItemPriceInfoId="9001" orderId="Demo1001" orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:0.000000, lastPrice: 24.000]"/> + <PartyRole partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/> + <PartyRole partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/> + <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/> + <OrderRole orderId="Demo1001" partyId="Company" roleTypeId="BILL_TO_CUSTOMER" /> + <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/> + <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/> + <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/> + <OrderItemShipGroup orderId="Demo1001" shipGroupSeqId="00001" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" contactMechId="9200" maySplit="N" isGift="N" estimatedDeliveryDate="2009-08-13 17:43:53.0"/> + <OrderItemShipGroupAssoc orderId="Demo1001" orderItemSeqId="00001" shipGroupSeqId="00001" quantity="2.000000"/> + + <OrderStatus orderStatusId="9009" statusId="ORDER_CREATED" orderId="Demo1001" statusDatetime="2009-08-13 17:45:50.419" statusUserLogin="admin"/> + <OrderStatus orderStatusId="9010" statusId="ITEM_CREATED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:45:50.419" statusUserLogin="admin"/> + <OrderStatus orderStatusId="9011" statusId="ITEM_APPROVED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:46:15.144" statusUserLogin="admin"/> + <OrderStatus orderStatusId="9012" statusId="ORDER_APPROVED" orderId="Demo1001" statusDatetime="2009-08-13 17:46:15.206" statusUserLogin="admin"/> + <OrderStatus orderStatusId="9013" statusId="ITEM_COMPLETED" orderId="Demo1001" orderItemSeqId="00001" statusDatetime="2009-08-13 17:47:47.292" statusUserLogin="admin"/> + <OrderStatus orderStatusId="9014" statusId="ORDER_COMPLETED" orderId="Demo1001" statusDatetime="2009-08-13 17:47:47.344" statusUserLogin="admin"/> + <OrderContactMech orderId="Demo1001" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200"/> + + <Shipment shipmentId="9997" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_RECEIVED" primaryOrderId="Demo1001" primaryShipGroupSeqId="00001" estimatedShipCost="0.00" destinationFacilityId="WebStoreWarehouse" destinationContactMechId="9200" destinationTelecomNumberId="9201" partyIdFrom="DemoSupplier"/> + <ShipmentItem shipmentId="9997" shipmentItemSeqId="00001" productId="GZ-2644" quantity="2.000000"/> + <ShipmentRouteSegment shipmentId="9997" shipmentRouteSegmentId="00001" destFacilityId="WebStoreWarehouse" destContactMechId="9200" destTelecomNumberId="9201" carrierPartyId="_NA_" shipmentMethodTypeId="NO_SHIPPING" carrierServiceStatusId="SHRSCS_NOT_STARTED"/> + <ShipmentPackage shipmentId="9997" shipmentPackageSeqId="00001" dateCreated="2009-08-13 17:46:29.751"/> + <ShipmentPackageContent shipmentId="9997" shipmentPackageSeqId="00001" shipmentItemSeqId="00001" quantity="2.000000"/> + <ShipmentPackageRouteSeg shipmentId="9997" shipmentPackageSeqId="00001" shipmentRouteSegmentId="00001"/> + <ShipmentStatus statusId="PURCH_SHIP_CREATED" shipmentId="9997" statusDate="2009-08-13 17:46:28.784"/> + <ShipmentStatus statusId="PURCH_SHIP_RECEIVED" shipmentId="9997" statusDate="2009-08-13 17:47:47.602"/> + <ShipmentStatus statusId="PURCH_SHIP_SHIPPED" shipmentId="9997" statusDate="2009-08-13 17:46:29.836"/> + <AcctgTrans acctgTransId="8015" acctgTransTypeId="SHIPMENT_RECEIPT" transactionDate="2009-08-13 17:47:48.642" isPosted="Y" postedDate="2009-08-13 17:47:49.281" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" shipmentId="9997"/> + <AcctgTransEntry acctgTransId="8015" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-2644" glAccountTypeId="UNINVOICED_SHIP_RCPT" glAccountId="214000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="8015" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-2644" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + + <InventoryItem inventoryItemId="9025" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" datetimeReceived="2009-08-13 17:47:31.095" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" quantityOnHandTotal="2.000000" availableToPromiseTotal="2.000000" unitCost="24.000000" currencyUomId="USD"/> + <ShipmentReceipt receiptId="9000" inventoryItemId="9025" productId="GZ-2644" shipmentId="9997" orderId="Demo1001" orderItemSeqId="00001" datetimeReceived="2009-08-13 17:47:31.095" quantityAccepted="2.000000" quantityRejected="0.000000"/> + <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="10000" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/> + <ItemIssuance itemIssuanceId="9000" orderId="Demo1001" orderItemSeqId="00001" shipGroupSeqId="00001" shipmentId="9997" shipmentItemSeqId="00001" issuedDateTime="2009-08-13 17:46:29.603" quantity="2.000000"/> + + <Invoice invoiceId="8008" invoiceTypeId="PURCHASE_INVOICE" description="Purchase Order Invoice" partyIdFrom="DemoSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-08-13 17:47:47.929" currencyUomId="USD"/> + <InvoiceItem invoiceId="8008" invoiceItemSeqId="00001" invoiceItemTypeId="PINV_FPROD_ITEM" productId="GZ-2644" quantity="2.000000" amount="24.000" description="GZ-2644-0 Round Gizmo"/> + <OrderItemBilling orderId="Demo1001" orderItemSeqId="00001" invoiceId="8008" invoiceItemSeqId="00001" shipmentReceiptId="9000" quantity="2.000000" amount="24.00"/> + <AcctgTrans acctgTransId="8016" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-08-13 18:58:34.65" isPosted="Y" postedDate="2009-08-13 18:58:35.08" glFiscalTypeId="ACTUAL" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8008"/> + <AcctgTransEntry acctgTransId="8016" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" productId="GZ-2644" glAccountId="214000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="8016" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000" organizationPartyId="Company" amount="48.00" currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + + <!--Demo Sales Order for Accounting--> + <OrderHeader orderId="Demo1002" orderTypeId="SALES_ORDER" orderName="Demo Sales Order" salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2009-08-17 14:23:49.475" priority="2" entryDate="2009-08-17 14:23:49.475" visitId="10000" statusId="ORDER_COMPLETED" createdBy="admin" currencyUom="USD" webSiteId="OrderEntry" productStoreId="9000" remainingSubTotal="107.98" grandTotal="127.09"/> + <OrderItem orderId="Demo1002" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="WG-1111" prodCatalogId="DemoCatalog" isPromo="N" quantity="2.000000" selectedAmount="0.000000" unitPrice="59.99" unitListPrice="60.00" isModifiedPrice="N" itemDescription="Micro Chrome Widget" correspondingPoId="" statusId="ITEM_COMPLETED"/> + <OrderItem orderId="Demo1002" orderItemSeqId="00004" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="WG-1111" isPromo="Y" quantity="1.000000" selectedAmount="0.000000" unitPrice="59.99" unitListPrice="60.00" isModifiedPrice="N" itemDescription="Micro Chrome Widget" correspondingPoId="" statusId="ITEM_COMPLETED"/> + <PartyRole partyId="DemoCustomer" roleTypeId="END_USER_CUSTOMER"/> + <PartyRole partyId="DemoCustomer" roleTypeId="SHIP_TO_CUSTOMER"/> + <PartyRole partyId="DemoCustomer" roleTypeId="PLACING_CUSTOMER"/> + + <OrderRole orderId="Demo1002" partyId="Company" roleTypeId="BILL_FROM_VENDOR"/> + <OrderRole orderId="Demo1002" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER"/> + <OrderRole orderId="Demo1002" partyId="DemoCustomer" roleTypeId="END_USER_CUSTOMER"/> + <OrderRole orderId="Demo1002" partyId="DemoCustomer" roleTypeId="PLACING_CUSTOMER"/> + <OrderRole orderId="Demo1002" partyId="DemoCustomer" roleTypeId="SHIP_TO_CUSTOMER"/> + + <OrderItemShipGroup orderId="Demo1002" shipGroupSeqId="00001" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" contactMechId="9015" maySplit="N" isGift="N"/> + <OrderItemShipGroupAssoc orderId="Demo1002" orderItemSeqId="00001" shipGroupSeqId="00001" quantity="2.000000"/> + <OrderItemShipGroupAssoc orderId="Demo1002" orderItemSeqId="00004" shipGroupSeqId="00001" quantity="1.000000"/> + <OrderAdjustment orderAdjustmentId="8000" orderAdjustmentTypeId="PROMOTION_ADJUSTMENT" orderId="Demo1002" orderItemSeqId="_NA_" shipGroupSeqId="_NA_" amount="-12.000" productPromoId="9011" productPromoRuleId="01" productPromoActionSeqId="01" createdDate="2009-08-17 14:56:44.515"/> + <OrderAdjustment orderAdjustmentId="8001" orderAdjustmentTypeId="PROMOTION_ADJUSTMENT" orderId="Demo1002" orderItemSeqId="00004" shipGroupSeqId="_NA_" amount="-59.990" productPromoId="9000" productPromoRuleId="01" productPromoActionSeqId="01" createdDate="2009-08-17 14:56:44.515"/> + <OrderAdjustment orderAdjustmentId="8002" orderAdjustmentTypeId="SHIPPING_CHARGES" orderId="Demo1002" orderItemSeqId="_NA_" shipGroupSeqId="00001" amount="12.100" createdDate="2009-08-17 14:56:44.515" createdByUserLogin="admin" lastUpdatedStamp="2009-08-17 14:56:44.778"/> + <OrderAdjustment orderAdjustmentId="8003" orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="_NA_" shipGroupSeqId="00001" comments="Utah County, Utah Sales Tax" amount="-0.012" taxAuthorityRateSeqId="9005" sourcePercentage="0.100000" primaryGeoId="UT-UTAH" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" overrideGlAccountId="224153"/> + <OrderAdjustment orderAdjustmentId="8004" orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001" shipGroupSeqId="00001" comments="Utah County, Utah Sales Tax" amount="0.120" taxAuthorityRateSeqId="9005" sourcePercentage="0.100000" primaryGeoId="UT-UTAH" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" overrideGlAccountId="224153" createdDate="2009-08-17 14:56:44.515"/> + <OrderAdjustment orderAdjustmentId="8005" orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001" shipGroupSeqId="00001" comments="Utah State Sales Tax" amount="5.699" taxAuthorityRateSeqId="9004" sourcePercentage="4.750000" primaryGeoId="UT" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" overrideGlAccountId="224153" createdDate="2009-08-17 14:56:44.515"/> + <OrderAdjustment orderAdjustmentId="8006" orderAdjustmentTypeId="SALES_TAX" orderId="Demo1002" orderItemSeqId="00001" shipGroupSeqId="00001" comments="1% OFB _NA_ Tax" amount="1.200" taxAuthorityRateSeqId="9000" sourcePercentage="1.000000" primaryGeoId="_NA_" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" overrideGlAccountId="224000" createdDate="2009-08-17 14:56:44.515"/> + <OrderPaymentPreference orderPaymentPreferenceId="9001" orderId="Demo1002" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" presentFlag="N" swipedFlag="N" overflowFlag="N" maxAmount="127.09" processAttempt="1" statusId="PAYMENT_SETTLED" needsNsfRetry="N" createdDate="2009-08-17 14:56:44.573"/> + + <OrderStatus orderStatusId="8000" statusId="ORDER_CREATED" orderId="Demo1002" statusDatetime="2009-08-17 14:56:44.162" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8001" statusId="ITEM_CREATED" orderId="Demo1002" orderItemSeqId="00001" statusDatetime="2009-08-17 14:56:44.162" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8002" statusId="ITEM_CREATED" orderId="Demo1002" orderItemSeqId="00004" statusDatetime="2009-08-17 14:56:44.162" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8003" statusId="PAYMENT_NOT_AUTH" orderId="Demo1002" orderPaymentPreferenceId="9001" statusDatetime="2009-08-17 14:56:44.938" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8004" statusId="PAYMENT_NOT_AUTH" orderId="Demo1002" orderPaymentPreferenceId="9001" statusDatetime="2009-08-17 14:56:46.344" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8005" statusId="PAYMENT_AUTHORIZED" orderId="Demo1002" orderPaymentPreferenceId="9001" statusDatetime="2009-08-17 14:56:46.523" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8006" statusId="ORDER_APPROVED" orderId="Demo1002" statusDatetime="2009-08-17 14:56:46.558" statusUserLogin="admin" lastUpdatedStamp="2009-08-17 14:56:46.561"/> + <OrderStatus orderStatusId="8007" statusId="ITEM_APPROVED" orderId="Demo1002" orderItemSeqId="00001" statusDatetime="2009-08-17 14:56:46.712" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8008" statusId="ITEM_APPROVED" orderId="Demo1002" orderItemSeqId="00004" statusDatetime="2009-08-17 14:56:46.712" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8009" statusId="ITEM_COMPLETED" orderId="Demo1002" orderItemSeqId="00001" statusDatetime="2009-08-17 14:57:01.657" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8010" statusId="ITEM_COMPLETED" orderId="Demo1002" orderItemSeqId="00004" statusDatetime="2009-08-17 14:57:02.401" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8011" statusId="ORDER_COMPLETED" orderId="Demo1002" statusDatetime="2009-08-17 14:57:02.433" statusUserLogin="admin"/> + <OrderStatus orderStatusId="8012" statusId="PAYMENT_SETTLED" orderId="Demo1002" orderPaymentPreferenceId="9001" statusDatetime="2009-08-17 14:57:04.825" statusUserLogin="admin"/> + <OrderContactMech orderId="Demo1002" contactMechPurposeTypeId="BILLING_LOCATION" contactMechId="9015"/> + <OrderContactMech orderId="Demo1002" contactMechPurposeTypeId="ORDER_EMAIL" contactMechId="9026"/> + <OrderContactMech orderId="Demo1002" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9015"/> + + <Shipment shipmentId="9996" shipmentTypeId="SALES_SHIPMENT" statusId="SHIPMENT_SHIPPED" primaryOrderId="Demo1002" primaryShipGroupSeqId="00001" estimatedShipCost="12.10" originFacilityId="WebStoreWarehouse" originContactMechId="9200" originTelecomNumberId="9201" destinationContactMechId="9015" destinationTelecomNumberId="9025" partyIdTo="DemoCustomer" partyIdFrom="Company" createdDate="2009-08-17 14:56:57.553"/> + <ShipmentItem shipmentId="9996" shipmentItemSeqId="00001" productId="WG-1111" quantity="3.000000"/> + <ShipmentRouteSegment shipmentId="9996" shipmentRouteSegmentId="00001" originFacilityId="WebStoreWarehouse" originContactMechId="9200" originTelecomNumberId="9201" destContactMechId="9015" destTelecomNumberId="9025" carrierPartyId="UPS" shipmentMethodTypeId="NEXT_DAY" carrierServiceStatusId="SHRSCS_NOT_STARTED"/> + <ShipmentPackage shipmentId="9996" shipmentPackageSeqId="00001" dateCreated="2009-08-17 14:57:02.742"/> + <ShipmentPackageContent shipmentId="9996" shipmentPackageSeqId="00001" shipmentItemSeqId="00001" quantity="3.000000"/> + <ShipmentPackageRouteSeg shipmentId="9996" shipmentPackageSeqId="00001" shipmentRouteSegmentId="00001"/> + <ShipmentStatus statusId="SHIPMENT_INPUT" shipmentId="9996" statusDate="2009-08-17 16:35:36.119"/> + <ShipmentStatus statusId="SHIPMENT_PACKED" shipmentId="9996" statusDate="2009-08-17 16:35:39.627"/> + <ShipmentStatus statusId="SHIPMENT_SHIPPED" shipmentId="9996" statusDate="2009-08-17 16:35:42.707"/> + <AcctgTrans acctgTransId="9002" acctgTransTypeId="SALES_SHIPMENT" transactionDate="2009-08-17 14:56:59.96" isPosted="Y" postedDate="2009-08-17 14:57:01.321" glFiscalTypeId="ACTUAL" shipmentId="9996"/> + <AcctgTransEntry acctgTransId="9002" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" productId="WG-1111" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000" organizationPartyId="Company" amount="9.00" currencyUomId="USD" origAmount="9.00" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9002" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" productId="WG-1111" glAccountTypeId="COGS_ACCOUNT" glAccountId="500000" organizationPartyId="Company" amount="9.00" currencyUomId="USD" origAmount="9.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTrans acctgTransId="9003" acctgTransTypeId="SALES_SHIPMENT" transactionDate="2009-08-17 14:57:01.955" isPosted="Y" postedDate="2009-08-17 14:57:02.345" glFiscalTypeId="ACTUAL" shipmentId="9996"/> + <AcctgTransEntry acctgTransId="9003" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" productId="WG-1111" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000" organizationPartyId="Company" amount="4.50" currencyUomId="USD" origAmount="4.50" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9003" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" productId="WG-1111" glAccountTypeId="COGS_ACCOUNT" glAccountId="500000" organizationPartyId="Company" amount="4.50" currencyUomId="USD" origAmount="4.50" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + + <ItemIssuance itemIssuanceId="9001" orderId="Demo1002" orderItemSeqId="00001" shipGroupSeqId="00001" inventoryItemId="9005" shipmentId="9996" shipmentItemSeqId="00001" issuedDateTime="2009-08-17 14:56:58.664" issuedByUserLoginId="admin" quantity="2.000000"/> + <ItemIssuance itemIssuanceId="9002" orderId="Demo1002" orderItemSeqId="00004" shipGroupSeqId="00001" inventoryItemId="9005" shipmentId="9996" shipmentItemSeqId="00001" issuedDateTime="2009-08-17 14:57:01.872" issuedByUserLoginId="admin" quantity="1.000000"/> + + <Invoice invoiceId="8009" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustomer" statusId="INVOICE_PAID" invoiceDate="2009-08-17 14:57:03.614" paidDate="2009-08-17 14:57:04.99" currencyUomId="USD"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00001" invoiceItemTypeId="INV_FPROD_ITEM" inventoryItemId="9005" productId="WG-1111" quantity="2.000000" amount="59.990" description="Micro Chrome Widget"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00002" invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153" productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001" quantity="1.000000" amount="0.120" description="Utah County, Utah Sales Tax" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthGeoId="UT-UTAH" taxAuthorityRateSeqId="9005"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00003" invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153" productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001" quantity="1.000000" amount="5.699" description="Utah State Sales Tax" taxAuthPartyId="UT_TAXMAN" taxAuthGeoId="UT" taxAuthorityRateSeqId="9004"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00004" invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224000" productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00001" quantity="1.000000" amount="1.200" description="1% OFB _NA_ Tax" taxAuthPartyId="_NA_" taxAuthGeoId="_NA_" taxAuthorityRateSeqId="9000"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00005" invoiceItemTypeId="INV_FPROD_ITEM" inventoryItemId="9005" productId="WG-1111" quantity="1.000000" amount="59.990" description="Micro Chrome Widget"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00006" invoiceItemTypeId="ITM_PROMOTION_ADJ" productId="WG-1111" parentInvoiceId="8009" parentInvoiceItemSeqId="00005" quantity="1.000000" amount="-59.990"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00007" invoiceItemTypeId="ITM_PROMOTION_ADJ" quantity="1.000000" amount="-12.000"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00008" invoiceItemTypeId="ITM_SHIPPING_CHARGES" quantity="1.000000" amount="12.100"/> + <InvoiceItem invoiceId="8009" invoiceItemSeqId="00009" invoiceItemTypeId="ITM_SALES_TAX" overrideGlAccountId="224153" quantity="1.000000" amount="-0.010" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthGeoId="UT-UTAH" taxAuthorityRateSeqId="9005"/> + <AcctgTrans acctgTransId="9004" acctgTransTypeId="SALES_INVOICE" transactionDate="2009-08-17 14:57:06.129" isPosted="Y" postedDate="2009-08-17 14:57:06.587" glFiscalTypeId="ACTUAL" invoiceId="8009"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" productId="WG-1111" glAccountId="400000" organizationPartyId="Company" amount="119.98" currencyUomId="USD" origAmount="119.98" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="UT_UTAH_TAXMAN" roleTypeId="TAX_AUTHORITY" productId="WG-1111" glAccountId="224153" organizationPartyId="Company" amount="0.12" currencyUomId="USD" origAmount="0.12" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00003" acctgTransEntryTypeId="_NA_" partyId="UT_TAXMAN" roleTypeId="TAX_AUTHORITY" productId="WG-1111" glAccountId="224153" organizationPartyId="Company" amount="5.69" currencyUomId="USD" origAmount="5.69" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00004" acctgTransEntryTypeId="_NA_" partyId="_NA_" roleTypeId="TAX_AUTHORITY" productId="WG-1111" glAccountId="224000" organizationPartyId="Company" amount="1.20" currencyUomId="USD" origAmount="1.20" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00005" acctgTransEntryTypeId="_NA_" productId="WG-1111" glAccountId="400000" organizationPartyId="Company" amount="59.99" currencyUomId="USD" origAmount="59.99" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00006" acctgTransEntryTypeId="_NA_" productId="WG-1111" glAccountId="400000" organizationPartyId="Company" amount="59.99" currencyUomId="USD" origAmount="59.99" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00007" acctgTransEntryTypeId="_NA_" glAccountId="410000" organizationPartyId="Company" amount="12.00" currencyUomId="USD" origAmount="12.00" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00008" acctgTransEntryTypeId="_NA_" glAccountId="409000" organizationPartyId="Company" amount="12.10" currencyUomId="USD" origAmount="12.10" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00009" acctgTransEntryTypeId="_NA_" partyId="UT_UTAH_TAXMAN" roleTypeId="TAX_AUTHORITY" glAccountId="224153" organizationPartyId="Company" amount="0.01" currencyUomId="USD" origAmount="0.01" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9004" acctgTransEntrySeqId="00010" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="127.08" currencyUomId="USD" origAmount="127.08" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + + <PaymentGatewayResponse paymentGatewayResponseId="9001" paymentServiceTypeEnumId="PRDS_PAY_AUTH" orderPaymentPreferenceId="9001" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" transCodeEnumId="PGT_AUTHORIZE" amount="127.09" currencyUomId="USD" referenceNum="1250501206473" altReference="1250501206473" gatewayCode="100" gatewayFlag="A" gatewayMessage="This is a test processor; no payments were captured or authorized." transactionDate="2009-08-17 14:56:46.498"/> + <PaymentGatewayResponse paymentGatewayResponseId="9002" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" orderPaymentPreferenceId="9001" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" transCodeEnumId="PGT_CAPTURE" amount="127.09" currencyUomId="USD" referenceNum="1250501224763" altReference="1250501224763" gatewayFlag="C" gatewayMessage="This is a test capture; no money was transferred" transactionDate="2009-08-17 14:57:04.836"/> + <Payment paymentId="8004" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="CREDIT_CARD" paymentMethodId="9015" paymentGatewayResponseId="9002" paymentPreferenceId="9001" partyIdFrom="DemoCustomer" partyIdTo="Company" statusId="PMNT_RECEIVED" effectiveDate="2009-08-17 14:57:04.99" paymentRefNum="1250501224763" amount="127.09" currencyUomId="USD"/> + <AcctgTrans acctgTransId="9005" acctgTransTypeId="INCOMING_PAYMENT" transactionDate="2009-08-17 14:57:05.182" isPosted="Y" postedDate="2009-08-17 14:57:05.56" glFiscalTypeId="ACTUAL" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" paymentId="8004"/> + <AcctgTransEntry acctgTransId="9005" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" glAccountId="122300" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9005" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + + <PaymentApplication paymentApplicationId="9003" paymentId="8004" invoiceId="8009" amountApplied="127.09"/> + <AcctgTrans acctgTransId="9006" acctgTransTypeId="PAYMENT_APPL" transactionDate="2009-08-17 14:57:05.741" isPosted="Y" postedDate="2009-08-17 14:57:05.878" glFiscalTypeId="ACTUAL" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" invoiceId="8009" paymentId="8004"/> + <AcctgTransEntry acctgTransId="9006" acctgTransEntrySeqId="00001" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="D" reconcileStatusId="AES_NOT_RECONCILED"/> + <AcctgTransEntry acctgTransId="9006" acctgTransEntrySeqId="00002" acctgTransEntryTypeId="_NA_" partyId="DemoCustomer" roleTypeId="BILL_TO_CUSTOMER" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000" organizationPartyId="Company" amount="127.09" currencyUomId="USD" origAmount="127.09" origCurrencyUomId="USD" debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/> + + <OrderAdjustmentBilling orderAdjustmentId="8000" invoiceId="8009" invoiceItemSeqId="00007" amount="-12.00"/> + <OrderAdjustmentBilling orderAdjustmentId="8001" invoiceId="8009" invoiceItemSeqId="00006" amount="-59.99"/> + <OrderAdjustmentBilling orderAdjustmentId="8002" invoiceId="8009" invoiceItemSeqId="00008" amount="12.10"/> + <OrderAdjustmentBilling orderAdjustmentId="8003" invoiceId="8009" invoiceItemSeqId="00009" amount="-0.01"/> + <OrderAdjustmentBilling orderAdjustmentId="8004" invoiceId="8009" invoiceItemSeqId="00002" amount="0.12"/> + <OrderAdjustmentBilling orderAdjustmentId="8005" invoiceId="8009" invoiceItemSeqId="00003" amount="5.69"/> + <OrderAdjustmentBilling orderAdjustmentId="8006" invoiceId="8009" invoiceItemSeqId="00004" amount="1.20"/> + <ShipmentItemBilling shipmentId="9996" shipmentItemSeqId="00001" invoiceId="8009" invoiceItemSeqId="00001"/> + <OrderItemBilling orderId="Demo1002" orderItemSeqId="00001" invoiceId="8009" invoiceItemSeqId="00001" itemIssuanceId="9001" quantity="2.000000" amount="59.99"/> + <OrderItemBilling orderId="Demo1002" orderItemSeqId="00004" invoiceId="8009" invoiceItemSeqId="00005" itemIssuanceId="9002" quantity="1.000000" amount="59.99"/> + </entity-engine-xml> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTreeContent.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTreeContent.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTreeContent.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTreeContent.xml Mon Aug 17 15:42:56 2009 @@ -18,7 +18,6 @@ under the License. --> <entity-engine-xml> - <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/> <Content contentId="PICTURE" contentTypeId="DOCUMENT" contentName="Picture" dataResourceId=""/> <Content contentId="PROD_DESCRIPTION" contentTypeId="DOCUMENT" contentName="Product Description" dataResourceId=""/> <Content contentId="GENERAL" contentTypeId="DOCUMENT" contentName="General" dataResourceId=""/> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/templates/email/emailpayretry.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/templates/email/emailpayretry.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/templates/email/emailpayretry.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/templates/email/emailpayretry.ftl Mon Aug 17 15:42:56 2009 @@ -19,11 +19,11 @@ <BR> <#if orderHeader.statusId == "ORDER_REJECTED"> - ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br/> - ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br/> + ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br/> + ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br/> <#elseif orderHeader.statusId == "ORDER_APPROVED"> - ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted} + ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted} <#else> - ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br/> + ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br/> </#if> - <br/>${uiLabelMap.OrderEmailCustomerService} ([hidden email])<br/> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 --> + <br/>${uiLabelMap.OrderEmailCustomerService} ([hidden email])<br/> <#-- Customer service email (not a variable why?) must be adapted - JLR 1/6/5 --> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Mon Aug 17 15:42:56 2009 @@ -106,7 +106,7 @@ <div> <a href="<@ofbizUrl>clearSearchOptionsHistoryList</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a> - ${uiLabelMap.OrderClearSearchHistoryNote} + ${uiLabelMap.OrderClearSearchHistoryNote} </div> <#list searchOptionsHistoryList as searchOptions> <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Mon Aug 17 15:42:56 2009 @@ -236,25 +236,25 @@ } <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> - function checkRadioButton() { - var block1 = document.getElementById("addCart1"); - var block2 = document.getElementById("addCart2"); - <#list featureLists as featureList> - <#list featureList as feature> - <#if feature_index == 0> - var myList = document.getElementById("FT${feature.productFeatureTypeId}"); - if (myList.options[0].selected == true){ - block1.style.display = "none"; - block2.style.display = "block"; - return; - } - <#break> - </#if> - </#list> - </#list> - block1.style.display = "block"; - block2.style.display = "none"; - } + function checkRadioButton() { + var block1 = document.getElementById("addCart1"); + var block2 = document.getElementById("addCart2"); + <#list featureLists as featureList> + <#list featureList as feature> + <#if feature_index == 0> + var myList = document.getElementById("FT${feature.productFeatureTypeId}"); + if (myList.options[0].selected == true){ + block1.style.display = "none"; + block2.style.display = "block"; + return; + } + <#break> + </#if> + </#list> + </#list> + block1.style.display = "block"; + block2.style.display = "none"; + } </#if> //--> </script> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Mon Aug 17 15:42:56 2009 @@ -21,33 +21,33 @@ <#if forumMessage.caContentAssocTypeId == "RESPONSE"> <#assign threadContentId = forumMessage.ownerContentId?if_exists/> </#if> - <#if rsp?exists> - <#assign contentId = rsp.contentId> - <#else> - <#assign contentId = forumMessage.contentId> - </#if> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} - <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> - </div> - <div class="tableheadtext"> - ${forumMessage.description?if_exists} - </div> - - <#-- - <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> - <#if (result.resultData)?exists> - <div class="tableheadtext"> - ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} - <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> - </div> - <div class="tabletext"> - <#if result.resultData.electronicText?exists> - ${result.resultData.electronicText.textData} - </#if> - </div> - <hr/> - <#else> - <div class="tabletext"> ${result.errorMessage?if_exists}</div> - </#if> - --> + <#if rsp?exists> + <#assign contentId = rsp.contentId> + <#else> + <#assign contentId = forumMessage.contentId> + </#if> + <div class="tableheadtext"> + ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} + <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> + </div> + <div class="tableheadtext"> + ${forumMessage.description?if_exists} + </div> + + <#-- + <#assign result = dispatcher.runSync("getPublicForumMessage", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId, "userLogin", userLogin))/> + <#if (result.resultData)?exists> + <div class="tableheadtext"> + ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} + <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> + </div> + <div class="tabletext"> + <#if result.resultData.electronicText?exists> + ${result.resultData.electronicText.textData} + </#if> + </div> + <hr/> + <#else> + <div class="tabletext"> ${result.errorMessage?if_exists}</div> + </#if> + --> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/forum/showforum.ftl Mon Aug 17 15:42:56 2009 @@ -18,5 +18,5 @@ --> <#list forumMessages?if_exists as forumMessage> - <#include "messageDisplay.ftl"> + <#include "messageDisplay.ftl"> </#list> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Mon Aug 17 15:42:56 2009 @@ -241,7 +241,7 @@ // handle the adjustments OrderAdjustment adjustment = info.getOrderAdjustment(); - if (adjustment != null){ + if (adjustment != null) { addAdjustments(cart, adjustment); // ship group info Shipping shipping = info.getOrderAdjustment().getShipping(); @@ -354,30 +354,30 @@ } } - protected String[] getPartyInfo(Address shipAddr, Address billAddr) throws GeneralException { - String shipCmId = null; - String billCmId = null; - String partyId = null; - - // look for an existing shipping address - List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shipAddr.getAddress1(), - (UtilValidate.isEmpty(shipAddr.getAddress2()) ? null : shipAddr.getAddress2()), shipAddr.getCity(), shipAddr.getRegion(), - shipAddr.getPostalCode(), null, getCountryGeoId(shipAddr.getCountryCode()), shipAddr.getStructuredName().getFirstName(), - null, shipAddr.getStructuredName().getLastName()); - - if (shipInfo != null && shipInfo.size() > 0) { - GenericValue first = EntityUtil.getFirst(shipInfo); - shipCmId = first.getString("contactMechId"); - partyId = first.getString("partyId"); - Debug.logInfo("Existing shipping address found : " + shipCmId + " (party: " + partyId + ")", module); - } - - // look for an existing billing address - List<GenericValue> billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(), - (UtilValidate.isEmpty(billAddr.getAddress2()) ? null : billAddr.getAddress2()), billAddr.getCity(), billAddr.getRegion(), - billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(), - null, billAddr.getStructuredName().getLastName()); - + protected String[] getPartyInfo(Address shipAddr, Address billAddr) throws GeneralException { + String shipCmId = null; + String billCmId = null; + String partyId = null; + + // look for an existing shipping address + List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shipAddr.getAddress1(), + (UtilValidate.isEmpty(shipAddr.getAddress2()) ? null : shipAddr.getAddress2()), shipAddr.getCity(), shipAddr.getRegion(), + shipAddr.getPostalCode(), null, getCountryGeoId(shipAddr.getCountryCode()), shipAddr.getStructuredName().getFirstName(), + null, shipAddr.getStructuredName().getLastName()); + + if (shipInfo != null && shipInfo.size() > 0) { + GenericValue first = EntityUtil.getFirst(shipInfo); + shipCmId = first.getString("contactMechId"); + partyId = first.getString("partyId"); + Debug.logInfo("Existing shipping address found : " + shipCmId + " (party: " + partyId + ")", module); + } + + // look for an existing billing address + List<GenericValue> billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(), + (UtilValidate.isEmpty(billAddr.getAddress2()) ? null : billAddr.getAddress2()), billAddr.getCity(), billAddr.getRegion(), + billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(), + null, billAddr.getStructuredName().getLastName()); + if (billInfo != null && billInfo.size() > 0) { GenericValue first = EntityUtil.getFirst(billInfo); billCmId = first.getString("contactMechId"); @@ -421,11 +421,11 @@ } } - return new String[] { partyId, shipCmId, billCmId }; - } + return new String[] { partyId, shipCmId, billCmId }; + } - protected String createPerson(StructuredName name) throws GeneralException { - Map<String, Object> personMap = FastMap.newInstance(); + protected String createPerson(StructuredName name) throws GeneralException { + Map<String, Object> personMap = FastMap.newInstance(); personMap.put("firstName", name.getFirstName()); personMap.put("lastName", name.getLastName()); personMap.put("userLogin", system); @@ -437,10 +437,10 @@ String partyId = (String) personResp.get("partyId"); Debug.logInfo("New party created : " + partyId, module); - return partyId; - } - - protected String createPartyAddress(String partyId, Address addr) throws GeneralException { + return partyId; + } + + protected String createPartyAddress(String partyId, Address addr) throws GeneralException { // check for zip+4 String postalCode = addr.getPostalCode(); String postalCodeExt = null; @@ -474,34 +474,34 @@ String contactMechId = (String) addrResp.get("contactMechId"); Debug.logInfo("Created new address for partyId [" + partyId + "] :" + contactMechId, module); - return contactMechId; - } - - protected void addPurposeToAddress(String partyId, String contactMechId, int addrType) throws GeneralException { - // convert the int to a purpose type ID - String contactMechPurposeTypeId = getAddressType(addrType); - - // check to make sure the purpose doesn't already exist - List<GenericValue> values = delegator.findByAnd("PartyContactMechPurpose", UtilMisc.toMap("partyId", partyId, - "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId)); - - if (values == null || values.size() == 0) { - Map<String, Object> addPurposeMap = FastMap.newInstance(); - addPurposeMap.put("contactMechId", contactMechId); - addPurposeMap.put("partyId", partyId); - addPurposeMap.put("contactMechPurposeTypeId", contactMechPurposeTypeId); - addPurposeMap.put("userLogin", system); - - Map<String, Object> addPurposeResp = dispatcher.runSync("createPartyContactMechPurpose", addPurposeMap); - if (addPurposeResp != null && ServiceUtil.isError(addPurposeResp)) { - throw new GeneralException(ServiceUtil.getErrorMessage(addPurposeResp)); - } - } - } - - protected String getAddressType(int addrType) { - String contactMechPurposeTypeId = "GENERAL_LOCATION"; - switch(addrType) { + return contactMechId; + } + + protected void addPurposeToAddress(String partyId, String contactMechId, int addrType) throws GeneralException { + // convert the int to a purpose type ID + String contactMechPurposeTypeId = getAddressType(addrType); + + // check to make sure the purpose doesn't already exist + List<GenericValue> values = delegator.findByAnd("PartyContactMechPurpose", UtilMisc.toMap("partyId", partyId, + "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId)); + + if (values == null || values.size() == 0) { + Map<String, Object> addPurposeMap = FastMap.newInstance(); + addPurposeMap.put("contactMechId", contactMechId); + addPurposeMap.put("partyId", partyId); + addPurposeMap.put("contactMechPurposeTypeId", contactMechPurposeTypeId); + addPurposeMap.put("userLogin", system); + + Map<String, Object> addPurposeResp = dispatcher.runSync("createPartyContactMechPurpose", addPurposeMap); + if (addPurposeResp != null && ServiceUtil.isError(addPurposeResp)) { + throw new GeneralException(ServiceUtil.getErrorMessage(addPurposeResp)); + } + } + } + + protected String getAddressType(int addrType) { + String contactMechPurposeTypeId = "GENERAL_LOCATION"; + switch (addrType) { case SHIPPING_ADDRESS: contactMechPurposeTypeId = "SHIPPING_LOCATION"; break; @@ -510,9 +510,9 @@ break; } return contactMechPurposeTypeId; - } - - protected void setContactInfo(ShoppingCart cart, String contactMechPurposeTypeId, String infoString) throws GeneralException { + } + + protected void setContactInfo(ShoppingCart cart, String contactMechPurposeTypeId, String infoString) throws GeneralException { Map<String, Object> lookupMap = FastMap.newInstance(); String cmId = null; @@ -576,11 +576,11 @@ cart.addContactMech(contactMechPurposeTypeId, cmId); } } - - protected String getCountryGeoId(String geoCode) { - if (geoCode != null && geoCode.length() == 3) { - return geoCode; - } + + protected String getCountryGeoId(String geoCode) { + if (geoCode != null && geoCode.length() == 3) { + return geoCode; + } List<GenericValue> geos = null; try { geos = delegator.findByAnd("Geo", UtilMisc.toMap("geoCode", geoCode, "geoTypeId", "COUNTRY")); @@ -593,17 +593,17 @@ return "_NA_"; } } - - protected boolean hasHoldOrderNotes(String orderId) { - EntityCondition idCond = EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId); - EntityCondition content = EntityCondition.makeCondition("noteInfo", EntityOperator.LIKE, "%Order is held%"); - EntityCondition mainCond = EntityCondition.makeCondition(UtilMisc.toList(idCond, content), EntityOperator.AND); - List<GenericValue> holdOrderNotes = null; - try { - holdOrderNotes = delegator.findList("OrderHeaderNoteView", mainCond, null, null, null, false); - } catch (GenericEntityException e) { - Debug.logError(e, module); - } - return UtilValidate.isNotEmpty(holdOrderNotes); - } + + protected boolean hasHoldOrderNotes(String orderId) { + EntityCondition idCond = EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId); + EntityCondition content = EntityCondition.makeCondition("noteInfo", EntityOperator.LIKE, "%Order is held%"); + EntityCondition mainCond = EntityCondition.makeCondition(UtilMisc.toList(idCond, content), EntityOperator.AND); + List<GenericValue> holdOrderNotes = null; + try { + holdOrderNotes = delegator.findList("OrderHeaderNoteView", mainCond, null, null, null, false); + } catch (GenericEntityException e) { + Debug.logError(e, module); + } + return UtilValidate.isNotEmpty(holdOrderNotes); + } } \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java Mon Aug 17 15:42:56 2009 @@ -87,10 +87,10 @@ Iterator invItemListIter = invItemList.iterator(); while (invItemListIter.hasNext()) { GenericValue invItem = (GenericValue)invItemListIter.next(); - if ( invItem != null) { + if (invItem != null) { int qoh = ((Double)invItem.get("quantityOnHandTotal")).intValue(); - if ( qoh < 0 ) { + if (qoh < 0) { // Got a negative qoh so lets balance if off to zero. Map contextInput = UtilMisc.toMap("userLogin", userLogin, "inventoryItemId", invItem.get("inventoryItemId"), "varianceReasonId", "VAR_LOST", "availableToPromiseVar", new Double(qoh*-1), @@ -117,12 +117,12 @@ String locationSeqId = (String) context.get("locationSeqId"); String locationSeqIdNew = (String) context.get("locationSeqIdNew"); Double quantity = (Double) context.get("quantity"); - if ( UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId) ) { + if (UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId)) { return ServiceUtil.returnError("productId or facilityId not found"); } // First identify the location and get a list of inventoryItemIds for that location. - if ( UtilValidate.isEmpty(locationSeqId) ) { + if (UtilValidate.isEmpty(locationSeqId)) { // Assume this is the null field version locationSeqId = "nullField"; } @@ -138,7 +138,7 @@ } int atp = ((Double)invAvailability.get("availableToPromiseTotal")).intValue(); int qoh = ((Double)invAvailability.get("quantityOnHandTotal")).intValue(); - if ( quantity.intValue() == qoh ) { + if (quantity.intValue() == qoh) { // No change required. Debug.logInfo("updateProductStocktake No change required quantity("+quantity+") = qoh("+qoh+")", module); return ServiceUtil.returnSuccess(); @@ -159,7 +159,7 @@ GenericValue invItem = (GenericValue)invItemListIter.next(); String locationFound = invItem.getString("locationSeqId"); Debug.logInfo("updateProductStocktake: InvItemId("+invItem.getString("inventoryItemId")+")", module); - if ( locationFound == null ) { + if (locationFound == null) { locationFound = "nullField"; } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Aug 17 15:42:56 2009 @@ -160,23 +160,26 @@ <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/> <!-- Myportal help pages --> - <DataResource dataResourceId="HELP-MY-PORTAL" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" /> - <ElectronicText dataResourceId="HELP-MY-PORTAL"> + <DataResource dataResourceId="HELP_MYPORTAL" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" /> + <ElectronicText dataResourceId="HELP_MYPORTAL"> <textData><![CDATA[ <root> <generalTitle> The My portal Component introduction. </generalTitle> <general> - Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system. - Examples are a general employee, an account manager, a customer, a supplier etc... - The system makes use of special portlets which can be arranged and selected/hidden by the logged on user. + <section> + <text> + Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system. + Examples are a general employee, an account manager, a customer, a supplier etc... + The system makes use of special portlets which can be arranged and selected/hidden by the logged on user. + </text> + </section> </general> </root> ]]></textData> </ElectronicText> - <DataResource dataResourceId="HELP-TEMPL-FLAT_GREY"/> - <Content contentId="HELP-MY-PORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceId="HELP-MY-PORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal General help" mimeTypeId="text/html"/> - + <Content contentId="HELP_MYPORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_MYPORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal help" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_MYPORTAL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/> </entity-engine-xml> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Aug 17 15:42:56 2009 @@ -528,7 +528,7 @@ String invItemStatus = UtilXml.childElementValue(receiptLnElement, "of:DISPOSITN"); if (invItemStatus.equals("ReceivedTOAvailable") || invItemStatus.equals("NotAvailableTOAvailable")) { ripCtx.put("statusId","INV_AVAILABLE"); - } else if (invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable") ) { + } else if (invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable")) { ripCtx.put("statusId","INV_ON_HOLD"); } */ Modified: ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Mon Aug 17 15:42:56 2009 @@ -226,7 +226,7 @@ String carrierCode = UtilXml.childElementValue(shipUnitElement, "of:CARRIER"); // of if (UtilValidate.isNotEmpty(carrierCode)) { String carrierPartyId = null; - if ( carrierCode.startsWith("F") || carrierCode.startsWith("f")) { + if (carrierCode.startsWith("F") || carrierCode.startsWith("f")) { carrierPartyId = "FEDEX"; } else if (carrierCode.startsWith("U")|| carrierCode.startsWith("u")) { carrierPartyId = "UPS"; @@ -810,7 +810,7 @@ EntityCondition findShipmentCondition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "SHIPMENT_CANCELLED") - ), EntityOperator.AND); + ), EntityOperator.AND); List shipmentList = delegator.findList("Shipment", findShipmentCondition, null, null, null, false); GenericValue shipment = EntityUtil.getFirst(shipmentList); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Mon Aug 17 15:42:56 2009 @@ -32,9 +32,9 @@ <#assign shipmentNotesSize = 65/> <n:PROCESS_SHIPMENT_001 xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:os="http://www.openapplications.org/oagis_segments" - xmlns:of="http://www.openapplications.org/oagis_fields"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:os="http://www.openapplications.org/oagis_segments" + xmlns:of="http://www.openapplications.org/oagis_fields"> <os:CNTROLAREA> <os:BSR> <of:VERB>PROCESS</of:VERB> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/config/PosUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/config/PosUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/config/PosUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/config/PosUiLabels.xml Mon Aug 17 15:42:56 2009 @@ -25,7 +25,6 @@ <value xml:lang="fr">(ajustement)</value> <value xml:lang="it">(adjustment)</value> <value xml:lang="ro">(adjustment)</value> - <value xml:lang="zh">(adjustment)</value> <value xml:lang="zh">(è°æ´)</value> </property> <property key="PosAmt"> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Aug 17 15:42:56 2009 @@ -201,7 +201,7 @@ } public List lookupItem(String sku) throws GeneralException { - return ProductWorker.findProductsById( session.getDelegator(), sku, null); + return ProductWorker.findProductsById(session.getDelegator(), sku, null); } public String getOrderId() { @@ -443,9 +443,9 @@ return pcw; } - public ProductConfigWrapper getProductConfigWrapper(String productId, String cartIndex ) { + public ProductConfigWrapper getProductConfigWrapper(String productId, String cartIndex) { // Get a PCW for a pre-configured product - trace("get Product Config Wrapper", productId + "/" + cartIndex ); + trace("get Product Config Wrapper", productId + "/" + cartIndex); ProductConfigWrapper pcw = null; try { int index = Integer.parseInt(cartIndex); @@ -490,7 +490,7 @@ public void addItem(String productId, ProductConfigWrapper pcw) throws ItemNotFoundException, CartItemModifyException { - trace("add item with ProductConfigWrapper", productId ); + trace("add item with ProductConfigWrapper", productId); try { cart.addOrIncreaseItem(productId, null, BigDecimal.ONE, null, null, null, null, null, null, null, null, pcw, null, null, null, session.getDispatcher()); } catch (ItemNotFoundException e) { @@ -507,7 +507,7 @@ public void modifyConfig(String productId, ProductConfigWrapper pcw, String cartIndex) throws CartItemModifyException, ItemNotFoundException { - trace("modify item config", cartIndex ); + trace("modify item config", cartIndex); try { int cartIndexInt = Integer.parseInt(cartIndex); ShoppingCartItem cartItem = cart.findCartItem(cartIndexInt); @@ -1380,7 +1380,7 @@ } public void saveOrder(String shoppingListName, PosScreen pos) { - if (cart.size() == 0 ) { + if (cart.size() == 0) { pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); return; } @@ -1409,7 +1409,7 @@ } public void saveSale(String shoppingListName, PosScreen pos) { - if (cart.size() == 0 ) { + if (cart.size() == 0) { pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); return; } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Mon Aug 17 15:42:56 2009 @@ -73,7 +73,7 @@ public void setFunction(String function, String value) throws IllegalArgumentException { if (isValidFunction(function)) { - this.functionStack.push( new String[] { function, value }); + this.functionStack.push(new String[] { function, value }); input.setText(""); } else { throw new IllegalArgumentException(); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java Mon Aug 17 15:42:56 2009 @@ -26,25 +26,25 @@ protected javax.swing.JTextField savedInput; protected XPassword password = null; - public InputWithPassword( PosScreen page) { - super( page); + public InputWithPassword(PosScreen page) { + super(page); this.savedInput = super.input; this.password = (XPassword)page.findComponent("pos_inputpassword"); - if ( this.password == null) { + if (this.password == null) { this.password = new XPassword(); } this.password.setVisible(false); this.password.setFocusable(false); } public void setPasswordInput(boolean isPasswordInput) { - if ( isPasswordInput) { + if (isPasswordInput) { this.savedInput.setVisible(false); this.password.setText(""); - this.password.setVisible( true); + this.password.setVisible(true); super.input = this.password; } else { this.password.setVisible(false); - this.savedInput.setVisible( true); + this.savedInput.setVisible(true); super.input = this.savedInput; } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Mon Aug 17 15:42:56 2009 @@ -75,7 +75,7 @@ // some settings needed for XUI 3.2rc2b update jtable.setRowHeight(30); // Better to catch the line on a touch screen (minimal height I think) XStyle style = currentProject.getStyleManager().getStyle("journalBorder"); - Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE ); + Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE); jtable.setGridColor(borderColor); // jtable.setBorderStyle("journalBorder"); above is not working anymore style = currentProject.getStyleManager().getStyle("journalData"); Color backgoundColor = style.getStyleAsColor(XStyle.COLOR_BACK); @@ -201,7 +201,7 @@ private String getModelText(XModel model) { StringWriter sw = new StringWriter(); - XDataSource.outputModel( sw, model ); + XDataSource.outputModel(sw, model); return "<Datasets>" + sw.toString() + "</Datasets>"; } } \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Mon Aug 17 15:42:56 2009 @@ -154,7 +154,7 @@ input.clearInput(); pos.showDialog("dialog/error/invalidcardnumber"); } - } else if (msrInfo == null && (securityCodeInfo == null) ) { + } else if (msrInfo == null && (securityCodeInfo == null)) { // test expiration date if (UtilValidate.isNotEmpty(input.value()) && (input.value().length() == 4)) { // ask for Security Code, put in SECURITYCODE @@ -168,7 +168,7 @@ input.clearInput(); pos.showDialog("dialog/error/invalidexpirationdate"); } - } else if (msrInfo == null && (postalCodeInfo == null) ) { + } else if (msrInfo == null && (postalCodeInfo == null)) { // test security code - allow blank for illegible cards if (UtilValidate.isEmpty(input.value()) || (UtilValidate.isNotEmpty(input.value()) && (input.value().length() <= 4))) { Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Mon Aug 17 15:42:56 2009 @@ -89,13 +89,13 @@ if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) { output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault())); input.setFunction(loginFunc); - input.setPasswordInput( false); + input.setPasswordInput(false); } else if (UtilValidate.isEmpty(func[1])) { output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUPassw",Locale.getDefault())); input.setFunction(loginFunc); - input.setPasswordInput( true); + input.setPasswordInput(true); } else { - input.setPasswordInput( false); + input.setPasswordInput(false); String username = func[1]; String password = text; if (!mgr) { Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Mon Aug 17 15:42:56 2009 @@ -481,7 +481,7 @@ private void printALine(String s) { printerBuffer = printerBuffer.append(s); - if ( s.indexOf(NullPosPrinter.PAPER_CUT) > 0 ) { + if (s.indexOf(NullPosPrinter.PAPER_CUT) > 0) { Debug.log(printerBuffer.toString(), module); printerBuffer = new StringBuffer(); } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Mon Aug 17 15:42:56 2009 @@ -191,7 +191,7 @@ while (iter.hasNext()) { Question buttonQuestion = qf.get((ConfigItem)iter.next()); XButton button = (XButton)buttons.next(); - questionHashMap.put(button.getName(), buttonQuestion ); + questionHashMap.put(button.getName(), buttonQuestion); buttonQuestion.setupButton(button); if (buttonQuestion instanceof ListQuestion) { ((ListQuestion)buttonQuestion).setupListPane(m_optionListPane); @@ -204,7 +204,7 @@ private void getButtons() { ArrayList buttonList = new ArrayList(); - for(String[] buttonSingleArray : buttonArray ) { + for(String[] buttonSingleArray : buttonArray) { for(String buttonName : buttonSingleArray) { //Debug.logInfo("ButtonName: "+buttonName, module); XButton button = (XButton) m_dialog.findComponent(buttonName); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java Mon Aug 17 15:42:56 2009 @@ -55,8 +55,8 @@ originalText = getText(); // XuiUtilities.getMaxCoordinates(m_dialog); // Panel m_panel = m_dialog.PANEL; -// pageHelper.componentFactory.setParentComponent( this ); -// contentPanel = ( XPanel )pageHelper.componentFactory.addComponent( XPage.PANEL, 0, 0, 800, 600 ); +// pageHelper.componentFactory.setParentComponent(this); +// contentPanel = (XPanel)pageHelper.componentFactory.addComponent(XPage.PANEL, 0, 0, 800, 600); // FIXME XUI dialog boxes are hardcoded to a 800*600 max ! https://issues.apache.org/jira/browse/OFBIZ-1606?focusedCommentId=12614469#action_12614469 // actually maxi seem to be 808*628 certainly due to margins(?) m_dialog.pack(); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Mon Aug 17 15:42:56 2009 @@ -302,7 +302,7 @@ Point size = this.getMaxCoordinates(contentPane); size.x += 2 * padding + 2; size.y += 2 * padding + 4 + 2; - if ( size.x != wSize.width || size.y != wSize.height ) { + if (size.x != wSize.width || size.y != wSize.height) { this.pack(); } } @@ -343,7 +343,7 @@ dialog.setVisible(posDialogVisible); } } - ); + ); } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java Mon Aug 17 15:42:56 2009 @@ -43,22 +43,22 @@ // SwingUtilities.invokeLater( // new Runnable() { // public void run() { -// Debug.logInfo( "isEditable in setFocus :" + m_focused.isEditable(), "======================================" ); -// Debug.logInfo( "isEnabled in setFocus: " + m_focused.isEnabled(), "======================================" ); -// Debug.logInfo( "isFocusable in setFocus :" + m_focused.isFocusable(), "======================================" ); +// Debug.logInfo("isEditable in setFocus :" + m_focused.isEditable(), "======================================"); +// Debug.logInfo("isEnabled in setFocus: " + m_focused.isEnabled(), "======================================"); +// Debug.logInfo("isFocusable in setFocus :" + m_focused.isFocusable(), "======================================"); // m_focused.requestFocusInWindow(); // } // } -// ); +// ); // } // // /** // * @param m_focused the m_focused to set // */ // public void setM_focused(XEdit focused) { -// Debug.logInfo( "isEditable in setM_focused :" + focused.isEditable(), "======================================" ); -// Debug.logInfo( "isEnabled in setM_focused :" + focused.isEnabled(), "======================================" ); -// Debug.logInfo( "isFocusable in setM_focused :" + focused.isFocusable(), "======================================" ); +// Debug.logInfo("isEditable in setM_focused :" + focused.isEditable(), "======================================"); +// Debug.logInfo("isEnabled in setM_focused :" + focused.isEnabled(), "======================================"); +// Debug.logInfo("isFocusable in setM_focused :" + focused.isFocusable(), "======================================"); // this.m_focused = focused; // } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Mon Aug 17 15:42:56 2009 @@ -1414,7 +1414,7 @@ <property key="ProjectMgrWorkEffortActualCompletionDate"> <value xml:lang="de">Tatsächliches Erledigungsdatum</value> <value xml:lang="en">Actual Completion Date</value> - <value xml:lang="fr">Date de fin réelle</value> + <value xml:lang="fr">Date réelle d'achèvement</value> <value xml:lang="it">Data fine attuale</value> <value xml:lang="th">วัà¸à¸à¸µà¹à¸à¸³à¹à¸ªà¸£à¹à¸à¸à¸£à¸´à¸</value> <value xml:lang="zh">å®é å®ææ¥æ</value> @@ -1447,7 +1447,6 @@ <value xml:lang="en">Id</value> <value xml:lang="fr">Réf.</value> <value xml:lang="it">Impegno di lavoro</value> - <value xml:lang="zh">Id</value> <value xml:lang="zh">æ è¯</value> </property> <property key="ProjectMgrWorkEffortIdFrom"> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Mon Aug 17 15:42:56 2009 @@ -48,7 +48,7 @@ GenericValue assoc = (GenericValue) a.next(); GenericValue nextTask = assoc.getRelatedOne("ToWorkEffort"); Timestamp newStartDate = task.getTimestamp("estimatedCompletionDate"); // start of next task the next day - if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate) ) { + if (nextTask.get("estimatedStartDate") == null || nextTask.getTimestamp("estimatedStartDate").before(newStartDate)) { nextTask.put("estimatedStartDate", UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"), 1)); // start of next task the next day nextTask.put("estimatedCompletionDate", calculateCompletionDate(nextTask, task.getTimestamp("estimatedCompletionDate"))); nextTask.store(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |