[OFBiz] SVN: r6798 - in trunk/specialized/opentravelsystem/webapp/hotelbackend: accounting includes screens
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Mon Feb 20 19:43:18 CST 2006
Author: hansbak
Date: 2006-02-20 19:43:02 -0600 (Mon, 20 Feb 2006)
New Revision: 6798
Modified:
trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml
Log:
OTS: updated party select/list, fixed problem with locale
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl 2006-02-21 01:16:08 UTC (rev 6797)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/accounting/appheaderAccounting.ftl 2006-02-21 01:43:02 UTC (rev 6798)
@@ -39,11 +39,11 @@
<div class="col"><a href="<@ofbizUrl>mainAccounting</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
<div class="col"><a href="<@ofbizUrl>findInvoices</@ofbizUrl>" class="${selectedLeftClassMap.invoices?default(unselectedLeftClassName)}">${uiLabelMap.AccountingInvoicesMenu}</a></div>
<div class="col"><a href="<@ofbizUrl>findPayments</@ofbizUrl>" class="${selectedLeftClassMap.payments?default(unselectedLeftClassName)}">${uiLabelMap.AccountingPaymentsMenu}</a></div>
- <div class="col"><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>" class="${selectedLeftClassMap.Ledger?default(unselectedLeftClassName)}">Gen.Ledger</a></div>
+ <!--div class="col"><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>" class="${selectedLeftClassMap.Ledger?default(unselectedLeftClassName)}">Gen.Ledger</a></div-->
<div class="col"><a href="<@ofbizUrl>AccountingReports</@ofbizUrl>" class="${selectedLeftClassMap.Reports?default(unselectedLeftClassName)}">Reports</a></div>
<!--div class="col"><a href="<@ofbizUrl>DataExchange</@ofbizUrl>" class="${selectedLeftClassMap.DataExchange?default(unselectedLeftClassName)}">Bank Upload</a></div-->
<div class="col"><a href="<@ofbizUrl>Utilities</@ofbizUrl>" class="${selectedLeftClassMap.Utilities?default(unselectedLeftClassName)}">Utilities</a></div>
- <div class="col"><a href="<@ofbizUrl>AdminMain</@ofbizUrl>" class="${selectedLeftClassMap.Setup?default(unselectedLeftClassName)}">Setup</a></div>
+ <!--div class="col"><a href="<@ofbizUrl>AdminMain</@ofbizUrl>" class="${selectedLeftClassMap.Setup?default(unselectedLeftClassName)}">Setup</a></div-->
<#if userLogin?has_content>
<div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl 2006-02-21 01:16:08 UTC (rev 6797)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/includes/header.ftl 2006-02-21 01:43:02 UTC (rev 6798)
@@ -90,15 +90,15 @@
</#if>
<div class="insideHeaderText"> ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</div>
<div class="insideHeaderText">
- <form method="post" action="/backend/control/setSessionLocale" style="margin: 0;">
- <select name="locale" class="selectBox">
- <option value="en_US">English (United States)</option>
- <option value="en">----</option>
- <option value="nl">Dutch</option>
- <option value="en_US">English (United States)</option>
- <option value="th_TH">Thai (Thailand)</option>
- </select>
- <input type="submit" value="Set" class="smallSubmit"/>
+ <form method="post" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
+ <select name="locale" class="selectBox">
+ <option value="${locale}">${locale.getDisplayName(locale)}</option>
+ <option value="${locale}">----</option>
+ <#list availableLocales as availableLocale>
+ <option value="${availableLocale.toString()}">${availableLocale.getDisplayName(locale)}</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonSet}" class="smallSubmit"/>
</form>
</div>
</td>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml 2006-02-21 01:16:08 UTC (rev 6797)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml 2006-02-21 01:43:02 UTC (rev 6798)
@@ -13,23 +13,6 @@
<field name="partyIdTo" title="Party Id" ><text-find default-option="contains" ignore-case="true"/></field>
<field name="groupName"><text-find default-option="contains" ignore-case="true"/></field>
<field name="lastName" ><text-find default-option="contains" ignore-case="true"/></field>
- <field name="partyRelationshipTypeId">
- <drop-down allow-empty="true">
- <entity-options description="${partyRelationshipName}" entity-name="PartyRelationshipType">
- <entity-order-by field-name="partyRelationshipName"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="statusId" title="Status" >
- <drop-down allow-empty="true" no-current-selected-key="PARTYREL-ACTIVE">
- <entity-options description="${description}" entity-name="StatusItem">
- <entity-constraint name="statusTypeId" value="PARTY-RELATION"/>
- <entity-order-by field-name="description"/>
- </entity-options>
- </drop-down>
- </field>
- <!--field name="statusId" use-when="deleted!=null"><hidden value="PARTYREL-DELETED"/></field>
- <field name="statusId" use-when="deleted==null"><hidden value="PARTYREL-ACTIVE"/></field-->
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
@@ -38,20 +21,19 @@
<form name="ListParties" type="list" separate-columns="true"
title="Party List" default-title-style="tableheadtext"
default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="findParties" list-iterator-name="listIt" default-entity-name="PartyRelationshipAndPartyDetail">
+ paginate-target="findParties" list-iterator-name="listIt" default-entity-name="PartyNameView">
<actions>
<set field="parameters.partyIdFrom" from-field="parameters.organizationPartyId"/>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" value="PartyRelationshipAndPartyDetail"/>
- <field-map field-name="orderBy" value="groupName"/>
+ <field-map field-name="entityName" value="PartyNameView"/>
+ <field-map field-name="orderBy" value="partyId"/>
</service>
</actions>
<field name="partyId" widget-style="buttontext" >
<hyperlink description="${partyId}" target="editParty?partyId=${partyId}"/>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem"/></field>
- <field name="partyRelationshipTypeId" title="Relation"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
+ <field name="partyTypeId"><display-entity entity-name="PartyType" description="${description}"/></field>
<field name="groupName" title="Name"><display description="${groupName} ${lastName} ${firstName} ${middleName}"/></field>
<field name="financialHistory" title=" " widget-style="buttontext" >
<hyperlink description="Fin.Hist" target="partyFinancialHistory?partyId=${partyId}" target-window="new"/>
@@ -60,31 +42,6 @@
<hyperlink description="Delete" target-type="plain" target="javascript:confirmActionLink('You want to delete this party?','deleteParty?organizationPartyId=${organizationPartyId}&partyId=${partyId}&statusId=PARTYREL-DELETED')"/>
</field>
</form>
- <form name="ListParties1" type="list" separate-columns="true"
- title="Party List" default-title-style="tableheadtext"
- default-widget-style="tabletext" default-tooltip-style="tabletext"
- paginate-target="findParties" list-iterator-name="listIt" default-entity-name="PartyRelationshipAndPartyDetail">
- <actions>
- <set field="parameters.partyIdFrom" from-field="parameters.organizationPartyId"/>
- <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" value="PartyRelationshipAndPartyDetail"/>
- <field-map field-name="orderBy" value="groupName"/>
- </service>
- </actions>
- <field name="partyId" widget-style="buttontext" >
- <hyperlink description="${partyId}" target="editParty?partyId=${partyId}"/>
- </field>
- <field name="statusId"><display-entity entity-name="StatusItem"/></field>
- <field name="partyRelationshipTypeId" title="Relation"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
- <field name="groupName" title="Name"><display description="${groupName} ${lastName} ${firstName} ${middleName}"/></field>
- <field name="financialHistory" title=" " widget-style="buttontext" >
- <hyperlink description="Fin.Hist" target="partyFinancialHistory?partyId=${partyId}" target-window="new"/>
- </field>
- <field name="Enable" title=" " widget-style="buttontext">
- <hyperlink description="Enable" target-type="plain" target="javascript:confirmActionLink('You want to Enable this party?','deleteParty?organizationPartyId=${organizationPartyId}&partyId=${partyId}&statusId=PARTYREL-ACTIVE')"/>
- </field>
- </form>
<form name="editParty" type="single"
target="updateParty" title="Edit Party" default-map-name="info"
More information about the Svn
mailing list