svn commit: r1044097 - in /ofbiz/branches/release10.04: ./ applications/party/widget/partymgr/PartyForms.xml comment.tmp

Author: jleroux
Date: Thu Dec  9 19:22:09 2010
New Revision: 1044097

URL: http://svn.apache.org/viewvc?rev=1044097&view=rev
Log:
"Applied fix from trunk for revision: 1044082+1044084"
------------------------------------------------------------------------

1044082: Fix a small rendering issue:
When you updated personal information of a lead, if this lead was assigned, in the status dropdown you saw LEAD_ASSIGNED. I have changed to show correct information (also possible i18n)

r1044084  Fix a typo (double ,)

| jleroux | 2010-12-09 19:55:39 +0100 (jeu., 09 déc. 2010)
------------------------------------------------------------------------

Added:
    ofbiz/branches/release10.04/comment.tmp
Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  9 19:22:09 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084

Modified: ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml?rev=1044097&r1=1044096&r2=1044097&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml Thu Dec  9 19:22:09 2010
@@ -81,6 +81,14 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
+        <field name="statusId" use-when="person!=null &amp;&amp; leadDescription!=null">
+            <drop-down allow-empty="false">
+                <entity-options description="${description}" entity-name="StatusItem">
+                    <entity-constraint name="statusId" operator="in" value="LEAD_ASSIGNED,PARTY_ENABLED,PARTY_DISABLED"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
         <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
             <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">

Added: ofbiz/branches/release10.04/comment.tmp
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/comment.tmp?rev=1044097&view=auto
==============================================================================
--- ofbiz/branches/release10.04/comment.tmp (added)
+++ ofbiz/branches/release10.04/comment.tmp Thu Dec  9 19:22:09 2010
@@ -0,0 +1,7 @@
+"Applied fix from trunk for revision: 1044084"
+------------------------------------------------------------------------
+r1044084 | jleroux | 2010-12-09 19:55:39 +0100 (jeu., 09 déc. 2010) | 1 line
+
+Fix a typo (double ,)
+------------------------------------------------------------------------
+
\ No newline at end of file