svn commit: r830093 - in /ofbiz/branches/release09.04: ./ applications/product/config/Pr
Locked
svn commit: r830093 - in /ofbiz/branches/release09.04: ./ applications/product/config/Pr
 
|
Author: jleroux
Date: Tue Oct 27 08:40:48 2009 New Revision: 830093 URL: http://svn.apache.org/viewvc?rev=830093&view=rev Log: "Applied fix from trunk for revision: 830091" ------------------------------------------------------------------------ r830091 | jleroux | 2009-10-27 09:29:12 +0100 (mar. 27 oct. 2009) | 1 ligne Better behavior in case of error (nothing to export from product search list) ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml ofbiz/branches/release09.04/applications/product/widget/catalog/FindScreens.xml Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 27 08:40:48 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091 Modified: ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml?rev=830093&r1=830092&r2=830093&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/release09.04/applications/product/config/ProductUiLabels.xml Tue Oct 27 08:40:48 2009 @@ -9424,6 +9424,10 @@ <value xml:lang="th">ERROR: à¸à¸´à¸à¸à¸¥à¸²à¸ ! à¹à¸¡à¹à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">é误ï¼æ²¡ææ¾å°äº§å</value> </property> + <property key="ProductErrorNothingToExport"> + <value xml:lang="en">ERROR: Nothing To Export</value> + <value xml:lang="fr">ERREUR : rien à exporter</value> + </property> <property key="ProductErrorShipmentNotPurchaseShipment"> <value xml:lang="de">Lieferung ${shipmentId} ist keine Einkaufslieferung</value> <value xml:lang="en">Shipment ${shipmentId} is not a Purchase Shipment</value> Modified: ofbiz/branches/release09.04/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/widget/catalog/FindScreens.xml?rev=830093&r1=830092&r2=830093&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/branches/release09.04/applications/product/widget/catalog/FindScreens.xml Tue Oct 27 08:40:48 2009 @@ -100,9 +100,13 @@ <set field="productExportList" from-field="parameters.productExportList"/> </actions> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/find/exportproducts.ftl"/></html> - </platform-specific> + <decorator-screen name="CommonFindDecorator"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/find/exportproducts.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> </widgets> </section> </screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |