svn commit: r924378 [2/8] - in /ofbiz/trunk: ./ applications/accounting/config
Locked
svn commit: r924378 [2/8] - in /ofbiz/trunk: ./ applications/accounting/config
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign Wed Mar 17 17:28:01 2010 @@ -543,7 +543,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateMonth = params["DateMonth"].value; DateYear = params["DateYear"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); @@ -580,261 +580,261 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) 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"); - - quantity = starschema.getString("quantity"); - GS = starschema.getString("GrossSales"); - GMS = starschema.getString("GrossMerchandizeSales"); - GMP = starschema.getString("GrossMerchandizeProfit"); - GSP = starschema.getString("GrossShippingProfit"); - GP = starschema.getString("GrossProfit"); - eBay = starschema.getString("eBay"); - RRC = starschema.getString("RRC"); - Others = starschema.getString("OtherFree"); - NBO = starschema.getString("NBO"); - - salesChannelEnumId = starschema.getString("salesChannelEnumId"); + 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"); + + quantity = starschema.getString("quantity"); + GS = starschema.getString("GrossSales"); + GMS = starschema.getString("GrossMerchandizeSales"); + GMP = starschema.getString("GrossMerchandizeProfit"); + GSP = starschema.getString("GrossShippingProfit"); + GP = starschema.getString("GrossProfit"); + eBay = starschema.getString("eBay"); + RRC = starschema.getString("RRC"); + Others = starschema.getString("OtherFree"); + NBO = starschema.getString("NBO"); + + salesChannelEnumId = starschema.getString("salesChannelEnumId"); - if (orderDateMonthOfYear == DateMonth) - { - row["Daily"] = 1; - } - else - { - row["Daily"] = 2; - } - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["Date"] = orderDateYearMonthDay; - row["Month"] = orderDateMonthOfYear; - row["MonthName"] = orderDateMonthName; - row["Today"] = DateDay; - } - - currentRow ++; + if (orderDateMonthOfYear == DateMonth) + { + row["Daily"] = 1; + } + else + { + row["Daily"] = 2; + } + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["Date"] = orderDateYearMonthDay; + row["Month"] = orderDateMonthOfYear; + row["MonthName"] = orderDateMonthName; + row["Today"] = DateDay; + } + + currentRow ++; } return true;]]></method> @@ -1167,7 +1167,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateDay = params["DateDay"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); methodContext.putEnv("productStoreId", productStoreId); @@ -1201,242 +1201,242 @@ if (Date_starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) return false; { - Date_starschema = Date_starschemas.get(currentRow); - orderDateDateValue = Date_starschema.getString("orderDateDateValue"); - orderDateDayName = Date_starschema.getString("orderDateDayName"); - orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth"); - orderDateMonthName = Date_starschema.getString("orderDateMonthName"); - orderDateYearName = Date_starschema.getString("orderDateYearName"); - orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay"); - orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear"); - orderDateDescription = Date_starschema.getString("orderDateDescription"); - - quantity = Date_starschema.getString("quantity"); - GS = Date_starschema.getString("GrossSales"); - GMS = Date_starschema.getString("GrossMerchandizeSales"); - GMP = Date_starschema.getString("GrossMerchandizeProfit"); - GSP = Date_starschema.getString("GrossShippingProfit"); - GP = Date_starschema.getString("GrossProfit"); - eBay = Date_starschema.getString("eBay"); - RRC = Date_starschema.getString("RRC"); - Others = Date_starschema.getString("OtherFree"); - NBO = Date_starschema.getString("NBO"); - - salesChannelEnumId = Date_starschema.getString("salesChannelEnumId"); - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["Date"] = orderDateYearMonthDay; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateDayOfMonth"] = orderDateDayOfMonth; - row["orderDateMonthName"] = orderDateMonthName; - row["orderDateYearName"] = orderDateYearName; - row["orderDateDateValue"] = orderDateDateValue; - row["Parcel"] = quantity; - row["GS"] = GS; - row["GMS"] = GMS; - row["GMP"] = GMP; - row["GSP"] = GSP; - row["GP"] = GP; - row["eBay"] = eBay; - row["RRC"] = RRC; - row["Others"] = Others; - row["NBO"] = NBO; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["Date"] = orderDateYearMonthDay; - } - - currentRow ++; + Date_starschema = Date_starschemas.get(currentRow); + orderDateDateValue = Date_starschema.getString("orderDateDateValue"); + orderDateDayName = Date_starschema.getString("orderDateDayName"); + orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth"); + orderDateMonthName = Date_starschema.getString("orderDateMonthName"); + orderDateYearName = Date_starschema.getString("orderDateYearName"); + orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay"); + orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear"); + orderDateDescription = Date_starschema.getString("orderDateDescription"); + + quantity = Date_starschema.getString("quantity"); + GS = Date_starschema.getString("GrossSales"); + GMS = Date_starschema.getString("GrossMerchandizeSales"); + GMP = Date_starschema.getString("GrossMerchandizeProfit"); + GSP = Date_starschema.getString("GrossShippingProfit"); + GP = Date_starschema.getString("GrossProfit"); + eBay = Date_starschema.getString("eBay"); + RRC = Date_starschema.getString("RRC"); + Others = Date_starschema.getString("OtherFree"); + NBO = Date_starschema.getString("NBO"); + + salesChannelEnumId = Date_starschema.getString("salesChannelEnumId"); + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["Date"] = orderDateYearMonthDay; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateDayOfMonth"] = orderDateDayOfMonth; + row["orderDateMonthName"] = orderDateMonthName; + row["orderDateYearName"] = orderDateYearName; + row["orderDateDateValue"] = orderDateDateValue; + row["Parcel"] = quantity; + row["GS"] = GS; + row["GMS"] = GMS; + row["GMP"] = GMP; + row["GSP"] = GSP; + row["GP"] = GP; + row["eBay"] = eBay; + row["RRC"] = RRC; + row["Others"] = Others; + row["NBO"] = NBO; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["Date"] = orderDateYearMonthDay; + } + + currentRow ++; } return true;]]></method> @@ -1559,7 +1559,7 @@ classLoader = appContext.get(EngineConst starschemas = null; try { - productStoreId = params["productStoreId"].value; + productStoreId = params["productStoreId"].value; DateMonth = params["DateMonth"].value; DateYear = params["DateYear"].value; methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE); @@ -1595,106 +1595,106 @@ if (starschemas) }]]></method> <method name="fetch"><![CDATA[if (currentRow >= totalRows) return false; { - starschema = starschemas.get(currentRow); + starschema = starschemas.get(currentRow); - salesChannelEnumId = starschema.getString("salesChannelEnumId"); - orderDateMonthName = starschema.getString("orderDateMonthName"); - orderDateYearName = starschema.getString("orderDateYearName"); - NBO = starschema.getString("NBO"); - CountDate = starschema.getString("CountDate"); - - if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_AU; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_CA; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_IE; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_SG; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_UK; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod1; - row["Account"] = account_B2C_US; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_DE; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_ES; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_FR; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") - { - row["SalesChannel"] = salesChannelEnumId; - row["orderDateMonthName"] = orderDateMonthName; - row["Pod"] = pod2; - row["Account"] = account_B2C_IT; - row["NBO"] = NBO; - row["CountDate"] = CountDate; - } - - currentRow ++; + salesChannelEnumId = starschema.getString("salesChannelEnumId"); + orderDateMonthName = starschema.getString("orderDateMonthName"); + orderDateYearName = starschema.getString("orderDateYearName"); + NBO = starschema.getString("NBO"); + CountDate = starschema.getString("CountDate"); + + if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_AU; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_CA; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_IE; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_SG; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_UK; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_US_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod1; + row["Account"] = account_B2C_US; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_DE; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_ES; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_FR; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL") + { + row["SalesChannel"] = salesChannelEnumId; + row["orderDateMonthName"] = orderDateMonthName; + row["Pod"] = pod2; + row["Account"] = account_B2C_IT; + row["NBO"] = NBO; + row["CountDate"] = CountDate; + } + + currentRow ++; } return true;]]></method> @@ -4299,11 +4299,11 @@ return true;]]></method> <property name="name">Show_Daily</property> <expression name="expression">if(dimension["Account"]["Daily"]==1) { - "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) + "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) } else if(dimension["Account"]["Daily"]==2) { - "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) + "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3) }</expression> <property name="dataType">string</property> </structure> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign Wed Mar 17 17:28:01 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/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign Wed Mar 17 17:28:01 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/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign Wed Mar 17 17:28:01 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/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign Wed Mar 17 17:28:01 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/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Wed Mar 17 17:28:01 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/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy?rev=924378&r1=924377&r2=924378&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy Wed Mar 17 17:28:01 2010 @@ -42,11 +42,11 @@ int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth")); if (lastIntMonth == 0 ){ - fromOrderDate = null; + fromOrderDate = null; }else{ - fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30))); - fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy") - Debug.logInfo("====fromDate======="+fromOrderDate.toString(),""); + fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30))); + fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy") + Debug.logInfo("====fromDate======="+fromOrderDate.toString(),""); } birtParameters.facilityId = request.getParameter("facilityId"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |