[OFBiz] SVN: r5898 - in trunk/specialized/opentravelsystem:
src/org/ofbiz/opentravelsystem webapp/hotelbackend/WEB-INF
webapp/hotelbackend/screens
hansbak at svn.ofbiz.org
hansbak at svn.ofbiz.org
Sun Oct 2 11:04:28 EDT 2005
Author: hansbak
Date: 2005-10-02 10:04:17 -0500 (Sun, 02 Oct 2005)
New Revision: 5898
Modified:
trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/mt940.java
trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingForms.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
Log:
remove accountingExt screens from opentravelsystem
Modified: trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/mt940.java
===================================================================
--- trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/mt940.java 2005-10-02 08:34:08 UTC (rev 5897)
+++ trunk/specialized/opentravelsystem/src/org/ofbiz/opentravelsystem/mt940.java 2005-10-02 15:04:17 UTC (rev 5898)
@@ -128,11 +128,11 @@
if (debug) Debug.logInfo("Start processing payments...", module);
while (getPayment(request) != null) {
if (debet == false) {
- payment.put("statusId","PMNT_RECEIVED");
+ payment.put("statusId","PMNT_NOT_PAID");
payment.put("partyIdFrom",getParty(delegator));
payment.put("partyIdTo", accountPartyId); }
else { // credit
- payment.put("statusId","PMNT_SENT");
+ payment.put("statusId","PMNT_NOT_PAID");
payment.put("partyIdTo",getParty(delegator));
payment.put("partyIdFrom", accountPartyId); }
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2005-10-02 08:34:08 UTC (rev 5897)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2005-10-02 15:04:17 UTC (rev 5898)
@@ -2459,12 +2459,12 @@
<view-map name="TaxSummary" type="screen" page="component://accountingext/widget/AccountingScreens.xml#TaxSummary"/>
<view-map name="AccountActivitiesDetail" type="screen" page="component://accountingext/widget/AccountingScreens.xml#AccountActivitiesDetail"/>
<!-- Accounting administrative pages -->
- <view-map name="AdminMain" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml#AdminMain"/>
- <view-map name="PartyAcctgPreference" type="screen" page="component://accountingext/widget/AccountingScreens.xml#PartyAcctgPreference"/>
- <view-map name="ViewFXConversions" type="screen" page="component://accountingext/widget/AccountingScreens.xml#ViewFXConversions"/>
+ <view-map name="AdminMain" type="screen" page="component://accountingext/widget/AdminScreens.xml#AdminMain"/>
+ <view-map name="PartyAcctgPreference" type="screen" page="component://accountingext/widget/AdminScreens.xml#PartyAcctgPreference"/>
+ <view-map name="ViewFXConversions" type="screen" page="component://accountingext/widget/AdminScreens.xml#ViewFXConversions"/>
<view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accountingext/widget/AccountingScreens.xml#ListUnpostedAcctgTrans"/>
<!-- GL organisation -->
- <view-map name="ListGlAccountOrganization" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml#ListGlAccountOrganization"/>
+ <view-map name="ListGlAccountOrganization" type="screen" page="component://accountingext/widget/AccountingScreens.xml#ListGlAccountOrganization"/>
<view-map name="AssignGlAccount" type="screen" page="component://accountingext/widget/AccountingScreens.xml#AssignGlAccount"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingForms.xml 2005-10-02 08:34:08 UTC (rev 5897)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingForms.xml 2005-10-02 15:04:17 UTC (rev 5898)
@@ -41,31 +41,5 @@
<submit button-type="button"/>
</field>
</form>
- <form name="AssignGlAccount" type="single"
- target="createGlAccountOrganization" title="" default-map-name="account"
- default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-
- <!-- field name="glAccountId" title="Edit" widget-style="buttontext" -->
-
- <field name="glAccountId" title="GlAccount" widget-style="selectBox">
- <drop-down>
- <entity-options entity-name="GlAccount" description="${accountName}">
- <entity-order-by field-name="accountName"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <!--field name="partyId" parameter-name="organizationPartyId" title="Party" widget-style="selectBox">
- <drop-down>
- <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" -->
- <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
- <!--entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
- <entity-order-by field-name="partyId"/>
- </entity-options>
- </drop-down>
- </field-->
- <field name="submitButton" title="Create Assignment" widget-style="smallSubmit"><submit button-type="button"/></field>
-
- </form>
</forms>
\ No newline at end of file
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml 2005-10-02 08:34:08 UTC (rev 5897)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/AccountingScreens.xml 2005-10-02 15:04:17 UTC (rev 5898)
@@ -151,95 +151,4 @@
</widgets>
</section>
</screen>
- <screen name="AdminMain">
- <section>
- <actions>
- <set field="title" value="Administrative Options"/>
- <set field="headerItem" value="companies"/>
- <set field="labelTitleProperty" value="Administrative Options"/>
- <set field="organizationPartyId" from-scope="user" from-field="productStoreId" />
- <!--set field="organizationPartyId" from-field="parameters.organizationPartyId"/-->
- <entity-condition entity-name="CustomTimePeriod" list-name="openTimePeriods">
- <condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="isClosed" operator="equals" value="N"/>
- </condition-list>
- <order-by field-name="thruDate"/>
- </entity-condition>
- <entity-condition entity-name="CustomTimePeriod" list-name="closedTimePeriods">
- <condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="isClosed" operator="equals" value="Y"/>
- </condition-list>
- <order-by field-name="periodTypeId"/>
- <order-by field-name="periodNum"/>
- <order-by field-name="thruDate"/>
- </entity-condition>
- </actions>
- <widgets>
- <decorator-screen name="CommonAccountingDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://accountingext/webapp/accountingext/admin/adminMain.ftl"/></html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="GListGlAccountEntries">
- <section>
- <actions>
- <set field="title" value="View GL Account Entries"/>
- <set field="tabButtonItem" value="ListGlAccountOrganization"/>
- <set field="glAccountId" from-field="requestParameters.glAccountId"/>
- <entity-and entity-name="AcctgTransEntry" list-name="entries">
- <field-map field-name="glAccountId"/>
- </entity-and>
- </actions>
- <widgets>
- <decorator-screen name="CommonAccountingDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="column-left-wide">
- <include-tree name="GlAccountTree" location="component://accountingext/widget/AccountingTrees.xml" />
- </container>
- <include-form name="ListAcctgTransEntries" location="component://accountingext/webapp/accountingext/chartofaccounts/GlAccountForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="ListGlAccountOrganization">
- <section>
- <actions>
- <set field="title" value="List GlAccountOrganization"/>
- <set field="titleProperty" value="List GlAccountOrganization"/>
- <set field="tabButtonItem" value="Ledger"/>
- <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
- <set field="requestParameters.organizationPartyId" from-scope="user" from-field="productStoreId" />
- <set field="requestParameters.glAccountId" value=""/> <!-- make sure a list is shown and not a single account. -->
- <set field="organizationPartyId" from-scope="user" from-field="productStoreId" />
- <!--set field="organizationPartyId" from-field="requestParameters.organizationPartyId"/-->
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonAccountingDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container>
- <label style="head1">General ledger accounts for ${organizationPartyId}</label>
- </container>
- <container>
- <include-form name="ListGlAccountOrganization" location="component://accountingext/webapp/accountingext/chartofaccounts/GlAccountForms.xml"/>
- </container>
- <container>
- <label style="head1"><br/>Add another GL account</label>
- </container>
- <include-form name="AssignGlAccount" location="component://opentravelsystem/webapp/hotelbackend/screens/AccountingForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2005-10-02 08:34:08 UTC (rev 5897)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2005-10-02 15:04:17 UTC (rev 5898)
@@ -49,6 +49,7 @@
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
+ <set field="organizationPartyId" from-scope="user" from-field="productStoreId" />
<set field="activeApp" value="hotelbackend" global="true"/>
</actions>
<widgets>
@@ -373,5 +374,41 @@
</widgets>
</section>
</screen>
+ <screen name="CommonAdminDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="Accounting"/>
+ <set field="organizationPartyId" from-scope="user" from-field="productStoreId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="mainAccountingDecorator">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <widgets>
+ <container>
+ <label style="head1">For organization: ${organizationPartyId}</label>
+ </container>
+ <platform-specific>
+ <html><html-template location="component://accountingext/webapp/accountingext/admin/AdminTabBar.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.AcccountingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
More information about the Svn
mailing list