svn commit: r1070621 - in /ofbiz/trunk/applications: accounting/entitydef/entitymodel.xml order/script/org/ofbiz/order/order/OrderServices.xml

Author: jleroux
Date: Mon Feb 14 19:38:40 2011
New Revision: 1070621

URL: http://svn.apache.org/viewvc?rev=1070621&view=rev
Log:
A patch from Martin Kreidenweis "New Custom Method order ID generation implementation in OFBIZ-3765 broke backwards compatibility" (https://issues.apache.org/jira/browse/OFBIZ-4178) - OFBIZ-4178

Due to missed col-name attributes for the deprecated field names (old* fields) and a typo in the minilang code in the original patch (OFBIZ-3765), the backwards compatibility with the old enum IDs broke.

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1070621&r1=1070620&r2=1070621&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Feb 14 19:38:40 2011
@@ -2325,9 +2325,9 @@ under the License.
             </description>
         </field>
         <!-- Deprecated Field-->
-        <field name="oldInvoiceSequenceEnumId" type="id-ne"/>
-        <field name="oldOrderSequenceEnumId" type="id-ne"/>
-        <field name="oldQuoteSequenceEnumId" type="id-ne"/>
+        <field name="oldInvoiceSequenceEnumId" col-name="INVOICE_SEQUENCE_ENUM_ID" type="id-ne"/>
+        <field name="oldOrderSequenceEnumId" col-name="ORDER_SEQUENCE_ENUM_ID" type="id-ne"/>
+        <field name="oldQuoteSequenceEnumId" col-name="QUOTE_SEQUENCE_ENUM_ID" type="id-ne"/>
         <prim-key field="partyId"/>
         <relation type="one" rel-entity-name="Party" fk-name="ACTG_PREF_PTY">
             <key-map field-name="partyId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1070621&r1=1070620&r2=1070621&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Feb 14 19:38:40 2011
@@ -491,7 +491,7 @@ under the License.
         <if-not-empty field="customMethod">
             <set field="customMethodName" from-field="customMethod.customMethodName"/>
             <else><!-- retreive service from deprecated enumeration -->
-                <if-compare operator="equals" value="ORDSQ_ENF_SEQ" field="partyAcctgPreference.oldOrderSequenceEnumId">
+                <if-compare operator="equals" value="ODRSQ_ENF_SEQ" field="partyAcctgPreference.oldOrderSequenceEnumId">
                     <set field="customMethodName" value="orderSequence-enforced"/>
                 </if-compare>
             </else>