svn commit: r1758091 - in /ofbiz/trunk/framework/common: template/includes/Simple.fo.ftl widget/CommonScreens.xml

Author: jleroux
Date: Sun Aug 28 05:12:56 2016
New Revision: 1758091

URL: http://svn.apache.org/viewvc?rev=1758091&view=rev
Log:
A patch from Pierre Smits for "Have TransactionTotalsPdf.pdf show the internal company show it has been generated for." https://issues.apache.org/jira/browse/OFBIZ-7920

The TransactionTotalsPdf.pdf currently doesn't show the name of the company it has been generated for.

jleroux: I asked Pierre to check that "Aree we sure that the changes in Simple.fo.ftl are general enough? I mean did you check that they will not appear in inopportune places?"
Pierre's answer:  Checked against most occurrences where the SimpleDecorator is used. A few weren't possible to check due to missing demo data.

Modified:
    ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl
    ofbiz/trunk/framework/common/widget/CommonScreens.xml

Modified: ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl?rev=1758091&r1=1758090&r2=1758091&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl Sun Aug 28 05:12:56 2016
@@ -69,6 +69,14 @@ under the License.
               <fo:list-block provisional-distance-between-starts="1in">
                 <fo:list-item>
                   <fo:list-item-label>
+                    <fo:block font-weight="bold">${uiLabelMap.CommonCompany}</fo:block>
+                  </fo:list-item-label>
+                  <fo:list-item-body start-indent="body-start()">
+                    <fo:block><#if currentOrganization??>${currentOrganization.partyId} - ${currentOrganization.groupName}</#if></fo:block>
+                  </fo:list-item-body>
+                </fo:list-item>
+                <fo:list-item>
+                  <fo:list-item-label>
                     <fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
                   </fo:list-item-label>
                   <fo:list-item-body start-indent="body-start()">

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1758091&r1=1758090&r2=1758091&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Aug 28 05:12:56 2016
@@ -477,6 +477,10 @@ under the License.
                 <set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/>
                 <!-- The settings below are used for xsl-fo screens -->
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${userPreferences.ORGANIZATION_PARTY}" global="true" to-scope="user"/>
+                <entity-one entity-name="PartyNameView" value-field="currentOrganization">
+                    <field-map field-name="partyId" from-field="organizationPartyId"/>
+                </entity-one>
                 <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>