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/08 15:08:29 UTC
svn commit: r1199251 [2/11] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/widget/ applications/content/config/
applications/content/script/org/ofbiz/content/content/ app...
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=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PicklistManage.ftl Tue Nov 8 14:08:24 2011
@@ -18,220 +18,219 @@ under the License.
-->
<div class="screenlet">
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.ProductPicklistManage}</li>
- </ul>
- <br class="clear"/>
- </div>
- <div class="screenlet-body">
- <#if picklistInfoList?has_content>
- <#list picklistInfoList as picklistInfo>
- <#assign picklist = picklistInfo.picklist>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductPicklistManage}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <#if picklistInfoList?has_content>
+ <#list picklistInfoList as picklistInfo>
+ <#assign picklist = picklistInfo.picklist>
- <#-- Picklist -->
- <div>
- <span class="label">${uiLabelMap.ProductPickList}</span> ${picklist.picklistId}
- <span class="label">${uiLabelMap.CommonDate}</span> ${picklist.picklistDate}
- <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
- <select name="statusId">
- <option value="${picklistInfo.statusItem.statusId}" selected>${picklistInfo.statusItem.get("description",locale)}</option>
- <option value="${picklistInfo.statusItem.statusId}">---</option>
- <#list picklistInfo.statusValidChangeToDetailList as statusValidChangeToDetail>
- <option value="${statusValidChangeToDetail.get("statusIdTo", locale)}">${statusValidChangeToDetail.get("description", locale)} (${statusValidChangeToDetail.get("transitionName", locale)})</option>
- </#list>
- </select>
- <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
- </form>
- <span class="label">${uiLabelMap.ProductCreatedModifiedBy}</span> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
- <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}</a>
- <hr />
- </div>
- <#if picklistInfo.shipmentMethodType?has_content>
- <div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType}</span> ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}
- </div>
- </#if>
+ <#-- Picklist -->
+ <div>
+ <span class="label">${uiLabelMap.ProductPickList}</span> ${picklist.picklistId}
+ <span class="label">${uiLabelMap.CommonDate}</span> ${picklist.picklistDate}
+ <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
+ <select name="statusId">
+ <option value="${picklistInfo.statusItem.statusId}" selected>${picklistInfo.statusItem.get("description",locale)}</option>
+ <option value="${picklistInfo.statusItem.statusId}">---</option>
+ <#list picklistInfo.statusValidChangeToDetailList as statusValidChangeToDetail>
+ <option value="${statusValidChangeToDetail.get("statusIdTo", locale)}">${statusValidChangeToDetail.get("description", locale)} (${statusValidChangeToDetail.get("transitionName", locale)})</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
+ </form>
+ <span class="label">${uiLabelMap.ProductCreatedModifiedBy}</span> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
+ <a href="<@o...@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}</a>
+ <hr />
+ </div>
+ <#if picklistInfo.shipmentMethodType?has_content>
+ <div style="margin-left: 15px;">
+ <span class="label">${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType}</span> ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}
+ </div>
+ </#if>
- <#-- PicklistRole -->
- <#list picklistInfo.picklistRoleInfoList?if_exists as picklistRoleInfo>
- <div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.PartyParty}</span> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
- <span class="label">${uiLabelMap.PartyRole}</span> ${picklistRoleInfo.roleType.description}
- <span class="label">${uiLabelMap.CommonFrom}</span> ${picklistRoleInfo.picklistRole.fromDate}
- <#if picklistRoleInfo.picklistRole.thruDate?exists><span class="label">${uiLabelMap.CommonThru}</span> ${picklistRoleInfo.picklistRole.thruDate}</#if>
- </div>
- </#list>
- <div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.ProductAssignPicker}</span>
- <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
- <input type="hidden" name="roleTypeId" value="PICKER"/>
- <select name="partyId">
- <#list partyRoleAndPartyDetailList as partyRoleAndPartyDetail>
- <option value="${partyRoleAndPartyDetail.partyId}">${partyRoleAndPartyDetail.firstName?if_exists} ${partyRoleAndPartyDetail.middleName?if_exists} ${partyRoleAndPartyDetail.lastName?if_exists} ${partyRoleAndPartyDetail.groupName?if_exists} [${partyRoleAndPartyDetail.partyId}]</option>
- </#list>
- </select>
- <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
- </form>
- </div>
+ <#-- PicklistRole -->
+ <#list picklistInfo.picklistRoleInfoList?if_exists as picklistRoleInfo>
+ <div style="margin-left: 15px;">
+ <span class="label">${uiLabelMap.PartyParty}</span> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
+ <span class="label">${uiLabelMap.PartyRole}</span> ${picklistRoleInfo.roleType.description}
+ <span class="label">${uiLabelMap.CommonFrom}</span> ${picklistRoleInfo.picklistRole.fromDate}
+ <#if picklistRoleInfo.picklistRole.thruDate?exists><span class="label">${uiLabelMap.CommonThru}</span> ${picklistRoleInfo.picklistRole.thruDate}</#if>
+ </div>
+ </#list>
+ <div style="margin-left: 15px;">
+ <span class="label">${uiLabelMap.ProductAssignPicker}</span>
+ <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
+ <input type="hidden" name="roleTypeId" value="PICKER"/>
+ <select name="partyId">
+ <#list partyRoleAndPartyDetailList as partyRoleAndPartyDetail>
+ <option value="${partyRoleAndPartyDetail.partyId}">${partyRoleAndPartyDetail.firstName?if_exists} ${partyRoleAndPartyDetail.middleName?if_exists} ${partyRoleAndPartyDetail.lastName?if_exists} ${partyRoleAndPartyDetail.groupName?if_exists} [${partyRoleAndPartyDetail.partyId}]</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
+ </form>
+ </div>
- <#-- PicklistStatusHistory -->
- <#list picklistInfo.picklistStatusHistoryInfoList?if_exists as picklistStatusHistoryInfo>
- <div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.CommonStatus}</span> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
- ${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.description}
- ${uiLabelMap.CommonOn} ${picklistStatusHistoryInfo.picklistStatusHistory.changeDate}
- ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId}
- </div>
- </#list>
- <hr />
- <#-- PicklistBin -->
- <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo>
- <#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/>
- <#if (!isBinComplete)>
- <div style="margin-left: 15px;">
- <span class="label">${uiLabelMap.ProductBinNum}</span> ${picklistBinInfo.picklistBin.binLocationNumber} (${picklistBinInfo.picklistBin.picklistBinId})
- <#if picklistBinInfo.primaryOrderHeader?exists><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
- <#if picklistBinInfo.primaryOrderItemShipGroup?exists><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
- <#if !picklistBinInfo.picklistItemInfoList?has_content><a href="javascript:document.DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a></#if>
- <form name="DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
+ <#-- PicklistStatusHistory -->
+ <#list picklistInfo.picklistStatusHistoryInfoList?if_exists as picklistStatusHistoryInfo>
+ <div style="margin-left: 15px;">
+ <span class="label">${uiLabelMap.CommonStatus}</span> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
+ ${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.description}
+ ${uiLabelMap.CommonOn} ${picklistStatusHistoryInfo.picklistStatusHistory.changeDate}
+ ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId}
+ </div>
+ </#list>
+ <hr />
+ <#-- PicklistBin -->
+ <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo>
+ <#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/>
+ <#if (!isBinComplete)>
+ <div style="margin-left: 15px;">
+ <span class="label">${uiLabelMap.ProductBinNum}</span> ${picklistBinInfo.picklistBin.binLocationNumber} (${picklistBinInfo.picklistBin.picklistBinId})
+ <#if picklistBinInfo.primaryOrderHeader?exists><span class="label">${uiLabelMap.ProductPrimaryOrderId}</span> ${picklistBinInfo.primaryOrderHeader.orderId}</#if>
+ <#if picklistBinInfo.primaryOrderItemShipGroup?exists><span class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span> ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</#if>
+ <#if !picklistBinInfo.picklistItemInfoList?has_content><a href="javascript:document.DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a></#if>
+ <form name="DeletePicklistBin_${picklistInfo_index}_${picklistBinInfo_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ </form>
+ </div>
+ <div style="margin-left: 30px;">
+ <span class="label">${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}</span>
+ <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
+ <span class="label">${uiLabelMap.ProductLocation} ${uiLabelMap.CommonNbr}</span>
+ <input type"text" size="2" name="binLocationNumber" value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
+ <span class="label">${uiLabelMap.PageTitlePickList}</span>
+ <select name="picklistId">
+ <#list picklistActiveList as picklistActive>
+ <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")>
+ <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected="selected"</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
+ </form>
+ </div>
+ <#if picklistBinInfo.picklistItemInfoList?has_content>
+ <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.ProductLocation}</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>
+ <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>${inventoryItemAndLocation.areaId?if_exists}-${inventoryItemAndLocation.aisleId?if_exists}-${inventoryItemAndLocation.sectionId?if_exists}-${inventoryItemAndLocation.levelId?if_exists}-${inventoryItemAndLocation.positionId?if_exists}</td>
+ <td>${picklistItem.quantity}</td>
+ <#if !picklistItemInfo.itemIssuanceList?has_content>
+ <td>
+ <form name="deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}" method="post" action="<@o...@ofbizUrl>">
+ <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}"/>
+ <a href='javascript:document.deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}.submit()' class='buttontext'> ${uiLabelMap.CommonDelete} </a>
+ </form>
+ </td>
+ </#if>
+ <td>
+ <#-- picklistItem.orderItemShipGrpInvRes (do we want to display any of this info?) -->
+ <#-- picklistItemInfo.itemIssuanceList -->
+ <#list picklistItemInfo.itemIssuanceList?if_exists as itemIssuance>
+ <b>${uiLabelMap.ProductIssue} ${uiLabelMap.CommonTo} ${uiLabelMap.ProductShipmentItemSeqId}:</b> ${itemIssuance.shipmentId}:${itemIssuance.shipmentItemSeqId}
+ <b>${uiLabelMap.ProductQuantity}:</b> ${itemIssuance.quantity}
+ <b>${uiLabelMap.CommonDate}: </b> ${itemIssuance.issuedDateTime}
+ </#list>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#assign alt_row = !alt_row>
+ </#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}"/>
- </form>
- </div>
- <div style="margin-left: 30px;">
- <span class="label">${uiLabelMap.CommonUpdate} ${uiLabelMap.ProductBinNum}</span>
- <form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- <input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
- <span class="label">${uiLabelMap.ProductLocation} ${uiLabelMap.CommonNbr}</span>
- <input type"text" size="2" name="binLocationNumber" value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
- <span class="label">${uiLabelMap.PageTitlePickList}</span>
- <select name="picklistId">
- <#list picklistActiveList as picklistActive>
- <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")>
- <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected="selected"</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
- </#list>
- </select>
- <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
- </form>
- </div>
- <#if picklistBinInfo.picklistItemInfoList?has_content>
- <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.ProductLocation}</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>
- <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>${inventoryItemAndLocation.areaId?if_exists}-${inventoryItemAndLocation.aisleId?if_exists}-${inventoryItemAndLocation.sectionId?if_exists}-${inventoryItemAndLocation.levelId?if_exists}-${inventoryItemAndLocation.positionId?if_exists}</td>
- <td>${picklistItem.quantity}</td>
- <#if !picklistItemInfo.itemIssuanceList?has_content>
- <td>
- <form name="deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}" method="post" action="<@o...@ofbizUrl>">
- <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}"/>
- <a href='javascript:document.deletePicklistItem_${picklist.picklistId}_${picklistItem.orderId}_${picklistItemInfo_index}.submit()' class='buttontext'> ${uiLabelMap.CommonDelete} </a>
- </form>
- </td>
- </#if>
- <td>
- <#-- picklistItem.orderItemShipGrpInvRes (do we want to display any of this info?) -->
- <#-- picklistItemInfo.itemIssuanceList -->
- <#list picklistItemInfo.itemIssuanceList?if_exists as itemIssuance>
- <b>${uiLabelMap.ProductIssue} ${uiLabelMap.CommonTo} ${uiLabelMap.ProductShipmentItemSeqId}:</b> ${itemIssuance.shipmentId}:${itemIssuance.shipmentItemSeqId}
- <b>${uiLabelMap.ProductQuantity}:</b> ${itemIssuance.quantity}
- <b>${uiLabelMap.CommonDate}: </b> ${itemIssuance.issuedDateTime}
- </#list>
- </td>
- </tr>
- <#-- toggle the row color -->
- <#assign alt_row = !alt_row>
- </#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>
+ <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>
- </#if>
- </#list>
- <#if picklistInfo_has_next>
- <hr />
- </#if>
- </#list>
- <#else/>
- <h3>${uiLabelMap.ProductNoPicksStarted}.</h3>
+ </#list>
+ </table>
+ </div>
+ </#if>
+ </#if>
+ </#if>
+ </#list>
+ <#if picklistInfo_has_next>
+ <hr />
</#if>
- </div>
+ </#list>
+ <#else/>
+ <h3>${uiLabelMap.ProductNoPicksStarted}.</h3>
+ </#if>
+ </div>
</div>
Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Tue Nov 8 14:08:24 2011
@@ -40,6 +40,7 @@ public class UtilFormatOut {
}
// ------------------- price format handlers -------------------
+ // FIXME: This is not thread-safe! DecimalFormat is not synchronized.
static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "#,##0.00"));
/** Formats a Double representing a price into a string
Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Tue Nov 8 14:08:24 2011
@@ -4807,6 +4807,7 @@
<property key="CommonMax250Chars">
<value xml:lang="en">250 Chars Maximum</value>
<value xml:lang="es">250 caracteres máximo</value>
+ <value xml:lang="fr">250 caractères max.</value>
<value xml:lang="hi_IN">à¤
धिà¤à¤¤à¤® 250 वरà¥à¤£</value>
<value xml:lang="it">250 caratteri al massimo</value>
<value xml:lang="pt_BR">Máximo de 250 caracteres</value>
Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl Tue Nov 8 14:08:24 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:600px;height:300px;"></div>
Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl Tue Nov 8 14:08:24 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl Tue Nov 8 14:08:24 2011
@@ -27,7 +27,7 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title?if_exists}</title>
- <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Tue Nov 8 14:08:24 2011
@@ -118,16 +118,16 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.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/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
<!-- jQuery CSSs -->
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/>
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/>
@@ -379,13 +379,13 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.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/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
<!-- jQuery CSSs -->
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/>
<set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/>
Modified: ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl Tue Nov 8 14:08:24 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Hodiny',
minuteText: 'Minuty',
secondText: 'VteÅiny',
+ millisecText: 'Milisekundy',
timezoneText: 'Äasové pásmo',
currentText: 'NynÃ',
closeText: 'ZavÅÃt',
timeFormat: 'h:m',
+ amNames: ['dop.', 'AM', 'A'],
+ pmNames: ['odp.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['cs']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Stunde',
minuteText: 'Minute',
secondText: 'Sekunde',
+ millisecText: 'Millisekunde',
timezoneText: 'Zeitzone',
currentText: 'Jetzt',
closeText: 'Fertig',
timeFormat: 'hh:mm tt',
+ amNames: ['vorm.', 'AM', 'A'],
+ pmNames: ['nachm.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['de']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'ÎÏεÏ',
minuteText: 'ÎεÏÏά',
secondText: 'ÎεÏ
ÏεÏÏλεÏÏα',
+ millisecText: 'μιλιδεÏ
ÏεÏÏλεÏÏο',
timezoneText: 'ÎÏνη ÏÏαÏ',
currentText: 'ΤÏÏα',
closeText: 'ÎλείÏιμο',
timeFormat: 'hh:mm',
+ amNames: ['Ï.μ.', 'AM', 'A'],
+ pmNames: ['μ.μ.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['el']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Horas',
minuteText: 'Minutos',
secondText: 'Segundos',
+ millisecText: 'Milisegundos',
timezoneText: 'Huso horario',
currentText: 'Ahora',
closeText: 'Cerrar',
timeFormat: 'hh:mm',
+ amNames: ['a.m.', 'AM', 'A'],
+ pmNames: ['p.m.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['es']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Tund',
minuteText: 'Minut',
secondText: 'Sekund',
+ millisecText: 'Millisekundis',
timezoneText: 'Ajavöönd',
currentText: 'Praegu',
closeText: 'Valmis',
timeFormat: 'hh:mm tt',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['et']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Heures',
minuteText: 'Minutes',
secondText: 'Secondes',
+ millisecText: 'Millisecondes',
timezoneText: 'Fuseau horaire',
currentText: 'Maintenant',
closeText: 'Terminé',
timeFormat: 'hh:mm',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['fr']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Ãra',
minuteText: 'Perc',
secondText: 'Másodperc',
+ millisecText: 'Milliszekundumos',
timezoneText: 'IdÅzóna',
currentText: 'Most',
closeText: 'Kész',
timeFormat: 'hh:mm tt',
+ amNames: ['de.', 'AM', 'A'],
+ pmNames: ['du.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['hu']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Pukul',
minuteText: 'Menit',
secondText: 'Detik',
+ millisecText: 'Milidetik',
timezoneText: 'Zona Waktu',
currentText: 'Sekarang',
closeText: 'OK',
timeFormat: 'hh:mm tt',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['id']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Ora',
minuteText: 'Minuto',
secondText: 'Secondo',
+ millisecText: 'Millisecondo',
timezoneText: 'Fuso orario',
currentText: 'Adesso',
closeText: 'Chiudi',
timeFormat: 'hh:mm',
+ amNames: ['m.', 'AM', 'A'],
+ pmNames: ['p.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['it']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Valandos',
minuteText: 'MinutÄs',
secondText: 'SekundÄs',
+ millisecText: 'MilisekundÄs',
timezoneText: 'Laiko zona',
currentText: 'Dabar',
closeText: 'Uždaryti',
timeFormat: 'hh:mm',
+ amNames: ['priešpiet', 'AM', 'A'],
+ pmNames: ['popiet', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['lt']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Uur',
minuteText: 'Minuut',
secondText: 'Seconde',
+ millisecText: 'Milliseconde',
timezoneText: 'Tijdzone',
currentText: 'Vandaag',
closeText: 'Sluiten',
timeFormat: 'hh:mm tt',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['nl']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'ЧаÑÑ',
minuteText: 'ÐинÑÑÑ',
secondText: 'СекÑндÑ',
+ millisecText: 'ÐиллиÑекÑндÑ',
timezoneText: 'ÐÑÐµÐ¼Ñ Ð·Ð¾Ð½Ñ',
currentText: 'ТепеÑÑ',
closeText: 'ÐакÑÑÑÑ',
timeFormat: 'hh:mm tt',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['ru']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Saat',
minuteText: 'Dakika',
secondText: 'Saniye',
+ millisecText: 'Milisaniyelik',
timezoneText: 'Zaman Dilimi',
currentText: 'Åu an',
closeText: 'Tamam',
timeFormat: 'hh:mm',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['tr']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js Tue Nov 8 14:08:24 2011
@@ -7,10 +7,13 @@
hourText: 'Giá»',
minuteText: 'Phút',
secondText: 'Giây',
+ millisecText: 'Phần nghìn giây',
timezoneText: 'Múi giá»',
currentText: 'Hiá»n thá»i',
closeText: 'Äóng'
timeFormat: 'h:m',
+ amNames: ['SA', 'AM', 'A'],
+ pmNames: ['CH', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['vi']);
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/Makefile
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/Makefile?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/Makefile (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/Makefile Tue Nov 8 14:08:24 2011
@@ -1,15 +1,9 @@
# Makefile for generating minified files
-YUICOMPRESSOR_PATH=../yuicompressor-2.3.5.jar
-
-# if you need another compressor path, just copy the above line to a
-# file called Makefile.local, customize it and you're good to go
--include Makefile.local
-
.PHONY: all
# we cheat and process all .js files instead of an exhaustive list
all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
%.min.js: %.js
- java -jar $(YUICOMPRESSOR_PATH) $< -o $@
+ yui-compressor $< -o $@
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt Tue Nov 8 14:08:24 2011
@@ -1,4 +1,4 @@
-Flot x.x
+Flot 0.7
--------
API changes:
Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js?rev=1199251&r1=1199250&r2=1199251&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js (original)
+++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js Tue Nov 8 14:08:24 2011
@@ -1,4 +1,4 @@
-/*! Javascript plotting library for jQuery, v. 0.6.
+/*! Javascript plotting library for jQuery, v. 0.7.
*
* Released under the MIT license by IOLA, December 2007.
*
@@ -2531,7 +2531,7 @@
return plot;
};
- $.plot.version = "0.7pre";
+ $.plot.version = "0.7";
$.plot.plugins = [];