Author: jleroux
Date: Thu Jan 20 20:19:34 2011
New Revision: 1061491
URL: http://svn.apache.org/viewvc?rev=1061491&view=rev
Log:
Fix "If you try to use help after changing the status of an order in order view
you get an error" (https://issues.apache.org/jira/browse/OFBIZ-3273) -
OFBIZ-3273
I still wonder why it occurs for order view and not for order list, stats or
other screens
Added:
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml (with
props)
Modified:
ofbiz/trunk/applications/order/data/OrderHelpData.xml
ofbiz/trunk/applications/order/documents/Order.xml
Modified: ofbiz/trunk/applications/order/data/OrderHelpData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderHelpData.xml?rev=1061491&r1=1061490&r2=1061491&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderHelpData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderHelpData.xml Thu Jan 20 20:19:34
2011
@@ -25,6 +25,12 @@ under the License.
dataResourceId="HELP_ORDER" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ORDER"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000"/>
+ <!-- Order View -->
+ <DataResource dataResourceId="HELP_ORDER_VIEW" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
+ objectInfo="applications/order/data/helpdata/HELP_ORDER_View.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_ORDER_VIEW" contentTypeId="DOCUMENT"
contentName="Order View Help" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_ORDER_VIEW" statusId="CTNT_IN_PROGRESS"
mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_VIEW"
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"
sequenceNum="000" mapKey="OrderEntry_orderview"/>
+
<!-- Reports -->
<DataResource dataResourceId="HELP_ORDER_REPORT" localeString="en"
dataResourceTypeId="OFBIZ_FILE"
objectInfo="applications/order/data/helpdata/HELP_ORDER_Report.xml"
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay"
mimeTypeId="text/xml" isPublic="Y" />
Added: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml?rev=1061491&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml (added)
+++ ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml Thu Jan 20
20:19:34 2011
@@ -0,0 +1,21 @@
+<?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.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="5.0"
xmlns:xl="http://www.w3.org/1999/xlink";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
xsi:schemaLocation="http://docbook.org/ns/docbook
../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook";>
+ <title>Order View</title>
+ <para> This screen allow not only to view an order but also to change it
(this is a mock to hide a weird bug, please fill in...)</para>
+</section>
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_View.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/order/documents/Order.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/documents/Order.xml?rev=1061491&r1=1061490&r2=1061491&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/documents/Order.xml (original)
+++ ofbiz/trunk/applications/order/documents/Order.xml Thu Jan 20 20:19:34 2011
@@ -24,5 +24,6 @@ under the License.
xmlns="http://docbook.org/ns/docbook";>
<title>The Order Component.</title>
<xi:include href="../data/helpdata/HELP_ORDER.xml" />
+ <xi:include href="../data/helpdata/HELP_ORDER_View.xml" />
<xi:include href="../data/helpdata/HELP_ORDER_Report.xml" />
</chapter>
