You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/04/19 13:48:23 UTC
svn commit: r1739909 - in /ofbiz/trunk/applications/order:
data/OrderSystemPropertyData.xml ofbiz-component.xml
Author: jleroux
Date: Tue Apr 19 11:48:23 2016
New Revision: 1739909
URL: http://svn.apache.org/viewvc?rev=1739909&view=rev
Log:
A patch from Pierre Smits for "Have configuration options for ordermgr" https://issues.apache.org/jira/browse/OFBIZ-6191
This patch addresses the integration of OrderSystemPropertyData.xml in the ofbiz-component.xml of the Order component.
Added:
ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml (with props)
Modified:
ofbiz/trunk/applications/order/ofbiz-component.xml
Added: ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml?rev=1739909&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml (added)
+++ ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml Tue Apr 19 11:48:23 2016
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+<!--
+# Days Till Cancel Replacement Order
+order.properties setting is: daysTillCancelReplacementOrder=30
+-->
+ <SystemProperty systemResourceId="order" systemPropertyId="daysTillCancelReplacementOrder" systemPropertyValue="30"
+ description="Days until replacement order is cancelled."
+ />
+
+<!--
+# Maximum age of auto-save shopping list for anonymous users (in days)
+order.properties setting is: autosave.max.age=14
+-->
+ <SystemProperty systemResourceId="order" systemPropertyId="autosave.max.age" systemPropertyValue="14"
+ description="Maximum age of auto-save shopping list for anonymous users (in days)."
+ />
+
+<!--
+# Order Item Attribute Prefix
+order.properties setting is: order.item.attr.prefix=order_item_attr_
+-->
+ <SystemProperty systemResourceId="order" systemPropertyId="order.item.attr.prefix" systemPropertyValue="order_item_attr_"
+ description="Prefix for Order Item Attribute."
+ />
+
+<!--
+#
+order.properties setting is: order.item.comment.enable=Y
+-->
+ <SystemProperty systemResourceId="order" systemPropertyId="order.item.comment.enable" systemPropertyValue="Y"
+ description="Allow comment on Order Item. Choices are: Y or N."
+ />
+
+</entity-engine-xml>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/data/OrderSystemPropertyData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=1739909&r1=1739908&r2=1739909&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Tue Apr 19 11:48:23 2016
@@ -28,12 +28,16 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
+
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
- <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
+
+ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderSystemPropertyData.xml"/>
+
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderQuoteDemoData.xml"/>