svn commit: r948021 - in /ofbiz/branches/release09.04: ./ applications/accounting/widget/AccountingTrees.xml applications/accounting/widget/GlobalGlAccountsScreens.xml

Author: jleroux
Date: Tue May 25 12:23:14 2010
New Revision: 948021

URL: http://svn.apache.org/viewvc?rev=948021&view=rev
Log:
"Applied fix from trunk for revision: 948017" (done hy hand because conflicts for GlobalGlAccountsScreens.xml)
------------------------------------------------------------------------
r948017 | jleroux | 2010-05-25 14:08:24 +0200 (mar. 25 mai 2010) | 8 lignes

A patch from Ankit Jain "Edit/Navigate Global GL Account - Found URL parameter [glAccountId] passed to secure (https) request-map with uri [updateGlAccount]" (https://issues.apache.org/jira/browse/OFBIZ-3316) - OFBIZ-3316

The error can be reproduced as following:

Steps:
1) Go to Accounting > Global GL Settings > Select any value(100000) from the list > in the "Edit GL Account" update the record > now in the "Navigate Accounts" section click on any node .

Then you will get the error .......
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/accounting/widget/AccountingTrees.xml
    ofbiz/branches/release09.04/applications/accounting/widget/GlobalGlAccountsScreens.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 12:23:14 2010
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
 6,928171,928180,928470,928477,929582,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
 6,928171,928180,928470,928477,929582,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017

Modified: ofbiz/branches/release09.04/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/widget/AccountingTrees.xml?rev=948021&r1=948020&r2=948021&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/branches/release09.04/applications/accounting/widget/AccountingTrees.xml Tue May 25 12:23:14 2010
@@ -20,7 +20,7 @@ under the License.
 
 <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
-    <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
+    <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem" expand-collapse-request="GlAccountNavigate">
         <node name="node-root" render-style="simple">
             <sub-node node-name="node-body">
                 <entity-and entity-name="GlAccount">
@@ -43,6 +43,29 @@ under the License.
             </sub-node>
         </node>
     </tree>
+    <tree name="ListGlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
+        <node name="node-root" render-style="simple">
+            <sub-node node-name="node-body">
+                <entity-and entity-name="GlAccount">
+                    <field-map field-name="parentGlAccountId" from-field="null"/>
+                    <order-by field-name="glAccountId"/>
+                </entity-and>
+            </sub-node>
+        </node>
+        <node name="node-body">
+            <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one>
+            <link target="GlAccountNavigate" text="${glAccountId} ${glAccount.accountName} ${postedBalance}">
+                <parameter param-name="glAccountId"/>
+                <parameter param-name="trail"/>
+            </link>
+            <sub-node node-name="node-body">
+                <entity-and entity-name="GlAccount">
+                    <field-map field-name="parentGlAccountId" from-field="glAccountId"/>
+                    <order-by field-name="glAccountId"/>
+                </entity-and>
+            </sub-node>
+        </node>
+    </tree>
     <tree name="TreeFixedAsset" root-node-name="node-root" entity-name="FixedAsset" expand-collapse-request="FixedAssetChildren"
         default-render-style="expand-collapse">
         <node name="node-root" render-style="simple">

Modified: ofbiz/branches/release09.04/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=948021&r1=948020&r2=948021&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue May 25 12:23:14 2010
@@ -212,7 +212,7 @@ under the License.
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
+                                        <include-tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
                                     </widgets>
                                 </section>
                             </container>
@@ -260,7 +260,7 @@ under the License.
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
+                                        <include-tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
                                     </widgets>
                                 </section>
                             </container>
@@ -314,7 +314,7 @@ under the License.
 
                         <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / -->
 
-                        <!-- tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ -->
+                        <!-- tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ -->
                      </decorator-section>
                 </decorator-screen>
             </widgets>