Author: jleroux
Date: Mon Jun 28 09:56:03 2010 New Revision: 958525 URL: http://svn.apache.org/viewvc?rev=958525&view=rev Log: "Applied fix from trunk for revision: 958521" ------------------------------------------------------------------------ r958521 | jleroux | 2010-06-28 11:51:16 +0200 (lun. 28 juin 2010) | 1 ligne I don't know how this line was removed anyway I re-add it (found by chance while backporting to R4.0) ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 28 09:56:03 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521 Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=958525&r1=958524&r2=958525&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original) +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Mon Jun 28 09:56:03 2010 @@ -59,6 +59,7 @@ under the License. <fo:table-row font-weight="bold"> <#if showProductStore><fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.FormFieldTitle_productStoreId}</fo:block></fo:table-cell></#if> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell> + <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderQuantitySold}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderValueSold}</fo:block></fo:table-cell> </fo:table-row> </fo:table-header> |
Free forum by Nabble | Edit this page |