svn commit: r1744769 - in /ofbiz/branches/release15.12: ./ specialpurpose/assetmaint/widget/AssetmaintScreens.xml

Author: jleroux
Date: Fri May 20 17:08:08 2016
New Revision: 1744769

URL: http://svn.apache.org/viewvc?rev=1744769&view=rev
Log:
"Applied fix from trunk for revision: 1744768  "
------------------------------------------------------------------------
r1744768 | jleroux | 2016-05-20 19:07:13 +0200 (ven. 20 mai 2016) | 8 lignes

A patch from Amardeep Singh Jhajj for "Fixed asset maintenance pdf has missing UI Labels" https://issues.apache.org/jira/browse/OFBIZ-7084

Steps to get fixed asset maintenance pdf:
1. Go to Asset Maintenance : https://localhost:8443/assetmaint/control/findFixedAssetMaints
2. Create maintenance for Fixed asset by clicking create maintenance button.
3. On edit fixed asset maintenance page, click on print(PDF).

jleroux: there are still some labels missing, 1st step...
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/specialpurpose/assetmaint/widget/AssetmaintScreens.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 17:08:08 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768

Modified: ofbiz/branches/release15.12/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=1744769&r1=1744768&r2=1744769&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Fri May 20 17:08:08 2016
@@ -313,11 +313,12 @@
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="layoutSettings.documentTitle" from-field="uiLabelMap.FixedAssetMaintWorkEffortName"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
                 <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+                <set field="layoutSettings.documentTitle" from-field="uiLabelMap.AccountingFixedAssetMaintWorkEffortName"/>
                 <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
                 <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
                     <condition-expr field-name="quantity" operator="greater" value="0"/>