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 2008/12/25 07:26:15 UTC
svn commit: r729396 [2/2] - in /ofbiz/trunk: applications/accounting/config/
applications/accounting/entitydef/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/...
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Wed Dec 24 22:26:14 2008
@@ -75,7 +75,7 @@
<field name="statusId" use-when="person==null"><hidden/></field>
<field name="statusId" use-when="person!=null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -106,7 +106,7 @@
<field name="statusId" use-when="partyGroup==null"><hidden/></field>
<field name="statusId" use-when="partyGroup!=null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -455,7 +455,7 @@
</display-entity>
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRole}">
- <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+ <display-entity entity-name="RoleType" description="${description}"/>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
<hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&partyId=${partyId}&roleTypeId=${roleTypeId}"
@@ -471,7 +471,7 @@
<field name="partyId"><hidden/></field>
<field name="roleTypeId">
<drop-down>
- <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+ <entity-options description="${description}" entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -522,7 +522,7 @@
</field>
<field name="statusId" use-when="content==null">
<drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -538,13 +538,13 @@
</field>
<field name="mimeTypeId" >
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+ <entity-options description="${description}" entity-name="MimeType"/>
</drop-down>
</field>
<field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field>
<field name="dataCategoryId" use-when="dataResource==null">
<drop-down allow-empty="false">
- <entity-options description="${categoryName}" entity-name="DataCategory" key-field-name="dataCategoryId"/>
+ <entity-options description="${categoryName}" entity-name="DataCategory"/>
</drop-down>
</field>
<field name="dataCategoryId" use-when="dataResource!=null">
@@ -553,7 +553,7 @@
<entity-constraint name="dataCategoryId" value="${dataResource.dataCategoryId}"/>
<entity-order-by field-name="categoryName"/>
</entity-options>
- <entity-options description="${categoryName}" entity-name="DataCategory" key-field-name="dataCategoryId"/>
+ <entity-options description="${categoryName}" entity-name="DataCategory"/>
</drop-down>
</field>
<field name="createButton" use-when="content==null"><submit button-type="button"/></field>
@@ -594,7 +594,7 @@
<auto-fields-service service-name="createServiceCredit" map-name="serviceCredit"/>
<field name="finAccountId">
<drop-down allow-empty="true">
- <entity-options entity-name="FinAccount" description="${finAccountName} [${finAccountId}]" key-field-name="finAccountId" filter-by-date="true">
+ <entity-options entity-name="FinAccount" description="${finAccountName} [${finAccountId}]" filter-by-date="true">
<entity-constraint name="ownerPartyId" value="${partyId}"/>
<entity-constraint name="finAccountTypeId" value="SVCCRED_ACCOUNT"/>
<entity-order-by field-name="-fromDate"/>
@@ -611,7 +611,7 @@
</field>
<field name="productStoreId">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]" key-field-name="productStoreId">
+ <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
<entity-order-by field-name="productStoreId"/>
</entity-options>
</drop-down>
@@ -658,25 +658,6 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="ListInternalOrganization" type="list" paginate-target="findEmployees"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <actions>
- <entity-condition entity-name="PartyRelationship">
- <condition-list combine="and">
- <condition-expr field-name="roleTypeIdFrom" operator="equals" value="INTERNAL_ORGANIZATIO"/>
- <condition-expr field-name="roleTypeIdTo" operator="equals" value="EMPLOYEE"/>
- <condition-expr field-name="partyIdTo" operator="equals" value="${parameters.partyId}"/>
- <condition-expr field-name="relationshipName" operator="equals" value="EMPLOYMENT"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
- </actions>
- <field name="partyIdFrom">
- <hyperlink target="viewprofile?partyId=${partyIdFrom}" description="${partyIdFrom}"/>
- </field>
- <field name="fromDate"><display/></field>
- </form>
-
<form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table">
<field name="subscriptionId">
<display-entity entity-name="Subscription" description="${description}">
@@ -813,105 +794,94 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
- <form name="partyFinancialHistoryInvoices" type="list" list-name="historyListInvoices"
+ <form name="ListInvoicesApplPayments" type="list" list-name="ListInvoicesApplPayments"
default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
- default-tooltip-style="tabletext" target="updateCategoryProductMember">
- <field name="invoiceId"><hidden/></field>
+ default-tooltip-style="tabletext">
+ <actions>
+ <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/>
+ </actions>
+ <row-actions>
+ <set field="total" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(delegator, invoiceId, actualCurrency)}"/>
+ <set field="amountToApply" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId, actualCurrency)}"/>
+ <set field="amountApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceAppliedBd(delegator,invoiceId, org.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/>
+ </row-actions>
<field name="invoiceId">
- <display-entity entity-name="Invoice" description=" ">
+ <display-entity entity-name="Invoice" description=" " also-hidden="true">
<sub-hyperlink target="/accounting/control/invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]" target-type="inter-app"/>
</display-entity>
</field>
- <field name="invoiceTypeId" title="T"><display/></field>
- <field name="invoiceDate"><display/></field>
- <field name="invoiceAmount" widget-area-style="tabletextright"><display/></field>
- <field name="totInvoiceApplied" widget-area-style="tabletextright"><display/></field>
- <field name="applied" widget-area-style="tabletextright"><display/></field>
- <field name="paymentId"><hidden/></field>
- <field name="paymentId">
- <display-entity entity-name="Payment" description=" ">
- <sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/>
- </display-entity>
- </field>
- <field name="effectiveDate"><display/></field>
- <field name="amount" widget-area-style="tabletextright"><display/></field>
- </form>
- <!--/accounting/control/invoiceOverview-->
- <form name="partyFinancialHistoryPayments" type="list" list-name="historyListPayments"
- default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
- default-tooltip-style="tabletext" target="updateCategoryProductMember">
- <field name="paymentId"><hidden/></field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceDate"><display type="date"/></field>
+ <field name="total"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field name="amountToApply"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field name="amountApplied"><display type="currency" currency="${actualCurrencyUomId}"/></field>
<field name="paymentId">
- <display-entity entity-name="Payment" description=" ">
+ <display-entity entity-name="Payment" description=" " also-hidden="true">
<sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/>
</display-entity>
</field>
- <field name="effectiveDate"><display/></field>
- <field name="amount" widget-area-style="tabletextright"><display/></field>
- <field name="applied" widget-area-style="tabletextright"><display/></field>
- <field name="toPaymentId"><hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="${toPaymentId}" target-type="inter-app"/></field>
- <field name="toEffectiveDate"><display/></field>
- <field name="toAmount" widget-area-style="tabletextright"><display/></field>
+ <field name="pmEffectiveDate"><display type="date"/></field>
+ <field name="pmAmount" use-when="actualCurrency==false"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field name="pmAmount" entry-name="pmActualCurrencyAmount" use-when="actualCurrency==true"><display type="currency" currency="${actualCurrencyUomId}"/></field>
</form>
-
- <form name="partyFinancialHistoryInvoicesN" type="list" list-name="historyListInvoicesN"
+ <form name="ListUnAppliedInvoices" type="list" list-name="ListUnAppliedInvoices"
default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
- default-tooltip-style="tabletext" target="updateCategoryProductMember">
- <field name="invoiceId"><hidden/></field>
+ default-tooltip-style="tabletext">
+ <actions>
+ <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy"/>
+ </actions>
<field name="invoiceId">
- <display-entity entity-name="Invoice" description=" ">
+ <display-entity entity-name="Invoice" description="${description}">
<sub-hyperlink target="/accounting/control/invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]" target-type="inter-app"/>
</display-entity>
</field>
- <field name="invoiceTypeId" title="T"><display/></field>
- <field name="invoiceDate"><display/></field>
- <field name="invoiceAmount" widget-area-style="tabletextright"><display/></field>
- <field name="invoiceNotApplied" widget-area-style="tabletextright"><display/></field>
- </form>
-
- <form name="partyFinancialHistoryPaymentsO"
- type="list"
- list-name="historyListPaymentsO"
- default-title-style="tableheadtext" default-widget-style="tabletext"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
- default-tooltip-style="tabletext" target="updateCategoryProductMember">
- <field name="paymentId">
- <display-entity entity-name="Payment" description=" ">
- <sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/>
- </display-entity>
+ <field name="invoiceParentTypeId">
+ <display-entity entity-name="InvoiceType" key-field-name="invoiceTypeId" description="${description}"/>
</field>
- <field name="effectiveDate"><display/></field>
- <field name="amount" widget-area-style="tabletextright"><display/></field>
- <field name="applied" widget-area-style="tabletextright"><display/></field>
- <field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
- <field name="invoiceItemSeqId" title="Seq"><display/></field>
- <field name="partyId" widget-area-style="tabletextright"><display/></field>
+ <field name="invoiceDate"><display type="date"/></field>
+ <field name="amount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field>
+ <field name="unAppliedAmount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field>
</form>
-
- <form name="partyFinancialHistoryPaymentsN" type="list" list-name="historyListPaymentsN" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
- default-title-style="tableheadtext" default-widget-style="tabletext"
- default-tooltip-style="tabletext" target="updateCategoryProductMember">
+ <form name="ListUnAppliedPayments" type="list" list-name="paymentList"
+ default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
+ default-tooltip-style="tabletext">
+ <actions>
+ <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy"/>
+ </actions>
<field name="paymentId"><hidden/></field>
<field name="paymentId">
<display-entity entity-name="Payment" description=" ">
<sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/>
</display-entity>
</field>
- <field name="effectiveDate"><display/></field>
- <field name="amount" widget-area-style="tabletextright"><display/></field>
- <field name="notApplied" widget-area-style="tabletextright"><display/></field>
+ <field name="effectiveDate"><display type="date"/></field>
+ <field name="paymentTypeId">
+ <display-entity entity-name="PaymentType" description="${description}"/>
+ </field>
+ <field name="paymentParentTypeId">
+ <display-entity entity-name="PaymentType" key-field-name="paymentTypeId" description="${description}"/>
+ </field>
+ <field name="amount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
+ <field name="unAppliedAmount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
</form>
-
<form name="partyFinancialSummary" type="single" title="Financial summary" default-map-name="finanSummary"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <field position="1" name="totalSalesInvoice"><display/></field>
- <field position="2" name="totalPurchaseInvoice"><display/></field>
- <field position="1" name="totalPaymentsIn"><display/></field>
- <field position="2" name="totalPaymentsOut"><display/></field>
- <field position="1" name="totalInvoiceNotApplied"><display/></field>
- <field position="2" name="totalPaymentNotApplied"><display/></field>
- <field position="1" name="totalToBePaid" title="${uiLabelMap.PartyToBePaidTo} ${parameters.partyId}"><display/></field>
- <field position="2" name="totalToBeReceived" title="${uiLabelMap.PartyToBeReceivedFrom} ${parameters.partyId}"><display/></field>
+ <actions>
+ <set field="actualCurrency" from-field="actualCurrency" default-value="true"/>
+ <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy"/>
+ </actions>
+ <field position="1" name="totalSalesInvoice"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="2" name="totalPurchaseInvoice"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="1" name="totalPaymentsIn"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="2" name="totalPaymentsOut"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="1" name="totalInvoiceNotApplied"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="2" name="totalPaymentNotApplied"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="1" name="totalToBePaid" use-when="finanSummary.get("totalToBePaid")!=null" title="${uiLabelMap.PartyToBeReceivedFrom} ${parameters.partyId}"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+ <field position="1" name="totalToBeReceived" use-when="finanSummary.get("totalToBeReceived")!=null" title="${uiLabelMap.PartyToBePaidTo} ${parameters.partyId}"><display type="currency" currency="${actualCurrencyUomId}"/></field>
</form>
<form name="ViewPartyRoles" type="list" list-name="partyRoles" target="viewroles"
default-title-style="tableheadtext" default-widget-style="tabletext"
@@ -938,7 +908,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}" required-field="true"><text/></field>
<field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
- <form name="ListPreference" type="list" target="updatePreference?partyId=${partyId}" list-name="userPreferences"
+ <form name="ListPreference" type="list" target="updatePreference?partyId=${partyId}" list-name="userPreferenceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true" use-row-submit="true" >
<row-actions>
<service service-name="getUserPreference" result-map-name="values">
@@ -951,8 +921,8 @@
<field name="enumTypeId" parameter-name="userPrefGroupTypeId"><hidden value="${enumTypeId}"/></field>
<field name="description" title="${uiLabelMap.CommonName}"><display/></field>
<field name="partyId" title="${uiLabelMap.CommonValue}" use-when="enumId.equals("ORGANIZATION_PARTY")" parameter-name="userPrefValue" >
- <drop-down current="selected">
- <entity-options entity-name="PartyAcctgAndName" description="${firstName} ${lastName} ${groupName}"/>
+ <drop-down current="selected" no-current-selected-key="defaultOrganizationPartyId">
+ <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}"/>
</drop-down>
</field>
<field name="visualThemeId" title="${uiLabelMap.CommonEmptyHeader}" use-when="enumId.equals("VISUAL_THEME")" parameter-name="userPrefValue">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Wed Dec 24 22:26:14 2008
@@ -116,7 +116,6 @@
<include-screen name="ShipperAccount" location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="mytasks" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="ViewInternalOrg" location="component://party/widget/partymgr/ProfileScreens.xml"/>
</container>
</widgets>
</section>
@@ -997,68 +996,146 @@
<set field="headerItem" value="accountsMain"/>
<set field="tabButtonItem" value="FinancialHistory"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-one entity-name="PartyNameView" value-name="party"></entity-one>
- <set field="organizationPartyId" from-scope="user" to-scope="screen" from-field="productStoreId"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy"/>
+ <entity-one entity-name="Party" value-name="party"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="h1" text="${uiLabelMap.FinancialHistory}"/></container>
- <screenlet title="${uiLabelMap.InvoicesPayments}" navigation-form-name="Invoices">
- <include-form name="partyFinancialHistoryInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
+ <label style="h1" text="${uiLabelMap.FinancialHistory}"/>
<section>
- <condition>
- <not>
- <if-empty field-name="historyListPaymentsO"/>
- </not>
- </condition>
+ <actions>
+ <entity-condition entity-name="InvoiceAndApplAndPayment" list-name="ListInvoicesApplPayments">
+ <condition-list combine="and">
+ <condition-list combine="or">
+ <condition-list combine="and">
+ <condition-expr field-name="partyId" env-name="partyId"/>
+ <condition-expr field-name="partyIdFrom" env-name="defaultOrganizationPartyId"/>
+ </condition-list>
+ <condition-list combine="and">
+ <condition-expr field-name="partyId" env-name="defaultOrganizationPartyId"/>
+ <condition-expr field-name="partyIdFrom" env-name="partyId"/>
+ </condition-list>
+ </condition-list>
+ <condition-expr field-name="statusId" operator="not-equals" value="INVOICE_IN_PROCESS"/>
+ <condition-expr field-name="statusId" operator="not-equals" value="INVOICE_CANCELLED"/>
+ <condition-expr field-name="statusId" operator="not-equals" value="INVOICE_WRITEOFF"/>
+ </condition-list>
+ </entity-condition>
+ </actions>
<widgets>
- <screenlet title="${uiLabelMap.InvoicesOtherParties}" navigation-form-name="partyFinancialHistoryPayments">
- <include-form name="partyFinancialHistoryPaymentsO" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
+ <section>
+ <condition>
+ <not><if-empty field-name="ListInvoicesApplPayments"/></not>
+ </condition>
+ <actions>
+ <set field="actualCurrency" value="false" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.InvoicesApplPayments}" navigation-form-name="Invoices">
+ <include-form name="ListInvoicesApplPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field-name="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ </and>
+ </condition>
+ <actions>
+ <set field="actualCurrency" value="true" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ </actions>
+ <widgets>
+ <label style="h2" text="In party currency"></label>
+ <include-form name="ListInvoicesApplPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </widgets>
+ </section>
</widgets>
</section>
<section>
- <condition>
- <not>
- <if-empty field-name="historyListPayments"/>
- </not>
- </condition>
+ <actions>
+ <set field="actualCurrency" value="false" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/>
+ </actions>
<widgets>
- <screenlet title="${uiLabelMap.AppliedPayments}" navigation-form-name="partyFinancialHistoryPayments">
- <include-form name="partyFinancialHistoryPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <screenlet title="${uiLabelMap.InvoicesNotApplied}" navigation-form-name="partyFinancialHistoryInvoicesN">
+ <include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field-name="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ </and>
+ </condition>
+ <actions>
+ <set field="actualCurrency" value="true" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ </actions>
+ <widgets>
+ <label style="h2" text="In party currency"></label>
+ <include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</screenlet>
</widgets>
</section>
<section>
- <condition>
- <not>
- <if-empty field-name="historyListInvoicesN"/>
- </not>
- </condition>
+ <actions>
+ <set field="actualCurrency" value="false" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyId"/>
+ </actions>
<widgets>
- <screenlet title="${uiLabelMap.InvoicesNotApplied}" navigation-form-name="partyFinancialHistoryInvoicesN">
- <include-form name="partyFinancialHistoryInvoicesN" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <screenlet title="${uiLabelMap.PaymentsNotApplied}" navigation-form-name="partyFinancialHistoryPaymentsN">
+ <include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field-name="defaultOrganizationPartyCurrencyId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ </and>
+ </condition>
+ <actions>
+ <set field="actualCurrency" value="true" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ </actions>
+ <widgets>
+ <label style="h2" text="In party currency"></label>
+ <include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</screenlet>
</widgets>
</section>
<section>
- <condition>
- <not>
- <if-empty field-name="historyListPaymentsN"/>
- </not>
- </condition>
+ <actions>
+ <set field="actualCurrency" value="false" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/>
+ </actions>
<widgets>
- <screenlet title="${uiLabelMap.PaymentsNotApplied}" navigation-form-name="partyFinancialHistoryPaymentsN">
- <include-form name="partyFinancialHistoryPaymentsN" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
+ <screenlet title="${uiLabelMap.PartyFinancialSummary}${defaultOrganizationPartyId}" navigation-form-name="partyFinancialSummary">
+ <include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="party.preferredCurrencyUomId"/></not>
+ <if-compare-field field-name="defaultOrganizationPartyCurrencyUomId" operator="not-equals" to-field-name="party.preferredCurrencyUomId"/>
+ </and>
+ </condition>
+ <actions>
+ <set field="actualCurrency" value="true" type="Boolean"/>
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ </actions>
+ <widgets>
+ <label style="h2" text="In party currency"></label>
+ <include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
</widgets>
</section>
- <screenlet title="${uiLabelMap.PartyFinancialSummary}${organizationPartyId}" navigation-form-name="partyFinancialSummary">
- <include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -1071,7 +1148,7 @@
<set field="headerItem" value="find"/>
<set field="tabButtonItem" value="preferences"/>
<set field="partyId" from-field="parameters.partyId"/>
- <entity-and entity-name="Enumeration" list-name="userPreferences">
+ <entity-and entity-name="Enumeration" list-name="userPreferenceList">
<field-map field-name="enumTypeId" value="GLOBAL_PREFERENCES"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Wed Dec 24 22:26:14 2008
@@ -509,29 +509,4 @@
</section>
</screen>
- <screen name="ViewInternalOrg">
- <section>
- <actions>
- <set field="headerItem" value="internalOrganization"/>
- <set field="roleTypeId" value="EMPLOYEE"/>
- </actions>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="boxlink">
- <link target="EditEmployment" style="lightbuttontext" text="${uiLabelMap.CommonUpdate}"/>
- </container>
- <label style="h3">${uiLabelMap.OrderOrderEntryInternalOrganization}</label>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListInternalOrganization" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Dec 24 22:26:14 2008
@@ -7649,6 +7649,9 @@
<value xml:lang="zh">订å</value>
<value xml:lang="zh_CN">订å</value>
</property>
+ <property key="DefaultOrganizationPartyId">
+ <value xml:lang="en">Default Organization</value>
+ </property>
<property key="PageTitleAddDataSource">
<value xml:lang="ar">إضاÙØ© Ù
صدر اÙÙ
عÙÙÙ
ات جدÙد</value>
<value xml:lang="de">Neue Datenquelle hinzufügen</value>
Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Wed Dec 24 22:26:14 2008
@@ -104,12 +104,15 @@
</li>
<li>
<#if person?has_content>
- ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
+ ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
<#elseif partyGroup?has_content>
${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
<#else>
${uiLabelMap.CommonWelcome}!
</#if>
+ <#if defaultOrganizationPartyId?exists>
+ ${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]
+ </#if>
</li>
<li>${nowTimestamp?datetime?string.short}</li>
<li class="control-area">
@@ -142,6 +145,9 @@
${uiLabelMap.CommonWelcome}!
</#if>
</p>
+ <#if defaultOrganizationPartyId?exists>
+ <p>${uiLabelMap.DefaultOrganizationPartyId} : ${defaultOrganizationPartyGroupName?if_exists} [${defaultOrganizationPartyId}]</p>
+ </#if>
<p>${nowTimestamp?datetime?string.short}</p>
<p>${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p>
<p>${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=729396&r1=729395&r2=729396&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Dec 24 22:26:14 2008
@@ -120,10 +120,10 @@
<set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/calendar_date_select.js" global="true"/>
<set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
- <service service-name="getUserPreferenceGroup">
+ <service service-name="getUserPreferenceGroup" result-map-name="prefResult">
<field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
</service>
- <set field="userPreferences" from-field="userPrefMap" global="true"/>
+ <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
<set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="DEFAULT" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
@@ -132,6 +132,14 @@
<set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
<set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/header.ftl"/>
<set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/footer.ftl"/>
+ <property-to-field resource="general" property="defaultOrganizationPartyId" field="defaultOrganizationPartyIdProperties"/>
+ <set field="defaultOrganizationPartyId" value="${bsh:"DEFAULT".equals(userPreferences.get("ORGANIZATION_PARTY"))?defaultOrganizationPartyIdProperties:userPreferences.get("ORGANIZATION_PARTY")}" global="true"/>
+ <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
+ <entity-one entity-name="PartyAcctgPrefAndGroup" value-name="orgParty">
+ <field-map field-name="partyId" env-name="defaultOrganizationPartyId"/>
+ </entity-one>
+ <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="defaultCurrencyUomId" global="true"/>
+ <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
</actions>
<widgets>
<!-- render header -->