svn commit: r1868550 - in /ofbiz/branches/release16.11: ./ applications/accounting/widget/ applications/content/widget/content/ applications/marketing/widget/ applications/order/widget/ordermgr/ applications/party/widget/partymgr/ applications/workeffo...

Author: jleroux
Date: Thu Oct 17 12:20:43 2019
New Revision: 1868550

URL: http://svn.apache.org/viewvc?rev=1868550&view=rev
Log:
"Applied fix from trunk framework for revision: 1868545"
------------------------------------------------------------------------
r1868545 | jleroux | 2019-10-17 14:19:33 +0200 (jeu. 17 oct. 2019) | 16 lignes

Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status
only. So current status is not in the list and the status print in the drop-down
is the next authorized. I want to modify exampleName or exampleType, I go to
editExample and change what I want and validate. The problem is status is also
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount)
there is the same bug: when I change FinAccount Name, status change too. If I
add current="first-in-list" in the tag drop-down it works

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/accounting/widget/FinAccountForms.xml
    ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml
    ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml
    ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml
    ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderForms.xml
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReturnForms.xml
    ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
  Merged /ofbiz/ofbiz-framework/trunk:r1868545

Modified: ofbiz/branches/release16.11/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/widget/FinAccountForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/widget/FinAccountForms.xml Thu Oct 17 12:20:43 2019
@@ -123,7 +123,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="finAccount!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" env-name="finAccount.statusId"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml Thu Oct 17 12:20:43 2019
@@ -365,7 +365,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" env-name="fixedAssetMaint.statusId"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml Thu Oct 17 12:20:43 2019
@@ -224,7 +224,7 @@ under the License.
         </field>
         <field name="statusId" use-when="currentValue==null"><ignored/></field>
         <field name="statusId" use-when="currentValue!=null">
-                <drop-down allow-empty="false" current-description="${currentStatus.description}">
+                <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${currentValue.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml Thu Oct 17 12:20:43 2019
@@ -187,7 +187,7 @@ under the License.
         </field>
         <field name="statusId" use-when="currentValue==null"><ignored/></field>
         <field name="statusId" use-when="currentValue!=null">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${currentValue.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml Thu Oct 17 12:20:43 2019
@@ -343,7 +343,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" no-current-selected-key="COM_PENDING" current-description="${uiLabelMap.CommonSelectOne}">
+            <drop-down allow-empty="false" current="first-in-list" no-current-selected-key="COM_PENDING" current-description="${uiLabelMap.CommonSelectOne}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${communicationEvent.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/CustRequestForms.xml Thu Oct 17 12:20:43 2019
@@ -265,7 +265,7 @@ under the License.
 
         <field use-when="custRequest==null" name="statusId"><hidden value="CRQ_SUBMITTED"/></field>
         <field use-when="custRequest!=null" name="statusId">
-            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}toto">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${custRequest.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/OrderForms.xml Thu Oct 17 12:20:43 2019
@@ -47,7 +47,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="orderHeader!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${orderHeader.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/QuoteForms.xml Thu Oct 17 12:20:43 2019
@@ -111,7 +111,6 @@ under the License.
         <auto-fields-entity entity-name="Quote" default-field-type="edit"/>
         <field name="quoteId" use-when="quote!=null" title="${uiLabelMap.OrderOrderQuoteId}"><display/></field>
         <field name="quoteId" use-when="quote==null" title="${uiLabelMap.OrderOrderQuoteId}"><hidden/></field>
-        <field name="statusId" title="${uiLabelMap.FormFieldTitle_statusId}"><ignored/></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="QuoteType" key-field-name="quoteTypeId">
@@ -129,8 +128,15 @@ under the License.
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
+        <field name="statusId" use-when="quote==null" title="${uiLabelMap.CommonStatus}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" value="QUOTE_STATUS"/>
+                </entity-options>
+            </drop-down>
+        </field>        
         <field name="statusId" use-when="quote!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${quote.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReturnForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReturnForms.xml Thu Oct 17 12:20:43 2019
@@ -47,7 +47,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="returnHeader!=null">
-            <drop-down current-description="${currentStatus.description}">
+            <drop-down current-description="${currentStatus.description}" current="first-in-list" >
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" env-name="returnHeader.statusId"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml Thu Oct 17 12:20:43 2019
@@ -784,7 +784,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="content!=null">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}" no-current-selected-key="CTNT_AVAILABLE">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}" no-current-selected-key="CTNT_AVAILABLE">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${content.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>

Modified: ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml?rev=1868550&r1=1868549&r2=1868550&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml Thu Oct 17 12:20:43 2019
@@ -569,7 +569,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}">
-            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+            <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${communicationEvent.statusId}"/>
                     <entity-order-by field-name="sequenceId"/>