svn commit: r1742742 - in /ofbiz/trunk/applications/order: template/quote/ViewQuoteItemInfo.ftl widget/ordermgr/QuoteForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1742742 - in /ofbiz/trunk/applications/order: template/quote/ViewQuoteItemInfo.ftl widget/ordermgr/QuoteForms.xml

diveshdutta
Author: diveshdutta
Date: Sat May  7 19:04:17 2016
New Revision: 1742742

URL: http://svn.apache.org/viewvc?rev=1742742&view=rev
Log:
[OFBIZ-7052] Now Comment added against any quote item is getting reflected on Quote Item UI. Thanks Swapnil Shah for reporting the issue and Thanks Mohammad Kathawala for providing the patch.

Modified:
    ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml

Modified: ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl?rev=1742742&r1=1742741&r2=1742742&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl Sat May  7 19:04:17 2016
@@ -32,8 +32,8 @@ under the License.
                 <td width="20%">${uiLabelMap.ProductProduct}</td>
                 <td width="10%" align="right">${uiLabelMap.ProductQuantity}</td>
                 <td width="10%" align="right">${uiLabelMap.OrderSelAmount}</td>
-                <td width="5%" align="right">&nbsp;</td>
-                <td width="10%" align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</td>
+                <td width="8%" align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</td>
+                <td width="7%" align="right">${uiLabelMap.CommonComments}</td>
                 <td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td>
                 <td width="10%" align="right">${uiLabelMap.CommonSubtotal}</td>
             </tr>
@@ -95,8 +95,8 @@ under the License.
                     </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">${quoteItem.comments!}</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>
                 </tr>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1742742&r1=1742741&r2=1742742&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Sat May  7 19:04:17 2016
@@ -212,7 +212,7 @@ under the License.
         <field name="productFeatureId"><hidden/></field>
         <field name="skillTypeId"><hidden/></field>
         <field name="deliverableTypeId"><hidden/></field>
-        <field name="comments"><hidden/></field>
+        <field name="comments"></field>
         <field name="uomId"><hidden/></field>
         <!--<field name="custRequestId"><display description="${custRequestId} - ${custRequestItemSeqId}"/></field>-->
         <field name="custRequestId" title="${uiLabelMap.CommonViewRequest}" widget-style="buttontext">