You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sh...@apache.org on 2014/07/30 16:45:00 UTC
svn commit: r1614671 - in /ofbiz/branches/release13.07: ./
applications/manufacturing/data/ applications/manufacturing/data/helpdata/
Author: sharan
Date: Wed Jul 30 14:44:59 2014
New Revision: 1614671
URL: http://svn.apache.org/r1614671
Log:
Applied fix from trunk for revision: 1614280
===
Applied OFBIZ-5684 (OFBIZ-2219) updates to manufacturing help screens
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/manufacturing/data/ManufacturingHelpData_EN.xml
ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_main.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1614280
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/ManufacturingHelpData_EN.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/ManufacturingHelpData_EN.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/ManufacturingHelpData_EN.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/ManufacturingHelpData_EN.xml Wed Jul 30 14:44:59 2014
@@ -36,7 +36,7 @@
<ContentAssoc mapKey="MANUFACTURING_main" contentId="HELP_MFG" contentIdTo="MFG_Main" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="MFG_ProdRuns" localeString="en" dataResourceTypeId="OFBIZ_FILE"
- objectInfo="applications/manufacturing/data/helpdata/Help_MFG_findProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+ objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="MFG_ProdRuns" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="MFG_ProdRuns" contentTypeId="DOCUMENT" contentName="Production Runs" templateDataResourceId="HELP_TEMPL"
dataResourceId="MFG_ProdRuns" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml Wed Jul 30 14:44:59 2014
@@ -23,62 +23,68 @@
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>Manufacturing: Edit production run</title>
+ <title>Manufacturing: Edit Production Run</title>
<para>
- This screen displays the production run. Through this screen you can:
+ This screen displays the details of a Production Run. Through this screen you can:
</para>
<itemizedlist>
- <listitem><para>Edit the base details of the production run</para></listitem>
- <listitem><para>Create tasks - Click 'Taksks'</para></listitem>
- <listitem><para>Add materials - Click 'Materials'</para></listitem>
- <listitem><para>Associate equipment - Click 'Equipment'</para></listitem>
- <listitem><para>View associated (dependent) productie runs - click 'Assocs'</para></listitem>
- <listitem><para>View associated content - Click 'Content'</para></listitem>
- <listitem><para>View actual cost of the production run - Click 'Actual Costs'</para></listitem>
+ <listitem><para>Edit the basic details of the Production Run</para></listitem>
+ <listitem><para>Create tasks that will be performed as part of the Production Run by clicking 'Tasks'</para></listitem>
+ <listitem><para>Add materials that the Production Run will use to make the manufactured product by clicking 'Materials'</para></listitem>
+ <listitem><para>Associate equipment that will be used as part of Production by clicking 'Equipment'</para></listitem>
+ <listitem><para>View any associated (or dependent) Production Runs by clicking 'Assocs'</para></listitem>
+ <listitem><para>View any associated content by clicking 'Content'</para></listitem>
+ <listitem><para>View the actual cost of the Production Run by click 'Actual Costs'</para></listitem>
</itemizedlist>
<section>
- <title>Base details production run</title>
+ <title>Basic Production Run Details</title>
<para>
- This section displays the base details of the production run. Additionally you can edit the details.
+ This section displays the basic details of the Production Run. This includes information about the
+ Facility where the Production Run will take place, the quantity of product to be produced and the proposed start and
+ completion date.</para>
+ <para>The majority of these fields are editable, the exception being the "Calculated completion date".
</para>
- <para>In this section following action can be performed:</para>
+ <para>This section also allows you to change the Production Run status as follows:</para>
<itemizedlist>
- <listitem><para>Cancel - to cancel the production run.</para></listitem>
- <listitem><para>Quick close - to close the production run</para></listitem>
- <listitem><para>Quick complete - to mark the production run as 'complete'</para></listitem>
- <listitem><para>Confirm - to confirm the production run</para></listitem>
- <listitem><para>Schedule -to schedule the production run in the calendar</para></listitem>
- <listitem><para>Print - to create a pdf file of the production run</para></listitem>
+ <listitem><para>"Cancel" - To cancel the Production Run.</para></listitem>
+ <listitem><para>"Quick Close" - To close the Production Run</para></listitem>
+ <listitem><para>"Quick complete" - To mark the Production Run as 'complete'</para></listitem>
+ <listitem><para>"Confirm" - To confirm the Production Run</para></listitem>
+ <listitem><para>"Schedule" -To schedule the Production Run in the calendar</para></listitem>
+ <listitem><para>"Print" - To create a pdf file of the Production Run</para></listitem>
</itemizedlist>
</section>
<section>
- <title>Order items</title>
+ <title>Order Items</title>
<para>
- This section displays an overview of associated order items.
+ This section displays an overview of associated order items if the Production Run will be used
+ to fulfill an order.
</para>
</section>
<section>
<title>Tasks</title>
<para>
- This section displays an overview of associated tasks
+ This section displays an overview of associated tasks that will be performed as part of the Production Run.
+ These are also called "Routing Tasks"
</para>
</section>
<section>
<title>Materials</title>
<para>
- this section displays an overview of the required materials
+ This section displays an overview of the required materials that will be used during the Production Run. This
+ information is taken from the Bill of Materials.
</para>
</section>
<section>
- <title>Equipment</title>
+ <title>Equipment/Production Run Fixed Assets</title>
<para>
- This section displays the required equimpent to be used in the productionn run.
+ This section displays the required equipment or machinery to be used in the Production Pun.
</para>
</section>
<section>
<title>Notes</title>
<para>
- this sections displays an overview of associated notes.
+ This section displays an overview of any associated Production Run notes.
</para>
</section>
</section>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml Wed Jul 30 14:44:59 2014
@@ -23,8 +23,12 @@
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>Manufacturing: Create and edit Routing</title>
+ <title>Manufacturing: Create and Edit Routing</title>
<para>
- In this screen you can create new a new routing and edit an existing routing.
+ <para>In this screen you can :</para>
+ <itemizedlist>
+ <listitem><para>Create new a new Routing or;</para></listitem>
+ <listitem><para>Edit an existing Routing.</para></listitem>
+ </itemizedlist>
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml Wed Jul 30 14:44:59 2014
@@ -23,11 +23,15 @@
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>Manufacturing: Create and edit routing associated product-link</title>
+ <title>Manufacturing: Create and Edit Routing associated product-link</title>
<para>
- In this screen can you create a link to a product for the route.
- You can also edit a existing product link.
+ In this screen can you create a link to a product for the routing.</para>
+ <para>The product specified here will be linked to this routing. This means that when a Production Run
+ is created for this product, it will automatically use this routing by default.</para>
+ <para>
+ You can also edit an existing product link.</para>
+ <para>
An overview of the associated products is displayed in the lower section of the screen.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml Wed Jul 30 14:44:59 2014
@@ -25,6 +25,15 @@
xmlns="http://docbook.org/ns/docbook">
<title>Manufacturing: Create and edit route task</title>
<para>
- In this screen you can create a new routing task and modify an existing routing task.
+ A "Routing Task" is an individual step or activity that is used in the manufacturing or assembling process of a
+ product.</para>
+ <para>Examples include:</para>
+ <itemizedlist>
+ <listitem><para>Weighing out Raw Materials</para></listitem>
+ <listitem><para>Assembling a Product</para></listitem>
+ <listitem><para>Machining or Processing Materials</para></listitem>
+ </itemizedlist>
+ <para>
+ In this screen you can create a new routing task and modify an existing Routing Task.
</para>
</section>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_main.xml?rev=1614671&r1=1614670&r2=1614671&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_main.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/data/helpdata/Help_MFG_main.xml Wed Jul 30 14:44:59 2014
@@ -25,6 +25,32 @@
xmlns="http://docbook.org/ns/docbook">
<title>Manufacturing: Main</title>
<para>
- This is the start screen of the application.
+ The default screen is the JobShop menu.</para>
+ <para>The JobShop is used to manage and track all the manufacturing or assembling work.
+ The work (or job) carried out in the JobShop is called a Production Run. Production Runs
+ can also be called Work Orders.
</para>
+ <para>Production Runs are the work list of the manufacturing department and include details of:</para>
+ <itemizedlist>
+ <listitem>
+ <para>the product to be manufactured</para></listitem>
+ <listitem
+ ><para>the raw materials or sub assemblies to use</para></listitem>
+ <listitem><para>the steps needed to make the finished product</para></listitem>
+ </itemizedlist>
+ <title>How do I create a new Production Run?</title>
+ <para>Productions Runs can be created manually or automatically. To create one manually:</para>
+ <orderedlist>
+ <listitem><para>Click the "Create a Production Run" button</para></listitem>
+
+ </orderedlist>
+ <title>How do I locate an existing Production Run?</title>
+ <para>To locate an existing Production Run</para>
+ <orderedlist>
+ <listitem><para>Click "Find"</para></listitem>
+ <listitem><para>A list of any existing Production Runs will be displayed</para></listitem>
+ <listitem><para>Click the Production Run Id to view the Production Run details</para></listitem>
+ </orderedlist>
+ <title>How do I delete a Production Run?</title>
+ <para>Production Runs cannot be deleted but they can be cancelled instead.</para>
</section>
\ No newline at end of file