You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/11/15 15:07:18 UTC
svn commit: r1639888 - in
/ofbiz/branches/release12.04/applications/accounting:
data/AccountingTypeData.xml
script/org/ofbiz/accounting/invoice/InvoiceServices.xml
servicedef/services_invoice.xml
Author: ashish
Date: Sat Nov 15 14:07:17 2014
New Revision: 1639888
URL: http://svn.apache.org/r1639888
Log:
Applied patch from jira issue OFBIZ-5452 - Illegal simple methods name.
==========================================================================
/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
script, has two methods wich do not follow the necessary method name pattern.
invoiceSequence-enforced
invoiceSequence-restart
As result, the log file contains the following errors:
UtilXml.java:1060:ERROR] XmlFileLoader: File file:/D:/Projects/OFBiz-12.04-AP/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml process error. Line: 77. Error message: cvc-pattern-valid: Value 'invoiceSequence-enforced' is not facet-valid with respect to pattern '[a-zA-Z_]{1}[a-zA-Z0-9_$.]+' for type 'javaClassName'.
UtilXml.java:1060:ERROR] XmlFileLoader: File file:/D:/Projects/OFBiz-12.04-AP/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml process error. Line: 77. Error message: cvc-attribute.3: The value 'invoiceSequence-enforced' of attribute 'method-name' on element 'simple-method' is not valid with respect to its type, 'javaClassName'.
etc.
==========================================================================
Thanks Sergei Biletnikov for reporting the issue, Thanks Pranay for providing the patch for this issue.
Modified:
ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml
ofbiz/branches/release12.04/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml
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=1639888&r1=1639887&r2=1639888&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/data/AccountingTypeData.xml Sat Nov 15 14:07:17 2014
@@ -944,8 +944,8 @@ under the License.
<!-- inventory sequencing mode for accounting preferences -->
<CustomMethodType customMethodTypeId="HOOK" parentTypeId="HOOK" hasTable="N" description="Custom Methode Type define HOOK method to resolve specific sequence"/>
<CustomMethodType customMethodTypeId="INVOICE_HOOK" parentTypeId="HOOK" hasTable="N" description="Invoice Sequence methods"/>
- <CustomMethod customMethodId="INV_HOOK_ENF_SEQ" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/>
- <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)"/>
+ <CustomMethod customMethodId="INV_HOOK_ENF_SEQ" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequenceEnforced" description="Enforced Sequence (no gaps, per organization)"/>
+ <CustomMethod customMethodId="INV_HOOK_RES_YR" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequenceRestart" 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="quoteSequenceEnforced" description="Enforced Sequence (no gaps, per organization)"/>
Modified: ofbiz/branches/release12.04/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1639888&r1=1639887&r2=1639888&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Sat Nov 15 14:07:17 2014
@@ -40,10 +40,10 @@ under the License.
<set field="customMethodName" from-field="customMethod.customMethodName"/>
<else><!-- retreive service from deprecated enumeration -->
<if-compare operator="equals" value="INVSQ_ENF_SEQ" field="partyAcctgPreference.oldInvoiceSequenceEnumId">
- <set field="customMethodName" value="invoiceSequence-enforced"/>
+ <set field="customMethodName" value="invoiceSequenceEnforced"/>
</if-compare>
<if-compare operator="equals" value="INVSQ_RESTARTYR" field="partyAcctgPreference.oldInvoiceSequenceEnumId">
- <set field="customMethodName" value="invoiceSequence-restart"/>
+ <set field="customMethodName" value="invoiceSequenceRestart"/>
</if-compare>
</else>
</if-not-empty>
@@ -74,7 +74,7 @@ under the License.
<field-to-result field="invoiceId" result-name="invoiceId"/>
</simple-method>
- <simple-method method-name="invoiceSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)">
+ <simple-method method-name="invoiceSequenceEnforced" short-description="Enforced Sequence (no gaps, per organization)">
<log level="info" message="In createInvoice 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 -->
@@ -93,7 +93,7 @@ under the License.
<field-to-result field="invoiceId" result-name="invoiceId"/>
</simple-method>
- <simple-method method-name="invoiceSequence-restart" short-description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)">
+ <simple-method method-name="invoiceSequenceRestart" short-description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)">
<log level="info" message="In createInvoice sequence enum Restart"/>
<set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/>
<!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year -->
Modified: ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml?rev=1639888&r1=1639887&r2=1639888&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml Sat Nov 15 14:07:17 2014
@@ -33,15 +33,15 @@ under the License.
<attribute name="invoiceId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="invoiceSequence-enforced" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequence-enforced">
+ <service name="invoiceSequenceEnforced" engine="simple"
+ location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequenceEnforced">
<implements service="getNextInvoiceId"/>
<attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
<override name="invoiceId" type="Long" mode="OUT"/>
</service>
- <service name="invoiceSequence-restart" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequence-restart">
+ <service name="invoiceSequenceRestart" engine="simple"
+ location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="invoiceSequenceRestart">
<implements service="getNextInvoiceId"/>
<attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
</service>