Author: jleroux Date: Mon May 12 12:56:51 2014 New Revision: 1593953 URL: http://svn.apache.org/r1593953 Log: "Applied fix from trunk for revision: 1593952" ------------------------------------------------------------------------ r1593952 | jleroux | 2014-05-12 14:56:21 +0200 (lun. 12 mai 2014) | 3 lignes
Fixes https://issues.apache.org/jira/browse/OFBIZ-5633 "Inline style being applied to Order Manager > Find Orders" ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1593952 Modified: ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1593953&r1=1593952&r2=1593953&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml Mon May 12 12:56:51 2014 @@ -241,7 +241,7 @@ under the License. <!-- asmslect parameters, must be prefixed by asm_ for setMultipleSelectJs.ftl --> <set field="asm_multipleSelectForm" value="lookuporder"/> <set field="asm_multipleSelect" value="roleTypeId"/> - <set field="asm_formSize" value="700"/> + <set field="asm_formSize" value="1000"/> <set field="asm_asmListItemPercentOfForm" value="95"/> <set field="asm_sortable" value="false"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -334,11 +334,11 @@ under the License. <set field="headerItem" value="findorders"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ReceivePayment.groovy"/> <entity-and entity-name="OrderRole" list="orderRoles"> - <field-map field-name="orderId" value="${parameters.orderId}"/> - <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> + <field-map field-name="orderId" value="${parameters.orderId}"/> + <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> </entity-and> <entity-and entity-name="PaymentMethod" list="paymentMethods"> - <field-map field-name="partyId" from-field="orderRoles[0].partyId"/> + <field-map field-name="partyId" from-field="orderRoles[0].partyId"/> </entity-and> </actions> <widgets>
