svn commit: r778350 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mor
Date: Mon May 25 08:34:26 2009 New Revision: 778350 URL: http://svn.apache.org/viewvc?rev=778350&view=rev Log: Fix: When a pick sheet is printed using Print Pick Sheet link on Order Detail Page it was resulting in error when an order is not ready for picking because it needs stock move. Patch from Arpit Singh Pandya and Pranay Pandey. Added: ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl (with props) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/servicedef/services_picklist.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=778350&r1=778349&r2=778350&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon May 25 08:34:26 2009 @@ -13970,6 +13970,9 @@ <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value> <value xml:lang="zh">订åæç»</value> </property> + <property key="ProductOrderNotReadyForPickNeedStockMove"> + <value xml:lang="en">Order not ready for picking, needs stock move</value> + </property> <property key="ProductOrderNumber"> <value xml:lang="de">Auftragsnummer</value> <value xml:lang="en">Order Number</value> Modified: ofbiz/trunk/applications/product/servicedef/services_picklist.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_picklist.xml?rev=778350&r1=778349&r2=778350&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_picklist.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_picklist.xml Mon May 25 08:34:26 2009 @@ -71,7 +71,7 @@ <attribute name="groupByNoOfOrderItems" type="String" mode="IN" optional="true"/> <attribute name="groupByWarehouseArea" type="String" mode="IN" optional="true"/> <attribute name="groupByShippingMethod" type="String" mode="IN" optional="true"/> - <attribute name="pickMoveInfoList" type="List" mode="OUT" optional="false"/> + <attribute name="pickMoveInfoList" type="List" mode="OUT" optional="true"/> <attribute name="orderId" type="String" mode="IN" optional="true"/> </service> Added: ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl?rev=778350&view=auto ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl (added) +++ ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl Mon May 25 08:34:26 2009 @@ -0,0 +1,46 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in" + margin-top="0.5in" margin-bottom="1in" margin-left=".5in" margin-right="1in"> + <fo:region-body margin-top="1in"/> + <fo:region-before extent="1in"/> + <fo:region-after extent="1in"/> + </fo:simple-page-master> + </fo:layout-master-set> + + <fo:page-sequence master-reference="main"> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <#include "component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/> + <fo:table border-width="1pt" border-style="solid"> + <fo:table-column column-width="250pt"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell> + <fo:block>${uiLabelMap.ProductOrderNotReadyForPickNeedStockMove}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:flow> + </fo:page-sequence> + </fo:root> +</#escape> \ No newline at end of file Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/NotReadyToPick.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=778350&r1=778349&r2=778350&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Mon May 25 08:34:26 2009 @@ -1212,16 +1212,42 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="facilityId" from-field="parameters.facilityId"/> <service service-name="printPickSheets"/> - <script location="component://product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy"/> </actions> <widgets> - <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/PrintPickSheets.fo.ftl"/></xsl-fo> - </platform-specific> + <section> + <condition> + <not><if-empty field="pickMoveInfoList"/></not> + </condition> + <actions> + <script location="component://product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy"/> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field="orderHeaderList"/></not> + </condition> + <widgets> + <platform-specific> + <xsl-fo><html-template location="component://product/webapp/facility/facility/PrintPickSheets.fo.ftl"/></xsl-fo> + </platform-specific> + </widgets> + <fail-widgets> + <platform-specific> + <xsl-fo><html-template location="component://product/webapp/facility/facility/NotReadyToPick.fo.ftl"/></xsl-fo> + </platform-specific> + </fail-widgets> + </section> + </widgets> + <fail-widgets> + <platform-specific> + <xsl-fo><html-template location="component://product/webapp/facility/facility/NotReadyToPick.fo.ftl"/></xsl-fo> + </platform-specific> + </fail-widgets> + </section> </widgets> - </section> - </screen> + </section> + </screen> <screen name="ReviewOrdersNotPickedOrPacked"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |