svn commit: r1068279 [2/2] - in /ofbiz/trunk/applications: order/entitydef/ order/script/org/ofbiz/order/o
Locked
svn commit: r1068279 [2/2] - in /ofbiz/trunk/applications: order/entitydef/ order/script/org/ofbiz/order/o
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign Tue Feb 8 07:10:36 2011 @@ -124,6 +124,16 @@ under the License. <property name="iconFile">/templates/blank_report.gif</property> <property name="layoutPreference">auto layout</property> <parameters> + <scalar-parameter name="reportBy" id="2051"> + <property name="valueType">static</property> + <property name="dataType">string</property> + <property name="distinct">true</property> + <property name="paramType">simple</property> + <property name="controlType">text-box</property> + <structure name="format"> + <property name="category">Unformatted</property> + </structure> + </scalar-parameter> <scalar-parameter name="fromDate" id="310"> <property name="valueType">static</property> <property name="isRequired">false</property> @@ -146,9 +156,10 @@ under the License. <property name="category">Unformatted</property> </structure> </scalar-parameter> - <scalar-parameter name="reportBy" id="2051"> + <scalar-parameter name="lastDate" id="2734"> <property name="valueType">static</property> - <property name="dataType">string</property> + <property name="isRequired">false</property> + <property name="dataType">date</property> <property name="distinct">true</property> <property name="paramType">simple</property> <property name="controlType">text-box</property> @@ -228,31 +239,36 @@ under the License. </structure> <structure> <property name="position">7</property> - <property name="name">quantity</property> + <property name="name">countOrder</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">8</property> - <property name="name">GS</property> + <property name="name">quantity</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">9</property> - <property name="name">GMS</property> + <property name="name">GS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">10</property> - <property name="name">GMP</property> + <property name="name">GMS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">11</property> - <property name="name">GSP</property> + <property name="name">GMP</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">12</property> + <property name="name">GSP</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">13</property> <property name="name">GP</property> <property name="dataType">integer</property> </structure> @@ -283,6 +299,10 @@ under the License. <text-property name="displayName">orderDateMonthName</text-property> </structure> <structure> + <property name="columnName">countOrder</property> + <text-property name="displayName">countOrder</text-property> + </structure> + <structure> <property name="columnName">quantity</property> <text-property name="displayName">quantity</text-property> </structure> @@ -341,31 +361,36 @@ under the License. </structure> <structure> <property name="position">7</property> - <property name="name">quantity</property> + <property name="name">countOrder</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">8</property> - <property name="name">GS</property> + <property name="name">quantity</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">9</property> - <property name="name">GMS</property> + <property name="name">GS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">10</property> - <property name="name">GMP</property> + <property name="name">GMS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">11</property> - <property name="name">GSP</property> + <property name="name">GMP</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">12</property> + <property name="name">GSP</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">13</property> <property name="name">GP</property> <property name="dataType">integer</property> </structure> @@ -385,6 +410,7 @@ try reportBy = params["reportBy"].value; fromDate = params["fromDate"].value; thruDate = params["thruDate"].value; + lastDate = params["lastDate"].value; thruWeek = params["thruWeek"].value; thruMonth = params["thruMonth"].value; thisYear = params["thisYear"].value; @@ -392,6 +418,7 @@ try methodContext.putEnv("reportBy", reportBy); methodContext.putEnv("fromDate", fromDate); methodContext.putEnv("thruDate", thruDate); + methodContext.putEnv("lastDate", lastDate); methodContext.putEnv("thruWeek", thruWeek); methodContext.putEnv("thruMonth", thruMonth); methodContext.putEnv("thisYear", thisYear); @@ -427,6 +454,7 @@ if (starschemas) account = starschema.getString("account"); quantity = starschema.getString("quantity"); + quantity = starschema.getString("quantity"); GS = starschema.getString("GS"); GMS = starschema.getString("GMS"); GMP = starschema.getString("GMP"); @@ -439,6 +467,7 @@ if (starschemas) row["orderDateYearName"] = orderDateYearName; row["orderDateMonthOfYear"] = orderDateMonthOfYear; row["orderDateMonthName"] = orderDateMonthName; + row["countOrder"] = countOrder; row["quantity"] = quantity; row["GS"] = GS; row["GMS"] = GMS; @@ -501,6 +530,10 @@ return true;]]></method> <property name="measureGroups"> <tabular-measure-group name="Summary Field" id="2041"> <property name="measures"> + <tabular-measure name="countOrder" id="2736"> + <expression name="measureExpression">dataSetRow["countOrder"]</expression> + <property name="dataType">integer</property> + </tabular-measure> <tabular-measure name="quantity" id="2042"> <expression name="measureExpression">dataSetRow["quantity"]</expression> <property name="dataType">integer</property> @@ -586,12 +619,14 @@ return true;]]></method> </styles> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> - <property name="type">us-legal</property> + <property name="type">custom</property> + <property name="height">10in</property> + <property name="width">20in</property> <property name="orientation">landscape</property> - <property name="topMargin">0.25in</property> - <property name="leftMargin">0.25in</property> - <property name="bottomMargin">0.25in</property> - <property name="rightMargin">0.25in</property> + <property name="topMargin">0.5in</property> + <property name="leftMargin">0.5in</property> + <property name="bottomMargin">0.5in</property> + <property name="rightMargin">0.5in</property> <page-footer> <text id="3"> <property name="fontFamily">sans-serif</property> @@ -613,6 +648,90 @@ return true;]]></method> </label> <extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2586"> <property name="measures"> + <extended-item extensionName="MeasureView" id="2737"> + <property name="measure">countOrder</property> + <property name="detail"> + <extended-item extensionName="AggregationCell" id="2738"> + <property name="aggregationOnRow">Account/Account</property> + <property name="aggregationOnColumn">Date/orderDateMonthName</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#FFEBCD</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2745"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Account_Date/orderDateMonthName</property> + </data> + </property> + </extended-item> + </property> + <property name="aggregations"> + <extended-item extensionName="AggregationCell" id="2739"> + <property name="aggregationOnRow">Account/Brand</property> + <property name="aggregationOnColumn">Date/orderDateMonthName</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#87CEFA</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2740"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Brand_Date/orderDateMonthName</property> + </data> + </property> + </extended-item> + <extended-item extensionName="AggregationCell" id="2741"> + <property name="aggregationOnRow">Account/Pod</property> + <property name="aggregationOnColumn">Date/orderDateMonthName</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#B0C4DE</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2742"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Pod_Date/orderDateMonthName</property> + </data> + </property> + </extended-item> + <extended-item extensionName="AggregationCell" id="2743"> + <property name="aggregationOnColumn">Date/orderDateMonthName</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#6495ED</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2744"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Date/orderDateMonthName</property> + </data> + </property> + </extended-item> + </property> + <property name="header"> + <extended-item extensionName="CrosstabCell" id="2746"> + <property name="content"> + <label id="2747"> + <text-property name="text">Order</text-property> + </label> + </property> + <property name="fontFamily">sans-serif</property> + <property name="fontSize">small</property> + <property name="fontWeight">bold</property> + <property name="backgroundColor">#ECE9D8</property> + <property name="textAlign">center</property> + </extended-item> + </property> + </extended-item> <extended-item extensionName="MeasureView" id="2588"> <property name="measure">quantity</property> <property name="detail"> @@ -875,7 +994,7 @@ return true;]]></method> <property name="backgroundColor">#FFEBCD</property> <property name="textAlign">center</property> <property name="content"> - <data id="2615"> + <data id="2730"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> @@ -893,12 +1012,12 @@ return true;]]></method> <property name="backgroundColor">#87CEFA</property> <property name="textAlign">center</property> <property name="content"> - <data id="2672"> + <data id="2732"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Account/Brand_Date/orderDateMonthName</property> + <property name="resultSetColumn">Brand_GP</property> </data> </property> </extended-item> @@ -909,12 +1028,12 @@ return true;]]></method> <property name="backgroundColor">#B0C4DE</property> <property name="textAlign">center</property> <property name="content"> - <data id="2690"> + <data id="2731"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Account/Pod_Date/orderDateMonthName</property> + <property name="resultSetColumn">Pod_GP</property> </data> </property> </extended-item> @@ -924,12 +1043,12 @@ return true;]]></method> <property name="backgroundColor">#6495ED</property> <property name="textAlign">center</property> <property name="content"> - <data id="2708"> + <data id="2733"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Date/orderDateMonthName</property> + <property name="resultSetColumn">Grand_GP</property> </data> </property> </extended-item> @@ -1984,6 +2103,65 @@ return true;]]></method> }</expression> <property name="dataType">float</property> </structure> + <structure> + <property name="name">Account_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Account_Date/orderDateMonthName"]+data["GSP_Account/Account_Date/orderDateMonthName"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Pod_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Pod_Date/orderDateMonthName"]+data["GSP_Account/Pod_Date/orderDateMonthName"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Brand_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Brand_Date/orderDateMonthName"]+data["GSP_Account/Brand_Date/orderDateMonthName"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Grand_GP</property> + <expression name="expression" type="javascript">data["GMP_Date/orderDateMonthName"]+data["GSP_Date/orderDateMonthName"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">countOrder_Account/Brand_Date/orderDateMonthName</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Brand</value> + <value>Date/orderDateMonthName</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Account/Pod_Date/orderDateMonthName</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Pod</value> + <value>Date/orderDateMonthName</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Date/orderDateMonthName</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Date/orderDateMonthName</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Account/Account_Date/orderDateMonthName</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Account</value> + <value>Date/orderDateMonthName</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> </list-property> </extended-item> </body> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign Tue Feb 8 07:10:36 2011 @@ -124,6 +124,16 @@ under the License. <property name="iconFile">/templates/blank_report.gif</property> <property name="layoutPreference">auto layout</property> <parameters> + <scalar-parameter name="reportBy" id="2051"> + <property name="valueType">static</property> + <property name="dataType">string</property> + <property name="distinct">true</property> + <property name="paramType">simple</property> + <property name="controlType">text-box</property> + <structure name="format"> + <property name="category">Unformatted</property> + </structure> + </scalar-parameter> <scalar-parameter name="fromDate" id="310"> <property name="valueType">static</property> <property name="isRequired">false</property> @@ -146,9 +156,10 @@ under the License. <property name="category">Unformatted</property> </structure> </scalar-parameter> - <scalar-parameter name="reportBy" id="2051"> + <scalar-parameter name="lastDate" id="2771"> <property name="valueType">static</property> - <property name="dataType">string</property> + <property name="isRequired">false</property> + <property name="dataType">date</property> <property name="distinct">true</property> <property name="paramType">simple</property> <property name="controlType">text-box</property> @@ -233,31 +244,36 @@ under the License. </structure> <structure> <property name="position">8</property> - <property name="name">quantity</property> + <property name="name">countOrder</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">9</property> - <property name="name">GS</property> + <property name="name">quantity</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">10</property> - <property name="name">GMS</property> + <property name="name">GS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">11</property> - <property name="name">GMP</property> + <property name="name">GMS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">12</property> - <property name="name">GSP</property> + <property name="name">GMP</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">13</property> + <property name="name">GSP</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">14</property> <property name="name">GP</property> <property name="dataType">integer</property> </structure> @@ -292,6 +308,10 @@ under the License. <text-property name="displayName">orderDateWeekOfYear</text-property> </structure> <structure> + <property name="columnName">countOrder</property> + <text-property name="displayName">countOrder</text-property> + </structure> + <structure> <property name="columnName">quantity</property> <text-property name="displayName">quantity</text-property> </structure> @@ -355,31 +375,36 @@ under the License. </structure> <structure> <property name="position">8</property> - <property name="name">quantity</property> + <property name="name">countOrder</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">9</property> - <property name="name">GS</property> + <property name="name">quantity</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">10</property> - <property name="name">GMS</property> + <property name="name">GS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">11</property> - <property name="name">GMP</property> + <property name="name">GMS</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">12</property> - <property name="name">GSP</property> + <property name="name">GMP</property> <property name="dataType">integer</property> </structure> <structure> <property name="position">13</property> + <property name="name">GSP</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">14</property> <property name="name">GP</property> <property name="dataType">integer</property> </structure> @@ -399,6 +424,7 @@ try reportBy = params["reportBy"].value; fromDate = params["fromDate"].value; thruDate = params["thruDate"].value; + lastDate = params["lastDate"].value; thruWeek = params["thruWeek"].value; thruMonth = params["thruMonth"].value; thisYear = params["thisYear"].value; @@ -406,6 +432,7 @@ try methodContext.putEnv("reportBy", reportBy); methodContext.putEnv("fromDate", fromDate); methodContext.putEnv("thruDate", thruDate); + methodContext.putEnv("lastDate", lastDate); methodContext.putEnv("thruWeek", thruWeek); methodContext.putEnv("thruMonth", thruMonth); methodContext.putEnv("thisYear", thisYear); @@ -441,6 +468,7 @@ if (starschemas) account = starschema.getString("account"); quantity = starschema.getString("quantity"); + countOrder = starschema.getString("countOrder"); GS = starschema.getString("GS"); GMS = starschema.getString("GMS"); GMP = starschema.getString("GMP"); @@ -454,6 +482,7 @@ if (starschemas) row["orderDateMonthOfYear"] = orderDateMonthOfYear; row["orderDateMonthName"] = orderDateMonthName; row["orderDateWeekOfYear"] = orderDateWeekOfYear; + row["countOrder"] = countOrder; row["quantity"] = quantity; row["GS"] = GS; row["GMS"] = GMS; @@ -520,6 +549,10 @@ return true;]]></method> <property name="measureGroups"> <tabular-measure-group name="Summary Field" id="2041"> <property name="measures"> + <tabular-measure name="countOrder" id="2772"> + <expression name="measureExpression">dataSetRow["countOrder"]</expression> + <property name="dataType">integer</property> + </tabular-measure> <tabular-measure name="quantity" id="2042"> <expression name="measureExpression">dataSetRow["quantity"]</expression> <property name="dataType">integer</property> @@ -605,12 +638,14 @@ return true;]]></method> </styles> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> - <property name="type">us-legal</property> + <property name="type">custom</property> + <property name="height">10in</property> + <property name="width">20in</property> <property name="orientation">landscape</property> - <property name="topMargin">0.25in</property> - <property name="leftMargin">0.25in</property> - <property name="bottomMargin">0.25in</property> - <property name="rightMargin">0.25in</property> + <property name="topMargin">0.5in</property> + <property name="leftMargin">0.5in</property> + <property name="bottomMargin">0.5in</property> + <property name="rightMargin">0.5in</property> <page-footer> <text id="3"> <property name="fontFamily">sans-serif</property> @@ -632,6 +667,90 @@ return true;]]></method> </label> <extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="2621"> <property name="measures"> + <extended-item extensionName="MeasureView" id="2773"> + <property name="measure">countOrder</property> + <property name="detail"> + <extended-item extensionName="AggregationCell" id="2774"> + <property name="aggregationOnRow">Account/Account</property> + <property name="aggregationOnColumn">Date/orderDateWeekOfYear</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#FFEBCD</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2781"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Account_Date/orderDateWeekOfYear</property> + </data> + </property> + </extended-item> + </property> + <property name="aggregations"> + <extended-item extensionName="AggregationCell" id="2775"> + <property name="aggregationOnRow">Account/Brand</property> + <property name="aggregationOnColumn">Date/orderDateWeekOfYear</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#87CEFA</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2776"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Brand_Date/orderDateWeekOfYear</property> + </data> + </property> + </extended-item> + <extended-item extensionName="AggregationCell" id="2777"> + <property name="aggregationOnRow">Account/Pod</property> + <property name="aggregationOnColumn">Date/orderDateWeekOfYear</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#B0C4DE</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2778"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Account/Pod_Date/orderDateWeekOfYear</property> + </data> + </property> + </extended-item> + <extended-item extensionName="AggregationCell" id="2779"> + <property name="aggregationOnColumn">Date/orderDateWeekOfYear</property> + <property name="fontFamily">sans-serif</property> + <property name="backgroundColor">#6495ED</property> + <property name="textAlign">center</property> + <property name="content"> + <data id="2780"> + <structure name="numberFormat"> + <property name="category">Fixed</property> + <property name="pattern">#,##0</property> + </structure> + <property name="resultSetColumn">countOrder_Date/orderDateWeekOfYear</property> + </data> + </property> + </extended-item> + </property> + <property name="header"> + <extended-item extensionName="CrosstabCell" id="2782"> + <property name="content"> + <label id="2783"> + <text-property name="text">Order</text-property> + </label> + </property> + <property name="fontFamily">sans-serif</property> + <property name="fontSize">small</property> + <property name="fontWeight">bold</property> + <property name="backgroundColor">#ECE9D8</property> + <property name="textAlign">center</property> + </extended-item> + </property> + </extended-item> <extended-item extensionName="MeasureView" id="2623"> <property name="measure">quantity</property> <property name="detail"> @@ -894,7 +1013,7 @@ return true;]]></method> <property name="backgroundColor">#FFEBCD</property> <property name="textAlign">center</property> <property name="content"> - <data id="2650"> + <data id="2767"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> @@ -912,12 +1031,12 @@ return true;]]></method> <property name="backgroundColor">#87CEFA</property> <property name="textAlign">center</property> <property name="content"> - <data id="2710"> + <data id="2769"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Account/Brand_Date/orderDateWeekOfYear</property> + <property name="resultSetColumn">Brand_GP</property> </data> </property> </extended-item> @@ -928,12 +1047,12 @@ return true;]]></method> <property name="backgroundColor">#B0C4DE</property> <property name="textAlign">center</property> <property name="content"> - <data id="2728"> + <data id="2768"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Account/Pod_Date/orderDateWeekOfYear</property> + <property name="resultSetColumn">Pod_GP</property> </data> </property> </extended-item> @@ -943,12 +1062,12 @@ return true;]]></method> <property name="backgroundColor">#6495ED</property> <property name="textAlign">center</property> <property name="content"> - <data id="2746"> + <data id="2770"> <structure name="numberFormat"> <property name="category">Fixed</property> <property name="pattern">#,##0</property> </structure> - <property name="resultSetColumn">GP_Date/orderDateWeekOfYear</property> + <property name="resultSetColumn">Grand_GP</property> </data> </property> </extended-item> @@ -1415,6 +1534,20 @@ return true;]]></method> </extended-item> </property> </extended-item> + <extended-item extensionName="LevelView" name="NewLevel View1" id="2784"> + <property name="level">Date/orderDateMonthOfYear</property> + <property name="member"> + <extended-item extensionName="CrosstabCell" id="2785"> + <property name="content"> + <data name="orderDateMonthOfYear" id="2786"> + <property name="resultSetColumn">orderDateMonthOfYear</property> + </data> + </property> + <property name="backgroundColor">#FFEBCD</property> + <property name="textAlign">center</property> + </extended-item> + </property> + </extended-item> <extended-item extensionName="LevelView" name="NewLevel View2" id="2661"> <property name="level">Date/orderDateMonthName</property> <property name="member"> @@ -1432,6 +1565,12 @@ return true;]]></method> </extended-item> <extended-item extensionName="LevelView" name="NewLevel View3" id="2664"> <property name="level">Date/orderDateWeekOfYear</property> + <property name="sort"> + <sort-element> + <expression name="key" type="javascript">data["orderDateWeekOfYear"]</expression> + <property name="direction">asc</property> + </sort-element> + </property> <property name="member"> <extended-item extensionName="CrosstabCell" id="2665"> <property name="content"> @@ -1454,6 +1593,7 @@ return true;]]></method> <property name="header"> <extended-item extensionName="CrosstabCell" id="2622"/> </property> + <property name="fontFamily">sans-serif</property> <property name="backgroundColor">#FFFFFF</property> <property name="cube">BIC_DataCube</property> <list-property name="boundDataColumns"> @@ -2003,6 +2143,70 @@ return true;]]></method> }</expression> <property name="dataType">float</property> </structure> + <structure> + <property name="name">Account_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Account_Date/orderDateWeekOfYear"]+data["GSP_Account/Account_Date/orderDateWeekOfYear"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Pod_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Pod_Date/orderDateWeekOfYear"]+data["GSP_Account/Pod_Date/orderDateWeekOfYear"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Brand_GP</property> + <expression name="expression" type="javascript">data["GMP_Account/Brand_Date/orderDateWeekOfYear"]+data["GSP_Account/Brand_Date/orderDateWeekOfYear"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Grand_GP</property> + <expression name="expression" type="javascript">data["GMP_Date/orderDateWeekOfYear"]+data["GSP_Date/orderDateWeekOfYear"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">countOrder_Account/Brand_Date/orderDateWeekOfYear</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Brand</value> + <value>Date/orderDateWeekOfYear</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Account/Pod_Date/orderDateWeekOfYear</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Pod</value> + <value>Date/orderDateWeekOfYear</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Date/orderDateWeekOfYear</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Date/orderDateWeekOfYear</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">countOrder_Account/Account_Date/orderDateWeekOfYear</property> + <expression name="expression">measure["countOrder"]</expression> + <property name="dataType">integer</property> + <simple-property-list name="aggregateOn"> + <value>Account/Account</value> + <value>Date/orderDateWeekOfYear</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + </structure> + <structure> + <property name="name">orderDateMonthOfYear</property> + <expression name="expression">dimension["Date"]["orderDateMonthOfYear"]</expression> + <property name="dataType">string</property> + </structure> </list-property> </extended-item> </body> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Tue Feb 8 07:10:36 2011 @@ -207,6 +207,13 @@ under the License. <option key="month" description="Months"></option> </drop-down> </field> + <field name="exportType" title="Format Type"> + <drop-down> + <option key="pdf" description="PDF"></option> + <option key="excel" description="Excel"></option> + <option key="html" description="HTML"></option> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Feb 8 07:10:36 2011 @@ -889,6 +889,13 @@ under the License. <number value="1"/> </calcop> </calculate> + <if-compare field="week" operator="equals" value="1"> + <calculate field="year"> + <calcop field="year" operator="subtract"> + <number value="1"/> + </calcop> + </calculate> + </if-compare> </else> </if-compare> @@ -953,9 +960,7 @@ under the License. <if-empty field="productCategoryRollupList"> <set-service-fields service-name="FindBestSellingProduct" map="parameters" to-map="AddProductMap"/> <set field="AddProductMap.productCategoryId" from-field="parameters.productCategoryId"/> - <call-service service-name="FindBestSellingProduct" in-map-name="AddProductMap"> - <result-to-field result-name="productCategoryId"/> - </call-service> + <call-service service-name="FindBestSellingProduct" in-map-name="AddProductMap"/> <else> <iterate list="productCategoryRollupList" entry="productCategoryRollup"> <set-service-fields service-name="FindCategoryChild" map="parameters" to-map="CategoryChildMap"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml Tue Feb 8 07:10:36 2011 @@ -213,7 +213,6 @@ under the License. <entity-one value-field="dataResource" entity-name="DataResource"> <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> - <log level="always" message="===========parameters.drIsPublic========== : ${parameters.drIsPublic}"></log> <set field="dataResource.isPublic" from-field="parameters.drIsPublic"/> <store-value value-field="dataResource"/> </if-compare> Modified: ofbiz/trunk/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Feb 8 07:10:36 2011 @@ -1515,7 +1515,6 @@ under the License. <attribute name="primaryProductCategoryId" mode="IN" type="String" optional="false"/> <attribute name="week" mode="IN" type="Long" optional="false"/> <attribute name="year" mode="IN" type="Long" optional="false"/> - <attribute name="checkCategoryChild" mode="IN" type="List" optional="true"/> </service> <service name="FindBestSellingProduct" engine="simple" Modified: ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1068279&r1=1068278&r2=1068279&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl Tue Feb 8 07:10:36 2011 @@ -42,7 +42,7 @@ jQuery(document).ready(function(){ <#assign userLoginApprover = userLoginApprovers[0]> <#assign userLoginAndPartyDetails = delegator.findByPrimaryKey("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId))?if_exists> <#if userLoginAndPartyDetails != null && userLoginAndPartyDetails?has_content> - <#assign partyContentDetail = delegator.findByAnd("PartyContentDetail",Static["org.ofbiz.base.util.UtilMisc"].toMap("partyContentTypeId", "IMAGEAPPROVER", "statusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId))/> + <#assign partyContentDetail = delegator.findByAnd("ContentApproval",Static["org.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId))/> <#assign imageApproveSize = partyContentDetail.size()> <#if userLoginAndPartyDetails.userLoginId == userLogin.userLoginId> <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |