From 64ad5ff3d8d738395d5b8f636e03ebb1d2422344 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 21 Dec 2017 16:06:28 +0100 Subject: [PATCH] [IMP] manufacturing: Restructure pages --- inventory/settings/products.rst | 4 +- .../settings/products}/media/strategies01.png | Bin .../settings/products}/media/strategies02.png | Bin .../settings/products}/media/strategies03.png | Bin .../settings/products}/strategies.rst | 0 manufacturing.rst | 2 +- manufacturing/management.rst | 14 +++ .../bill_configuration.rst | 0 .../kit_shipping.rst | 0 .../manufacturing_order.rst | 0 .../media/bill_configuration01.png | Bin .../media/bill_configuration02.png | Bin .../media/bill_configuration03.png | Bin .../media/bill_configuration04.png | Bin .../media/bill_configuration05.png | Bin .../media/bill_configuration06.png | Bin .../media/bill_configuration07.png | Bin .../media/kit_shipping01.png | Bin .../media/kit_shipping02.png | Bin .../media/kit_shipping03.png | Bin .../media/kit_shipping04.png | Bin .../media/kit_shipping05.png | Bin .../media/kit_shipping06.png | Bin .../media/product_variants01.png | Bin .../media/product_variants02.png | Bin .../media/sub_assemblies01.png | Bin .../media/sub_assemblies02.png | Bin .../product_variants.rst | 0 .../sub_assemblies.rst | 0 manufacturing/operations.rst | 8 -- manufacturing/operations/replenishment.rst | 8 -- manufacturing/overview.rst | 7 +- manufacturing/overview/bill_of_materials.rst | 11 -- manufacturing/overview/getting_started.rst | 11 -- manufacturing/overview/main_concepts.rst | 9 -- .../overview/main_concepts/intro.rst | 14 --- .../overview/main_concepts/terminologies.rst | 107 ------------------ 37 files changed, 22 insertions(+), 173 deletions(-) rename {manufacturing/operations/replenishment => inventory/settings/products}/media/strategies01.png (100%) rename {manufacturing/operations/replenishment => inventory/settings/products}/media/strategies02.png (100%) rename {manufacturing/operations/replenishment => inventory/settings/products}/media/strategies03.png (100%) rename {manufacturing/operations/replenishment => inventory/settings/products}/strategies.rst (100%) create mode 100644 manufacturing/management.rst rename manufacturing/{overview/getting_started => management}/bill_configuration.rst (100%) rename manufacturing/{overview/bill_of_materials => management}/kit_shipping.rst (100%) rename manufacturing/{overview/getting_started => management}/manufacturing_order.rst (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration01.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration02.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration03.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration04.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration05.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration06.png (100%) rename manufacturing/{overview/getting_started => management}/media/bill_configuration07.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping01.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping02.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping03.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping04.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping05.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/kit_shipping06.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/product_variants01.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/product_variants02.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/sub_assemblies01.png (100%) rename manufacturing/{overview/bill_of_materials => management}/media/sub_assemblies02.png (100%) rename manufacturing/{overview/bill_of_materials => management}/product_variants.rst (100%) rename manufacturing/{overview/bill_of_materials => management}/sub_assemblies.rst (100%) delete mode 100644 manufacturing/operations.rst delete mode 100644 manufacturing/operations/replenishment.rst delete mode 100644 manufacturing/overview/bill_of_materials.rst delete mode 100644 manufacturing/overview/getting_started.rst delete mode 100644 manufacturing/overview/main_concepts.rst delete mode 100644 manufacturing/overview/main_concepts/intro.rst delete mode 100644 manufacturing/overview/main_concepts/terminologies.rst diff --git a/inventory/settings/products.rst b/inventory/settings/products.rst index 6d6618eba..3f9b25f02 100644 --- a/inventory/settings/products.rst +++ b/inventory/settings/products.rst @@ -9,4 +9,6 @@ Products products/uom products/variants products/usage - products/packages \ No newline at end of file + products/packages + products/strategies + diff --git a/manufacturing/operations/replenishment/media/strategies01.png b/inventory/settings/products/media/strategies01.png similarity index 100% rename from manufacturing/operations/replenishment/media/strategies01.png rename to inventory/settings/products/media/strategies01.png diff --git a/manufacturing/operations/replenishment/media/strategies02.png b/inventory/settings/products/media/strategies02.png similarity index 100% rename from manufacturing/operations/replenishment/media/strategies02.png rename to inventory/settings/products/media/strategies02.png diff --git a/manufacturing/operations/replenishment/media/strategies03.png b/inventory/settings/products/media/strategies03.png similarity index 100% rename from manufacturing/operations/replenishment/media/strategies03.png rename to inventory/settings/products/media/strategies03.png diff --git a/manufacturing/operations/replenishment/strategies.rst b/inventory/settings/products/strategies.rst similarity index 100% rename from manufacturing/operations/replenishment/strategies.rst rename to inventory/settings/products/strategies.rst diff --git a/manufacturing.rst b/manufacturing.rst index ad9fe7682..1bea40972 100644 --- a/manufacturing.rst +++ b/manufacturing.rst @@ -8,4 +8,4 @@ Manufacturing :titlesonly: manufacturing/overview - manufacturing/operations + manufacturing/management diff --git a/manufacturing/management.rst b/manufacturing/management.rst new file mode 100644 index 000000000..67659d8f1 --- /dev/null +++ b/manufacturing/management.rst @@ -0,0 +1,14 @@ +:banner: banners/manufacturing.jpg + +======================== +Manufacturing Management +======================== + +.. toctree:: + :titlesonly: + + management/bill_configuration + management/manufacturing_order + management/kit_shipping + management/product_variants + management/sub_assemblies diff --git a/manufacturing/overview/getting_started/bill_configuration.rst b/manufacturing/management/bill_configuration.rst similarity index 100% rename from manufacturing/overview/getting_started/bill_configuration.rst rename to manufacturing/management/bill_configuration.rst diff --git a/manufacturing/overview/bill_of_materials/kit_shipping.rst b/manufacturing/management/kit_shipping.rst similarity index 100% rename from manufacturing/overview/bill_of_materials/kit_shipping.rst rename to manufacturing/management/kit_shipping.rst diff --git a/manufacturing/overview/getting_started/manufacturing_order.rst b/manufacturing/management/manufacturing_order.rst similarity index 100% rename from manufacturing/overview/getting_started/manufacturing_order.rst rename to manufacturing/management/manufacturing_order.rst diff --git a/manufacturing/overview/getting_started/media/bill_configuration01.png b/manufacturing/management/media/bill_configuration01.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration01.png rename to manufacturing/management/media/bill_configuration01.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration02.png b/manufacturing/management/media/bill_configuration02.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration02.png rename to manufacturing/management/media/bill_configuration02.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration03.png b/manufacturing/management/media/bill_configuration03.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration03.png rename to manufacturing/management/media/bill_configuration03.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration04.png b/manufacturing/management/media/bill_configuration04.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration04.png rename to manufacturing/management/media/bill_configuration04.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration05.png b/manufacturing/management/media/bill_configuration05.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration05.png rename to manufacturing/management/media/bill_configuration05.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration06.png b/manufacturing/management/media/bill_configuration06.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration06.png rename to manufacturing/management/media/bill_configuration06.png diff --git a/manufacturing/overview/getting_started/media/bill_configuration07.png b/manufacturing/management/media/bill_configuration07.png similarity index 100% rename from manufacturing/overview/getting_started/media/bill_configuration07.png rename to manufacturing/management/media/bill_configuration07.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping01.png b/manufacturing/management/media/kit_shipping01.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping01.png rename to manufacturing/management/media/kit_shipping01.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping02.png b/manufacturing/management/media/kit_shipping02.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping02.png rename to manufacturing/management/media/kit_shipping02.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping03.png b/manufacturing/management/media/kit_shipping03.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping03.png rename to manufacturing/management/media/kit_shipping03.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping04.png b/manufacturing/management/media/kit_shipping04.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping04.png rename to manufacturing/management/media/kit_shipping04.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping05.png b/manufacturing/management/media/kit_shipping05.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping05.png rename to manufacturing/management/media/kit_shipping05.png diff --git a/manufacturing/overview/bill_of_materials/media/kit_shipping06.png b/manufacturing/management/media/kit_shipping06.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/kit_shipping06.png rename to manufacturing/management/media/kit_shipping06.png diff --git a/manufacturing/overview/bill_of_materials/media/product_variants01.png b/manufacturing/management/media/product_variants01.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/product_variants01.png rename to manufacturing/management/media/product_variants01.png diff --git a/manufacturing/overview/bill_of_materials/media/product_variants02.png b/manufacturing/management/media/product_variants02.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/product_variants02.png rename to manufacturing/management/media/product_variants02.png diff --git a/manufacturing/overview/bill_of_materials/media/sub_assemblies01.png b/manufacturing/management/media/sub_assemblies01.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/sub_assemblies01.png rename to manufacturing/management/media/sub_assemblies01.png diff --git a/manufacturing/overview/bill_of_materials/media/sub_assemblies02.png b/manufacturing/management/media/sub_assemblies02.png similarity index 100% rename from manufacturing/overview/bill_of_materials/media/sub_assemblies02.png rename to manufacturing/management/media/sub_assemblies02.png diff --git a/manufacturing/overview/bill_of_materials/product_variants.rst b/manufacturing/management/product_variants.rst similarity index 100% rename from manufacturing/overview/bill_of_materials/product_variants.rst rename to manufacturing/management/product_variants.rst diff --git a/manufacturing/overview/bill_of_materials/sub_assemblies.rst b/manufacturing/management/sub_assemblies.rst similarity index 100% rename from manufacturing/overview/bill_of_materials/sub_assemblies.rst rename to manufacturing/management/sub_assemblies.rst diff --git a/manufacturing/operations.rst b/manufacturing/operations.rst deleted file mode 100644 index 2f2984551..000000000 --- a/manufacturing/operations.rst +++ /dev/null @@ -1,8 +0,0 @@ -======================== -Manufacturing Operations -======================== - -.. toctree:: - :titlesonly: - - operations/replenishment \ No newline at end of file diff --git a/manufacturing/operations/replenishment.rst b/manufacturing/operations/replenishment.rst deleted file mode 100644 index ac437cf6d..000000000 --- a/manufacturing/operations/replenishment.rst +++ /dev/null @@ -1,8 +0,0 @@ -======================== -Replenishment Strategies -======================== - -.. toctree:: - :titlesonly: - - replenishment/strategies \ No newline at end of file diff --git a/manufacturing/overview.rst b/manufacturing/overview.rst index 7af526335..3b7377b2f 100644 --- a/manufacturing/overview.rst +++ b/manufacturing/overview.rst @@ -1,3 +1,5 @@ +:banner: banners/manufacturing.jpg + ======== Overview ======== @@ -5,6 +7,5 @@ Overview .. toctree:: :titlesonly: - overview/main_concepts - overview/getting_started - overview/bill_of_materials \ No newline at end of file + I want to use Odoo Manufacturing + diff --git a/manufacturing/overview/bill_of_materials.rst b/manufacturing/overview/bill_of_materials.rst deleted file mode 100644 index a5195606d..000000000 --- a/manufacturing/overview/bill_of_materials.rst +++ /dev/null @@ -1,11 +0,0 @@ -================= -Bill of Materials -================= - -.. toctree:: - :titlesonly: - - getting_started/bill_configuration - bill_of_materials/kit_shipping - bill_of_materials/product_variants - bill_of_materials/sub_assemblies \ No newline at end of file diff --git a/manufacturing/overview/getting_started.rst b/manufacturing/overview/getting_started.rst deleted file mode 100644 index f90e34de4..000000000 --- a/manufacturing/overview/getting_started.rst +++ /dev/null @@ -1,11 +0,0 @@ -=============== -Getting Started -=============== - -How to consume composents to make a finished product - -.. toctree:: - :titlesonly: - - getting_started/bill_configuration - getting_started/manufacturing_order \ No newline at end of file diff --git a/manufacturing/overview/main_concepts.rst b/manufacturing/overview/main_concepts.rst deleted file mode 100644 index b31ee86d0..000000000 --- a/manufacturing/overview/main_concepts.rst +++ /dev/null @@ -1,9 +0,0 @@ -============= -Main Concepts -============= - -.. toctree:: - :titlesonly: - - main_concepts/intro - main_concepts/terminologies \ No newline at end of file diff --git a/manufacturing/overview/main_concepts/intro.rst b/manufacturing/overview/main_concepts/intro.rst deleted file mode 100644 index 53b3a98b7..000000000 --- a/manufacturing/overview/main_concepts/intro.rst +++ /dev/null @@ -1,14 +0,0 @@ -================================== -Introduction to Odoo Manufacturing -================================== - -.. youtube:: QtIU0p8daAo - :align: right - :width: 700 - :height: 394 - -Transcript -========== - -Work in progress. - diff --git a/manufacturing/overview/main_concepts/terminologies.rst b/manufacturing/overview/main_concepts/terminologies.rst deleted file mode 100644 index 950779a97..000000000 --- a/manufacturing/overview/main_concepts/terminologies.rst +++ /dev/null @@ -1,107 +0,0 @@ -=========================== -Manufacturing Terminologies -=========================== - -.. glossary:: - - Bill of Materials - - A bill of materials (BoM) is a document that describes the materials, - the quantity of each material, and the steps required to manufacture a - product. Depending on the industry and the nature of the finished - product, a different name may be used to describe the same document. For - example, in the pharmaceutical industry, the term “recipe” may be used. - - Cycle - - A production cycle is a frame of time during which an entire - manufacturing process can be fulfilled. - - Downtime or Leave - - Time during which a resource is unavailable. If the resource is a - machine, the unavailability is downtime, while if the resource is human, - unavailable time is called a Leave. - - Finished products - - Finished products are the final output of a manufacturing process. They - are normally not intended to be used as input into another manufacturing - order of the company. - - Kit - - A kit is a set of components that are described by a bill of materials, - but which are delivered separately rather than assembled or mixed. - - Multi-level Bill of Materials - - A bill of material can quickly grow very complex. To keep it manageable, - it can be broken down into several smaller manufactured parts, each - having its own BOM. These parts are typically referred to as - sub-assembly of intermediate products. - - Defining a BOM in multiple levels reduces the complexity of the - top-level document and allows components to be reused in other BoMs. - - Phantom Bill of Material - - A phantom bill of material is always used in the context of multi-level - BOMs. It allows to add a sub-assembly as part of a bigger end-product - while avoiding to trigger a separate manufacturing order for the - sub-assembly. - - As such, when a manufacturing order for the final product is launched, - the components of the sub-assembly are reflected in the parent BOM as if - they were direct components of the parent BOM. - - Phantom BOM are thus used for grouping a set of components with the aim - of reusing them in many other BOM without the need to launch separate - manufacturing orders for the sub-assemblies. - - Raw Materials - - Raw materials and components constitute the input that are transformed - to produce semi-finished or finished goods. - - The transformation here can take many aspects according to the industry. - It can be simple assembly, welding, mixing, etc. - - Routing - - A routing is a document that describes a series of Work Orders and the - Work Centers at which they will be carried out - - Semi-finished products and sub-assemblies - - These are products which are manufactured with the purpose to be - consumed in another manufacturing order. - - Work Order Operations - - Work Order Operations specify the set of activities necessary to fully - process a manufacturing order. Each activity or operation takes some - time to be completed and is performed into a determined production unit - (also called work center). - - Work Order - - A work order is a single manufacturing operation that is scheduled for - execution on a given date and a given duration. - - Work Center - - Work centers identify production units and their resources. They are - used to represent the plant capacity as well as costing information. The - capacity is a combination of resources and their availability time. - - Resources - - In manufacturing a resource can be a human being (employee) or machine - available in a work center. - - Working Time - - Each resource has its normal working time. For instance, machines can be - set up to operate 7 days a week 20 hours out of 24. -