svn commit: r1647102 - in /ofbiz/trunk/applications/prod
Locked
svn commit: r1647102 - in /ofbiz/trunk/applications/prod
 
|
Author: jleroux
Date: Sun Dec 21 07:43:55 2014 New Revision: 1647102 URL: http://svn.apache.org/r1647102 Log: A patch from Divesh Dutta for "Inventory Transfer Printing Format and Layout" https://issues.apache.org/jira/browse/OFBIZ-4673 Adds PDF (fo.ftl file) which will be opened when user click on "Print" button. Earlier web page was opened with bad formatting. New PDF is clean. Added: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl (with props) Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1647102&r1=1647101&r2=1647102&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sun Dec 21 07:43:55 2014 @@ -1378,7 +1378,7 @@ under the License. <view-map name="PicklistOptions" type="screen" page="component://product/widget/facility/FacilityScreens.xml#PicklistOptions"/> <view-map name="PicklistManage" type="screen" page="component://product/widget/facility/FacilityScreens.xml#PicklistManage"/> <view-map name="PickMoveStock" type="screen" page="component://product/widget/facility/FacilityScreens.xml#PickMoveStock"/> - <view-map name="PickMoveStockSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#PickMoveStockSimple"/> + <view-map name="PickMoveStockSimple" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#PickMoveStockSimple.fo" content-type="application/pdf" encoding="none"/> <view-map name="PicklistReport.pdf" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#PicklistReport.fo" content-type="application/pdf" encoding="none"/> <view-map name="PrintPickSheets.pdf" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#PrintPickSheets.fo" content-type="application/pdf" encoding="none"/> <view-map name="ReviewOrdersNotPickedOrPacked" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ReviewOrdersNotPickedOrPacked"/> Added: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl?rev=1647102&view=auto ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl (added) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl Sun Dec 21 07:43:55 2014 @@ -0,0 +1,151 @@ +<#assign rowCount = 0> +<fo:table table-layout="fixed" border-spacing="3pt"> + <fo:table-column column-width="0.8in"/> + <fo:table-column column-width="0.8in"/> + <fo:table-column column-width="1.2in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="1.2in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="1in"/> + <fo:table-column column-width="1in"/> + <fo:table-header> + <fo:table-row> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductProductId}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductProduct}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductFromLocation}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductQoh}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductAtp}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductToLocation}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductQoh}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductAtp}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductMinimumStock}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-weight="bold">${uiLabelMap.ProductMoveQuantity}</fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-header> + <fo:table-body> + <#if moveByOisgirInfoList?has_content || moveByPflInfoList?has_content> + <#assign alt_row = false> + <#list moveByOisgirInfoList! as moveByOisgirInfo> + <#assign product = moveByOisgirInfo.product> + <#assign facilityLocationFrom = moveByOisgirInfo.facilityLocationFrom> + <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))!> + <#assign facilityLocationTo = moveByOisgirInfo.facilityLocationTo> + <#assign targetProductFacilityLocation = moveByOisgirInfo.targetProductFacilityLocation> + <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!> + <#assign totalQuantity = moveByOisgirInfo.totalQuantity> + <fo:table-row> + <#-- <tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> --> + <fo:table-cell> + <fo:block>${product.productId}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${product.internalName!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${facilityLocationFrom.areaId!}:${facilityLocationFrom.aisleId!}:${facilityLocationFrom.sectionId!}:${facilityLocationFrom.levelId!}:${facilityLocationFrom.positionId!}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByOisgirInfo.quantityOnHandTotalFrom!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByOisgirInfo.availableToPromiseTotalFrom!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${facilityLocationTo.areaId!}:${facilityLocationTo.aisleId!}:${facilityLocationTo.sectionId!}:${facilityLocationTo.levelId!}:${facilityLocationTo.positionId!}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByOisgirInfo.quantityOnHandTotalTo!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByOisgirInfo.availableToPromiseTotalTo!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${targetProductFacilityLocation.minimumStock!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${targetProductFacilityLocation.moveQuantity!}</fo:block> + </fo:table-cell> + <#-- </tr> --> + </fo:table-row> + <#assign rowCount = rowCount + 1> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <#list moveByPflInfoList! as moveByPflInfo> + <#assign product = moveByPflInfo.product> + <#assign facilityLocationFrom = moveByPflInfo.facilityLocationFrom> + <#assign facilityLocationTypeEnumFrom = (facilityLocationFrom.getRelatedOne("TypeEnumeration", true))!> + <#assign facilityLocationTo = moveByPflInfo.facilityLocationTo> + <#assign targetProductFacilityLocation = moveByPflInfo.targetProductFacilityLocation> + <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOne("TypeEnumeration", true))!> + <#assign totalQuantity = moveByPflInfo.totalQuantity> + <#-- <tr id="moveInfoId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> --> + <fo:table-row> + <fo:table-cell> + <fo:block>${product.productId}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${product.internalName!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${facilityLocationFrom.areaId!}:${facilityLocationFrom.aisleId!}:${facilityLocationFrom.sectionId!}:${facilityLocationFrom.levelId!}:${facilityLocationFrom.positionId!}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByPflInfo.quantityOnHandTotalFrom!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByPflInfo.availableToPromiseTotalFrom!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${facilityLocationTo.areaId!}:${facilityLocationTo.aisleId!}:${facilityLocationTo.sectionId!}:${facilityLocationTo.levelId!}:${facilityLocationTo.positionId!}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByPflInfo.quantityOnHandTotalTo!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${moveByPflInfo.availableToPromiseTotalTo!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${targetProductFacilityLocation.minimumStock!}</fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block>${targetProductFacilityLocation.moveQuantity!}</fo:block> + </fo:table-cell> + </fo:table-row> + <#-- </tr> --> + <#assign rowCount = rowCount + 1> + </#list> + </#if> + <#assign messageCount = 0> + <#list pflWarningMessageList! as pflWarningMessage> + <#assign messageCount = messageCount + 1> + <fo:table-row> + <fo:table-cell> + <fo:block>${messageCount}:${pflWarningMessage}.</fo:block> + </fo:table-cell> + </fo:table-row> + </#list> + </fo:table-body> +</fo:table> \ No newline at end of file Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStockSimple.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=1647102&r1=1647101&r2=1647102&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Dec 21 07:43:55 2014 @@ -1306,7 +1306,7 @@ under the License. </widgets> </section> </screen> - <screen name="PickMoveStockSimple"> + <screen name="PickMoveStockSimple.fo"> <section> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> @@ -1333,7 +1333,7 @@ under the License. <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/PickMoveStock.ftl"/></html> + <xsl-fo><html-template location="component://product/webapp/facility/facility/PickMoveStockSimple.fo.ftl"/></xsl-fo> </platform-specific> </decorator-section> </decorator-screen> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |