Author: jleroux
Date: Fri Sep 4 09:10:34 2009 New Revision: 811306 URL: http://svn.apache.org/viewvc?rev=811306&view=rev Log: "Applied fix from trunk for revision: 811297 " ------------------------------------------------------------------------ r811297 | jleroux | 2009-09-04 11:04:23 +0200 (ven., 04 sept. 2009) | 2 lines A modified patch from Ahmed Dini "Total order of a party." (https://issues.apache.org/jira/browse/OFBIZ-2362) - OFBIZ-2362 ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/findparty.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 4 09:10:34 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,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,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,810814,810832,810 836,810878,810917,810921,811020,811280 +/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,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,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,810814,810832,810 836,810878,810917,810921,811020,811280,811297 Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/findparty.ftl?rev=811306&r1=811305&r2=811306&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/findparty.ftl Fri Sep 4 09:10:34 2009 @@ -248,6 +248,7 @@ <td> </td> </tr> <#assign alt_row = false> + <#assign rowCount = 0> <#list partyList as partyRow> <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> @@ -305,7 +306,14 @@ <td class="button-col align-float"> <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> - <a href="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId + externalKeyParam}&viewIndex=1&viewSize=20">${uiLabelMap.OrderOrders}</a> + <form name= "searchorders_o_${rowCount}" method= "post" action= "/ordermgr/control/searchorders"> + <input type= "hidden" name= "lookupFlag" value= "Y"> + <input type= "hidden" name= "hideFields" value= "Y"> + <input type= "hidden" name= "partyId" value= "${partyRow.partyId}"> + <input type= "hidden" name= "viewIndex" value= "1"> + <input type= "hidden" name= "viewSize" value= "20"> + <a href="javascript:document.searchorders_o_${rowCount}.submit()">${uiLabelMap.OrderOrders}</a> + </form> <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a> </#if> <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> @@ -314,6 +322,7 @@ </#if> </td> </tr> + <#assign rowCount = rowCount + 1> <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> |
Free forum by Nabble | Edit this page |