You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/06/03 09:34:58 UTC
svn commit: r1746695 - in /ofbiz/trunk/applications:
datamodel/entitydef/order-entitymodel.xml order/config/OrderUiLabels.xml
order/template/quote/ViewQuoteItemInfo.ftl
order/widget/ordermgr/QuoteForms.xml
Author: diveshdutta
Date: Fri Jun 3 09:34:58 2016
New Revision: 1746695
URL: http://svn.apache.org/viewvc?rev=1746695&view=rev
Log:
[OFBIZ-7051] Added support for specifying lead time while placing a quote to purchase a product. This will help purchase manager to take more informed decesion. Lead time days will also shown in view quote screen and list quote screen. Thanks Swapnil Shah for suggesting the improvement and Mohammad Kathawala for providing the patch.
Modified:
ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
Modified: ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1746695&r1=1746694&r2=1746695&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/order-entitymodel.xml Fri Jun 3 09:34:58 2016
@@ -1468,6 +1468,7 @@ under the License.
<field name="estimatedDeliveryDate" type="date-time"></field>
<field name="comments" type="comment"></field>
<field name="isPromo" type="indicator"></field>
+ <field name="leadTimeDays" type="numeric"></field>
<prim-key field="quoteId"/>
<prim-key field="quoteItemSeqId"/>
<relation type="one" fk-name="QUOTE_ITM_QTE" rel-entity-name="Quote">
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1746695&r1=1746694&r2=1746695&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Jun 3 09:34:58 2016
@@ -8513,6 +8513,9 @@
<value xml:lang="zh-CN">报价项目</value>
<value xml:lang="zh-TW">報價細項</value>
</property>
+ <property key="OrderOrderQuoteLeadTimeDays">
+ <value xml:lang="en">Lead Time Days</value>
+ </property>
<property key="OrderOrderQuoteListAdjustments">
<value xml:lang="ar">عرض تضبيطات عرض السعر</value>
<value xml:lang="de">Liste der Angebotsanpassungen</value>
Modified: ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl?rev=1746695&r1=1746694&r2=1746695&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl Fri Jun 3 09:34:58 2016
@@ -33,7 +33,8 @@ under the License.
<td width="10%" align="right">${uiLabelMap.ProductQuantity}</td>
<td width="10%" align="right">${uiLabelMap.OrderSelAmount}</td>
<td width="8%" align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</td>
- <td width="7%" align="right">${uiLabelMap.CommonComments}</td>
+ <td width="7%" align="right">${uiLabelMap.OrderOrderQuoteLeadTimeDays}</td>
+ <td width="10%" align="right">${uiLabelMap.CommonComments}</td>
<td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td>
<td width="10%" align="right">${uiLabelMap.CommonSubtotal}</td>
</tr>
@@ -45,6 +46,7 @@ under the License.
<td></td>
<td></td>
<td></td>
+ <td></td>
<td align="right"> </td>
</tr>
<#assign totalQuoteAmount = 0.0>
@@ -96,6 +98,7 @@ under the License.
<td align="right" valign="top">${quoteItem.quantity!}</td>
<td align="right" valign="top">${quoteItem.selectedAmount!}</td>
<td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td>
+ <td align="right" valign="top">${quoteItem.leadTimeDays!}</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>
@@ -111,6 +114,7 @@ under the License.
<td align="right" valign="top"></td>
<td align="right" valign="top"></td>
<td align="right" valign="top"></td>
+ <td align="right" valign="top"></td>
</tr>
</#list>
<#-- now show adjustment details per line item -->
@@ -127,10 +131,10 @@ under the License.
</#list>
<tr><td colspan="10"><hr /></td></tr>
<tr>
- <td align="right" colspan="7" class="label">${uiLabelMap.CommonSubtotal}</td>
+ <td align="right" colspan="8" class="label">${uiLabelMap.CommonSubtotal}</td>
<td align="right"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></td>
</tr>
- <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr>
+ <tr><td colspan="6"></td><td colspan="7"><hr /></td></tr>
<#assign totalQuoteHeaderAdjustmentAmount = 0.0>
<#assign findAdjustment = false>
<#list quoteAdjustments as quoteAdjustment>
@@ -138,7 +142,7 @@ under the License.
<#if !quoteAdjustment.quoteItemSeqId??>
<#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
<tr>
- <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)!}</span></td>
+ <td align="right" colspan="7"><span class="label">${adjustmentType.get("description",locale)!}</span></td>
<td align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></td>
</tr>
</#if>
@@ -146,10 +150,10 @@ under the License.
</#list>
<#assign grandTotalQuoteAmount = totalQuoteAmount + totalQuoteHeaderAdjustmentAmount>
<#if findAdjustment>
- <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr>
+ <tr><td colspan="5"></td><td colspan="7"><hr /></td></tr>
</#if>
<tr>
- <td align="right" colspan="7" class="label">${uiLabelMap.OrderGrandTotal}</td>
+ <td align="right" colspan="8" class="label">${uiLabelMap.OrderGrandTotal}</td>
<td align="right">
<@ofbizCurrency amount=grandTotalQuoteAmount isoCode=quote.currencyUomId/>
</td>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1746695&r1=1746694&r2=1746695&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Fri Jun 3 09:34:58 2016
@@ -213,6 +213,7 @@ under the License.
<field name="skillTypeId"><hidden/></field>
<field name="deliverableTypeId"><hidden/></field>
<field name="comments"></field>
+ <field name="leadTimeDays"></field>
<field name="uomId"><hidden/></field>
<!--<field name="custRequestId"><display description="${custRequestId} - ${custRequestItemSeqId}"/></field>-->
<field name="custRequestId" title="${uiLabelMap.CommonViewRequest}" widget-style="buttontext">