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 2013/06/19 05:59:17 UTC
svn commit: r1494435 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml webapp/accounting/WEB-INF/controller.xml
widget/AccountingMenus.xml widget/GlSetupForms.xml widget/GlSetupScreens.xml
Author: hansbak
Date: Wed Jun 19 03:59:17 2013
New Revision: 1494435
URL: http://svn.apache.org/r1494435
Log:
fixed problem of not able to add accounting company, caused by r1494034 and reported by Pierre
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1494435&r1=1494434&r2=1494435&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Jun 19 03:59:17 2013
@@ -1764,7 +1764,7 @@
<property key="AccountingAvailableInternalOrganizations">
<value xml:lang="ar">اÙÙ
ؤسسات اÙداخÙÙØ© اÙÙ
تÙÙرة</value>
<value xml:lang="de">Verfügbare interne Organisationen</value>
- <value xml:lang="en">Available Internal Organizations</value>
+ <value xml:lang="en">Available Internal Accounting Organizations</value>
<value xml:lang="es">Organizaciones internas disponibles</value>
<value xml:lang="fr">Organisations internes disponibles</value>
<value xml:lang="hi_IN">à¤à¤ªà¤²à¤¬à¥à¤§ à¤à¤à¤¤à¤°à¤¿à¤ सà¤à¤à¤ न</value>
@@ -8967,6 +8967,9 @@
<value xml:lang="zh">æ°å»ºååæ¡ä»¶</value>
<value xml:lang="zh_TW">æ°å»ºååæ¢ä»¶</value>
</property>
+ <property key="AccountingNewCompany">
+ <value xml:lang="en">Create new accounting company</value>
+ </property>
<property key="AccountingNewBillingAccount">
<value xml:lang="ar">جساب ÙÙترة جدÙد</value>
<value xml:lang="de">Neues Rechnungskonto</value>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1494435&r1=1494434&r2=1494435&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Jun 19 03:59:17 2013
@@ -1481,6 +1481,10 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ListCompanies"/>
</request-map>
+ <request-map uri="AddCompany">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="AddCompany"/>
+ </request-map>
<request-map uri="AdminMain">
<security https="true" auth="true"/>
<response name="success" type="view" value="PartyAcctgPreference"/>
@@ -2743,6 +2747,7 @@ under the License.
<!-- administrative pages -->
<view-map name="ListCompanies" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListCompanies"/>
+ <view-map name="AddCompany" type="screen" page="component://accounting/widget/GlSetupScreens.xml#AddCompany"/>
<view-map name="TimePeriods" type="screen" page="component://accounting/widget/GlSetupScreens.xml#TimePeriods"/>
<view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/GlSetupScreens.xml#PartyAcctgPreference"/>
<view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/GlSetupScreens.xml#ListGlAccountOrganization"/>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1494435&r1=1494434&r2=1494435&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Wed Jun 19 03:59:17 2013
@@ -1312,4 +1312,10 @@ under the License.
</link>
</menu-item>
</menu>
+ <menu name="newAccountOrganization">
+ <menu-item name="addCompany" title="${uiLabelMap.AccountingNewCompany}">
+ <link target="AddCompany" link-type="auto">
+ </link>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1494435&r1=1494434&r2=1494435&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Wed Jun 19 03:59:17 2013
@@ -59,6 +59,18 @@ under the License.
<field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
</form>
+ <form name="AddCompany" type="single" target="AdminMain" title="" >
+ <field name="organizationPartyId">
+ <drop-down>
+ <entity-options description="${groupName}[${partyId}]" entity-name="PartyRoleAndPartyDetail" key-field-name="partyId">
+ <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
+ <entity-order-by field-name="groupName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.AccountingNewCompany}"><submit button-type="button"/></field>
+ </form>
+
<form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account"
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1494435&r1=1494434&r2=1494435&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Jun 19 03:59:17 2013
@@ -68,7 +68,8 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}">
+ <screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}" navigation-menu-name="newAccountOrganization">
+ <include-menu location="component://accounting/widget/AccountingMenus.xml" name="newAccountOrganization"/>
<include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
</decorator-section>
@@ -76,6 +77,21 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="AddCompany">
+ <section>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingNewCompany"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="AddCompany" location="component://accounting/widget/GlSetupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="ListGlAccountOrganization">
<section>
<actions>