You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/03 18:59:33 UTC
svn commit: r1197247 [6/10] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/servicedef/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/w...
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl Thu Nov 3 17:59:29 2011
@@ -173,6 +173,56 @@ under the License.
</#list>
</table>
</div>
+ <#if picklistBinInfo.productStore.managedByLot?exists && picklistBinInfo.productStore.managedByLot = "Y">
+ <div style="margin-left: 30px;">
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row"
+ <td>${uiLabelMap.ProductOrderId}</td>
+ <td>${uiLabelMap.ProductOrderShipGroupId}</td>
+ <td>${uiLabelMap.ProductOrderItem}</td>
+ <td>${uiLabelMap.ProductProduct}</td>
+ <td>${uiLabelMap.ProductInventoryItem}</td>
+ <td>${uiLabelMap.ProductLotId}</td>
+ <td>${uiLabelMap.ProductQuantity}</td>
+ <td> </td>
+ </tr>
+ <#assign alt_row = false>
+ <#list picklistBinInfo.picklistItemInfoList?if_exists as picklistItemInfo>
+ <#assign picklistItem = picklistItemInfo.picklistItem>
+ <#assign inventoryItemAndLocation = picklistItemInfo.inventoryItemAndLocation>
+ <#if !picklistItemInfo.product.lotIdFilledIn?has_content || picklistItemInfo.product.lotIdFilledIn != "Forbidden">
+ <form name="editPicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}" method="post" action="<@o...@ofbizUrl>">
+ <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+ <td>${picklistItem.orderId}</td>
+ <td>${picklistItem.shipGroupSeqId}</td>
+ <td>${picklistItem.orderItemSeqId}</td>
+ <td>${picklistItemInfo.orderItem.productId}<#if picklistItemInfo.orderItem.productId != inventoryItemAndLocation.productId> [${inventoryItemAndLocation.productId}]</#if></td>
+ <td>${inventoryItemAndLocation.inventoryItemId}</td>
+ <td><input type="text" name="lotId" <#if inventoryItemAndLocation.lotId?has_content>value="${inventoryItemAndLocation.lotId}"</#if> /></td>
+ <td><input type="text" name="quantity" value="${picklistItem.quantity}" /></td>
+ <td>
+ <input type="hidden" name="picklistBinId" value="${picklistItemInfo.picklistItem.picklistBinId}"/>
+ <input type="hidden" name="orderId" value= "${picklistItemInfo.picklistItem.orderId}"/>
+ <input type="hidden" name="orderItemSeqId" value="${picklistItemInfo.picklistItem.orderItemSeqId}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${picklistItemInfo.picklistItem.shipGroupSeqId}"/>
+ <input type="hidden" name="inventoryItemId" value="${picklistItemInfo.picklistItem.inventoryItemId}"/>
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <input type="hidden" name="productId" value="${picklistItemInfo.orderItem.productId}" />
+ <#if inventoryItemAndLocation.lotId?has_content>
+ <input type="hidden" name="oldLotId" value="${inventoryItemAndLocation.lotId}" />
+ </#if>
+ <a href='javascript:document.editPicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}.submit()' class='buttontext'> ${uiLabelMap.CommonEdit} </a>
+ </td>
+ </tr>
+ </form>
+ <#-- toggle the row color -->
+ <#assign alt_row = !alt_row>
+ </#if>
+ </#list>
+ </table>
+ </div>
+ </#if>
+ </#if>
</#if>
</#if>
</#list>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu Nov 3 17:59:29 2011
@@ -38,6 +38,7 @@ under the License.
<td>${uiLabelMap.ProductPo}</td>
<td>${uiLabelMap.ProductLine}</td>
<td>${uiLabelMap.ProductProductId}</td>
+ <td>${uiLabelMap.ProductLotId}</td>
<td>${uiLabelMap.ProductPerUnitPrice}</td>
<td>${uiLabelMap.CommonRejected}</td>
<td>${uiLabelMap.CommonAccepted}</td>
@@ -55,6 +56,7 @@ under the License.
<td><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></td>
<td>${item.orderItemSeqId}</td>
<td>${item.productId?default("Not Found")}</td>
+ <td>${item.lotId?default("")}</td>
<td>${item.unitCost?default(0)?string("##0.00")}</td>
<td>${item.quantityRejected?default(0)?string.number}</td>
<td>${item.quantityAccepted?string.number}</td>
@@ -449,7 +451,17 @@ under the License.
<input type="text" name="quantityRejected_o_${rowCount}" value="0" size="6"/>
</td>
<tr>
- <td colspan="4" align="right">${uiLabelMap.OrderQtyOrdered} :</td>
+ <td> </td>
+ <#if !product.lotIdFilledIn?has_content || product.lotIdFilledIn != "Forbidden">
+ <td align="right">${uiLabelMap.ProductLotId}</td>
+ <td align="right">
+ <input type="text" name="lotId_o_${rowCount}" size="20" />
+ </td>
+ <#else />
+ <td align="right"> </td>
+ <td align="right"> </td>
+ </#if>
+ <td align="right">${uiLabelMap.OrderQtyOrdered} :</td>
<td align="right">
<input type="text" class="inputBox" name="quantityOrdered" value="${orderItem.quantity}" size="6" maxlength="20" disabled="disabled" />
</td>
@@ -473,7 +485,7 @@ under the License.
${currencyUomId?if_exists}
</td>
<#else>
- <td>${uiLabelMap.ProductPerUnitPrice}:</td>
+ <td align="right">${uiLabelMap.ProductPerUnitPrice}:</td>
<td align="right">
<input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}" />
<input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20" />
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml Thu Nov 3 17:59:29 2011
@@ -43,7 +43,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.13.custom.min.js" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PriceForms.xml Thu Nov 3 17:59:29 2011
@@ -138,7 +138,7 @@
<field name="productPriceActionSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! -->
<field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}">
<drop-down allow-empty="false" current="selected">
- <list-options list-name="productPriceActionTypes" key-name="productPriceActionTypeId" description="${description}"/>
+ <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/>
</drop-down>
</field>
<field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml Thu Nov 3 17:59:29 2011
@@ -123,6 +123,14 @@ under the License.
</field>
<field name="inventoryMessage" title="${uiLabelMap.ProductInventoryMessage}"><text size="20" maxlength="255"/></field>
+ <field name="lotIdFilledIn" title="${uiLabelMap.ProductLotId}">
+ <drop-down allow-empty="false">
+ <option key="Allowed" description="${uiLabelMap.lotIdFilledInAllowed}"/>
+ <option key="Mandatory" description="${uiLabelMap.lotIdFilledInMandatory}"/>
+ <option key="Forbidden" description="${uiLabelMap.lotIdFilledInForbidden}"/>
+ </drop-down>
+ </field>
+
<field position="1" name="ratingTypeEnum" title="${uiLabelMap.ProductRatingTypeEnum}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
@@ -290,6 +298,7 @@ under the License.
<sort-field name="requirementMethodEnumId"/>
<sort-field name="requireInventory"/>
<sort-field name="inventoryMessage"/>
+ <sort-field name="lotIdFilledIn"/>
</field-group>
<field-group title="${uiLabelMap.CommonRate}" collapsible="true" initially-collapsed="true">
<sort-field name="ratingTypeEnum"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml Thu Nov 3 17:59:29 2011
@@ -237,6 +237,12 @@
</drop-down>
</field>
<field name="oldStyleSheet"><hidden/></field>
+ <field name="managedByLot" title="${uiLabelMap.ProductManagedByLot}">
+ <drop-down allow-empty="false" no-current-selected-key="N">
+ <option key="Y" description="${uiLabelMap.CommonY}"/>
+ <option key="N" description="${uiLabelMap.CommonN}"/>
+ </drop-down>
+ </field>
<field name="oldHeaderLogo"><hidden/></field>
<field name="oldHeaderMiddleBackground"><hidden/></field>
<field name="oldHeaderRightBackground"><hidden/></field>
@@ -330,7 +336,8 @@
<sort-field name="reserveInventory"/>
<sort-field name="reserveOrderEnumId"/>
<sort-field name="balanceResOnOrderCreation"/>
- <sort-field name="showOutOfStockProducts"/>
+ <sort-field name="showOutOfStockProducts"/>
+ <sort-field name="managedByLot"/>
</field-group>
<field-group title="${uiLabelMap.CommonShoppingCart}" collapsible="true" initially-collapsed="true">
<sort-field name="viewCartOnAdd"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityMenus.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityMenus.xml Thu Nov 3 17:59:29 2011
@@ -40,6 +40,7 @@ under the License.
<parameter param-name="facilityId"/>
</link>
</menu-item>
+ <menu-item name="tracking" title="${uiLabelMap.Tracking}"><link target="Tracking"/></menu-item>
</menu>
<menu name="FacilityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml?rev=1197247&r1=1197246&r2=1197247&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml Thu Nov 3 17:59:29 2011
@@ -50,7 +50,7 @@ under the License.
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
<attribute name="webSiteId" type="String" mode="IN" optional="true"/><!-- for notification services -->
<override name="workEffortTypeId" optional="false"/>
- <override name="workEffortName" optional="false"/>
+ <override name="workEffortName" optional="false" allow-html="safe"/>
<override name="currentStatusId" optional="false"/>
<override name="description" allow-html="safe"/>
</service>