svn commit: r1446581 - in /ofbiz/branches/release12.04: ./ applications/accounting/data/AccountingTypeData.xml applications/order/script/org/ofbiz/order/quote/QuoteServices.xml applications/order/servicedef/services_quote.xml

Author: jleroux
Date: Fri Feb 15 13:42:16 2013
New Revision: 1446581

URL: http://svn.apache.org/r1446581
Log:
"Applied fix from trunk for revision: 1446575  "
------------------------------------------------------------------------
r1446575 | jleroux | 2013-02-15 14:28:42 +0100 (ven., 15 févr. 2013) | 7 lines

A patch from Chatree Srichart for "services_quote.xml#quoteSequence-enforced method is not facet-valid with respect to pattern" https://issues.apache.org/jira/browse/OFBIZ-5135

I got an error message:
Error message: cvc-attribute.3: The value 'quoteSequence-enforced' of attribute 'method-name' on element 'simple-method' is not valid with respect to its type, 'javaClassName'.



------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml
    ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
    ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1446575

Modified: ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml?rev=1446581&r1=1446580&r2=1446581&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml Fri Feb 15 13:42:16 2013
@@ -948,7 +948,7 @@ under the License.
     <CustomMethod customMethodId="INV_HOOK_RES_YR" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequence-restart" description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)"/>
     <!-- quote sequencing mode for accounting preferences -->
     <CustomMethodType customMethodTypeId="QUOTE_HOOK" parentTypeId="HOOK" hasTable="N" description="Quote Sequence methods"/>
-    <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/>
+    <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequenceEnforced" description="Enforced Sequence (no gaps, per organization)"/>
     <!-- order sequencing mode for accounting preferences -->
     <CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/>
     <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence_enforced" description="Enforced Sequence (no gaps, per organization)"/>

Modified: ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1446581&r1=1446580&r2=1446581&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Fri Feb 15 13:42:16 2013
@@ -43,7 +43,7 @@ under the License.
             <set field="customMethodName" from-field="customMethod.customMethodName"/>
             <else><!-- retreive service from deprecated enumeration -->
                 <if-compare operator="equals" value="QUOSQ_ENF_SEQ" field="partyAcctgPreference.oldQuoteSequenceEnumId">
-                    <set field="customMethodName" value="quoteSequence-enforced"/>
+                    <set field="customMethodName" value="quoteSequenceEnforced"/>
                 </if-compare>
             </else>
         </if-not-empty>
@@ -75,7 +75,7 @@ under the License.
         <field-to-result field="quoteId" result-name="quoteId"/>
     </simple-method>
 
-    <simple-method method-name="quoteSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)">
+    <simple-method method-name="quoteSequenceEnforced" short-description="Enforced Sequence (no gaps, per organization)">
         <log level="info" message="In getNextQuoteId sequence enum Enforced"/>
         <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/>
         <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml?rev=1446581&r1=1446580&r2=1446581&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml Fri Feb 15 13:42:16 2013
@@ -33,8 +33,8 @@ under the License.
         <attribute name="quoteId" type="String" mode="OUT" optional="false"/>
     </service>
 
-    <service name="quoteSequence-enforced" engine="simple"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="quoteSequence-enforced">
+    <service name="quoteSequenceEnforced" engine="simple"
+        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="quoteSequenceEnforced">
         <implements service="getNextQuoteId" optional="true"/>
         <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
         <override name="quoteId" type="Long" mode="OUT"/>