svn commit: r1336922 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/ applications/manufacturing/data/ applications/manufacturing/data/helpdata/ applications/manufacturing/documents/ applications/product/config/

Author: jleroux
Date: Thu May 10 22:05:01 2012
New Revision: 1336922

URL: http://svn.apache.org/viewvc?rev=1336922&view=rev
Log:
"Applied fix from trunk for revision: 1336921  "
------------------------------------------------------------------------
r1336921 | jleroux | 2012-05-11 00:03:33 +0200 (ven., 11 mai 2012) | 5 lines

A patch from Pierre Smits "Help screens in Manufacturing" https://issues.apache.org/jira/browse/OFBIZ-4802

Fix the help screens of Manufacturing

jleroux: We maybe need to think about the components order in help
------------------------------------------------------------------------


Added:
    ofbiz/branches/release12.04/applications/manufacturing/data/ManufacturingHelpData_EN.xml
      - copied unchanged from r1336921, ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_EN.xml
    ofbiz/branches/release12.04/applications/manufacturing/data/ManufacturingHelpData_NL.xml
      - copied unchanged from r1336921, ofbiz/trunk/applications/manufacturing/data/ManufacturingHelpData_NL.xml
    ofbiz/branches/release12.04/applications/manufacturing/data/helpdata/
      - copied from r1336921, ofbiz/trunk/applications/manufacturing/data/helpdata/
    ofbiz/branches/release12.04/applications/manufacturing/documents/
      - copied from r1336921, ofbiz/trunk/applications/manufacturing/documents/
Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/manufacturing/ofbiz-component.xml
    ofbiz/branches/release12.04/applications/product/config/ProductEntityLabels.xml

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

Modified: ofbiz/branches/release12.04/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/ofbiz-component.xml?rev=1336922&r1=1336921&r2=1336922&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/branches/release12.04/applications/manufacturing/ofbiz-component.xml Thu May 10 22:05:01 2012
@@ -35,6 +35,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
     <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingExampleData.xml"/>
 

Modified: ofbiz/branches/release12.04/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/config/ProductEntityLabels.xml?rev=1336922&r1=1336921&r2=1336922&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/release12.04/applications/product/config/ProductEntityLabels.xml Thu May 10 22:05:01 2012
@@ -3390,8 +3390,7 @@
         <value xml:lang="vi">Nếu trang mạng cho phép người dụng nhập vào đánh giá sản phẩm, phần này sẽ kiểm soát xem đánh giá đó có phải được phê duyệt trước, hay nó có thể hiển thị ngay lên trang web.</value>
     </property>
     <property key="FieldDescription.ProductStore.isDemoStore">
-        <value xml:lang="en">If Yes, any orders created will not be sent, credit card charges will not be made, etc.
-        </value>
+        <value xml:lang="en">If Yes, any orders created will not be sent, credit card charges will not be made, etc.</value>
     </property>
     <property key="FieldDescription.ProductStore.isImmediatelyFulfilled">
         <value xml:lang="en">If Yes, the order will be immediately fulfilled through system-generated processes in ofbiz (e.g. for POS sales).  If no, it will be held for manual review.</value>