You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2016/02/05 02:45:51 UTC
svn commit: r1728584 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/servicedef/
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/WEB-INF/actions/ch...
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Fri Feb 5 01:45:50 2016
@@ -215,17 +215,16 @@ under the License.
<set field="titleProperty" value="AccountingTrialBalance"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TrialBalance"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
<entity-condition entity-name="Party" list="parties">
<condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
</entity-condition>
- <set field="partyIds[]" from-field="organizationPartyId"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
</actions>
<widgets>
@@ -242,12 +241,12 @@ under the License.
<widgets>
<screenlet title="${uiLabelMap.AccountingTrialBalance}">
<link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="TrialBalanceSearchResultsCsv.csv">
- <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
<parameter param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
+ <parameter param-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</link>
<link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="TrialBalanceSearchResultsPdf.pdf" target-window="_BLANK">
- <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
<parameter param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
+ <parameter param-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}">
</link>
<include-form name="TrialBalanceReport" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container style="h3">
@@ -270,17 +269,16 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
<entity-condition entity-name="Party" list="parties">
<condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
</entity-condition>
- <set field="partyIds[]" from-field="organizationPartyId"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
</actions>
<widgets>
@@ -296,17 +294,16 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId')}, 'GROUP_ROLLUP')}" type="List"/>
<entity-condition entity-name="Party" list="parties">
<condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
</entity-condition>
- <set field="partyIds[]" from-field="organizationPartyId"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
</actions>
<widgets>
@@ -339,9 +336,8 @@ under the License.
<set field="titleProperty" value="AccountingBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="BalanceSheet"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -373,7 +369,7 @@ under the License.
<label style="h3" text="${uiLabelMap.AccountingEquities}"/>
<include-form name="BalanceSheetEquities" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="BalanceTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -385,9 +381,8 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -420,9 +415,8 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -448,9 +442,8 @@ under the License.
<set field="titleProperty" value="AccountingComparativeBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeBalanceSheet"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -536,9 +529,8 @@ under the License.
<set field="titleProperty" value="AccountingComparativeBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeBalanceSheet"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -608,9 +600,8 @@ under the License.
<set field="titleProperty" value="AccountingComparativeBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeBalanceSheet"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -673,15 +664,16 @@ under the License.
<set field="labelTitleProperty" value="AccountingTransactionTotals"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TransactionTotals"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true">
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"></field-map>
+ </service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
@@ -742,10 +734,11 @@ under the License.
<set field="labelTitleProperty" value="AccountingTransactionTotals"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TransactionTotals"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true">
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"></field-map>
+ </service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${nowTimestamp}"/>
@@ -780,10 +773,11 @@ under the License.
<set field="labelTitleProperty" value="AccountingTransactionTotals"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TransactionTotals"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true">
+ <field-map field-name="organizationPartyId" value="parameters.get('ApplicationDecorator|organizationPartyId')"/>
+ </service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${nowTimestamp}"/>
@@ -809,15 +803,14 @@ under the License.
<set field="titleProperty" value="AccountingIncomeStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="IncomeStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
@@ -835,13 +828,13 @@ under the License.
<link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="IncomeStatementListCsv.csv">
<parameter param-name="fromDate" from-field="fromDate"/>
<parameter param-name="thruDate" from-field="thruDate"/>
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="glFiscalTypeId" from-field="glFiscalTypeId"/>
</link>
<link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="IncomeStatementListPdf.pdf" target-window="_BLANK">
<parameter param-name="fromDate" from-field="fromDate"/>
<parameter param-name="thruDate" from-field="thruDate"/>
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="glFiscalTypeId" from-field="glFiscalTypeId"/>
</link>
<label style="h3" text="${uiLabelMap.AccountingRevenues}"/>
@@ -864,7 +857,6 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
@@ -896,7 +888,6 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
@@ -922,16 +913,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeIncomeStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeIncomeStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
@@ -1024,16 +1014,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeIncomeStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeIncomeStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
@@ -1106,16 +1095,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeIncomeStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeIncomeStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
@@ -1179,7 +1167,6 @@ under the License.
<set field="labelTitleProperty" value="AccountingGlAccountTrialBalance"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="GlAccountTrialBalance"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
</actions>
<widgets>
@@ -1218,7 +1205,6 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
</actions>
<widgets>
@@ -1243,15 +1229,16 @@ under the License.
<set field="labelTitleProperty" value="FormFieldTitle_costCenters"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="GlAccountBalanceByCostCenter"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true">
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
+ </service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
@@ -1300,9 +1287,8 @@ under the License.
<service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy"/>
@@ -1342,13 +1328,13 @@ under the License.
</condition>
<widgets>
<link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="InventoryValuation.pdf" target-window="_BLANK">
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="facilityId" from-field="parameters.facilityId"/>
<parameter param-name="productId" from-field="parameters.productId"/>
<parameter param-name="thruDate" from-field="parameters.thruDate"/>
</link>
<link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="InventoryValuation.csv">
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="facilityId" from-field="parameters.facilityId"/>
<parameter param-name="productId" from-field="parameters.productId"/>
<parameter param-name="thruDate" from-field="parameters.thruDate"/>
@@ -1408,19 +1394,18 @@ under the License.
<set field="titleProperty" value="AccountingCashFlowStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="CashFlowStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
- <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
+ <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
</actions>
@@ -1434,13 +1419,13 @@ under the License.
<link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="CashFlowStatementListCsv.csv">
<parameter param-name="fromDate" from-field="fromDate"/>
<parameter param-name="thruDate" from-field="thruDate"/>
- <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="glFiscalTypeId" from-field="glFiscalTypeId"/>
</link>
<link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="CashFlowStatementListPdf.pdf" target-window="_BLANK">
<parameter param-name="fromDate" from-field="fromDate"/>
<parameter param-name="thruDate" from-field="thruDate"/>
- <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ <parameter param-name="organizationPartyId"/>
<parameter param-name="glFiscalTypeId" from-field="glFiscalTypeId"/>
</link>
<label style="h3" text="${uiLabelMap.AccountingOpeningCashBalance}"/>
@@ -1462,7 +1447,6 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
@@ -1493,7 +1477,6 @@ under the License.
<actions>
<set field="viewSize" value="99999"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
@@ -1518,16 +1501,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeCashFlowStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeCashFlowStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
@@ -1604,16 +1586,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeCashFlowStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeCashFlowStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
@@ -1669,16 +1650,15 @@ under the License.
<set field="titleProperty" value="AccountingComparativeCashFlowStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeCashFlowStatement"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
<service service-name="getPartyAccountingPreferences" result-map="result">
- <field-map field-name="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
<!-- Get a default fromDate -->
<service service-name="findLastClosedDate" result-map="findLastClosedDateOutMap">
- <field-map field-name="organizationPartyId" from-field="organizationPartyId"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="period1FromDate" from-field="parameters.period1FromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy Fri Feb 5 01:45:50 2016
@@ -28,6 +28,7 @@ while (iter.hasNext()) {
partyAcctgPrefAndGroupList.add(["key":group.partyId,"value":group.groupName]);
}
globalContext.PartyAcctgPrefAndGroupList = partyAcctgPrefAndGroupList;
+globalContext.companyListSize = partyAcctgPrefAndGroupList.size();
//hiddenFileds
hiddenFields = [];
hiddenFields.add([name : "userPrefTypeId", value : "ORGANIZATION_PARTY"]);
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Fri Feb 5 01:45:50 2016
@@ -58,6 +58,7 @@ under the License.
<condition><not><if-empty field="PartyAcctgPrefAndGroupList"/></not></condition><!-- produced by changeOrgPartyId.groovy-->
<actions>
<set field="defaultOrganizationPartyId" value="${userPreferences.ORGANIZATION_PARTY}" global="true"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${userPreferences.ORGANIZATION_PARTY}" global="true" to-scope="user"/>
<property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
<entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Fri Feb 5 01:45:50 2016
@@ -129,7 +129,7 @@ if (!partyId) {
if (fromPartyId) {
partyId = fromPartyId;
} else {
- partyId = EntityUtilProperties.getPropertyValue("general", "ORGANIZATION_PARTY", delegator);
+ partyId = parameters.get('ApplicationDecorator|organizationPartyId') ? parameters.get('ApplicationDecorator|organizationPartyId') : context.defaultOrganizationPartyId;
}
}
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Feb 5 01:45:50 2016
@@ -1935,6 +1935,32 @@
<value xml:lang="zh-CN">è¯è®º</value>
<value xml:lang="zh-TW">è©è«</value>
</property>
+ <property key="CommonCompany">
+ <value xml:lang="ar">شرÙØ©</value>
+ <value xml:lang="cs">SpoleÄnost</value>
+ <value xml:lang="de">Gesellschaft</value>
+ <value xml:lang="en">Company</value>
+ <value xml:lang="es">CompañÃa</value>
+ <value xml:lang="fr">Entreprise</value>
+ <value xml:lang="hi-IN">à¤à¤à¤ªà¤¨à¥(Company)</value>
+ <value xml:lang="it">Azienda</value>
+ <value xml:lang="ja">ä¼ç¤¾</value>
+ <value xml:lang="nl">Vennootschap</value>
+ <value xml:lang="pt-BR">Companhia</value>
+ <value xml:lang="ru">ÐомпаниÑ</value>
+ <value xml:lang="vi">Công ty</value>
+ <value xml:lang="zh">å
¬å¸</value>
+ <value xml:lang="zh-TW">å
¬å¸</value>
+ </property>
+ <property key="CommonCompanyNoLogo">
+ <value xml:lang="en">No Logo</value>
+ </property>
+ <property key="CommonCompanySelected">
+ <value xml:lang="en">Selected Company</value>
+ </property>
+ <property key="CommonCompanyUsage">
+ <value xml:lang="en">Click on a link to select a company, and then on Done to validate your choice</value>
+ </property>
<property key="CommonCompleted">
<value xml:lang="ar">تÙ
ت</value>
<value xml:lang="cs">DokonÄeno</value>
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Fri Feb 5 01:45:50 2016
@@ -115,6 +115,9 @@ under the License.
<response name="error" type="request" value="main"/>
</request-map>
+ <!-- Common Mappings used for Set user organization -->
+ <request-map uri="ListSetCompanies"><security https="true" auth="false"/><response name="success" type="view" value="ListSetCompanies" save-last-view="true"/></request-map>
+
<!-- User preference mapping -->
<request-map uri="setUserPreference">
<security https="true" auth="true"/>
@@ -123,6 +126,13 @@ under the License.
<response name="error" type="request" value="main"/>
</request-map>
+ <request-map uri="setCompany">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="setUserPreference"/>
+ <response name="success" type="view-last-noparam" value="main"/>
+ <response name="error" type="request" value="main"/>
+ </request-map>
+
<request-map uri="ajaxSetUserPreference">
<security https="true" auth="true"/>
<event type="service" invoke="setUserPreference"/>
@@ -288,6 +298,7 @@ under the License.
<view-map name="EventMessages" type="screen" page="component://common/widget/CommonScreens.xml#EventMessages"/>
<view-map name="ListLocales" type="screen" page="component://common/widget/LookupScreens.xml#ListLocales"/>
+ <view-map name="ListSetCompanies" type="screen" page="component://common/widget/LookupScreens.xml#ListSetCompanies"/>
<view-map name="LookupTimeDuration" type="screen" page="component://common/widget/LookupScreens.xml#TimeDuration"/>
<view-map name="ListTimezones" type="screen" page="component://common/widget/LookupScreens.xml#ListTimezones"/>
<view-map name="ListVisualThemes" type="screen" page="component://common/widget/LookupScreens.xml#ListVisualThemes"/>
Modified: ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl Fri Feb 5 01:45:50 2016
@@ -66,7 +66,7 @@ margin: 1em;
<input type="hidden" name="userPrefTypeId" value="VISUAL_THEME"/>
<input type="hidden" name="userPrefValue" value="${visualTheme.visualThemeId}"/>
</form>
- <a href="javascript:document.SetUserPreferences_${visualTheme.visualThemeId}.submit()">${visualTheme.get("description", locale)?default(visualTheme.visualThemeId)}</a>
+ <a href="javascript:document.forms['SetUserPreferences_${visualTheme.visualThemeId}'].submit()">${visualTheme.get("description", locale)?default(visualTheme.visualThemeId)}</a>
</td>
<td>
<#if visualTheme.visualThemeId == visualThemeId>${uiLabelMap.CommonVisualThemeSelected}<#else> </#if>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Feb 5 01:45:50 2016
@@ -367,6 +367,7 @@ under the License.
<property-map resource="general" map-name="generalProperties" global="true"/>
<set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true"/>
+ <set field="defaultOrganizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources" from-field="layoutSettings"/>
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Feb 5 01:45:50 2016
@@ -118,6 +118,31 @@ under the License.
</section>
</screen>
+ <!-- Companies Lookup Screen -->
+ <screen name="ListSetCompanies">
+ <section>
+ <actions>
+ <set field="titleProperty" value="CommonCompany"/>
+ <entity-condition entity-name="PartyAcctgPrefAndGroup" list="companyList" distinct="true">
+ <condition-list>
+ <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
+ </condition-list>
+ <select-field field-name="partyId"/>
+ <select-field field-name="groupName"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://common/webcommon/includes/listCompanies.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<!-- Timezones Lookup Screen -->
<screen name="ListTimezones">
<section>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Fri Feb 5 01:45:50 2016
@@ -134,6 +134,17 @@ under the License.
<a href="<@o...@ofbizUrl>" id="language">${uiLabelMap.CommonLanguageTitle} - ${locale.getDisplayName(locale)}</a>
<a href="<@o...@ofbizUrl>" id="timezone">${nowTimestamp?datetime?string.short} - ${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>
<a href="<@o...@ofbizUrl>" id="theme">${uiLabelMap.CommonVisualThemes}</a>
+ <#if userLogin?exists>
+ <#if userLogin.partyId?exists>
+ <#assign size = companyListSize?default(0)>
+ <#if size > 1>
+ <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>
+ <#if currentCompany?exists>
+ <a href="<@o...@ofbizUrl>" id="company">${uiLabelMap.CommonCompany}</a>
+ </#if>
+ </#if>
+ </#if>
+ </#if>
</span>
</span>
<span>
@@ -144,6 +155,17 @@ under the License.
<#else>
${uiLabelMap.CommonWelcome}
</#if>
+ <#if userLogin?exists>
+ <#if userLogin.partyId?exists>
+ <#assign size = companyListSize?default(0)>
+ <#if size > 1>
+ <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>
+ <#if currentCompany?exists>
+ - ${currentCompany.groupName}
+ </#if>
+ </#if>
+ </#if>
+ </#if>
</span>
<span><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span>
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js Fri Feb 5 01:45:50 2016
@@ -201,6 +201,11 @@ jQuery('document').ready (function () {
this.href = "javascript:void(0);"
ModalWindow.openModalWindow(url, 'listTimezone', 430, 400);
});
+ jQuery("#company").click (function(e) {
+ var url = this.href;
+ this.href = "javascript:void(0);"
+ ModalWindow.openModalWindow(url, 'listSetCompanies', 430, 400);
+ });
});
/**************************************************
@@ -212,6 +217,3 @@ jQuery('document').ready(function () {
OFBIZ.initExpansion();
humanMsg.setup();
});
-
-
-
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Fri Feb 5 01:45:50 2016
@@ -162,6 +162,15 @@ under the License.
<ul id="preferences-menu">
<#if userLogin??>
<#if userLogin.partyId??>
+ <#assign size = companyListSize?default(0)>
+ <#if size > 1>
+ <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>
+ <#if currentCompany?exists>
+ <li class="user">
+ <a href="<@o...@ofbizUrl>">${currentCompany.groupName} - </a>
+ </li>
+ </#if>
+ </#if>
<li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam!}">${userName}</a></li>
<#else>
<li class="user">${userName}</li>
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Fri Feb 5 01:45:50 2016
@@ -196,6 +196,15 @@ under the License.
</#if>
<#if userLogin??>
<#if userLogin.partyId??>
+ <#assign size = companyListSize?default(0)>
+ <#if size > 1>
+ <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>
+ <#if currentCompany?exists>
+ <li class="user">
+ <a href="<@o...@ofbizUrl>">${currentCompany.groupName} - </a>
+ </li>
+ </#if>
+ </#if>
<li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam!}">${userName}</a></li>
<#else>
<li class="user">${userName}</li>
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1728584&r1=1728583&r2=1728584&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Fri Feb 5 01:45:50 2016
@@ -82,13 +82,19 @@ under the License.
<#else>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
- <li class="first"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLanguageTitle}</a></li>
- <#if userLogin??>
- <#if orgName?has_content>
- <li class="org">${orgName}</li>
- </#if>
- <#if userLogin.partyId??>
- <li class="user"><a href="<@o...@ofbizUrl>">${userName}</a></li>
+ <li <#if companyListSize?default(0) <= 1>class="language"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLanguageTitle}</a></li>
+ <#if userLogin?exists>
+ <#if userLogin.partyId?exists>
+ <li class="user"><a href="<@o...@ofbizUrl>">${userName}</a> </li>
+ <#assign size = companyListSize?default(0)>
+ <#if size > 1>
+ <#assign currentCompany = delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false)>
+ <#if currentCompany?exists>
+ <li class="user">
+ <a href="<@o...@ofbizUrl>">${currentCompany.groupName} - </a>
+ </li>
+ </#if>
+ </#if>
<#else>
<li class="user">${userName}</li>
</#if>