svn commit: r1654176 - in /ofbiz/branches/release14.12: ./ applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl

Author: jleroux
Date: Fri Jan 23 11:35:22 2015
New Revision: 1654176

URL: http://svn.apache.org/r1654176
Log:
"Applied fix from trunk for revision: 1654175  "
------------------------------------------------------------------------
r1654175 | jleroux | 2015-01-23 12:34:44 +0100 (ven. 23 janv. 2015) | 3 lignes

A patch from Pierre Smits for "ViewQuoteItemInfo.ftl has <td></td> at the wrong place" https://issues.apache.org/jira/browse/OFBIZ-6030

When a product has been added to a quote and subsequently looking at http://demo-trunk-ofbiz.apache.org/ordermgr/control/ViewQuote it shows that the quantity and sel. amount are positioned wrong (1 column to the right of where they should be).
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 23 11:35:22 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653456
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653456,1654175

Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1654176&r1=1654175&r2=1654176&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Fri Jan 23 11:35:22 2015
@@ -95,9 +95,9 @@ under the License.
                             </#if>
                         </div>
                     </td>
-                    <td></td>
                     <td align="right" valign="top">${quoteItem.quantity!}</td>
                     <td align="right" valign="top">${quoteItem.selectedAmount!}</td>
+                    <td></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></td>
                     <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td>