svn commit: r926987 [10/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [10/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -118,7 +118,7 @@ try { input = FastMap.newInstance(); inputFields = FastMap.newInstance(); if(params!=null){ - inputFields.put("noConditionFind", "Y"); + inputFields.put("noConditionFind", "Y"); } input.put("userLogin",userLogin); @@ -134,16 +134,16 @@ try { }]]></method> <method name="fetch"><![CDATA[if(orders == null)return false; if(order = orders.next()){ - row["orderId"] = order.getString("orderId"); - row["productId"] = order.getString("productProductId"); - row["productName"] = order.getString("productInternalName"); - row["discount"] = order.getString("extDiscountAmount"); - row["promoCode"] = order.getString("productPromoCode"); - Debug.logInfo("-----------order---------"+order.getString("orderId"),module); - return true; + row["orderId"] = order.getString("orderId"); + row["productId"] = order.getString("productProductId"); + row["productName"] = order.getString("productInternalName"); + row["discount"] = order.getString("extDiscountAmount"); + row["promoCode"] = order.getString("productPromoCode"); + Debug.logInfo("-----------order---------"+order.getString("orderId"),module); + return true; }else{ - orders.close(); - return false; + orders.close(); + return false; }]]></method> </script-data-set> </data-sets> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign Wed Mar 24 09:23:07 2010 @@ -254,10 +254,10 @@ module = "OrdersByChannel.rptdesign";]]> <property name="dataSource">OFBIZ</property> <method name="open"><![CDATA[salesOrderItemFacts = null; try { - if(params["saleChannel"] != "null"){ - salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact", UtilMisc.toMap("saleChannel", params["saleChannel"])); + if(params["saleChannel"] != "null"){ + salesOrderItemFacts = delegator.findByAnd("SalesOrderItemFact", UtilMisc.toMap("saleChannel", params["saleChannel"])); }else{ - salesOrderItemFacts = delegator.findAll("SalesOrderItemFact"); + salesOrderItemFacts = delegator.findAll("SalesOrderItemFact"); } } catch (e) { Debug.logError(e, module); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -265,7 +265,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; Week = params["Week"].value; Year = params["Year"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); @@ -289,41 +289,41 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows - 1) return false; { - starschema = starschemas.get(currentRow); - orderDateDateValue = starschema.getString("orderDateDateValue"); - orderDateDayName = starschema.getString("orderDateDayName"); - orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); - orderDateMonthName = starschema.getString("orderDateMonthName"); - orderDateYearName = starschema.getString("orderDateYearName"); - orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); - orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); - orderDateDescription = starschema.getString("orderDateDescription"); - - WeekOfYear = starschema.getString("orderDateWeekOfYear"); - SKU = starschema.getString("productProductId"); - ProductName = starschema.getString("productInternalName"); - CategoryName = starschema.getString("categoryName"); - QuantitySold = starschema.getString("quantity"); - GS = starschema.getString("GrossSales"); - GMS = starschema.getString("GrossMerchandizeSales"); - GMP = starschema.getString("GrossMerchandizeProfit"); - GSP = starschema.getString("GrossShippingProfit"); - GP = starschema.getString("GrossProfit"); - - salesChannelEnumId = starschema.getString("salesChannelEnumId"); - - row["Week"] = WeekOfYear; - row["SKU"] = SKU; - row["ProductName"] = ProductName; - row["CategoryName"] = CategoryName; - row["QuantitySold"] = QuantitySold; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - - currentRow ++; + starschema = starschemas.get(currentRow); + orderDateDateValue = starschema.getString("orderDateDateValue"); + orderDateDayName = starschema.getString("orderDateDayName"); + orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); + orderDateMonthName = starschema.getString("orderDateMonthName"); + orderDateYearName = starschema.getString("orderDateYearName"); + orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); + orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); + orderDateDescription = starschema.getString("orderDateDescription"); + + WeekOfYear = starschema.getString("orderDateWeekOfYear"); + SKU = starschema.getString("productProductId"); + ProductName = starschema.getString("productInternalName"); + CategoryName = starschema.getString("categoryName"); + QuantitySold = starschema.getString("quantity"); + GS = starschema.getString("GrossSales"); + GMS = starschema.getString("GrossMerchandizeSales"); + GMP = starschema.getString("GrossMerchandizeProfit"); + GSP = starschema.getString("GrossShippingProfit"); + GP = starschema.getString("GrossProfit"); + + salesChannelEnumId = starschema.getString("salesChannelEnumId"); + + row["Week"] = WeekOfYear; + row["SKU"] = SKU; + row["ProductName"] = ProductName; + row["CategoryName"] = CategoryName; + row["QuantitySold"] = QuantitySold; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + + currentRow ++; } return true;]]></method> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -468,408 +468,408 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows - 1) return false; { - starschema = starschemas.get(currentRow); - orderDateDescription = starschema.getString("orderDateDescription"); - orderDateDayName = starschema.getString("orderDateDayName"); - orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); - orderDateMonthName = starschema.getString("orderDateMonthName"); - orderDateYearName = starschema.getString("orderDateYearName"); - orderDateWeekOfYear = starschema.getString("orderDateWeekOfYear"); - orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); - orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); - - quantity = starschema.getString("quantity"); - GrossSales = starschema.getString("GrossSales"); - GrossMerchandizeSales = starschema.getString("GrossMerchandizeSales"); - GrossMerchandizeProfit = starschema.getString("GrossMerchandizeProfit"); - GrossShippingProfit = starschema.getString("GrossShippingProfit"); - GrossProfit = starschema.getString("GrossProfit"); - - salesChannelEnumId = starschema.getString("salesChannelEnumId"); - saleChannel = starschema.getString("saleChannel"); - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["AccountType"] = account_type1; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_AU_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_AU; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_CA_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_CA; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_IE_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_IE; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_SG_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_SG; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_UK_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_UK; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_US_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod1; - row["Account"] = account_B2B_US; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_DE_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod2; - row["Account"] = account_B2B_DE; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_ES_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod2; - row["Account"] = account_B2B_ES; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_FR_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod2; - row["Account"] = account_B2B_FR; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - if (salesChannelEnumId == "B2B_IT_SALES_CHANNEL") - { - row["AccountType"] = account_type2; - row["Pod"] = pod2; - row["Account"] = account_B2B_IT; - row["SalesChannel"] = salesChannelEnumId; - row["orderDateYearName"] = orderDateYearName; - row["orderDateMonthOfYear"] = orderDateMonthOfYear; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateWeekOfYear"] = orderDateWeekOfYear; - row["orderDateDayName"] = orderDateDayName; - row["orderDateDescription"] = orderDateDescription; - row["quantity"] = quantity; - row["GrossSales"] = GrossSales; - row["GrossMerchandizeSales"] = GrossMerchandizeSales; - row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; - row["GrossShippingProfit"] = GrossShippingProfit; - row["GrossProfit"] = GrossProfit; - } - - currentRow ++; + starschema = starschemas.get(currentRow); + orderDateDescription = starschema.getString("orderDateDescription"); + orderDateDayName = starschema.getString("orderDateDayName"); + orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth"); + orderDateMonthName = starschema.getString("orderDateMonthName"); + orderDateYearName = starschema.getString("orderDateYearName"); + orderDateWeekOfYear = starschema.getString("orderDateWeekOfYear"); + orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay"); + orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear"); + + quantity = starschema.getString("quantity"); + GrossSales = starschema.getString("GrossSales"); + GrossMerchandizeSales = starschema.getString("GrossMerchandizeSales"); + GrossMerchandizeProfit = starschema.getString("GrossMerchandizeProfit"); + GrossShippingProfit = starschema.getString("GrossShippingProfit"); + GrossProfit = starschema.getString("GrossProfit"); + + salesChannelEnumId = starschema.getString("salesChannelEnumId"); + saleChannel = starschema.getString("saleChannel"); + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["AccountType"] = account_type1; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_AU_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_AU; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_CA_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_CA; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_IE_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_IE; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_SG_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_SG; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_UK_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_UK; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_US_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod1; + row["Account"] = account_B2B_US; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_DE_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod2; + row["Account"] = account_B2B_DE; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_ES_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod2; + row["Account"] = account_B2B_ES; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_FR_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod2; + row["Account"] = account_B2B_FR; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + if (salesChannelEnumId == "B2B_IT_SALES_CHANNEL") + { + row["AccountType"] = account_type2; + row["Pod"] = pod2; + row["Account"] = account_B2B_IT; + row["SalesChannel"] = salesChannelEnumId; + row["orderDateYearName"] = orderDateYearName; + row["orderDateMonthOfYear"] = orderDateMonthOfYear; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["orderDateDayName"] = orderDateDayName; + row["orderDateDescription"] = orderDateDescription; + row["quantity"] = quantity; + row["GrossSales"] = GrossSales; + row["GrossMerchandizeSales"] = GrossMerchandizeSales; + row["GrossMerchandizeProfit"] = GrossMerchandizeProfit; + row["GrossShippingProfit"] = GrossShippingProfit; + row["GrossProfit"] = GrossProfit; + } + + currentRow ++; } return true;]]></method> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/reportlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/reports/reportlist.ftl Wed Mar 24 09:23:07 2010 @@ -22,7 +22,7 @@ They use the JasperReports reporting too they are good examples of creating detailed reports that you have a lot of control over. special thanks for Britton LaRoche for creating the first pass of these reports and helping to improve them.</div> -<br/> +<br /> <FORM METHOD="post" NAME="orderreportform" ACTION="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> <Table> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Wed Mar 24 09:23:07 2010 @@ -25,14 +25,14 @@ under the License. <body> <h2>${title}</h2> <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br/> + <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br /> ${StringUtil.wrapString(noteData.noteInfo?if_exists)} - <br/><br/> - Please login to the url below and add another note as a reply if required.<br/><br/> - The status and used hours can always be checked <br/> + <br /><br /> + Please login to the url below and add another note as a reply if required.<br /><br /> + The status and used hours can always be checked <br /> <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> - <br/><br/> - Regards.<br/><br/> + <br /><br /> + Regards.<br /><br /> Thank you for your business. </body> </html> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Wed Mar 24 09:23:07 2010 @@ -26,11 +26,11 @@ under the License. <h1>${title}</h1> <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. - <br/><br/> - The status and used hours can always be checked at the url: <br/> + <br /><br /> + The status and used hours can always be checked at the url: <br /> <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> - <br/><br/> - Regards.<br/><br/> + <br /><br /> + Regards.<br /><br /> Thank you for your business. </body> </html> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Wed Mar 24 09:23:07 2010 @@ -26,14 +26,14 @@ under the License. <h1>${title}</h1> <p>Hello ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists},</p> <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been created successfully. - <br/><br/> + <br /><br /> We will solve/implement the request as soon as possible - <br/><br/> - The status and used hours can always be checked <br/> + <br /><br /> + The status and used hours can always be checked <br /> <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> - <br/><br/> + <br /><br /> Regards. - <br/><br/> + <br /><br /> PS. we will notify you when the customer request is completed. </p> </body> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestContactMech.ftl Wed Mar 24 09:23:07 2010 @@ -46,17 +46,17 @@ under the License. <#if emailAddress?has_content>${emailAddress}</#if> <#if postalAddress?has_content> - <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if> + <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1?if_exists}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> ${postalAddress.city?if_exists}, <#if postalAddress.stateProvinceGeoId?has_content> <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")> ${stateProvince.abbreviation?default(stateProvince.geoId)} </#if> ${postalAddress.postalCode?if_exists} - <#if postalAddress.countryGeoId?has_content><br/> + <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOneCache("CountryGeo")> ${country.geoName?default(country.geoId)} </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestDate.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/request/requestDate.ftl Wed Mar 24 09:23:07 2010 @@ -31,7 +31,7 @@ under the License. ${(custRequest.custRequestDate.toString())?if_exists} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="25%" class="label"> ${uiLabelMap.OrderRequestCreatedDate} @@ -41,7 +41,7 @@ under the License. ${(custRequest.createdDate.toString())?if_exists} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="25%" class="label"> ${uiLabelMap.OrderRequestLastModifiedDate} @@ -53,4 +53,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/quickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/quickReturn.ftl Wed Mar 24 09:23:07 2010 @@ -37,7 +37,7 @@ under the License. <input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/> </#if> <#include "returnItemInc.ftl"/> - <hr/> + <hr /> <#if "CUSTOMER_RETURN" == returnHeaderTypeId> <h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3> <table cellspacing="0" class="basic-table"> @@ -82,14 +82,14 @@ under the License. </td> <td width="99%" valign="top" nowrap> <div> - <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br/></#if> - <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br/></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br/>${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br/>${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br/>${shippingAddress.countryGeoId}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> </div> </td> @@ -101,4 +101,4 @@ under the License. </table> </form> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnHeader.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnHeader.ftl Wed Mar 24 09:23:07 2010 @@ -263,14 +263,14 @@ under the License. <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}" <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if>> </#if> - <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br/></#if> - <#if postalAddress.address1?has_content> ${postalAddress.address1}<br/></#if> - <#if postalAddress.address2?has_content> ${postalAddress.address2}<br/></#if> + <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br /></#if> + <#if postalAddress.address1?has_content> ${postalAddress.address1}<br /></#if> + <#if postalAddress.address2?has_content> ${postalAddress.address2}<br /></#if> <#if postalAddress.city?has_content> ${postalAddress.city}</#if> <#if postalAddress.stateProvinceGeoId?has_content> ${postalAddress.stateProvinceGeoId}</#if> <#if postalAddress.postalCode?has_content> ${postalAddress.postalCode}</#if> - <#if postalAddress.countryGeoId?has_content><br/> ${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId?has_content><br /> ${postalAddress.countryGeoId}</#if> </div> </#if> </#macro> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItemInc.ftl Wed Mar 24 09:23:07 2010 @@ -160,7 +160,7 @@ under the License. <tr> <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td> </tr> - <tr><td colspan="9"><br/></td></tr> + <tr><td colspan="9"><br /></td></tr> <#if orderHeaderAdjustments?has_content> <tr class="header-row"> <td>${uiLabelMap.CommonDescription}</td> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnItems.ftl Wed Mar 24 09:23:07 2010 @@ -122,7 +122,7 @@ under the License. </table> </td></tr> </#if> - <tr><td colspan="10"><br/></td></tr> + <tr><td colspan="10"><br /></td></tr> <tr class="header-row"> <td>${uiLabelMap.OrderOrderItems}</td> <td>${uiLabelMap.ProductProduct}</td> @@ -185,9 +185,9 @@ under the License. <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right"> </#if> <#if item.receivedQuantity?exists> - <br/>${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} + <br />${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} <#list shipmentReceipts?if_exists as shipmentReceipt> - <br/>${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> + <br />${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </#list> </#if> </div></td> @@ -299,7 +299,7 @@ under the License. </#list> </#if> <#-- show the return total --> - <tr><td colspan="5"></td><td><hr/></td></tr> + <tr><td colspan="5"></td><td><hr /></td></tr> <tr> <td colspan="2"> </td> <td colspan="3" class="label">${uiLabelMap.OrderReturnTotal}</td> @@ -333,7 +333,7 @@ under the License. </#list> </#if> <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)> - <br/> + <br /> <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> <#if "CUSTOMER_RETURN" == returnHeader.returnHeaderTypeId> <#assign statusId = "RETURN_ACCEPTED"> @@ -349,7 +349,7 @@ under the License. </#if> <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> - <br/> + <br /> <form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> <input type="hidden" name="returnId" value="${returnId}"> <table border='0' cellpadding='2' cellspacing='0'> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnLinks.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnLinks.ftl Wed Mar 24 09:23:07 2010 @@ -24,7 +24,7 @@ under the License. <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> <li<#if selected="OrderReturnHistory"> class="selected"</#if>><a href="<@ofbizUrl>ReturnHistory?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHistory}</a></li> </ul> - <br/> + <br /> </div> <div> <#if selected != "OrderReturnHistory"> @@ -68,5 +68,5 @@ under the License. <#if requestParameters.returnId?has_content> <h2>${uiLabelMap.OrderNoReturnFoundWithId} : ${requestParameters.returnId}</h2> </#if> - <br/> + <br /> </#if> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnList.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnList.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/return/returnList.ftl Wed Mar 24 09:23:07 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.OrderReturnsCurrent}</h1> <div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div> -<br/> +<br /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.OrderReturnId} #</td> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Wed Mar 24 09:23:07 2010 @@ -95,7 +95,7 @@ under the License. </table> <#if security.hasEntityPermission("PAYPROC", "_CREATE", session)> -<br/> +<br /> <table border="0" width='100%' cellpadding='0' cellspacing=0 class='boxoutside'> <tr> <td width='100%'> @@ -205,6 +205,6 @@ under the License. </#if> <#else> - <br/> + <br /> <h3>You do not have permission to view this page. ("PAYSETUP_VIEW" or "PAYSETUP_ADMIN" needed)</h3> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/OrderMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/OrderMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/OrderMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/OrderMenus.xml Wed Mar 24 09:23:07 2010 @@ -288,7 +288,7 @@ under the License. </menu> <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2 no-clear"> + menu-container-style="button-bar button-style-2"> <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}"> <link target="EditRequest"/> </menu-item> Modified: ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/ReportScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/widget/ordermgr/ReportScreens.xml Wed Mar 24 09:23:07 2010 @@ -25,7 +25,7 @@ under the License. <section> <actions> - <set field="titleProperty" value="OrderReports"/> + <set field="titleProperty" value="OrderReports"/> <set field="headerItem" value="reports"/> <set field="parameters.portalPageId" value="OrderReportPage"/> Modified: ofbiz/branches/multitenant20100310/applications/party/config/PartyErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/config/PartyErrorUiLabels.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/config/PartyErrorUiLabels.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/config/PartyErrorUiLabels.xml Wed Mar 24 09:23:07 2010 @@ -458,7 +458,7 @@ </property> <property key="party.id_is_digit"> <value xml:lang="de">Die angegebene Akteur ID beginnt mit einer Zahl. Numerische IDs sind für vom System automatisch erstellte IDs reserviert.</value> - <value xml:lang="en">Specified party ID cannot start with a digit, numeric IDs are reserved for auto-generated IDs</value> + <value xml:lang="en">Specified party ID cannot be a digit, numeric IDs are reserved for auto-generated IDs</value> <value xml:lang="es">El código no puede empezar con un dÃgito, los códigos numericos están reservados para ser autogenerados.</value> <value xml:lang="fr">L'identifiant spécifié pour l'acteur ne peut démarrer par un chiffre, cela est réservé aux identifiants générés automatiquement</value> <value xml:lang="hi_IN">निरà¥à¤¦à¤¿à¤·à¥à¤ पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤ ठà¤à¤ à¤à¥ साथ शà¥à¤°à¥ नहà¥à¤ à¤à¤° सà¤à¤¤à¥ à¤à¤à¥ à¤à¤¤à¥à¤ªà¤¨à¥à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤à¥ à¤à¥ लिठठà¤à¤à¥à¤¯ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤°à¤à¥à¤·à¤¿à¤¤ हà¥à¤|</value> @@ -708,7 +708,7 @@ <value xml:lang="zh">ä¸è½å建ï¼å·²ç»åå¨æå®ä¼åæ è¯çéå±ã</value> </property> <property key="partyservices.cannot_create_affiliate_digit"> - <value xml:lang="en">Cannot create affiliate, specified party ID cannot start with a digit, numeric IDs are reserved for auto-generated IDs.</value> + <value xml:lang="en">Cannot create affiliate, specified party ID cannot be a digit, numeric IDs are reserved for auto-generated IDs.</value> <value xml:lang="es">No se pudo crear afiliado, el código del participante no puede empezar con un dÃgito, los códigos numericos están reservados para ser autogenerados.</value> <value xml:lang="fr">Impossible de créer l'affilié(e), la réf. d'acteur ne peut pas commencer par un chiffre, les identifiants numériques sont réservés aux identifiants générés automatiquement.</value> <value xml:lang="hi_IN">सà¤à¤¬à¤¦à¥à¤§ नहà¥à¤ बना सà¤à¤¤à¥, निरà¥à¤¦à¤¿à¤·à¥à¤ पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤ ठà¤à¤ à¤à¥ साथ शà¥à¤°à¥ नहà¥à¤ à¤à¤° सà¤à¤¤à¥ à¤à¤à¥ à¤à¤¤à¥à¤ªà¤¨à¥à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤à¥ à¤à¥ लिठठà¤à¤à¥à¤¯ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤°à¤à¥à¤·à¤¿à¤¤ हà¥à¤|</value> @@ -817,7 +817,7 @@ </property> <property key="partyservices.could_not_create_party_ID_digit"> <value xml:lang="de">Akteurgruppe kann nicht erstellt werden, Akteur ID darf nicht mit Zahl beginnen. Numerische Akteur IDs sind für das System reserviert.</value> - <value xml:lang="en">Cannot create party group, specified party ID cannot start with a digit, numeric IDs are reserved for auto-generated IDs.</value> + <value xml:lang="en">Cannot create party group, specified party ID cannot be a digit, numeric IDs are reserved for auto-generated IDs.</value> <value xml:lang="es">No se pudo crear grupo de participantes, el código no puede empezar con un dÃgito, los códigos numericos están reservados para ser autogenerados</value> <value xml:lang="fr">Impossible de créer le groupe d'acteur, L'identifiant spécifié pour l'acteur ne peut démarrer par un chiffre, cela est réservé aux identifiants générés automatiquement.</value> <value xml:lang="hi_IN">पारà¥à¤à¥ समà¥à¤¹ नहà¥à¤ बना सà¤à¤¤à¥, निरà¥à¤¦à¤¿à¤·à¥à¤ पारà¥à¤à¥ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤ ठà¤à¤ à¤à¥ साथ शà¥à¤°à¥ नहà¥à¤ à¤à¤° सà¤à¤¤à¥ à¤à¤à¥ à¤à¤¤à¥à¤ªà¤¨à¥à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤à¥ à¤à¥ लिठठà¤à¤à¥à¤¯ à¤à¥à¤°à¤®à¤¾à¤à¤ à¤à¤°à¤à¥à¤·à¤¿à¤¤ हà¥à¤|</value> Modified: ofbiz/branches/multitenant20100310/applications/party/data/PartyPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/data/PartyPortletData.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/data/PartyPortletData.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/data/PartyPortletData.xml Wed Mar 24 09:23:07 2010 @@ -140,7 +140,7 @@ screenshot="/images/portlets/MyCommunications.png"/> <PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/> - <PortalPage portalPageId="PartyProfile" sequenceNum="0" portalPageName="Party Profile Portal Page" description="Party profile page using flexible Portal technology" ownerUserLoginId="_NA_"/> + <PortalPage portalPageId="PartyProfile" sequenceNum="0" portalPageName="Parties" description="Party profile page using flexible Portal technology" ownerUserLoginId="_NA_"/> <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00001" columnWidthPercentage="50"/> <PortalPageColumn portalPageId="PartyProfile" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available --> Modified: ofbiz/branches/multitenant20100310/applications/party/data/PartyTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/data/PartyTypeData.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/data/PartyTypeData.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/data/PartyTypeData.xml Wed Mar 24 09:23:07 2010 @@ -328,6 +328,7 @@ under the License. <StatusItem description="Bounced" sequenceId="50" statusCode="BOUNCED" statusId="COM_BOUNCED" statusTypeId="COM_EVENT_STATUS"/> <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="COM_CANCELLED" statusTypeId="COM_EVENT_STATUS"/> <StatusValidChange condition="" statusId="COM_ENTERED" statusIdTo="COM_PENDING" transitionName="Set Pending, only visible to originator"/> + <StatusValidChange condition="" statusId="COM_ENTERED" statusIdTo="COM_IN_PROGRESS" transitionName="Set In Progress, waiting to be send"/> <StatusValidChange condition="" statusId="COM_ENTERED" statusIdTo="COM_COMPLETE" transitionName="Complete"/> <StatusValidChange condition="" statusId="COM_PENDING" statusIdTo="COM_ENTERED" transitionName="Entered,visible to all participants"/> <StatusValidChange condition="" statusId="COM_PENDING" statusIdTo="COM_IN_PROGRESS" transitionName="Set In Progress, waiting to be send"/> Modified: ofbiz/branches/multitenant20100310/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/entitydef/entitymodel.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/entitydef/entitymodel.xml Wed Mar 24 09:23:07 2010 @@ -1710,6 +1710,7 @@ under the License. </view-entity> <entity entity-name="PartyIdentificationType" package-name="org.ofbiz.party.party" + default-resource-name="PartyEntityLabels" title="Party Identification Type Entity"> <field name="partyIdentificationTypeId" type="id-ne"></field> <field name="parentTypeId" type="id"></field> Modified: ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Mar 24 09:23:07 2010 @@ -207,9 +207,9 @@ under the License. <set from-field="newEntity.communicationEventId" field="eventOrder.communicationEventId"/> <create-value value-field="eventOrder"/> </if-not-empty> - <if-not-empty field="parameters.custReqId"> + <if-not-empty field="parameters.custRequestId"> <make-value value-field="eventRequest" entity-name="CustRequestCommEvent"/> - <set from-field="parameters.custReqId" field="eventRequest.custReqId"/> + <set from-field="parameters.custRequestId" field="eventRequest.custRequestId"/> <set from-field="newEntity.communicationEventId" field="eventRequest.communicationEventId"/> <create-value value-field="eventRequest"/> </if-not-empty> Modified: ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/test/PartyTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/test/PartyTests.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/test/PartyTests.xml (original) +++ ofbiz/branches/multitenant20100310/applications/party/script/org/ofbiz/party/test/PartyTests.xml Wed Mar 24 09:23:07 2010 @@ -237,43 +237,6 @@ under the License. <call-service service-name="updateCommunicationEvent" in-map-name="updateCommEventMap"/> <check-errors/> </simple-method> - <simple-method method-name="testCreateNewRequest" short-description="create a new request" login-required="false"> - <set field="createNewRequestMap.custRequestTypeId" value="RF_PROPOSAL"/> - <set field="createNewRequestMap.statusId" value="CRQ_SUBMITTED"/> - <set field="createNewRequestMap.priority" value="1L" type="Long"/> - <set field="createNewRequestMap.fromPartyId" value="DemoCustomer"/> - <entity-one entity-name="UserLogin" value-field="createNewRequestMap.userLogin"> - <field-map field-name="userLoginId" value="system"/> - </entity-one> - <call-service service-name="createCustRequest" in-map-name="createNewRequestMap"> - <result-to-field result-name="custRequestId" field="requestMap.custRequestId"/> - </call-service> - <call-simple-method method-name="inlineUpdateRequest"/> - <entity-one entity-name="CustRequest" value-field="custRequest"> - <field-map field-name="custRequestId" from-field="requestMap.custRequestId"/> - </entity-one> - <assert> - <not><if-empty field="custRequest"/></not> - <if-compare-field field="custRequest.custRequestId" to-field="requestMap.custRequestId" operator="equals"/> - <if-compare-field field="custRequest.custRequestTypeId" to-field="updateRequestMap.custRequestTypeId" operator="equals"/> - <if-compare-field field="custRequest.statusId" to-field="updateRequestMap.statusId" operator="equals"/> - <if-compare-field field="custRequest.priority" to-field="updateRequestMap.priority" operator="equals"/> - <if-compare-field field="custRequest.fromPartyId" to-field="updateRequestMap.fromPartyId" operator="equals"/> - </assert> - <check-errors/> - </simple-method> - <simple-method method-name="inlineUpdateRequest" short-description="update a request" login-required="false"> - <set field="updateRequestMap.custRequestId" from-field="requestMap.custRequestId"/> - <set field="updateRequestMap.custRequestTypeId" value="RF_INFO"/> - <set field="updateRequestMap.statusId" value="CRQ_ACCEPTED"/> - <set field="updateRequestMap.priority" value="2L" type="Long"/> - <set field="updateRequestMap.fromPartyId" value="admin"/> - <entity-one entity-name="UserLogin" value-field="updateRequestMap.userLogin"> - <field-map field-name="userLoginId" value="system"/> - </entity-one> - <call-service service-name="updateCustRequest" in-map-name="updateRequestMap"/> - <check-errors/> - </simple-method> <simple-method method-name="testCreatePartyTelecomNumber" short-description="Test createPartyTelecomNumber service" login-required="false"> <set field="partyId" value="DemoCustomer"/> Modified: ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Wed Mar 24 09:23:07 2010 @@ -890,6 +890,7 @@ public class ContactMechServices { deletePcmCtx.put("contactMechPurposeTypeId", context.get("contactMechPurposeTypeId")); deletePcmCtx.put("fromDate", tempVal.get("fromDate")); deletePcmCtx.put("userLogin", context.get("userLogin")); + deletePcmCtx.put("partyId", partyId); try { Map<String, Object> deletePcmResult = ctx.getDispatcher().runSync("deletePartyContactMechPurpose", deletePcmCtx); if (ServiceUtil.isError(deletePcmResult)) { Modified: ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/branches/multitenant20100310/applications/party/src/org/ofbiz/party/party/PartyServices.java Wed Mar 24 09:23:07 2010 @@ -112,7 +112,7 @@ public class PartyServices { String description = (String) context.get("description"); // if specified partyId starts with a number, return an error - if (UtilValidate.isNotEmpty(partyId) && Character.isDigit(partyId.charAt(0))) { + if (UtilValidate.isNotEmpty(partyId) && partyId.matches("\\d+")) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "party.id_is_digit", locale)); } @@ -348,7 +348,7 @@ public class PartyServices { } } else { // if specified partyId starts with a number, return an error - if (Character.isDigit(partyId.charAt(0))) { + if (partyId.matches("\\d+")) { errMsg = UtilProperties.getMessage(resource,"partyservices.could_not_create_party_ID_digit", locale); return ServiceUtil.returnError(errMsg); } @@ -511,7 +511,7 @@ public class PartyServices { String partyId = getPartyId(context); // if specified partyId starts with a number, return an error - if (Character.isDigit(partyId.charAt(0))) { + if (UtilValidate.isNotEmpty(partyId) && partyId.matches("\\d+")) { errMsg = UtilProperties.getMessage(resource,"partyservices.cannot_create_affiliate_digit", locale); return ServiceUtil.returnError(errMsg); } Propchange: ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 24 09:23:07 2010 @@ -0,0 +1 @@ +/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 Modified: ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl Wed Mar 24 09:23:07 2010 @@ -28,7 +28,7 @@ under the License. </ul> <br class="clear"/> </div> - <br/> + <br /> </#if> <#else> <h2>${uiLabelMap.PartyMgrViewPermissionError}</h2> Modified: ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/party/editShoppingList.ftl Wed Mar 24 09:23:07 2010 @@ -50,7 +50,7 @@ under the License. </#if> </div> </div> -<br/> +<br /> <#if shoppingList?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -129,7 +129,7 @@ under the License. </div> </div> <#if childShoppingListDatas?has_content> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -158,7 +158,7 @@ under the License. </div> </div> </#if> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -221,7 +221,7 @@ under the License. </#if> </div> </div> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |