← Back to team overview

openerp-community team mailing list archive

[Merge] lp:openobject-doc/6.0 into lp:openobject-doc

 

Peter Van Wesemael has proposed merging lp:openobject-doc/6.0 into lp:openobject-doc.

Requested reviews:
  OpenERP Community (openerp-community)
Related bugs:
  Bug #736218 in OpenERP Documentation: "Typo in russian translation on index page"
  https://bugs.launchpad.net/openobject-doc/+bug/736218

For more details, see:
https://code.launchpad.net/~openerp-community/openobject-doc/6.0/+merge/127319
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-community/openobject-doc/6.0/+merge/127319
Your team OpenERP Community is requested to review the proposed merge of lp:openobject-doc/6.0 into lp:openobject-doc.
=== modified file 'books/book_crm/source/0/index.rst'
--- books/book_crm/source/0/index.rst	2012-04-18 16:16:24 +0000
+++ books/book_crm/source/0/index.rst	2012-10-01 15:56:24 +0000
@@ -124,7 +124,7 @@
 meet Fabien Pinckaers to share thoughts about documentation and training strategy.
 At a Partner Meeting she heard Fabien was looking for someone to manage training & documentation.
 This was absolutely an opportunity to be qualified, and now Els is the OpenERP Training Program Manager
-and in this job responsible for the worldwide training and certification program of OpenERP.
+and responsible for the worldwide training and certification program of OpenERP.
 
 Being an author of several Software Manuals, she finds it exciting to work on the
 OpenERP documentation and continuously take it to a higher level. Please note that this is a hell of a job,

=== modified file 'books/book_project_service/source/0/index.rst'
--- books/book_project_service/source/0/index.rst	2012-04-18 16:16:24 +0000
+++ books/book_project_service/source/0/index.rst	2012-10-01 15:56:24 +0000
@@ -124,7 +124,7 @@
 meet Fabien Pinckaers to share thoughts about documentation and training strategy.
 At a Partner Meeting she heard Fabien was looking for someone to manage training & documentation.
 This was absolutely an opportunity to be qualified, and now Els is the OpenERP Training Program Manager
-and in this job responsible for the worldwide training and certification program of OpenERP.
+and responsible for the worldwide training and certification program of OpenERP.
 
 Being an author of several Software Manuals, she finds it exciting to work on the
 OpenERP documentation and continuously take it to a higher level. Please note that this is a hell of a job,

=== modified file 'books/book_rh/source/0/index.rst'
--- books/book_rh/source/0/index.rst	2012-04-18 16:16:24 +0000
+++ books/book_rh/source/0/index.rst	2012-10-01 15:56:24 +0000
@@ -124,7 +124,7 @@
 meet Fabien Pinckaers to share thoughts about documentation and training strategy.
 At a Partner Meeting she heard Fabien was looking for someone to manage training & documentation.
 This was absolutely an opportunity to be qualified, and now Els is the OpenERP Training Program Manager
-and in this job responsible for the worldwide training and certification program of OpenERP.
+and responsible for the worldwide training and certification program of OpenERP.
 
 Being an author of several Software Manuals, she finds it exciting to work on the
 OpenERP documentation and continuously take it to a higher level. Please note that this is a hell of a job,

=== modified file 'i18n/es/source/bi/index.rst'
--- i18n/es/source/bi/index.rst	2011-09-05 17:57:06 +0000
+++ i18n/es/source/bi/index.rst	2012-10-01 15:56:24 +0000
@@ -32,6 +32,7 @@
     The BI modules can be found in `OpenERP Apps <http://apps.openerp.com>`_, but are
     not yet suitable for production use.
 
+
 .. i18n: .. toctree::
 .. i18n:     :maxdepth: 2
 .. i18n: 

=== modified file 'i18n/es/source/bi/installation/installation.rst'
--- i18n/es/source/bi/installation/installation.rst	2011-09-05 17:57:06 +0000
+++ i18n/es/source/bi/installation/installation.rst	2012-10-01 15:56:24 +0000
@@ -7,14 +7,7 @@
 ==================
 
 .. i18n: BI requires OpenERP Server and (preferably) OpenERP GTK client on the user system.
-..
-
-.. toctree::
-	:maxdepth: 2
-
-	Installing OpenERP Server and OLAP module <install_olap>
-	install_web
-
+.. i18n: 
 .. i18n: .. toctree::
 .. i18n: 	:maxdepth: 2
 .. i18n: 
@@ -22,8 +15,11 @@
 .. i18n: 	install_web
 ..
 
+BI requires OpenERP Server and (preferably) OpenERP GTK client on the user system.
+
 .. toctree::
 	:maxdepth: 2
 
 	Installing OpenERP Server and OLAP module <install_olap>
 	install_web
+

=== modified file 'i18n/es/source/book/0/index.rst'
=== modified file 'i18n/es/source/book/1/1_1_Inst_Config/index.rst'
--- i18n/es/source/book/1/1_1_Inst_Config/index.rst	2012-09-14 12:39:28 +0000
+++ i18n/es/source/book/1/1_1_Inst_Config/index.rst	2012-10-01 15:56:24 +0000
@@ -59,8 +59,13 @@
 
 .. i18n: .. note:: Renaming from Tiny ERP to OpenERP
 .. i18n: 
+<<<<<<< TREE
 .. i18n:    Tiny ERP was renamed to OpenERP early in 2008, so anyone who has used Tiny ERP should be
 .. i18n:    equally at home with OpenERP. Both names refer to the same software, so there is no
+=======
+.. i18n:    Tiny ERP was renamed to OpenERP early in 2008 so anyone who has used Tiny ERP should be
+.. i18n:    equally at home with Open ERP. The two names refer to the same software, so there is no
+>>>>>>> MERGE-SOURCE
 .. i18n:    functional difference between versions 4.2.X of OpenERP and 4.2.X of Tiny ERP. This book
 .. i18n:    applies to versions of OpenERP from 6.1.0 onwards, with references to earlier versions from
 .. i18n:    time to time.

=== modified file 'i18n/es/source/book/2/9_Marketing/index.rst'
--- i18n/es/source/book/2/9_Marketing/index.rst	2012-06-26 15:44:56 +0000
+++ i18n/es/source/book/2/9_Marketing/index.rst	2012-10-01 15:56:24 +0000
@@ -736,18 +736,18 @@
 .. i18n: 6.3 Reference of filter domains
 ..
 
-Generic format is:  [ (criterion_1), (criterion_2) ] to filter for resources matching both criterions.
-It is possible to combine criterions differently with the following operators:
+Generic format is:  [ (criterion_1), (criterion_2) ] to filter for resources matching both criteria.
+It is possible to combine criteria differently with the following operators:
 
-.. i18n: Generic format is:  [ (criterion_1), (criterion_2) ] to filter for resources matching both criterions.
-.. i18n: It is possible to combine criterions differently with the following operators:
+.. i18n: Generic format is:  [ (criterion_1), (criterion_2) ] to filter for resources matching both criteria.
+.. i18n: It is possible to combine criteria differently with the following operators:
 ..
 
-   * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criterions (always 2). This is also the implicit operator when no operator is specified.
+   * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criteria (always 2). This is also the implicit operator when no operator is specified.
 
      * for example:  [ (criterion_1), '&', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 AND criterion_3)
 
-   * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criterions (always 2)
+   * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criteria (always 2)
 
      * for example:  [ (criterion_1), '|', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 OR criterion_3)
 
@@ -755,11 +755,11 @@
 
      * for example:  [ (criterion_1), '!', (criterion_2), (criterion_3) ] means criterion_1 AND (NOT criterion_2) AND criterion_3
 
-.. i18n:    * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criterions (always 2). This is also the implicit operator when no operator is specified.
+.. i18n:    * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criteria (always 2). This is also the implicit operator when no operator is specified.
 .. i18n: 
 .. i18n:      * for example:  [ (criterion_1), '&', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 AND criterion_3)
 .. i18n: 
-.. i18n:    * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criterions (always 2)
+.. i18n:    * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criteria (always 2)
 .. i18n: 
 .. i18n:      * for example:  [ (criterion_1), '|', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 OR criterion_3)
 .. i18n: 
@@ -768,11 +768,11 @@
 .. i18n:      * for example:  [ (criterion_1), '!', (criterion_2), (criterion_3) ] means criterion_1 AND (NOT criterion_2) AND criterion_3
 ..
 
-   * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criterions (always 2). This is also the implicit operator when no operator is specified.
+   * '&' is the boolean AND operator and will make a new criterion by combining the next 2 criteria (always 2). This is also the implicit operator when no operator is specified.
 
      * for example:  [ (criterion_1), '&', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 AND criterion_3)
 
-   * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criterions (always 2)
+   * '|' is the boolean OR operator and will make a new criterion by combining the next 2 criteria (always 2)
 
      * for example:  [ (criterion_1), '|', (criterion_2), (criterion_3) ] means criterion_1 AND (criterion_2 OR criterion_3)
 

=== modified file 'i18n/es/source/contribute/02_working_in_teams.rst'
=== modified file 'i18n/es/source/contribute/05_developing_modules.rst'
--- i18n/es/source/contribute/05_developing_modules.rst	2012-06-26 15:44:56 +0000
+++ i18n/es/source/contribute/05_developing_modules.rst	2012-10-01 15:56:24 +0000
@@ -279,8 +279,16 @@
     - left: between 12 and 13 to allow punching holes without punching in the text area
     - right: between 12 and 13
 
-.. i18n:     .. note:: the line separator between the header and the body can overlap slightly in the left and right margins: up to 9 millimeters on the left and up to 12 millimeters on the right
-.. i18n: 
+.. i18n: .. note:: the line separator between the header and the body can overlap slightly in the left and right margins: up to 9 millimeters on the left and up to 12 millimeters on the right
+..
+
+.. note:: the line separator between the header and the body can overlap slightly in the left and right margins: up to 9 millimeters on the left and up to 12 millimeters on the right
+
+.. i18n: ..
+..
+
+..
+
 .. i18n:   * for Titles use font *Helvetica-Bold* with size *14.5*
 .. i18n: 
 .. i18n:   * put the context on each report: example, for the report account_balance: the context is the fiscal year and periods
@@ -291,18 +299,8 @@
 .. i18n:   * for report, we can define two kinds of arrays:
 .. i18n: 
 .. i18n:     - array with general information, like reference, date..., use:
-.. i18n: 
-.. i18n:       + *Bold-Helvetica* and size=8 for cells name
-.. i18n:       + *Helvetica* size="8" for content
-.. i18n:       
-.. i18n:     - array with detailed information, use:
-.. i18n: 
-.. i18n:       + *Helvetica-Bold* size *9* for cells names
-.. i18n:       + *Helvetica* size *8* for content
 ..
 
-    .. note:: the line separator between the header and the body can overlap slightly in the left and right margins: up to 9 millimeters on the left and up to 12 millimeters on the right
-
   * for Titles use font *Helvetica-Bold* with size *14.5*
 
   * put the context on each report: example, for the report account_balance: the context is the fiscal year and periods
@@ -314,11 +312,20 @@
 
     - array with general information, like reference, date..., use:
 
+.. i18n:       + *Bold-Helvetica* and size=8 for cells name
+.. i18n:       + *Helvetica* size="8" for content
+.. i18n:     - array with detailed information, use:
+..
+
       + *Bold-Helvetica* and size=8 for cells name
       + *Helvetica* size="8" for content
       
     - array with detailed information, use:
 
+.. i18n:       + *Helvetica-Bold* size *9* for cells names
+.. i18n:       + *Helvetica* size *8* for content
+..
+
       + *Helvetica-Bold* size *9* for cells names
       + *Helvetica* size *8* for content
 
@@ -546,6 +553,8 @@
       + Draft Customer Invoices (list)
       + Open Customer Invoices (list)
       + New Customer Invoice (form)
+      
+    - Supplier Invoices
 
 .. i18n:       + ...
 ..
@@ -562,7 +571,7 @@
 don't put *New ...* in a menu in the configuration part.
 
 .. i18n: If you use folders that are clickable, their child must be of the
-.. i18n: same object type. (we suppose that inheritances are the same objects)
+.. i18n: same object type. (we suppose that inheritancies are the same objects)
 ..
 
 If you use folders that are clickable, their child must be of the
@@ -716,11 +725,11 @@
   * Buttons to make the state change at the right of this state field
 
 .. i18n: Search Criteria
-.. i18n: #################
+.. i18n: ###############
 ..
 
 Search Criteria
-#################
+###############
 
 .. i18n: Search criteria: search available on all columns of the list view
 ..

=== modified file 'i18n/es/source/developer/6_22_XML-RPC_web_services/index.rst'
--- i18n/es/source/developer/6_22_XML-RPC_web_services/index.rst	2012-05-21 16:05:13 +0000
+++ i18n/es/source/developer/6_22_XML-RPC_web_services/index.rst	2012-10-01 15:56:24 +0000
@@ -1102,10 +1102,10 @@
 PHP Example
 -----------
 
-.. i18n: Here is an example on how to insert a new partner using PHP. This example makes use the phpxmlrpc library, available on sourceforge.
+.. i18n: This example shows how to insert a new partner using PHP. It uses the phpxmlrpc library, available on sourceforge.
 ..
 
-Here is an example on how to insert a new partner using PHP. This example makes use the phpxmlrpc library, available on sourceforge.
+This example shows how to insert a new partner using PHP. It uses the phpxmlrpc library, available on sourceforge.
 
 .. i18n: .. code-block:: php
 .. i18n: 

=== modified file 'i18n/es/source/technical_guide/account_analytic_default.rst'
--- i18n/es/source/technical_guide/account_analytic_default.rst	2011-01-25 11:55:10 +0000
+++ i18n/es/source/technical_guide/account_analytic_default.rst	2012-10-01 15:56:24 +0000
@@ -75,7 +75,7 @@
 
 .. i18n: ::
 .. i18n: 
-.. i18n:   Allows to automatically select analytic accounts based on criterions:
+.. i18n:   Allows to automatically select analytic accounts based on criteria:
 .. i18n:   * Product
 .. i18n:   * Partner
 .. i18n:   * User
@@ -85,7 +85,7 @@
 
 ::
 
-  Allows to automatically select analytic accounts based on criterions:
+  Allows to automatically select analytic accounts based on criteria:
   * Product
   * Partner
   * User

=== modified file 'i18n/es/source/technical_guide/crm.rst'
--- i18n/es/source/technical_guide/crm.rst	2011-07-04 22:45:52 +0000
+++ i18n/es/source/technical_guide/crm.rst	2012-10-01 15:56:24 +0000
@@ -847,20 +847,20 @@
 
 :exclusif: Exclusive, boolean
 
-.. i18n:     *Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions*
+.. i18n:     *Check if the category is limited to partners that match the segmentation criteria. If checked, remove the category from partners that doesn't match segmentation criteria*
 ..
 
-    *Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions*
+    *Check if the category is limited to partners that match the segmentation criteria. If checked, remove the category from partners that doesn't match segmentation criteria*
 
 .. i18n: :categ_id: Partner Category, many2one, required
 ..
 
 :categ_id: Partner Category, many2one, required
 
-.. i18n:     *The partner category that will be added to partners that match the segmentation criterions after computation.*
+.. i18n:     *The partner category that will be added to partners that match the segmentation criteria after computation.*
 ..
 
-    *The partner category that will be added to partners that match the segmentation criterions after computation.*
+    *The partner category that will be added to partners that match the segmentation criteria after computation.*
 
 .. i18n: :som_interval: Days per Periode, integer
 ..

=== modified file 'i18n/es/source/technical_guide/dm.rst'
--- i18n/es/source/technical_guide/dm.rst	2011-07-19 23:36:54 +0000
+++ i18n/es/source/technical_guide/dm.rst	2012-10-01 15:56:24 +0000
@@ -2616,12 +2616,12 @@
 
 :name: Name, char, required
 
-.. i18n: Object: Type of the adress list (dm.customers_list.type)
-.. i18n: ########################################################
+.. i18n: Object: Type of the address list (dm.customers_list.type)
+.. i18n: #########################################################
 ..
 
-Object: Type of the adress list (dm.customers_list.type)
-########################################################
+Object: Type of the address list (dm.customers_list.type)
+#########################################################
 
 .. i18n: :code: Code, char, required
 ..

=== modified file 'i18n/es/source/technical_guide/esale_osc.rst'
--- i18n/es/source/technical_guide/esale_osc.rst	2011-01-25 11:55:10 +0000
+++ i18n/es/source/technical_guide/esale_osc.rst	2012-10-01 15:56:24 +0000
@@ -50,7 +50,7 @@
 .. i18n: :Version: 5.0.1.0
 .. i18n: :Author: Axelor/Zikzakmedia
 .. i18n: :Directory: esale_osc
-.. i18n: :Web: www.aulaerp.com/cursos-aulaerp/configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
+.. i18n: :Web: www.aulaerp.com/cursos/detail/3-cursos-para-administradores-de-openeerp/22-configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
 .. i18n: :Official module: no
 .. i18n: :Quality certified: no
 ..
@@ -62,7 +62,7 @@
 :Version: 5.0.1.0
 :Author: Axelor/Zikzakmedia
 :Directory: esale_osc
-:Web: www.aulaerp.com/cursos-aulaerp/configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
+:Web: www.aulaerp.com/cursos/detail/3-cursos-para-administradores-de-openeerp/22-configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
 :Official module: no
 :Quality certified: no
 

=== modified file 'i18n/fr/source/bi/config_interface/config_interface.rst'
--- i18n/fr/source/bi/config_interface/config_interface.rst	2012-05-21 21:36:46 +0000
+++ i18n/fr/source/bi/config_interface/config_interface.rst	2012-10-01 15:56:24 +0000
@@ -178,11 +178,11 @@
         
 --------
 
-.. i18n: After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold , Dates, City etc.. to analyse the sales accordingly.
+.. i18n: After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold, Dates, City etc. to analyse the sales accordingly.
 .. i18n: We decide the measures to be used, for example items sold. So we can decide the dimension and measures:
 ..
 
-After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold , Dates, City etc.. to analyse the sales accordingly.
+After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold, Dates, City etc. to analyse the sales accordingly.
 We decide the measures to be used, for example items sold. So we can decide the dimension and measures:
 
 .. i18n: .. image::  images/9.png

=== modified file 'i18n/fr/source/bi/index.rst'
--- i18n/fr/source/bi/index.rst	2011-06-10 09:39:31 +0000
+++ i18n/fr/source/bi/index.rst	2012-10-01 15:56:24 +0000
@@ -17,6 +17,22 @@
 Part 1 : Introduction
 ---------------------
 
+.. i18n: .. sidebar:: Experimental Application
+.. i18n: 
+.. i18n:     This chapter describes an experimental BI Application that is not part of the
+.. i18n:     current quality-certified distribution of OpenERP.
+.. i18n:     The BI modules can be found in `OpenERP Apps <http://apps.openerp.com>`_, but are
+.. i18n:     not yet suitable for production use.
+..
+
+.. sidebar:: Experimental Application
+
+    This chapter describes an experimental BI Application that is not part of the
+    current quality-certified distribution of OpenERP.
+    The BI modules can be found in `OpenERP Apps <http://apps.openerp.com>`_, but are
+    not yet suitable for production use.
+
+
 .. i18n: .. toctree::
 .. i18n:     :maxdepth: 2
 .. i18n: 

=== modified file 'i18n/fr/source/book/0/index.rst'
=== modified file 'i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst'
--- i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst	2012-09-19 20:22:00 +0000
+++ i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst	2012-10-01 15:56:24 +0000
@@ -6,11 +6,11 @@
 .. index::
    single: architecture; OpenERP
 
-.. i18n: The architecture of OpenERP
+.. i18n: The Architecture of OpenERP
 .. i18n: ===========================
 ..
 
-The architecture of OpenERP
+The Architecture of OpenERP
 ===========================
 
 .. i18n: To access OpenERP you can:
@@ -62,22 +62,48 @@
    single: client; web (thin) and GTK (thick)
    single: client; caching
 
-.. i18n: .. note::   Web client and GTK client
+.. i18n: .. note::   Web Client and GTK Client
 .. i18n: 
 .. i18n:     There is little functional difference between the two OpenERP clients - the 
 .. i18n:     web client and the GTK client at present. 
-.. i18n:     The web client offers more functionality for instance for Calendar view, Gantt view, .
-.. i18n:     
+.. i18n:     The web client offers more functionality, for instance, the Corporate Intelligence feature, and the Gantt view.
+.. i18n:     
+<<<<<<< TREE
+=======
+.. i18n:     When you are changing the structure of your OpenERP installation (adding and
+.. i18n:     removing modules, perhaps changing labels), you might find the web client to be
+.. i18n:     irritating because of its use of **caching**. 
+.. i18n:     
+.. i18n:     Caching speeds it all up by keeping a copy of data somewhere between the server 
+.. i18n:     and your client, which is usually good. But you may 
+.. i18n:     have made changes to your installation that you cannot immediately see in
+.. i18n:     your browser. Many apparent faults are caused by this! The workaround is 
+.. i18n:     to use the GTK client during development and implementation where possible.
+.. i18n: 
+>>>>>>> MERGE-SOURCE
 .. i18n:     The OpenERP company will continue to support two clients for the foreseeable
 .. i18n:     future, so you can use whichever client you prefer.
 ..
 
-.. note::   Web client and GTK client
+.. note::   Web Client and GTK Client
 
     There is little functional difference between the two OpenERP clients - the 
     web client and the GTK client at present. 
-    The web client offers more functionality for instance for Calendar view, Gantt view, .
-    
+    The web client offers more functionality, for instance, the Corporate Intelligence feature, and the Gantt view.
+    
+<<<<<<< TREE
+=======
+    When you are changing the structure of your OpenERP installation (adding and
+    removing modules, perhaps changing labels), you might find the web client to be
+    irritating because of its use of **caching**. 
+    
+    Caching speeds it all up by keeping a copy of data somewhere between the server 
+    and your client, which is usually good. But you may 
+    have made changes to your installation that you cannot immediately see in
+    your browser. Many apparent faults are caused by this! The workaround is 
+    to use the GTK client during development and implementation where possible.
+
+>>>>>>> MERGE-SOURCE
     The OpenERP company will continue to support two clients for the foreseeable
     future, so you can use whichever client you prefer.
 
@@ -112,6 +138,54 @@
    
    *The architecture of OpenERP*
 
+<<<<<<< TREE
+=======
+.. i18n: .. note::   Terminology: Client-web – Server or Client?
+.. i18n: 
+.. i18n:     The client-web component can be thought of as a server or a client depending on
+.. i18n:     your viewpoint.
+.. i18n: 
+.. i18n:     It acts as a web server to an end user connecting from a web browser, but
+.. i18n:     it also acts as a client to the OpenERP application server just as a GTK
+.. i18n:     application client does.
+.. i18n: 
+.. i18n:     So in this book its context will determine whether the client-web component is referred to as
+.. i18n:     a server or a client.
+..
+
+.. note::   Terminology: Client-web – Server or Client?
+
+    The client-web component can be thought of as a server or a client depending on
+    your viewpoint.
+
+    It acts as a web server to an end user connecting from a web browser, but
+    it also acts as a client to the OpenERP application server just as a GTK
+    application client does.
+
+    So in this book its context will determine whether the client-web component is referred to as
+    a server or a client.
+
+.. i18n: .. index::
+.. i18n:    pair: eTiny; client-web
+..
+
+.. index::
+   pair: eTiny; client-web
+
+.. i18n: .. note::   eTiny
+.. i18n: 
+.. i18n:     The web application used to be known as “eTiny”.
+.. i18n:     Its name changed to “client-web” as Tiny ERP was renamed to OpenERP,
+.. i18n:     but its characteristics have generally stayed the same.
+..
+
+.. note::   eTiny
+
+    The web application used to be known as “eTiny”.
+    Its name changed to “client-web” as Tiny ERP was renamed to OpenERP,
+    but its characteristics have generally stayed the same.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. index::
 .. i18n:    single: PostgreSQL
 ..
@@ -136,15 +210,37 @@
     Operating System, from Unix/Linux to the various releases of Windows, via
     Mac OS X, Solaris, SunOS and BSD.
 
+<<<<<<< TREE
 .. i18n: Both components can be installed on the same server or
 .. i18n: distributed onto separate computer servers if performance considerations
+=======
+.. i18n: These three components can be installed on the same server or can be
+.. i18n: distributed onto separate computer servers, if performance considerations
+>>>>>>> MERGE-SOURCE
 .. i18n: require it.
 ..
 
+<<<<<<< TREE
 Both components can be installed on the same server or
 distributed onto separate computer servers if performance considerations
+=======
+These three components can be installed on the same server or can be
+distributed onto separate computer servers, if performance considerations
+>>>>>>> MERGE-SOURCE
 require it.
 
+<<<<<<< TREE
+=======
+.. i18n: If you choose to run only with GTK clients, you will not need the third component –
+.. i18n: the client-web server – at all. In this case, OpenERP's GTK client must be installed
+.. i18n: on the workstation of each OpenERP user in the company.
+..
+
+If you choose to run only with GTK clients, you will not need the third component –
+the client-web server – at all. In this case, OpenERP's GTK client must be installed
+on the workstation of each OpenERP user in the company.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. Copyright © Open Object Press. All rights reserved.
 ..
 

=== modified file 'i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst'
--- i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst	2011-06-10 09:39:31 +0000
+++ i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst	2012-10-01 15:56:24 +0000
@@ -19,13 +19,13 @@
 Database Creation
 =================
 
-.. i18n: Use the technique outlined in this section to create a new database, \ ``openerp_ch01``\  . This
+.. i18n: Use the technique outlined in this section to create a new database, \ ``openerp_ch01`` \. This
 .. i18n: database will contain the demonstration data provided with OpenERP and a large proportion of the
 .. i18n: core OpenERP functionality. You will need to know your super administrator password for this – or
 .. i18n: you will have to find somebody who does have it to create this database.
 ..
 
-Use the technique outlined in this section to create a new database, \ ``openerp_ch01``\  . This
+Use the technique outlined in this section to create a new database, \ ``openerp_ch01`` \. This
 database will contain the demonstration data provided with OpenERP and a large proportion of the
 core OpenERP functionality. You will need to know your super administrator password for this – or
 you will have to find somebody who does have it to create this database.
@@ -39,14 +39,14 @@
    single: password; super-administrator
    single: password; superadmin
 
-.. i18n: .. note:: The super-administrator password
+.. i18n: .. note:: The Super-administrator Password
 .. i18n: 
 .. i18n:    Anyone who knows the super-administrator password has complete access to the data on the server
 .. i18n:    – able to read, change and delete any of the data in any of the databases there.
 .. i18n: 
 .. i18n:    After first installation, the password is ``admin``. This is the hard-coded default, and
 .. i18n:    is used if there is no accessible server configuration file. If your system has been 
-.. i18n:    set up so that the server configuration file can be written to by the server then
+.. i18n:    set up so that the server configuration file can be written to by the server, then
 .. i18n:    you can change the password through the client. Or you could deliberately make the 
 .. i18n:    configuration file read-only so that there is no prospect of changing it from the client.
 .. i18n:    Either way, a server systems administrator can change it if you forget it.
@@ -60,14 +60,14 @@
 .. i18n:    the ``--config`` command line option.
 ..
 
-.. note:: The super-administrator password
+.. note:: The Super-administrator Password
 
    Anyone who knows the super-administrator password has complete access to the data on the server
    – able to read, change and delete any of the data in any of the databases there.
 
    After first installation, the password is ``admin``. This is the hard-coded default, and
    is used if there is no accessible server configuration file. If your system has been 
-   set up so that the server configuration file can be written to by the server then
+   set up so that the server configuration file can be written to by the server, then
    you can change the password through the client. Or you could deliberately make the 
    configuration file read-only so that there is no prospect of changing it from the client.
    Either way, a server systems administrator can change it if you forget it.
@@ -81,27 +81,27 @@
    the ``--config`` command line option.
 
 .. i18n: .. figure:: images/change_superadmin_pwd.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Changing the super-administrator password through the web client*
 ..
 
 .. figure:: images/change_superadmin_pwd.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Changing the super-administrator password through the web client*
 
 .. i18n: .. _sect-creatingdb:
 .. i18n: 
-.. i18n: Creating the database
+.. i18n: Creating the Database
 .. i18n: ---------------------
 ..
 
 .. _sect-creatingdb:
 
-Creating the database
+Creating the Database
 ---------------------
 
 .. i18n: If you are using the GTK client, choose :menuselection:`File --> Databases --> New database`  in
@@ -130,7 +130,7 @@
 .. i18n: :guilabel:`Create` on the database management page. Enter the super-administrator password, and the
 .. i18n: name of the new database you are creating.
 .. i18n:   
-.. i18n: In both cases you will see a checkbox that determines whether you load demonstration data or not.
+.. i18n: In both cases, you will see a checkbox that determines whether you load demonstration data or not.
 .. i18n: The consequences of checking this box or not affect the **whole use** of this database.
 ..
 
@@ -138,15 +138,15 @@
 :guilabel:`Create` on the database management page. Enter the super-administrator password, and the
 name of the new database you are creating.
   
-In both cases you will see a checkbox that determines whether you load demonstration data or not.
+In both cases, you will see a checkbox that determines whether you load demonstration data or not.
 The consequences of checking this box or not affect the **whole use** of this database.
 
-.. i18n: In both cases you will also see that you can choose the Administrator password. This makes your 
+.. i18n: In both cases, you will also see that you can choose the Administrator password. This makes your 
 .. i18n: database quite secure because you can ensure that it is unique from the outset.
 .. i18n: (In fact many people find it hard to resist ``admin`` as their password!)
 ..
 
-In both cases you will also see that you can choose the Administrator password. This makes your 
+In both cases, you will also see that you can choose the Administrator password. This makes your 
 database quite secure because you can ensure that it is unique from the outset.
 (In fact many people find it hard to resist ``admin`` as their password!)
 
@@ -166,12 +166,12 @@
 
 .. i18n: Wait for the message showing that the database has been successfully created, along with the user
 .. i18n: accounts and passwords (\ ``admin/XXXX``\   and \ ``demo/demo``\  ). Now that you have created this
-.. i18n: database you can extend it without having to know the super-administrator password.
+.. i18n: database, you can extend it without having to know the super-administrator password.
 ..
 
 Wait for the message showing that the database has been successfully created, along with the user
 accounts and passwords (\ ``admin/XXXX``\   and \ ``demo/demo``\  ). Now that you have created this
-database you can extend it without having to know the super-administrator password.
+database, you can extend it without having to know the super-administrator password.
 
 .. i18n: .. index::
 .. i18n:    single: access; LDAP
@@ -194,7 +194,7 @@
 .. i18n:  	.. index::
 .. i18n: 	   single: module; users_ldap
 .. i18n: 
-.. i18n: 	Alternatively you can install the :mod:`users_ldap` module, which manages the authentication of users
+.. i18n: 	Alternatively, you can install the :mod:`users_ldap` module, which manages the authentication of users
 .. i18n: 	in LDAP (the Lightweight Directory Access Protocol, a standard system), and connect it to several
 .. i18n: 	OpenERP databases. Using this, many databases can share the same user account details.
 ..
@@ -207,38 +207,38 @@
  	.. index::
 	   single: module; users_ldap
 
-	Alternatively you can install the :mod:`users_ldap` module, which manages the authentication of users
+	Alternatively, you can install the :mod:`users_ldap` module, which manages the authentication of users
 	in LDAP (the Lightweight Directory Access Protocol, a standard system), and connect it to several
 	OpenERP databases. Using this, many databases can share the same user account details.
 
-.. i18n: .. note::  Failure to create a database
+.. i18n: .. note::  Failure to Create a Database
 .. i18n: 
 .. i18n: 	How do you know if you have successfully created your new database?
 .. i18n: 	You are told if the database creation has been unsuccessful.
-.. i18n: 	If you have entered a database name using prohibited characters (or no name, or too short a name)
+.. i18n: 	If you have entered a database name using prohibited characters (or no name, or too short a name),
 .. i18n: 	you will be alerted by the dialog box :guilabel:`Bad database name!` explaining how to correct the error.
 .. i18n: 	If you have entered the wrong super-administrator password or a name already in use
 .. i18n: 	(some names can be reserved without your knowledge), you will be alerted by the dialog box
 .. i18n: 	:guilabel:`Error during database creation!`.
 ..
 
-.. note::  Failure to create a database
+.. note::  Failure to Create a Database
 
 	How do you know if you have successfully created your new database?
 	You are told if the database creation has been unsuccessful.
-	If you have entered a database name using prohibited characters (or no name, or too short a name)
+	If you have entered a database name using prohibited characters (or no name, or too short a name),
 	you will be alerted by the dialog box :guilabel:`Bad database name!` explaining how to correct the error.
 	If you have entered the wrong super-administrator password or a name already in use
 	(some names can be reserved without your knowledge), you will be alerted by the dialog box
 	:guilabel:`Error during database creation!`.
 
-.. i18n: Since this is the first time you have connected to this database you will be asked a series of questions to
+.. i18n: Since this is the first time you have connected to this database, you will be asked a series of questions to
 .. i18n: define the database parameters. You may choose to :guilabel:`Skip Configuration Wizards` or
 .. i18n: :guilabel:`Start Configuration`. If you choose to configure your application, you may proceed with the
 .. i18n: following steps:
 ..
 
-Since this is the first time you have connected to this database you will be asked a series of questions to
+Since this is the first time you have connected to this database, you will be asked a series of questions to
 define the database parameters. You may choose to :guilabel:`Skip Configuration Wizards` or
 :guilabel:`Start Configuration`. If you choose to configure your application, you may proceed with the
 following steps:
@@ -264,12 +264,12 @@
 	#.  :guilabel:`Install Applications` : check the applications you need and then click :guilabel:`Install`.
 	    For now, do not install any application.
 
-.. i18n: Once configuration is complete you are connected to your OpenERP system. Its functionality is very
+.. i18n: Once configuration is complete, you are connected to your OpenERP system. Its functionality is very
 .. i18n: limited because you have selected a :guilabel:`Simplified` interface with no application installed,
 .. i18n: but this is sufficient to demonstrate that your installation is working.
 ..
 
-Once configuration is complete you are connected to your OpenERP system. Its functionality is very
+Once configuration is complete, you are connected to your OpenERP system. Its functionality is very
 limited because you have selected a :guilabel:`Simplified` interface with no application installed,
 but this is sufficient to demonstrate that your installation is working.
 
@@ -293,29 +293,33 @@
 .. index::
    single: database; manage
 
+.. i18n: .. _sect-dbmanage:
+.. i18n: 
 .. i18n: Managing Databases
 .. i18n: ------------------
 ..
 
+.. _sect-dbmanage:
+
 Managing Databases
 ------------------
 
-.. i18n: As a super-administrator you do not only have rights to create new databases, but also to:
+.. i18n: As a super-administrator, you do not only have rights to create new databases, but also to:
 ..
 
-As a super-administrator you do not only have rights to create new databases, but also to:
+As a super-administrator, you do not only have rights to create new databases, but also to:
 
+.. i18n: * backup databases,
+.. i18n: 
 .. i18n: * delete databases,
 .. i18n: 
-.. i18n: * backup databases,
-.. i18n: 
 .. i18n: * restore databases.
 ..
 
+* backup databases,
+
 * delete databases,
 
-* backup databases,
-
 * restore databases.
 
 .. i18n: All of these operations can be carried out from the menu :menuselection:`File --> Databases...`
@@ -328,31 +332,95 @@
 :guilabel:`Login` screen.
 
 .. i18n: .. index::
+.. i18n:    single: database; backup
+..
+
+.. index::
+   single: database; backup
+
+.. i18n: .. tip:: Backup (copy) a Database
+.. i18n: 
+.. i18n:         To make a copy of a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Backup` button, select the database you want to copy and enter the super-administrator
+.. i18n: 	password. Click the :guilabel:`Backup` button to confirm that you want to copy the database.
+..
+
+.. tip:: Backup (copy) a Database
+
+        To make a copy of a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Backup` button, select the database you want to copy and enter the super-administrator
+	password. Click the :guilabel:`Backup` button to confirm that you want to copy the database.
+
+.. i18n: .. index::
+.. i18n:    single: database; drop
+..
+
+.. index::
+   single: database; drop
+
+.. i18n: .. tip:: Drop (delete) a Database
+.. i18n: 
+.. i18n:         To delete a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Drop` button, select the database you want to delete and enter the super-administrator
+.. i18n: 	password. Click the :guilabel:`Drop` button to confirm that you want to delete the database.
+..
+
+.. tip:: Drop (delete) a Database
+
+        To delete a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Drop` button, select the database you want to delete and enter the super-administrator
+	password. Click the :guilabel:`Drop` button to confirm that you want to delete the database.
+
+.. i18n: .. index::
+.. i18n:    single: database; restore
+..
+
+.. index::
+   single: database; restore
+
+.. i18n: .. tip:: Restore a Database
+.. i18n: 
+.. i18n:         To restore a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Restore` button, click the :guilabel:`Choose File` button to select the database
+.. i18n:         you want to restore. Give the database a name and enter the super-administrator	password.
+.. i18n: 	Click the :guilabel:`Restore` button to confirm that you want to install a new copy of the selected database.
+.. i18n: 	To restore a database, you need to have an existing copy, of course.
+..
+
+.. tip:: Restore a Database
+
+        To restore a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Restore` button, click the :guilabel:`Choose File` button to select the database
+        you want to restore. Give the database a name and enter the super-administrator	password.
+	Click the :guilabel:`Restore` button to confirm that you want to install a new copy of the selected database.
+	To restore a database, you need to have an existing copy, of course.
+
+.. i18n: .. index::
 .. i18n:    single: database; duplicate
 ..
 
 .. index::
    single: database; duplicate
 
-.. i18n: .. tip::   Duplicating a database
+.. i18n: .. tip::   Duplicating a Database
 .. i18n: 
-.. i18n: 	To duplicate a database you can:
+.. i18n: 	To duplicate a database, you can:
 .. i18n: 
 .. i18n:         #. make a backup file on your PC from this database.
 .. i18n: 
-.. i18n:         #. restore this database from the backup file on your PC, giving it a new name as you do so.
+.. i18n:         #. restore this database from the backup file on your PC, and give it a new name.
 .. i18n: 
 .. i18n: 	This can be a useful way of making a test database from a production database. You can try out the
 .. i18n: 	operation of a new configuration, new modules, or just the import of new data.
 ..
 
-.. tip::   Duplicating a database
+.. tip::   Duplicating a Database
 
-	To duplicate a database you can:
+	To duplicate a database, you can:
 
         #. make a backup file on your PC from this database.
 
-        #. restore this database from the backup file on your PC, giving it a new name as you do so.
+        #. restore this database from the backup file on your PC, and give it a new name.
 
 	This can be a useful way of making a test database from a production database. You can try out the
 	operation of a new configuration, new modules, or just the import of new data.
@@ -378,11 +446,11 @@
 You are now ready to use databases from your installation to familiarize yourself with the
 administration and use of OpenERP.
 
-.. i18n: New OpenERP functionality
+.. i18n: New OpenERP Functionality
 .. i18n: =========================
 ..
 
-New OpenERP functionality
+New OpenERP Functionality
 =========================
 
 .. i18n: The database you have created and managed so far is based on the core OpenERP functionality that you
@@ -426,12 +494,12 @@
 In both cases you will need to be a \ ``root`` \ user or \ ``Administrator`` \ of your
 OpenERP application server.
 
-.. i18n: Extending Open ERP
-.. i18n: ------------------
+.. i18n: Extending OpenERP
+.. i18n: -----------------
 ..
 
-Extending Open ERP
-------------------
+Extending OpenERP
+-----------------
 
 .. i18n: To extend OpenERP you will need to copy modules into the \ ``addons`` \ directory. That is in
 .. i18n: your server's \ ``openerp-server`` \ directory (which differs between Windows, Mac and some of the
@@ -499,7 +567,7 @@
 .. index::
    pair:  filesystem; permissions
 
-.. i18n: .. tip:: Changing permissions
+.. i18n: .. tip:: Changing Permissions
 .. i18n: 
 .. i18n: 	A very simple way of changing permissions on the Linux system you are using to develop an OpenERP
 .. i18n: 	application is to execute the command sudo chmod 777 <path_to_addons> (where <path_to_addons> is
@@ -507,7 +575,7 @@
 .. i18n: 	server/addons).
 ..
 
-.. tip:: Changing permissions
+.. tip:: Changing Permissions
 
 	A very simple way of changing permissions on the Linux system you are using to develop an OpenERP
 	application is to execute the command sudo chmod 777 <path_to_addons> (where <path_to_addons> is

=== modified file 'i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst'
--- i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst	2012-09-19 23:17:23 +0000
+++ i18n/fr/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst	2012-10-01 15:56:24 +0000
@@ -204,12 +204,20 @@
 you are using, or you may want to install the database server and application server on
 separate hardware units.
 
+<<<<<<< TREE
 .. i18n: For this situation, you can get a separate installer for the OpenERP server from the same
+=======
+.. i18n: For this situation, you can get separate installers for the OpenERP server and client from the same
+>>>>>>> MERGE-SOURCE
 .. i18n: location as the all-in-one auto-installer. You will also have to download and install a suitable
 .. i18n: version of PostgreSQL independently.
 ..
 
+<<<<<<< TREE
 For this situation, you can get a separate installer for the OpenERP server from the same
+=======
+For this situation, you can get separate installers for the OpenERP server and client from the same
+>>>>>>> MERGE-SOURCE
 location as the all-in-one auto-installer. You will also have to download and install a suitable
 version of PostgreSQL independently.
 
@@ -1095,6 +1103,91 @@
 If your Linux server is protected by a firewall you will have to provide access to port 
  \ ``8069`` \ or \ ``8070`` \ for users on other computers with OpenERP GTK clients.
 
+<<<<<<< TREE
+=======
+.. i18n: .. index::
+.. i18n:    single: installation; eTiny web server
+.. i18n:    single: installation; OpenERP client-web server
+..
+
+.. index::
+   single: installation; eTiny web server
+   single: installation; OpenERP client-web server
+
+.. i18n: Installation of an OpenERP Web Server
+.. i18n: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+..
+
+Installation of an OpenERP Web Server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. i18n: Just as you installed a GTK client on a Linux server, you can also install the OpenERP client-web
+.. i18n: server.
+.. i18n: You can install it from sources after installing its dependencies from packages as you did
+.. i18n: with the OpenERP server,
+.. i18n: but OpenERP has provided a simpler way to do this for the web client – using a system known as ez_setup.
+..
+
+Just as you installed a GTK client on a Linux server, you can also install the OpenERP client-web
+server.
+You can install it from sources after installing its dependencies from packages as you did
+with the OpenERP server,
+but OpenERP has provided a simpler way to do this for the web client – using a system known as ez_setup.
+
+.. i18n: Before proceeding, confirm that your OpenERP installation is functioning correctly with a GTK
+.. i18n: client.
+.. i18n: If it is not, you will need to go back now and fix it, because you need to be able to fully use it for
+.. i18n: the next stages.
+..
+
+Before proceeding, confirm that your OpenERP installation is functioning correctly with a GTK
+client.
+If it is not, you will need to go back now and fix it, because you need to be able to fully use it for
+the next stages.
+
+.. i18n: To install client-web follow the up-to-date instructions in the installation document on the website.
+..
+
+To install client-web follow the up-to-date instructions in the installation document on the website.
+
+.. i18n: .. note:: Ez Tool
+.. i18n: 
+.. i18n: 	Ez is the packaging system used by Python. It enables the installation of programs as required just
+.. i18n: 	like the packages used by a Linux distribution. The software is downloaded across the network and
+.. i18n: 	installed on your computer by ez_install.
+.. i18n: 
+.. i18n: 	:program:`ez_setup` is a small program that installs ez_install automatically.
+..
+
+.. note:: Ez Tool
+
+	Ez is the packaging system used by Python. It enables the installation of programs as required just
+	like the packages used by a Linux distribution. The software is downloaded across the network and
+	installed on your computer by ez_install.
+
+	:program:`ez_setup` is a small program that installs ez_install automatically.
+
+.. i18n: The OpenERP Web server connects to the OpenERP server in the same way as an OpenERP client
+.. i18n: using the NET-RPC protocol. Its default setup corresponds to that of the OpenERP server
+.. i18n: you have just installed, so should connect directly at startup.
+..
+
+The OpenERP Web server connects to the OpenERP server in the same way as an OpenERP client
+using the NET-RPC protocol. Its default setup corresponds to that of the OpenERP server
+you have just installed, so should connect directly at startup.
+
+.. i18n: #.	At the same console as you've just been using, go to the OpenERP web directory by typing
+.. i18n: 	:command:`cd openerp-web-6.X`.
+.. i18n: 
+.. i18n: #. 	At a terminal window type :command:`openerp-web` to start the OpenERP Web server.
+..
+
+#.	At the same console as you've just been using, go to the OpenERP web directory by typing
+	:command:`cd openerp-web-6.X`.
+
+#. 	At a terminal window type :command:`openerp-web` to start the OpenERP Web server.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. _fig-webwel:
 .. i18n:
 .. i18n:.. figure:: images/web_welcome.png

=== modified file 'i18n/fr/source/book/1/1_1_Inst_Config/index.rst'
--- i18n/fr/source/book/1/1_1_Inst_Config/index.rst	2012-09-14 12:39:28 +0000
+++ i18n/fr/source/book/1/1_1_Inst_Config/index.rst	2012-10-01 15:56:24 +0000
@@ -68,8 +68,13 @@
 
 .. note:: Renaming from Tiny ERP to OpenERP
 
+<<<<<<< TREE
    Tiny ERP was renamed to OpenERP early in 2008 so anyone who has used Tiny ERP should be
    equally at home with OpenERP. Both names refer to the same software, so there is no
+=======
+   Tiny ERP was renamed to OpenERP early in 2008, so anyone who has used Tiny ERP should be
+   equally at home with OpenERP. The two names refer to the same software, so there is no
+>>>>>>> MERGE-SOURCE
    functional difference between versions 4.2.X of OpenERP and 4.2.X of Tiny ERP. This book
    applies to versions of OpenERP from 6.1.0 onwards, with references to earlier versions from
    time to time.

=== modified file 'i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst'
--- i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst	2012-09-20 11:10:08 +0000
+++ i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst	2012-10-01 15:56:24 +0000
@@ -187,7 +187,20 @@
 	server's timezone. When the English users want to set up a meeting with an Indian user, the Indian
 	user's available time will be converted to English time.
 
-.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+<<<<<<< TREE
+.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+=======
+.. i18n: The :guilabel:`REQUESTS` link is found beside the :guilabel:`HOME` link. It is only visible if you are logged into
+.. i18n: a database. If your database is new it will show number of requests as 0. You can click on that link
+.. i18n: to look at requests that have been sent to you at any time.
+..
+
+The :guilabel:`REQUESTS` link is found beside the :guilabel:`HOME` link. It is only visible if you are logged into
+a database. If your database is new it will show number of requests as 0. You can click on that link
+to look at requests that have been sent to you at any time.
+
+.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+>>>>>>> MERGE-SOURCE
 .. i18n: get a dialog box where the current user can set his interface in the :guilabel:`Current Activity` tab;
 .. i18n: and in the :guilabel:`Preferences` tab, set his password, a timezone, a working language,
 .. i18n: e-mail and a signature:
@@ -365,6 +378,7 @@
 
 .. index:: requests
 
+<<<<<<< TREE
 .. i18n: Requests
 .. i18n: ^^^^^^^^
 .. i18n:
@@ -375,6 +389,183 @@
 ^^^^^^^^
 
 Requests have been removed in OpenERP 6.1 - a new internal communication system will be added in 7.0.
+=======
+.. i18n: Requests as a Mechanism for Internal Communication
+.. i18n: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+..
+
+Requests as a Mechanism for Internal Communication
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. i18n: Requests are a powerful communication mechanism between users of the system. They are also used by
+.. i18n: OpenERP itself to send system messages to users.
+..
+
+Requests are a powerful communication mechanism between users of the system. They are also used by
+OpenERP itself to send system messages to users.
+
+.. i18n: They have distinct advantages over traditional emails:
+..
+
+They have distinct advantages over traditional emails:
+
+.. i18n: * requests are linked to other OpenERP documents,
+.. i18n: 
+.. i18n: * an event's history is attached to the request,
+.. i18n: 
+.. i18n: * you can monitor events effectively from the messages they have sent.
+..
+
+* requests are linked to other OpenERP documents,
+
+* an event's history is attached to the request,
+
+* you can monitor events effectively from the messages they have sent.
+
+.. i18n: OpenERP uses this mechanism to inform users about certain system events. For example, if there is a
+.. i18n: problem concerning the procurement of a product, a request is sent by OpenERP to the production
+.. i18n: manager.
+..
+
+OpenERP uses this mechanism to inform users about certain system events. For example, if there is a
+problem concerning the procurement of a product, a request is sent by OpenERP to the production
+manager.
+
+.. i18n: Send a request to get an understanding of its functionality:
+..
+
+Send a request to get an understanding of its functionality:
+
+.. i18n: 	#. Click on the :guilabel:`REQUESTS` link that should currently be showing number of requests as 0.
+.. i18n: 	   This opens a window that lists all of your waiting requests.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`New` to create and send a new request.
+.. i18n: 
+.. i18n: 	#. Complete the subject of the request, such as \ ``How are things?``\  then give a description of the
+.. i18n: 	   enquiry in the field.
+.. i18n: 
+.. i18n: 	#. Click the :guilabel:`Search` button to the right of the :guilabel:`To` field in the
+.. i18n: 	   :guilabel:`Request` tab and select :guilabel:`Administrator` in the window that opens
+.. i18n: 	   (that is the user that you are already connected as).
+.. i18n: 
+.. i18n: 	#. You can then link this request to other system documents using the :guilabel:`References` field,
+.. i18n: 	   which could, for example, be a partner or a quotation or a disputed invoice.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`Send` to send the request to the intended recipient – that is yourself in this
+.. i18n: 	   case. Then click :guilabel:`HOME` to return to the original screen.
+..
+
+	#. Click on the :guilabel:`REQUESTS` link that should currently be showing number of requests as 0.
+	   This opens a window that lists all of your waiting requests.
+
+	#. Click :guilabel:`New` to create and send a new request.
+
+	#. Complete the subject of the request, such as \ ``How are things?``\  then give a description of the
+	   enquiry in the field.
+
+	#. Click the :guilabel:`Search` button to the right of the :guilabel:`To` field in the
+	   :guilabel:`Request` tab and select :guilabel:`Administrator` in the window that opens
+	   (that is the user that you are already connected as).
+
+	#. You can then link this request to other system documents using the :guilabel:`References` field,
+	   which could, for example, be a partner or a quotation or a disputed invoice.
+
+	#. Click :guilabel:`Send` to send the request to the intended recipient – that is yourself in this
+	   case. Then click :guilabel:`HOME` to return to the original screen.
+
+.. i18n: .. figure:: images/request_tab.png
+.. i18n:    :align: center
+.. i18n:    :scale: 80
+.. i18n: 
+.. i18n:    *Creating a new request*
+..
+
+.. figure:: images/request_tab.png
+   :align: center
+   :scale: 80
+
+   *Creating a new request*
+
+.. i18n: To check your requests:
+..
+
+To check your requests:
+
+.. i18n: 	#. Click on the :guilabel:`REQUESTS` link (which may now show the number of requests as 1)
+.. i18n: 	   to open a list of your requests. The list of requests then opens and you can see the
+.. i18n: 	   requests you have been sent there.
+.. i18n: 
+.. i18n: 	#. Click the :guilabel:`Edit` icon, represented by a pencil, at the left hand end of the request
+.. i18n: 	   line. That opens the request in edit mode.
+.. i18n: 
+.. i18n: 	#. You can then click the :guilabel:`Reply` button and make your response in the
+.. i18n: 	   :guilabel:`Description` field of the :guilabel:`Request` tab that appears in place of the original message.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`Send` to save your response and send it to the original sender.
+..
+
+	#. Click on the :guilabel:`REQUESTS` link (which may now show the number of requests as 1)
+	   to open a list of your requests. The list of requests then opens and you can see the
+	   requests you have been sent there.
+
+	#. Click the :guilabel:`Edit` icon, represented by a pencil, at the left hand end of the request
+	   line. That opens the request in edit mode.
+
+	#. You can then click the :guilabel:`Reply` button and make your response in the
+	   :guilabel:`Description` field of the :guilabel:`Request` tab that appears in place of the original message.
+
+	#. Click :guilabel:`Send` to save your response and send it to the original sender.
+
+.. i18n: .. note:: Requests vs. Email
+.. i18n: 
+.. i18n: 	The advantage of an OpenERP request compared with a set of emails about one thread of discussion
+.. i18n: 	is that a request contains all of the conversation in one place. You can easily monitor a whole
+.. i18n: 	discussion with the appropriate documents attached, and quickly review a list of incomplete
+.. i18n: 	discussions with the history within each request.
+..
+
+.. note:: Requests vs. Email
+
+	The advantage of an OpenERP request compared with a set of emails about one thread of discussion
+	is that a request contains all of the conversation in one place. You can easily monitor a whole
+	discussion with the appropriate documents attached, and quickly review a list of incomplete
+	discussions with the history within each request.
+
+.. i18n: To look at the request history (the user needs to set the interface as \ ``Extended`` \
+.. i18n: to use this feature), and close the request:
+..
+
+To look at the request history (the user needs to set the interface as \ ``Extended`` \
+to use this feature), and close the request:
+
+.. i18n: 	#. Click on the :guilabel:`History` tab in the :guilabel:`Request` form to see the
+.. i18n: 	   original request and all of the responses. By clicking on each line, you could get more information
+.. i18n: 	   on each element.
+.. i18n: 
+.. i18n: 	#. Return to the first tab, :guilabel:`Request` and click :guilabel:`Close` to set it to \
+.. i18n: 	   ``closed``\. This then appears greyed out.
+..
+
+	#. Click on the :guilabel:`History` tab in the :guilabel:`Request` form to see the
+	   original request and all of the responses. By clicking on each line, you could get more information
+	   on each element.
+
+	#. Return to the first tab, :guilabel:`Request` and click :guilabel:`Close` to set it to \
+	   ``closed``\. This then appears greyed out.
+
+.. i18n: .. tip:: Trigger Date
+.. i18n: 
+.. i18n: 	You can send a request with a future date. This request will not appear in the recipient's waiting
+.. i18n: 	list until the indicated date. This mechanism is very useful for setting up alerts before an
+.. i18n: 	important event.
+..
+
+.. tip:: Trigger Date
+
+	You can send a request with a future date. This request will not appear in the recipient's waiting
+	list until the indicated date. This mechanism is very useful for setting up alerts before an
+	important event.
+>>>>>>> MERGE-SOURCE
 
 .. i18n: .. index::
 .. i18n:    single: user; configuration

=== modified file 'i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst'
--- i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst	2011-06-10 09:39:31 +0000
+++ i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst	2012-10-01 15:56:24 +0000
@@ -1,20 +1,20 @@
 
-.. i18n: Database creation
+.. i18n: Database Creation
 .. i18n: =================
 ..
 
-Database creation
+Database Creation
 =================
 
 .. i18n: Use the technique outlined in :ref:`ch-inst` to create a new database, \ ``openerp_ch02``\  . This
 .. i18n: database will contain the demonstration data provided with OpenERP and a large proportion of the
-.. i18n: core Open ERP functionality. You will need to know your super administrator password for this – or
+.. i18n: core OpenERP functionality. You will need to know your super administrator password for this – or
 .. i18n: you will have to find somebody who does have it to create this seed database.
 ..
 
 Use the technique outlined in :ref:`ch-inst` to create a new database, \ ``openerp_ch02``\  . This
 database will contain the demonstration data provided with OpenERP and a large proportion of the
-core Open ERP functionality. You will need to know your super administrator password for this – or
+core OpenERP functionality. You will need to know your super administrator password for this – or
 you will have to find somebody who does have it to create this seed database.
 
 .. i18n: Start the database creation process from the :guilabel:`Login` page by clicking
@@ -50,3 +50,62 @@
 *  :guilabel:`Administrator password` : \ ``admin``\  (because it is easiest to remember at this stage, but obviously completely insecure),
 
 *  :guilabel:`Confirm password` : \ ``admin``\  .
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== modified file 'i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst'
--- i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst	2012-09-19 20:41:54 +0000
+++ i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst	2012-10-01 15:56:24 +0000
@@ -6,26 +6,26 @@
 .. index::
   single: module; new functionality
 
-.. i18n: Installing new functionality
-.. i18n: =============================
+.. i18n: Installing New Functionality
+.. i18n: ============================
 ..
 
-Installing new functionality
-=============================
+Installing New Functionality
+============================
 
-.. i18n: All of Open ERP's functionality is contained in its many and various modules. Many of these, the
+.. i18n: All of OpenERP's functionality is contained in its many and various modules. Many of these, the
 .. i18n: core modules, are automatically loaded during the initial installation of the system and can be
 .. i18n: updated online later. Although they are mostly not installed in your database at the outset, they are
 .. i18n: available on your computer for immediate installation. Additional modules can also be loaded online
-.. i18n: from the official Open ERP site http://openerp.com. These modules are inactive when they are loaded
+.. i18n: from the official OpenERP site http://openerp.com. These modules are inactive when they are loaded
 .. i18n: into the system, and can then be installed in a separate step.
 ..
 
-All of Open ERP's functionality is contained in its many and various modules. Many of these, the
+All of OpenERP's functionality is contained in its many and various modules. Many of these, the
 core modules, are automatically loaded during the initial installation of the system and can be
 updated online later. Although they are mostly not installed in your database at the outset, they are
 available on your computer for immediate installation. Additional modules can also be loaded online
-from the official Open ERP site http://openerp.com. These modules are inactive when they are loaded
+from the official OpenERP site http://openerp.com. These modules are inactive when they are loaded
 into the system, and can then be installed in a separate step.
 
 .. i18n: You will start by checking if there are any updates available online that apply to your initial
@@ -43,35 +43,35 @@
   single: module; upgrading
 
 .. i18n: Updating the Modules list
-.. i18n: ---------------------------
+.. i18n: -------------------------
 ..
 
 Updating the Modules list
----------------------------
+-------------------------
 
 .. i18n: Click :menuselection:`Administration --> Modules --> Update Modules List` to start the
 .. i18n: updating tool. The :guilabel:`Module Update` window opens notifying the user that
-.. i18n: Open ERP will look at the server side for adding new modules and updating
+.. i18n: OpenERP will look at the server side for adding new modules and updating
 .. i18n: existing ones.
 ..
 
 Click :menuselection:`Administration --> Modules --> Update Modules List` to start the
 updating tool. The :guilabel:`Module Update` window opens notifying the user that
-Open ERP will look at the server side for adding new modules and updating
+OpenERP will look at the server side for adding new modules and updating
 existing ones.
 
 .. i18n: Click :guilabel:`Update` to start the update on the server side. When it is
-.. i18n: complete you will see a :guilabel:`Module update result` section indicating how many new modules were added
+.. i18n: complete, you will see a :guilabel:`Module update result` section indicating how many new modules were added
 .. i18n: and how many existing modules were updated. Click :guilabel:`Open Modules` to return to the updated list.
 ..
 
 Click :guilabel:`Update` to start the update on the server side. When it is
-complete you will see a :guilabel:`Module update result` section indicating how many new modules were added
+complete, you will see a :guilabel:`Module update result` section indicating how many new modules were added
 and how many existing modules were updated. Click :guilabel:`Open Modules` to return to the updated list.
 
 .. i18n: .. note:: Modules
 .. i18n: 
-.. i18n: 	All the modules available on your computer can be found in the addons directory of your Open ERP
+.. i18n: 	All the modules available on your computer can be found in the addons directory of your OpenERP
 .. i18n: 	server. Each module there is represented by a directory carrying the name of the module or by a
 .. i18n: 	file with the module name and .zip appended to it. The file is in ZIP archive format and replicates
 .. i18n: 	the directory structure of unzipped modules.
@@ -79,7 +79,7 @@
 
 .. note:: Modules
 
-	All the modules available on your computer can be found in the addons directory of your Open ERP
+	All the modules available on your computer can be found in the addons directory of your OpenERP
 	server. Each module there is represented by a directory carrying the name of the module or by a
 	file with the module name and .zip appended to it. The file is in ZIP archive format and replicates
 	the directory structure of unzipped modules.
@@ -118,17 +118,25 @@
 .. index::
   single: module; installing
 
-.. i18n: The Configuration / Reconfigure wizard
+.. i18n: The Configuration / Reconfigure Wizard
 .. i18n: --------------------------------------
 ..
 
-The Configuration / Reconfigure wizard
+The Configuration / Reconfigure Wizard
 --------------------------------------
 
+<<<<<<< TREE
 .. i18n: One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web interface or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+=======
+.. i18n: One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web-client or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+>>>>>>> MERGE-SOURCE
 ..
 
+<<<<<<< TREE
 One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web interface or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+=======
+One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web-client or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+>>>>>>> MERGE-SOURCE
 
 .. i18n: When you go through the various steps in the wizard, you will come across some options that are checked and greyed. These are applications already installed. In the \ ``openerp_ch02`` \ database configuration, you may see that the \ ``Customer Relationship Management`` \ option is already checked because this Business Application has been installed in this database.
 .. i18n: Install extra applications simply by checking the corresponding options and clicking :guilabel:`Install` or click :guilabel:`Skip` to stop the configuration. You will eventually also come across the :guilabel:`CRM Application Configuration` step which you may use to add features to your CRM application. For now, select the \ ``Claims`` \ option and click :guilabel:`Configure`. This will in turn install the :mod:`crm_claim` module.
@@ -162,11 +170,11 @@
 
 .. note:: You can also change the Configuration Wizard through the :menuselection:`Administration --> Configuration --> Configuration Wizards --> Configuration Wizards`.
 
-.. i18n: Installing an application / module from the Modules list
+.. i18n: Installing an Application / Module from the Modules list
 .. i18n: --------------------------------------------------------
 ..
 
-Installing an application / module from the Modules list
+Installing an Application / Module from the Modules list
 --------------------------------------------------------
 
 .. i18n: .. index::
@@ -236,24 +244,24 @@
 form that appears. Close the window when the operation has completed. Return to the :guilabel:`Sales` menu; you will
 see the new menu :menuselection:`Products` has become available.
 
-.. i18n: .. tip::  Refreshing the menu in the GTK client
+.. i18n: .. tip::  Refreshing the menu in the GTK Client
 .. i18n: 
 .. i18n: 	After an update in the GTK client you will have to open a new menu to refresh the content –
-.. i18n: 	otherwise you will not see the new menu item. To do that use the window menu :menuselection:`Form -->
+.. i18n: 	otherwise you will not see the new menu item. To do that, use the window menu :menuselection:`Form -->
 .. i18n: 	Reload / Undo` or use the shortcut :kbd:`Ctrl+R`.
 ..
 
-.. tip::  Refreshing the menu in the GTK client
+.. tip::  Refreshing the menu in the GTK Client
 
 	After an update in the GTK client you will have to open a new menu to refresh the content –
-	otherwise you will not see the new menu item. To do that use the window menu :menuselection:`Form -->
+	otherwise you will not see the new menu item. To do that, use the window menu :menuselection:`Form -->
 	Reload / Undo` or use the shortcut :kbd:`Ctrl+R`.
 
-.. i18n: Installing a module with its dependencies
+.. i18n: Installing a Module with its Dependencies
 .. i18n: -----------------------------------------
 ..
 
-Installing a module with its dependencies
+Installing a Module with its Dependencies
 -----------------------------------------
 
 .. i18n: .. index::
@@ -301,22 +309,22 @@
 	#.  You will see details of all the features installed by the modules on a new
 	    :guilabel:`Features` tab on the module form. 
 
-.. i18n: When you return to the :menuselection:`Warehouse` menu you will find the new menu items under it like
+.. i18n: When you return to the :menuselection:`Warehouse` menu, you will find the new menu items under it like
 .. i18n: :menuselection:`Warehouse --> Warehouse Management --> Incoming Shipments`, :menuselection:`Warehouse --> Products Moves`,  which are a part of the Warehouse management system. You will also see all the accounting functions that are now available in the :menuselection:`Accounting` menu.
 ..
 
-When you return to the :menuselection:`Warehouse` menu you will find the new menu items under it like
+When you return to the :menuselection:`Warehouse` menu, you will find the new menu items under it like
 :menuselection:`Warehouse --> Warehouse Management --> Incoming Shipments`, :menuselection:`Warehouse --> Products Moves`,  which are a part of the Warehouse management system. You will also see all the accounting functions that are now available in the :menuselection:`Accounting` menu.
 
 .. i18n: There is no particular relationship between the modules installed and the menus added. Most of the
-.. i18n: core modules add complete menus but some also add submenus to menus already in the system. Other
-.. i18n: modules add menus and submenus as they need. Modules can also add additional fields to existing
+.. i18n: core modules add complete menus but some also add sub-menus to menus already in the system. Other
+.. i18n: modules add menus and sub-menus as they need. Modules can also add additional fields to existing
 .. i18n: forms, or simply additional demonstration data or some settings specific to a given requirement.
 ..
 
 There is no particular relationship between the modules installed and the menus added. Most of the
-core modules add complete menus but some also add submenus to menus already in the system. Other
-modules add menus and submenus as they need. Modules can also add additional fields to existing
+core modules add complete menus but some also add sub-menus to menus already in the system. Other
+modules add menus and sub-menus as they need. Modules can also add additional fields to existing
 forms, or simply additional demonstration data or some settings specific to a given requirement.
 
 .. i18n: .. index::
@@ -328,10 +336,10 @@
   single: module; dependencies
 ..
 
-.. i18n: .. note::  Dependencies between modules
+.. i18n: .. note::  Dependencies Between Modules
 .. i18n: 
 .. i18n: 	The module form shows two tabs before it is installed. 
-.. i18n: 	The first tab gives basic information about the module and the
+.. i18n: 	The first tab gives basic information about the module, and the
 .. i18n: 	second gives a list of modules that this module depends on. So when you install a module, OpenERP
 .. i18n: 	automatically selects all the necessary dependencies to install this module.
 .. i18n: 
@@ -339,10 +347,10 @@
 .. i18n: 	in your profile as a set of dependencies.
 ..
 
-.. note::  Dependencies between modules
+.. note::  Dependencies Between Modules
 
 	The module form shows two tabs before it is installed. 
-	The first tab gives basic information about the module and the
+	The first tab gives basic information about the module, and the
 	second gives a list of modules that this module depends on. So when you install a module, OpenERP
 	automatically selects all the necessary dependencies to install this module.
 
@@ -358,52 +366,52 @@
 fell swoop – you would have to uninstall module by module. Uninstalling is more complex than
 installing because you have to handle existing system data.
 
-.. i18n: .. note::  Uninstalling modules
+.. i18n: .. note::  Uninstalling Modules
 .. i18n: 
-.. i18n: 	Although it works quite well, uninstalling modules is not perfect in Open ERP. It is not guaranteed
+.. i18n: 	Although it works quite well, uninstalling modules is not perfect in OpenERP. It is not guaranteed
 .. i18n: 	to return the system exactly to the state it was in before installation.
 .. i18n: 
 .. i18n: 	So it is recommended that you make a backup of the database before installing your new modules so
-.. i18n: 	that you can test the new modules and decide whether they are suitable or not. If they are not then
+.. i18n: 	that you can test the new modules and decide whether they are suitable or not. If they are not, then
 .. i18n: 	you can return to your backup. If they are, then you will probably still reinstall the modules on
 .. i18n: 	your backup so that you do not have to delete all your test data.
 .. i18n: 
-.. i18n: 	If you wanted to uninstall you would use the menu :menuselection:`Administration --> Modules
+.. i18n: 	If you wanted to uninstall, you would use the menu :menuselection:`Administration --> Modules
 .. i18n: 	--> Modules` and then uninstall them in the inverse order of their
 .. i18n: 	dependencies: ``stock``, ``account``.
 ..
 
-.. note::  Uninstalling modules
+.. note::  Uninstalling Modules
 
-	Although it works quite well, uninstalling modules is not perfect in Open ERP. It is not guaranteed
+	Although it works quite well, uninstalling modules is not perfect in OpenERP. It is not guaranteed
 	to return the system exactly to the state it was in before installation.
 
 	So it is recommended that you make a backup of the database before installing your new modules so
-	that you can test the new modules and decide whether they are suitable or not. If they are not then
+	that you can test the new modules and decide whether they are suitable or not. If they are not, then
 	you can return to your backup. If they are, then you will probably still reinstall the modules on
 	your backup so that you do not have to delete all your test data.
 
-	If you wanted to uninstall you would use the menu :menuselection:`Administration --> Modules
+	If you wanted to uninstall, you would use the menu :menuselection:`Administration --> Modules
 	--> Modules` and then uninstall them in the inverse order of their
 	dependencies: ``stock``, ``account``.
 
-.. i18n: Installing additional functionality
-.. i18n: -------------------------------------
+.. i18n: Installing Additional Functionality
+.. i18n: -----------------------------------
 ..
 
-Installing additional functionality
--------------------------------------
+Installing Additional Functionality
+-----------------------------------
 
-.. i18n: To discover the full range of OpenERP's possibilities you can install many additional modules.
+.. i18n: To discover the full range of OpenERP's possibilities, you can install many additional modules.
 .. i18n: Installing them with their demonstration data provides a convenient way of exploring the whole core
-.. i18n: system. When you build on the \ ``openerp_ch02``\   database you will automatically include
+.. i18n: system. When you build on the \ ``openerp_ch02``\   database, you will automatically include
 .. i18n: demonstration data because you checked the :guilabel:`Load Demonstration Data` checkbox when you originally
 .. i18n: created the database.
 ..
 
-To discover the full range of OpenERP's possibilities you can install many additional modules.
+To discover the full range of OpenERP's possibilities, you can install many additional modules.
 Installing them with their demonstration data provides a convenient way of exploring the whole core
-system. When you build on the \ ``openerp_ch02``\   database you will automatically include
+system. When you build on the \ ``openerp_ch02``\   database, you will automatically include
 demonstration data because you checked the :guilabel:`Load Demonstration Data` checkbox when you originally
 created the database.
 
@@ -423,11 +431,11 @@
 Click :menuselection:`Administration --> Modules --> Modules` to give you an
 overview of all of the modules available for installation.
 
-.. i18n: To test several modules you will not have to install them all one by one. You can use the dependencies
+.. i18n: To test several modules, you will not have to install them all one by one. You can use the dependencies
 .. i18n: between modules to load several at once.
 ..
 
-To test several modules you will not have to install them all one by one. You can use the dependencies
+To test several modules, you will not have to install them all one by one. You can use the dependencies
 between modules to load several at once.
 
 .. i18n: .. Copyright © Open Object Press. All rights reserved.

=== modified file 'i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst'
--- i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst	2012-09-21 09:06:06 +0000
+++ i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst	2012-10-01 15:56:24 +0000
@@ -1,11 +1,11 @@
 
 .. i18n: *********************
-.. i18n: What's new in OpenERP
+.. i18n: What's New in OpenERP
 .. i18n: *********************
 ..
 
 *********************
-What's new in OpenERP
+What's New in OpenERP
 *********************
 
 .. i18n: .. index::
@@ -52,11 +52,13 @@
 .. i18n: 
 .. i18n: * Create your own e-mail templates for use throughout OpenERP,
 .. i18n: 
-.. i18n: * Use the Scheduler for other objects than Manufacturing,
+.. i18n: * Use the Scheduler for objects other than Manufacturing too,
 .. i18n: 
 .. i18n: * Click the `star` in the web version to quickly create a shortcut for a screen you often use,
 .. i18n: 
-.. i18n: * When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned. 
+.. i18n: * When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned,
+.. i18n: 
+.. i18n: * Updated configuration wizard to install new features using OpenERP modules in user friendly way.
 ..
 
 * OpenERP has been structured as Business Applications and its menu has been changed to match this,
@@ -87,11 +89,13 @@
 
 * Create your own e-mail templates for use throughout OpenERP,
 
-* Use the Scheduler for other objects than Manufacturing,
+* Use the Scheduler for objects other than Manufacturing too,
 
 * Click the `star` in the web version to quickly create a shortcut for a screen you often use,
 
-* When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned. 
+* When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned,
+
+* Updated configuration wizard to install new features using OpenERP modules in user friendly way.
 
 .. i18n: Business Application-related Features
 .. i18n: =====================================
@@ -111,19 +115,15 @@
 .. i18n: 
 .. i18n: * Manage your Marketing Campaigns and send automated e-mails based on your own templates,
 .. i18n: 
-.. i18n: * For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,  
+.. i18n: * For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,
 .. i18n: 
 .. i18n: * Create your company wiki for Sales FAQ,
 .. i18n: 
 .. i18n: * History tab in the Customer form to keep track of all events,
-.. i18n:  
-.. i18n: *Warehouse Management*
-.. i18n: 
-.. i18n: * Push & Pull rules for stock locations have been extended and integrated with multicompany,
-.. i18n: 
-.. i18n: * Configure units of measure by reference unit, bigger then / smaller then reference unit,
-.. i18n: 
-.. i18n: * Update stock level from the Product form and automatically create a physical inventory for it.
+.. i18n: 
+.. i18n: * When you convert a lead to an opportunity, you now have the option to not create a partner, but just keep the contact data in the opportunity,
+.. i18n: 
+.. i18n: * Create a new partner from a lead or an opportunity, or merge with an existing partner.
 ..
 
 * CRM has been integrated in the Sales Management Business Application,
@@ -132,17 +132,31 @@
 
 * Manage your Marketing Campaigns and send automated e-mails based on your own templates,
 
-* For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,  
+* For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,
 
 * Create your company wiki for Sales FAQ,
 
 * History tab in the Customer form to keep track of all events,
- 
+
+* When you convert a lead to an opportunity, you now have the option to not create a partner, but just keep the contact data in the opportunity,
+
+* Create a new partner from a lead or an opportunity, or merge with an existing partner.
+
+.. i18n: *Warehouse Management*
+..
+
 *Warehouse Management*
 
+.. i18n: * Push & Pull rules for stock locations have been extended and integrated with multicompany,
+.. i18n: 
+.. i18n: * Configure units of measure by reference unit, bigger than / smaller then reference unit,
+.. i18n: 
+.. i18n: * Update stock level from the Product form and automatically create a physical inventory for it.
+..
+
 * Push & Pull rules for stock locations have been extended and integrated with multicompany,
 
-* Configure units of measure by reference unit, bigger then / smaller then reference unit,
+* Configure units of measure by reference unit, bigger than / smaller then reference unit,
 
 * Update stock level from the Product form and automatically create a physical inventory for it.
 
@@ -151,17 +165,25 @@
 
 *Accounting & Financial Management*
 
+<<<<<<< TREE
 .. i18n: * By default, only one Entry Sequence is available for a journal. If you want to use two sequences for your journal numbering, please install the :mod:`account_sequence` module,
 .. i18n: 
 .. i18n: * Separate numbering now also available for Bank Journals,
 .. i18n: 
 .. i18n: * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries, 
+=======
+.. i18n: * By default, only one Entry Sequence is available for a journal. If you want to have two sequences to be used for your journal numbering, please install the :mod:`account_sequence` module,
+.. i18n: 
+.. i18n: * Separate numbering is now also available for Bank Journals,
+.. i18n: 
+.. i18n: * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries,
+>>>>>>> MERGE-SOURCE
 .. i18n: 
 .. i18n: * Chart of Accounts and Chart of Taxes can be displayed for a selected period,
 .. i18n: 
-.. i18n: * OpenERP added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You shouldn't use both Invoicing and Accounting,
+.. i18n: * OpenERP has added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You should not use both Invoicing and Accounting,
 .. i18n: 
-.. i18n: * Use the Financial Management Configuration Wizard to easily select features you want to use.
+.. i18n: * Use the Financial Management Configuration Wizard to easily select features you want to use,
 .. i18n: 
 .. i18n: * On installation of a predefined Chart of Accounts, the wizard also proposes default bank and cash accounts, and default Sales and Purchase taxes,
 .. i18n: 
@@ -174,17 +196,25 @@
 .. i18n: * Cash Box, possible to keep a real cash register.
 ..
 
+<<<<<<< TREE
 * By default, only one Entry Sequence is available for a journal. If you want to use two sequences for your journal numbering, please install the :mod:`account_sequence` module,
 
 * Separate numbering now also available for Bank Journals,
 
 * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries, 
+=======
+* By default, only one Entry Sequence is available for a journal. If you want to have two sequences to be used for your journal numbering, please install the :mod:`account_sequence` module,
+
+* Separate numbering is now also available for Bank Journals,
+
+* Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries,
+>>>>>>> MERGE-SOURCE
 
 * Chart of Accounts and Chart of Taxes can be displayed for a selected period,
 
-* OpenERP added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You shouldn't use both Invoicing and Accounting,
+* OpenERP has added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You should not use both Invoicing and Accounting,
 
-* Use the Financial Management Configuration Wizard to easily select features you want to use.
+* Use the Financial Management Configuration Wizard to easily select features you want to use,
 
 * On installation of a predefined Chart of Accounts, the wizard also proposes default bank and cash accounts, and default Sales and Purchase taxes,
 
@@ -214,10 +244,10 @@
 
 * On creation of a new project, OpenERP automatically creates the corresponding Analytic Account in the Projects chart of accounts. You no longer have access to the analytic account from the Project.
 
-.. i18n: *Manufacturing Management* 
+.. i18n: *Manufacturing Management*
 ..
 
-*Manufacturing Management* 
+*Manufacturing Management*
 
 .. i18n: * Scrap consumed or finished goods and have the related stock moves automatically,
 .. i18n: 
@@ -235,12 +265,16 @@
 
 .. i18n: * Manage your evaluation process,
 .. i18n: 
-.. i18n: * Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments.
+.. i18n: * Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments,
+.. i18n: 
+.. i18n: * A complete integration of payroll management system with accounting application.
 ..
 
 * Manage your evaluation process,
 
-* Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments.
+* Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments,
+
+* A complete integration of payroll management system with accounting application.
 
 .. i18n: .. Copyright © Open Object Press. All rights reserved.
 ..

=== modified file 'i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst'
--- i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst	2011-07-25 16:42:59 +0000
+++ i18n/fr/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst	2012-10-01 15:56:24 +0000
@@ -1,40 +1,40 @@
 
 .. i18n: ****************************
-.. i18n: Getting started with OpenERP
+.. i18n: Getting Started with OpenERP
 .. i18n: ****************************
 ..
 
 ****************************
-Getting started with OpenERP
+Getting Started with OpenERP
 ****************************
 
 .. i18n: You will now explore the database \ ``openerp_ch02``\   with these profile modules installed to give
-.. i18n: you an insight into the coverage of the core Open ERP software.
+.. i18n: you an insight into the coverage of the core OpenERP software.
 ..
 
 You will now explore the database \ ``openerp_ch02``\   with these profile modules installed to give
-you an insight into the coverage of the core Open ERP software.
+you an insight into the coverage of the core OpenERP software.
 
-.. i18n: .. tip:: Translating new modules
+.. i18n: .. tip:: Translating New Modules
 .. i18n: 
-.. i18n: 	When you have installed a new module and are using additional languages to English you have to reload
+.. i18n: 	When you have installed a new module and are using additional languages to English, you have to reload
 .. i18n: 	the translation file. New terms introduced in these modules are not translated by default. To do
 .. i18n: 	this use :menuselection:`Administration --> Translations --> Load an Official Translation`.
 ..
 
-.. tip:: Translating new modules
+.. tip:: Translating New Modules
 
-	When you have installed a new module and are using additional languages to English you have to reload
+	When you have installed a new module and are using additional languages to English, you have to reload
 	the translation file. New terms introduced in these modules are not translated by default. To do
 	this use :menuselection:`Administration --> Translations --> Load an Official Translation`.
 
-.. i18n: Depending on the user you are connected as the page appears differently.
+.. i18n: Depending on the user you are connected as, the page appears differently.
 .. i18n: Using the installation sequence above, certain dashboards may be assigned as various
 .. i18n: users' home pages. They show a summary of the information required to start the day effectively. A
 .. i18n: project dashboard might contain:
 ..
 
-Depending on the user you are connected as the page appears differently.
+Depending on the user you are connected as, the page appears differently.
 Using the installation sequence above, certain dashboards may be assigned as various
 users' home pages. They show a summary of the information required to start the day effectively. A
 project dashboard might contain:
@@ -68,31 +68,31 @@
 
 * a graph of Open Issues by Creation Date.
 
-.. i18n: Each of the lists can be reordered simply by clicking the heading of a column – first in ascending then in descending order as you click repeatedly. To get more information about any particular entry click on the name in the first column, or if you want to show a particular panel click :guilabel:`Zoom` above it.
+.. i18n: Each of the lists can be reordered simply by clicking the heading of a column – first in ascending, then in descending order as you click repeatedly. To get more information about any particular entry, click on the name in the first column, or if you want to show a particular panel, click :guilabel:`Zoom` above it.
 ..
 
-Each of the lists can be reordered simply by clicking the heading of a column – first in ascending then in descending order as you click repeatedly. To get more information about any particular entry click on the name in the first column, or if you want to show a particular panel click :guilabel:`Zoom` above it.
+Each of the lists can be reordered simply by clicking the heading of a column – first in ascending, then in descending order as you click repeatedly. To get more information about any particular entry, click on the name in the first column, or if you want to show a particular panel, click :guilabel:`Zoom` above it.
 
 .. i18n: .. figure:: images/admin_project_dashboard.png
 .. i18n:    :align: center
-.. i18n:    :scale: 75
+.. i18n:    :scale: 65
 .. i18n: 
 .. i18n:    *Project Dashboard*
 ..
 
 .. figure:: images/admin_project_dashboard.png
    :align: center
-   :scale: 75
+   :scale: 65
 
    *Project Dashboard*
 
 .. i18n: A user's home page is automatically reassigned during the creation or upgrading of a database. It is
-.. i18n: custom to assign a dashboard to someone's home page but any OpenERP screen can be assigned to the
+.. i18n: customary to assign a dashboard to someone's home page, but any OpenERP screen can be assigned to the
 .. i18n: home page of any user.
 ..
 
 A user's home page is automatically reassigned during the creation or upgrading of a database. It is
-custom to assign a dashboard to someone's home page but any OpenERP screen can be assigned to the
+customary to assign a dashboard to someone's home page, but any OpenERP screen can be assigned to the
 home page of any user.
 
 .. i18n: .. index::
@@ -102,24 +102,24 @@
 .. index::
    single: shortcut
 
-.. i18n: .. tip:: Creating shortcuts
+.. i18n: .. tip:: Creating Shortcuts
 .. i18n: 
 .. i18n: 	Each user has access to many menu items from the menu. But in
-.. i18n: 	general an employee uses only a small part of the system's functions.
+.. i18n: 	general, an employee uses only a small part of the system's functions.
 .. i18n: 
 .. i18n: 	So you can define shortcuts for the most-used menus. These shortcuts are personal for each user. To
-.. i18n: 	create a new shortcut just click the '*' of the header of the view in web client.
+.. i18n: 	create a new shortcut, just click the '*' of the header of the view in web client.
 .. i18n: 
 .. i18n: 	To remove a shortcut just click the link and again click '*' of the header of the view.
 ..
 
-.. tip:: Creating shortcuts
+.. tip:: Creating Shortcuts
 
 	Each user has access to many menu items from the menu. But in
-	general an employee uses only a small part of the system's functions.
+	general, an employee uses only a small part of the system's functions.
 
 	So you can define shortcuts for the most-used menus. These shortcuts are personal for each user. To
-	create a new shortcut just click the '*' of the header of the view in web client.
+	create a new shortcut, just click the '*' of the header of the view in web client.
 
 	To remove a shortcut just click the link and again click '*' of the header of the view.
 
@@ -171,11 +171,11 @@
 .. index::
    single: partner; search
 
-.. i18n: Search for a partner
+.. i18n: Search for a Partner
 .. i18n: ^^^^^^^^^^^^^^^^^^^^
 ..
 
-Search for a partner
+Search for a Partner
 ^^^^^^^^^^^^^^^^^^^^
 
 .. i18n: Above the partner list you will see a search form that enables you to quickly filter the partners.
@@ -183,10 +183,10 @@
 
 Above the partner list you will see a search form that enables you to quickly filter the partners.
 
-.. i18n: The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons this list shows only the first few partners. If you want to display other records you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
+.. i18n: The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons, this list shows only the first few partners. If you want to display other records, you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
 ..
 
-The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons this list shows only the first few partners. If you want to display other records you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
+The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons, this list shows only the first few partners. If you want to display other records, you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
 
 .. i18n: .. figure:: images/partner_search_tab.png
 .. i18n:    :scale: 75
@@ -201,42 +201,42 @@
 
    *Standard partner search*
 
-.. i18n: .. note:: List limits
+.. i18n: .. note:: List Limits
 .. i18n: 
-.. i18n: 	By default the list in the GTK client shows only the first 80 records, to avoid overloading the
+.. i18n: 	By default, the list in the GTK client shows only the first 80 records, to avoid overloading the
 .. i18n: 	network and the server.
 .. i18n: 
 .. i18n: 	But you can change that limit by clicking the selection widget (showing 80 by default) to the
 .. i18n: 	right of the search criteria.
 .. i18n: 
-.. i18n: 	Similarly the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
+.. i18n: 	Similarly, the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
 .. i18n: 
 .. i18n: 	The actual number can be switched by clicking the link between the PREVIOUS and NEXT buttons
 .. i18n: 	and selecting one of the other limits.
 ..
 
-.. note:: List limits
+.. note:: List Limits
 
-	By default the list in the GTK client shows only the first 80 records, to avoid overloading the
+	By default, the list in the GTK client shows only the first 80 records, to avoid overloading the
 	network and the server.
 
 	But you can change that limit by clicking the selection widget (showing 80 by default) to the
 	right of the search criteria.
 
-	Similarly the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
+	Similarly, the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
 
 	The actual number can be switched by clicking the link between the PREVIOUS and NEXT buttons
 	and selecting one of the other limits.
 
 .. i18n: In the web version, if you click the name of a partner, the form view corresponding to that partner opens in Read-Only
 .. i18n: mode. In the list you could alternatively click the pencil icon to open the same form in Edit mode.
-.. i18n: Once you have a form you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
+.. i18n: Once you have a form, you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
 .. i18n: Edit mode and :guilabel:`Edit` when in Read-Only mode.
 ..
 
 In the web version, if you click the name of a partner, the form view corresponding to that partner opens in Read-Only
 mode. In the list you could alternatively click the pencil icon to open the same form in Edit mode.
-Once you have a form you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
+Once you have a form, you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
 Edit mode and :guilabel:`Edit` when in Read-Only mode.
 
 .. i18n: .. index::
@@ -246,11 +246,11 @@
 .. index::
    single: partner; view form
 
-.. i18n: Partner form
+.. i18n: Partner Form
 .. i18n: ^^^^^^^^^^^^
 ..
 
-Partner form
+Partner Form
 ^^^^^^^^^^^^
 
 .. i18n: The partner form contains several tabs, all referring to the current record:
@@ -363,19 +363,19 @@
 .. index::
    single: buttons; reports, actions, links
 
-.. i18n: .. tip:: Reports, Actions and Links in the GTK client
+.. i18n: .. tip:: Reports, Actions and Links in the GTK Client
 .. i18n: 
 .. i18n: 	When you are viewing a form in the GTK client, the buttons to the right of the form are shortcuts to
 .. i18n: 	the same Reports, Actions and Links as described in the text. When you are viewing a list (such as
-.. i18n: 	the partner list) those buttons are not available to you. Instead, you can reach Reports and Actions
+.. i18n: 	the partner list), those buttons are not available to you. Instead, you can reach Reports and Actions
 .. i18n: 	through two of the buttons in the toolbar at the top of the list – Print and Action.
 ..
 
-.. tip:: Reports, Actions and Links in the GTK client
+.. tip:: Reports, Actions and Links in the GTK Client
 
 	When you are viewing a form in the GTK client, the buttons to the right of the form are shortcuts to
 	the same Reports, Actions and Links as described in the text. When you are viewing a list (such as
-	the partner list) those buttons are not available to you. Instead, you can reach Reports and Actions
+	the partner list), those buttons are not available to you. Instead, you can reach Reports and Actions
 	through two of the buttons in the toolbar at the top of the list – Print and Action.
 
 .. i18n: Partners are used throughout the OpenERP system in other documents. For example, the menu
@@ -385,7 +385,7 @@
 Partners are used throughout the OpenERP system in other documents. For example, the menu
 :menuselection:`Sales --> Sales Orders` brings up all the Sales Orders in list view. Open an order in form view and click the name of a partner, even when the form is read-only. The Partner form will open.
 
-.. i18n: .. tip:: Right-clicks and shortcuts
+.. i18n: .. tip:: Right-clicks and Shortcuts
 .. i18n: 
 .. i18n: 	In the GTK client you do not get hyperlinks to other document types. Instead, you can right-click in
 .. i18n: 	a list view to show the linked fields (that is fields having a link to other forms) on that line.
@@ -402,7 +402,7 @@
 .. i18n: 	both read-only and in edit mode, or with the GTK client.
 ..
 
-.. tip:: Right-clicks and shortcuts
+.. tip:: Right-clicks and Shortcuts
 
 	In the GTK client you do not get hyperlinks to other document types. Instead, you can right-click in
 	a list view to show the linked fields (that is fields having a link to other forms) on that line.
@@ -419,14 +419,14 @@
 	both read-only and in edit mode, or with the GTK client.
 
 .. i18n: .. figure:: images/familiarization_sale_partner.png
-.. i18n:    :scale: 75
+.. i18n:    :scale: 85
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Links for a partner appear in an order form*
 ..
 
 .. figure:: images/familiarization_sale_partner.png
-   :scale: 75
+   :scale: 85
    :align: center
 
    *Links for a partner appear in an order form*
@@ -454,10 +454,10 @@
 In OpenERP, `product` is used to define a raw material, a stockable product, a consumable or a service. You can
 work with whole products or with templates that separate the definition of products and variants (*extra module*).
 
-.. i18n: For example if you sell t-shirts in different sizes and colors:
+.. i18n: For example, if you sell t-shirts in different sizes and colors:
 ..
 
-For example if you sell t-shirts in different sizes and colors:
+For example, if you sell t-shirts in different sizes and colors:
 
 .. i18n: * the product template is the “T-shirt” which contains information common to all sizes and all
 .. i18n:   colors,
@@ -465,7 +465,7 @@
 .. i18n: * the variants are “Size:S” and “Color:Red”, which define the parameters for that size and
 .. i18n:   color,
 .. i18n: 
-.. i18n: * the final product is thus the combination of the two – t-shirt in size S and color Red.
+.. i18n: * the final product is thus the combination of the two – T-shirt in size S and color Red.
 ..
 
 * the product template is the “T-shirt” which contains information common to all sizes and all
@@ -474,16 +474,16 @@
 * the variants are “Size:S” and “Color:Red”, which define the parameters for that size and
   color,
 
-* the final product is thus the combination of the two – t-shirt in size S and color Red.
+* the final product is thus the combination of the two – T-shirt in size S and color Red.
 
-.. i18n: The value of this approach for some sectors is that you can just define a template in detail and all
-.. i18n: of its available variants briefly rather than every item as an entire product.
+.. i18n: The value of this approach, for some sectors, is that you can just define a template in detail and all
+.. i18n: of its available variants briefly, rather than every item as an entire product.
 ..
 
-The value of this approach for some sectors is that you can just define a template in detail and all
-of its available variants briefly rather than every item as an entire product.
+The value of this approach, for some sectors, is that you can just define a template in detail and all
+of its available variants briefly, rather than every item as an entire product.
 
-.. i18n: 	.. note::  *Example Product templates and variants*
+.. i18n: 	.. note::  *Example Product Templates and Variants*
 .. i18n: 
 .. i18n: 			A product can be defined as a whole or as a product template and several variants. The variants
 .. i18n: 			can be in one or several dimensions, depending on the installed modules.
@@ -504,11 +504,11 @@
 .. i18n: 			This separation of variant types requires the optional module :mod:`product_variant_multi`.
 .. i18n: 			Using it
 .. i18n: 			means that you can avoid an explosion in the number of products to manage in the database. If you
-.. i18n: 			take the example above it is easier to manage a template with 15 variants in four different types
+.. i18n: 			take the example above, it is easier to manage a template with 15 variants in four different types
 .. i18n: 			than 160 completely different products. This module is available in ``extra-addons``.
 ..
 
-	.. note::  *Example Product templates and variants*
+	.. note::  *Example Product Templates and Variants*
 
 			A product can be defined as a whole or as a product template and several variants. The variants
 			can be in one or several dimensions, depending on the installed modules.
@@ -529,7 +529,7 @@
 			This separation of variant types requires the optional module :mod:`product_variant_multi`.
 			Using it
 			means that you can avoid an explosion in the number of products to manage in the database. If you
-			take the example above it is easier to manage a template with 15 variants in four different types
+			take the example above, it is easier to manage a template with 15 variants in four different types
 			than 160 completely different products. This module is available in ``extra-addons``.
 
 .. i18n: The :menuselection:`Sales --> Products` menu gives you access to the definition of products and their templates and variants.
@@ -546,7 +546,7 @@
 
 .. i18n: .. tip::  Consumables
 .. i18n: 
-.. i18n: 	In OpenERP a consumable is a physical product which is treated like a stockable product, with the exception
+.. i18n: 	In OpenERP, a consumable is a physical product which is treated like a stockable product, with the exception
 .. i18n: 	that stock management is not taken into account by the system. You could buy it, deliver it or
 .. i18n: 	produce it but OpenERP will always assume that there is enough of it in stock. It never triggers a
 .. i18n: 	procurement exception.
@@ -554,7 +554,7 @@
 
 .. tip::  Consumables
 
-	In OpenERP a consumable is a physical product which is treated like a stockable product, with the exception
+	In OpenERP, a consumable is a physical product which is treated like a stockable product, with the exception
 	that stock management is not taken into account by the system. You could buy it, deliver it or
 	produce it but OpenERP will always assume that there is enough of it in stock. It never triggers a
 	procurement exception.
@@ -808,11 +808,11 @@
 =================
 
 .. i18n: The chapters in :ref:`part-genacct` in this book are dedicated to general and analytic accounting.
-.. i18n: A brief overview of the functions to introduce you to this Business Application.
+.. i18n: Following is a  brief overview of the functions to introduce you to this Business Application.
 ..
 
 The chapters in :ref:`part-genacct` in this book are dedicated to general and analytic accounting.
-A brief overview of the functions to introduce you to this Business Application.
+Following is a  brief overview of the functions to introduce you to this Business Application.
 
 .. i18n: Accounting is totally integrated into all of the company's functions, whether it is general,
 .. i18n: analytic, budgetary or auxiliary accounting. OpenERP's accounting function is double-entry and
@@ -836,15 +836,15 @@
 documents are being processed. You can avoid entering data twice in OpenERP, which is commonly a
 source of errors and delays.
 
-.. i18n: So OpenERP's accounting is not just for financial reporting – it is also the anchorpoint for many
-.. i18n: of a company's management processes. For example if one of your accountants puts a customer on
-.. i18n: credit hold then that will immediately block any other action related to that company's credit (such
+.. i18n: So OpenERP's accounting is not just for financial reporting – it is also the anchor-point for many
+.. i18n: of the company's management processes. For example, if one of your accountants puts a customer on
+.. i18n: credit hold, then that will immediately block any other action related to that company's credit (such
 .. i18n: as sales or delivery).
 ..
 
-So OpenERP's accounting is not just for financial reporting – it is also the anchorpoint for many
-of a company's management processes. For example if one of your accountants puts a customer on
-credit hold then that will immediately block any other action related to that company's credit (such
+So OpenERP's accounting is not just for financial reporting – it is also the anchor-point for many
+of the company's management processes. For example, if one of your accountants puts a customer on
+credit hold, then that will immediately block any other action related to that company's credit (such
 as sales or delivery).
 
 .. i18n: OpenERP also provides integrated analytical accounting, which enables management by business
@@ -858,10 +858,10 @@
 based on business management needs, rather than on the charts of accounts that generally meet only
 statutory requirements.
 
-.. i18n: OpenERP added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller business to keep track of their payments without having to implement a complete accounting system.
+.. i18n: OpenERP has added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller businesses to keep track of their payments without having to implement a complete accounting system.
 ..
 
-OpenERP added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller business to keep track of their payments without having to implement a complete accounting system.
+OpenERP has added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller businesses to keep track of their payments without having to implement a complete accounting system.
 
 .. i18n: Keep track of your Cash Moves by using the new OpenERP Cash Box.
 ..
@@ -923,12 +923,12 @@
    single: modules; hr_
    single: module; hr
 
-.. i18n: Most of these functions are provided from optional modules whose name starts with \ ``hr_``\
+.. i18n: Most of these functions are provided from optional modules whose name starts with \ ``hr_`` \
 .. i18n: rather than the core :mod:`hr` module, but they are all loaded into the main :menuselection:`Human
 .. i18n: Resources` menu.
 ..
 
-Most of these functions are provided from optional modules whose name starts with \ ``hr_``\
+Most of these functions are provided from optional modules whose name starts with \ ``hr_`` \
 rather than the core :mod:`hr` module, but they are all loaded into the main :menuselection:`Human
 Resources` menu.
 
@@ -966,14 +966,14 @@
 All projects are hierarchically structured. You can review all of the projects from the menu :menuselection:`Project --> Projects`. Then select :guilabel:`Gantt view` to obtain a graphical representation of the project.
 
 .. i18n: .. figure:: images/project_gantt.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Project Planning*
 ..
 
 .. figure:: images/project_gantt.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Project Planning*
@@ -1144,13 +1144,13 @@
 has a counterpart somewhere.
 
 .. i18n: Most stock management software is limited to generating lists of products in warehouses. Because of
-.. i18n: its double-entry system OpenERP automatically manages customer and suppliers stocks as well, which
+.. i18n: its double-entry system, OpenERP automatically manages customer and suppliers stocks as well, which
 .. i18n: has many advantages: complete traceability from supplier to customer, management of consigned stock,
 .. i18n: and analysis of counterpart stock moves.
 ..
 
 Most stock management software is limited to generating lists of products in warehouses. Because of
-its double-entry system OpenERP automatically manages customer and suppliers stocks as well, which
+its double-entry system, OpenERP automatically manages customer and suppliers stocks as well, which
 has many advantages: complete traceability from supplier to customer, management of consigned stock,
 and analysis of counterpart stock moves.
 
@@ -1170,17 +1170,17 @@
    single: Production Management
    single: Manufacturing
 
-.. i18n: Get Manufacturing done
+.. i18n: Get Manufacturing Done
 .. i18n: ======================
 ..
 
-Get Manufacturing done
+Get Manufacturing Done
 ======================
 
-.. i18n: OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute subassemblies dynamically, at the time of sales ordering. You can create virtual subassemblies for re-use on several products with phantom bills of materials.
+.. i18n: OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute sub-assemblies dynamically, at the time of sales ordering. You can create virtual sub-assemblies for re-use on several products with phantom bills of materials.
 ..
 
-OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute subassemblies dynamically, at the time of sales ordering. You can create virtual subassemblies for re-use on several products with phantom bills of materials.
+OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute sub-assemblies dynamically, at the time of sales ordering. You can create virtual sub-assemblies for re-use on several products with phantom bills of materials.
 
 .. i18n: .. index::
 .. i18n:    single: bill of materials
@@ -1191,7 +1191,7 @@
    single: bill of materials
    single: BOM
 
-.. i18n: .. note:: BOMs, routing, workcenters
+.. i18n: .. note:: BOMs, Routing, Workcenters
 .. i18n: 
 .. i18n: 	These documents describe the materials that make up a larger assembly. They are commonly called
 .. i18n: 	Bills of Materials or BOMs.
@@ -1202,7 +1202,7 @@
 .. i18n: 	Each operation is carried out at a workcenter, which can be a machine or a person.
 ..
 
-.. note:: BOMs, routing, workcenters
+.. note:: BOMs, Routing, Workcenters
 
 	These documents describe the materials that make up a larger assembly. They are commonly called
 	Bills of Materials or BOMs.
@@ -1295,10 +1295,10 @@
 Measure your Business Performance
 =================================
 
-.. i18n: To measure your business performance OpenERP provides two interesting features:
+.. i18n: To measure your business performance OpenERP, provides two interesting features:
 ..
 
-To measure your business performance OpenERP provides two interesting features:
+To measure your business performance OpenERP, provides two interesting features:
 
 .. i18n: * Dashboards
 .. i18n: * Statistical Reports
@@ -1308,34 +1308,34 @@
 * Statistical Reports
 
 .. i18n: On a single page, Dashboards give you an overview of all the information that is important to you.
-.. i18n: In OpenERP each application has its own dashboard which opens by default when you select the specific application.
-.. i18n: As for example `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
+.. i18n: In OpenERP, each application has its own dashboard which opens by default when you select the specific application.
+.. i18n: For example, `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
 ..
 
 On a single page, Dashboards give you an overview of all the information that is important to you.
-In OpenERP each application has its own dashboard which opens by default when you select the specific application.
-As for example `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
+In OpenERP, each application has its own dashboard which opens by default when you select the specific application.
+For example, `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
 
 .. i18n: .. note:: Dashboards
 .. i18n: 
-.. i18n: 	Unlike most other ERP systems and classic statistically-based systems,
+.. i18n: 	Unlike most other ERP systems and classic statistic-based systems,
 .. i18n: 	OpenERP can provide dashboards for all system users, and not just managers and accountants.
 .. i18n: 
 .. i18n: 	Each user can have his own dashboard, adapted to his needs,
 .. i18n: 	enabling him to manage his own work effectively.
-.. i18n: 	For example a developer using the :guilabel:`Project Dashboard` can see information such
+.. i18n: 	For example, a developer using the :guilabel:`Project Dashboard` can see information such
 .. i18n: 	as a list of open tasks, tasks delegated to him and an analysis of the progress of
 .. i18n: 	the relevant projects.
 ..
 
 .. note:: Dashboards
 
-	Unlike most other ERP systems and classic statistically-based systems,
+	Unlike most other ERP systems and classic statistic-based systems,
 	OpenERP can provide dashboards for all system users, and not just managers and accountants.
 
 	Each user can have his own dashboard, adapted to his needs,
 	enabling him to manage his own work effectively.
-	For example a developer using the :guilabel:`Project Dashboard` can see information such
+	For example, a developer using the :guilabel:`Project Dashboard` can see information such
 	as a list of open tasks, tasks delegated to him and an analysis of the progress of
 	the relevant projects.
 
@@ -1353,25 +1353,25 @@
 
 Dashboards can be customized to fit the needs of each user and each company.
 
-.. i18n: .. note:: Creating or customizing dashboards
+.. i18n: .. note:: Creating or Customizing Dashboards
 .. i18n: 
 .. i18n: 	OpenERP contains a Dashboard Editor. Create your own dashboard to fit your
 .. i18n: 	specific needs in only a few clicks. Go to the :menuselection:`Administration --> Customization --> Reporting --> Dashboard Definition` menu to define your own dashboard.
 ..
 
-.. note:: Creating or customizing dashboards
+.. note:: Creating or Customizing Dashboards
 
 	OpenERP contains a Dashboard Editor. Create your own dashboard to fit your
 	specific needs in only a few clicks. Go to the :menuselection:`Administration --> Customization --> Reporting --> Dashboard Definition` menu to define your own dashboard.
 
-.. i18n: The `Statistical Analysis` is one of the crucial thing for decision making process in any business. The OpenERP provides
-.. i18n: Statistical Reports for each application. As for example you can access the statistical analysis of Sales-related information
+.. i18n: The `Statistical Analysis` is one of the crucial thing for decision making process in any business. OpenERP provides
+.. i18n: Statistical Reports for each application. For example, you can access the statistical analysis of Sales-related information
 .. i18n: from the menu :menuselection:`Sales --> Reporting --> Sales Analysis`. You can search and group the data using this
 .. i18n: `Statistical Report`.
 ..
 
-The `Statistical Analysis` is one of the crucial thing for decision making process in any business. The OpenERP provides
-Statistical Reports for each application. As for example you can access the statistical analysis of Sales-related information
+The `Statistical Analysis` is one of the crucial thing for decision making process in any business. OpenERP provides
+Statistical Reports for each application. For example, you can access the statistical analysis of Sales-related information
 from the menu :menuselection:`Sales --> Reporting --> Sales Analysis`. You can search and group the data using this
 `Statistical Report`.
 
@@ -1392,14 +1392,14 @@
 then click the :guilabel:`?` button above its form to see the full process.
 
 .. i18n: .. figure:: images/guided_tour_process.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 55
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Process for a Sales Order*
 ..
 
 .. figure:: images/guided_tour_process.png
-   :scale: 50
+   :scale: 55
    :align: center
 
    *Process for a Sales Order*
@@ -1427,14 +1427,14 @@
 the :guilabel:`Print Workflow` or the :guilabel:`Print Workflow (Complex)` option.
 
 .. i18n: .. figure:: images/purchase_workflow.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Workflow for a Purchase Order*
 ..
 
 .. figure:: images/purchase_workflow.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Workflow for a Purchase Order*
@@ -1446,11 +1446,11 @@
 Alongside the document management system, the process visualization features make OpenERP
 far better for documentation than similar systems.
 
-.. i18n: Need more?
+.. i18n: Need More?
 .. i18n: ==========
 ..
 
-Need more?
+Need More?
 ==========
 
 .. i18n: You have been guided through a brisk, brief overview of many of the main functional areas of OpenERP.
@@ -1607,10 +1607,10 @@
    Ctrl+Esc      Close window without Saving
    ============  ===============================
 
-.. i18n: * Shortcuts in relation field
+.. i18n: * Shortcuts in a relation field
 ..
 
-* Shortcuts in relation field
+* Shortcuts in a relation field
 
 .. i18n: .. table::
 .. i18n: 
@@ -1708,14 +1708,14 @@
 menu :menuselection:`Project --> Reporting --> Tasks Analysis` when you have installed the `Project Management` module.
 
 .. i18n: .. figure:: images/filter_task_analysis.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 75
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Task Analysis*
 ..
 
 .. figure:: images/filter_task_analysis.png
-   :scale: 50
+   :scale: 75
    :align: center
 
    *Task Analysis*
@@ -1730,10 +1730,10 @@
 
 You can filter the information of a task according to the Group by features.
 
-.. i18n: Click for instance the `Stage` button in Group by, and then click Task to analyse your tasks by stage and then by task.
+.. i18n: Click, for instance, the `Stage` button in Group by, and then click `Task` to analyse your tasks by stage and then by task.
 ..
 
-Click for instance the `Stage` button in Group by, and then click Task to analyse your tasks by stage and then by task.
+Click, for instance, the `Stage` button in Group by, and then click `Task` to analyse your tasks by stage and then by task.
 
 .. i18n: This `Advanced Search View` can also be attached to any `List View` of an object and hence increase the
 .. i18n: search facility when a user looks up the record in list view.
@@ -1743,14 +1743,14 @@
 search facility when a user looks up the record in list view.
 
 .. i18n: .. figure:: images/filter_task_list_view.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 75
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Search the Tasks which are `In Progress` with Group by Project and State*
 ..
 
 .. figure:: images/filter_task_list_view.png
-   :scale: 50
+   :scale: 75
    :align: center
 
    *Search the Tasks which are `In Progress` with Group by Project and State*

=== modified file 'i18n/fr/source/book/4/4_11_HR/4_11_HR_timesheet.rst'
--- i18n/fr/source/book/4/4_11_HR/4_11_HR_timesheet.rst	2011-07-25 16:38:07 +0000
+++ i18n/fr/source/book/4/4_11_HR/4_11_HR_timesheet.rst	2012-10-01 15:56:24 +0000
@@ -68,7 +68,7 @@
 .. index::
    pair: cost; allocation
 
-.. i18n: .. note:: Don't confuse timesheets and attendence compliance
+.. i18n: .. note:: Don't confuse timesheets and attendance compliance
 .. i18n: 
 .. i18n: 	The timesheet system is not intended to be a disguised attendance form. There is no control over the
 .. i18n: 	service times and the employee is free to encode 8 or 9 hours or more of services each day if they
@@ -79,7 +79,7 @@
 .. i18n: 	they'll be entering – but to track the tasks running and the allocation of costs between them.
 ..
 
-.. note:: Don't confuse timesheets and attendence compliance
+.. note:: Don't confuse timesheets and attendance compliance
 
 	The timesheet system is not intended to be a disguised attendance form. There is no control over the
 	service times and the employee is free to encode 8 or 9 hours or more of services each day if they

=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst'
--- i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst	1970-01-01 00:00:00 +0000
+++ i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,757 @@
+
+.. i18n: Manufacturing Orders
+.. i18n: ====================
+..
+
+Manufacturing Orders
+====================
+
+.. i18n: Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route according to the needs of the company.
+..
+
+Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route according to the needs of the company.
+
+.. i18n: Production orders can be proposed automatically by the system depending on several criteria described in the preceding chapter:
+..
+
+Production orders can be proposed automatically by the system depending on several criteria described in the preceding chapter:
+
+.. i18n: * Using the ``Make to Order`` rules,
+.. i18n: 
+.. i18n: * Using the ``Order Point`` (Minimum Stock) rules,
+.. i18n: 
+.. i18n: * Using the Production plan.
+..
+
+* Using the ``Make to Order`` rules,
+
+* Using the ``Order Point`` (Minimum Stock) rules,
+
+* Using the Production plan.
+
+.. i18n: Of course, you can also start production manually by clicking the button :guilabel:`New` in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+..
+
+Of course, you can also start production manually by clicking the button :guilabel:`New` in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+
+.. i18n: .. figure:: images/mrp_manual.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Manufacturing Order*
+..
+
+.. figure:: images/mrp_manual.png
+   :scale: 75
+   :align: center
+
+   *Manufacturing Order*
+
+.. i18n: .. index::
+.. i18n:    single: module; mrp_jit
+..
+
+.. index::
+   single: module; mrp_jit
+
+.. i18n: If you have not installed the Just-in-Time planning module :mod:`mrp_jit`, you should start using OpenERP to schedule the Production Orders automatically using the various system rules. To do this, use the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+..
+
+If you have not installed the Just-in-Time planning module :mod:`mrp_jit`, you should start using OpenERP to schedule the Production Orders automatically using the various system rules. To do this, use the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+
+.. i18n: .. tip:: Procurement Exceptions
+.. i18n: 
+.. i18n:         Pay attention to the fact that you have to define `minimum stock rules` for each product set as ``Make to Stock``.
+..
+
+.. tip:: Procurement Exceptions
+
+        Pay attention to the fact that you have to define `minimum stock rules` for each product set as ``Make to Stock``.
+
+.. i18n: Complete Production Workflow
+.. i18n: ============================
+..
+
+Complete Production Workflow
+============================
+
+.. i18n: To understand the usefulness and the functioning of the system you should test a complete workflow
+.. i18n: on the database installed with the demonstration data. We will show you:
+..
+
+To understand the usefulness and the functioning of the system you should test a complete workflow
+on the database installed with the demonstration data. We will show you:
+
+.. i18n: * How to create a sales order,
+.. i18n: 
+.. i18n: * The manufacturing workflow for an intermediate product,
+.. i18n: 
+.. i18n: * The manufacturing of an ordered product,
+.. i18n: 
+.. i18n: * The delivery of products to a customer,
+.. i18n: 
+.. i18n: * Invoicing at the end of the month,
+.. i18n: 
+.. i18n: * Traceability for after-sales service.
+..
+
+* How to create a sales order,
+
+* The manufacturing workflow for an intermediate product,
+
+* The manufacturing of an ordered product,
+
+* The delivery of products to a customer,
+
+* Invoicing at the end of the month,
+
+* Traceability for after-sales service.
+
+.. i18n: .. tip:: Demonstration data
+.. i18n: 
+.. i18n:     To exactly follow the workflow as shown below, you should keep the same quantities as in the
+.. i18n:     example and start from a new database. Then you will not run into exceptions resulting from a lack of stock.
+..
+
+.. tip:: Demonstration data
+
+    To exactly follow the workflow as shown below, you should keep the same quantities as in the
+    example and start from a new database. Then you will not run into exceptions resulting from a lack of stock.
+
+.. i18n: This more advanced case of handling problems in procurement will be sorted out later in the chapter.
+..
+
+This more advanced case of handling problems in procurement will be sorted out later in the chapter.
+
+.. i18n: To be able to do the following step, add ``Sales Management`` through the Reconfigure wizard.
+..
+
+To be able to do the following step, add ``Sales Management`` through the Reconfigure wizard.
+
+.. i18n: The Sales Order
+.. i18n: +++++++++++++++
+..
+
+The Sales Order
++++++++++++++++
+
+.. i18n: .. index:: quotation
+.. i18n: .. index:: sales order
+..
+
+.. index:: quotation
+.. index:: sales order
+
+.. i18n: Begin by encoding a sales (or customer) order through the menu :menuselection:`Sales --> Sales Orders -> New Quotation`. Enter the following information:
+..
+
+Begin by encoding a sales (or customer) order through the menu :menuselection:`Sales --> Sales Orders -> New Quotation`. Enter the following information:
+
+.. i18n: * :guilabel:`Customer` : Agrolait,
+.. i18n: 
+.. i18n: * :guilabel:`Shipping Policy` : Invoice from the picking (``Other Information`` tab),
+.. i18n: 
+.. i18n: * :guilabel:`Sales Order Lines`, click `New`:
+.. i18n: 
+.. i18n:   * :guilabel:`Product` : PC2 – Basic PC (assembly on order),
+.. i18n: 
+.. i18n:   * :guilabel:`Quantity (UoM)` : 1,
+.. i18n: 
+.. i18n:   * :guilabel:`Product UoM` : PCE,
+.. i18n: 
+.. i18n:   * :guilabel:`Procurement Method` : on order.
+..
+
+* :guilabel:`Customer` : Agrolait,
+
+* :guilabel:`Shipping Policy` : Invoice from the picking (``Other Information`` tab),
+
+* :guilabel:`Sales Order Lines`, click `New`:
+
+  * :guilabel:`Product` : PC2 – Basic PC (assembly on order),
+
+  * :guilabel:`Quantity (UoM)` : 1,
+
+  * :guilabel:`Product UoM` : PCE,
+
+  * :guilabel:`Procurement Method` : on order.
+
+.. i18n: Once the quotation has been entered, you can confirm it immediately by clicking the button
+.. i18n: :guilabel:`Confirm Order` at the bottom to the right. Keep note of the order reference because this
+.. i18n: follows all through the process. Usually, in a new database, this will be ``SO007`` . At this stage,
+.. i18n: you can look at the process linked to your order using the :guilabel:`Question Mark` button next to the ``Sales Orders`` title.
+..
+
+Once the quotation has been entered, you can confirm it immediately by clicking the button
+:guilabel:`Confirm Order` at the bottom to the right. Keep note of the order reference because this
+follows all through the process. Usually, in a new database, this will be ``SO007`` . At this stage,
+you can look at the process linked to your order using the :guilabel:`Question Mark` button next to the ``Sales Orders`` title.
+
+.. i18n: .. figure:: images/mrp_sales_process_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Process for Handling Sales Order SO007*
+..
+
+.. figure:: images/mrp_sales_process_new.png
+   :scale: 75
+   :align: center
+
+   *Process for Handling Sales Order SO007*
+
+.. i18n: Start the requirements calculation using the menu :menuselection:`Manufacturing --> Compute All Schedulers`.
+..
+
+Start the requirements calculation using the menu :menuselection:`Manufacturing --> Compute All Schedulers`.
+
+.. i18n: .. index::
+.. i18n:    single: semi-finished product
+..
+
+.. index::
+   single: semi-finished product
+
+.. i18n: Producing an Intermediate Product
+.. i18n: +++++++++++++++++++++++++++++++++
+..
+
+Producing an Intermediate Product
++++++++++++++++++++++++++++++++++
+
+.. i18n: To understand the implications of requirements calculation, you should know the configuration of the sold product. To do this, go to the form for product PC2 and click the link :guilabel:`Product BoM Structure` to the right. You get the scheme shown in :ref:`fig-mrpbomtree` which is the composition of the selected product.
+..
+
+To understand the implications of requirements calculation, you should know the configuration of the sold product. To do this, go to the form for product PC2 and click the link :guilabel:`Product BoM Structure` to the right. You get the scheme shown in :ref:`fig-mrpbomtree` which is the composition of the selected product.
+
+.. i18n: .. _fig-mrpbomtree:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_product_bom_tree_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Composition of PC2*
+..
+
+.. _fig-mrpbomtree:
+
+.. figure:: images/mrp_product_bom_tree_new.png
+   :scale: 75
+   :align: center
+
+   *Composition of PC2*
+
+.. i18n: The PC2 computer has to be manufactured in two steps:
+..
+
+The PC2 computer has to be manufactured in two steps:
+
+.. i18n: 1: The intermediate product: CPU_GEN
+..
+
+1: The intermediate product: CPU_GEN
+
+.. i18n: 2: The finished product using that intermediate product: PC2
+..
+
+2: The finished product using that intermediate product: PC2
+
+.. i18n: The manufacturing supervisor can then consult the production orders using the menu
+.. i18n: :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. You then get a
+.. i18n: list of orders to start (``Ready to Produce``) and the estimated start date (``Scheduled Date``) to meet the customer delivery date.
+..
+
+The manufacturing supervisor can then consult the production orders using the menu
+:menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. You then get a
+list of orders to start (``Ready to Produce``) and the estimated start date (``Scheduled Date``) to meet the customer delivery date.
+
+.. i18n: .. figure:: images/mrp_production_list_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *List of Manufacturing Orders*
+..
+
+.. figure:: images/mrp_production_list_new.png
+   :scale: 75
+   :align: center
+
+   *List of Manufacturing Orders*
+
+.. i18n: You will see the production order for CPU_GEN, but not the one for PC2 because it depends on an intermediate product that has to be produced first. Return to the production order for CPU_GEN and click it. If there are several of them, select the one corresponding to your order using the source document that contains your order number (in this example ``SO007`` ).
+..
+
+You will see the production order for CPU_GEN, but not the one for PC2 because it depends on an intermediate product that has to be produced first. Return to the production order for CPU_GEN and click it. If there are several of them, select the one corresponding to your order using the source document that contains your order number (in this example ``SO007`` ).
+
+.. i18n: .. figure:: images/mrp_production_form_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Details of a Production Order*
+..
+
+.. figure:: images/mrp_production_form_new.png
+   :scale: 75
+   :align: center
+
+   *Details of a Production Order*
+
+.. i18n: The system shows you that you have to manufacture product CPU_GEN using the components: MB1, CPU1, FAN, RAM. You can then confirm the production twice:
+..
+
+The system shows you that you have to manufacture product CPU_GEN using the components: MB1, CPU1, FAN, RAM. You can then confirm the production twice:
+
+.. i18n: Start production: consumption of raw materials,
+..
+
+Start production: consumption of raw materials,
+
+.. i18n: Produce: manufacturing of finished product.
+..
+
+Produce: manufacturing of finished product.
+
+.. i18n: Click the ``Start Production`` button, then click the ``Edit`` button, and edit the line for the product MB1. Enter a lot number for it by putting the cursor in the field :guilabel:`Production Lot` and pressing :kbd:`<F1>` to create a new lot. Enter an internal reference, for example: ``MB1345678``. The system may then show you a warning because this lot is not in stock, but you can ignore this message.
+..
+
+Click the ``Start Production`` button, then click the ``Edit`` button, and edit the line for the product MB1. Enter a lot number for it by putting the cursor in the field :guilabel:`Production Lot` and pressing :kbd:`<F1>` to create a new lot. Enter an internal reference, for example: ``MB1345678``. The system may then show you a warning because this lot is not in stock, but you can ignore this message.
+
+.. i18n: Click the ``Produce`` button to manufacture the finished product.
+..
+
+Click the ``Produce`` button to manufacture the finished product.
+
+.. i18n: The production order has to be in the closed state as shown in the figure :ref:`fig-mrpprdfrm`.
+..
+
+The production order has to be in the closed state as shown in the figure :ref:`fig-mrpprdfrm`.
+
+.. i18n: .. _fig-mrpprdfrm:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_form_end_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Production Order after the Different Stages*
+..
+
+.. _fig-mrpprdfrm:
+
+.. figure:: images/mrp_production_form_end_new.png
+   :scale: 75
+   :align: center
+
+   *Production Order after the Different Stages*
+
+.. i18n: Finished Product Manufacturing
+.. i18n: ++++++++++++++++++++++++++++++
+..
+
+Finished Product Manufacturing
+++++++++++++++++++++++++++++++
+
+.. i18n: Having manufactured the intermediate product CPU_GEN, OpenERP automatically proposes the manufacturing
+.. i18n: of the computer PC2 using the order created earlier. Return to the Manufacturing Orders menu and look at the orders Ready to Produce through  :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+..
+
+Having manufactured the intermediate product CPU_GEN, OpenERP automatically proposes the manufacturing
+of the computer PC2 using the order created earlier. Return to the Manufacturing Orders menu and look at the orders Ready to Produce through  :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+
+.. i18n: You will find computer PC2 which has been sold to the customer (source document SO007), as shown in the figure hereafter.
+..
+
+You will find computer PC2 which has been sold to the customer (source document SO007), as shown in the figure hereafter.
+
+.. i18n: .. figure:: images/mrp_production_list_end_new.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Completed Production for PC2*
+..
+
+.. figure:: images/mrp_production_list_end_new.png
+    :scale: 75
+    :align: center
+    
+    *Completed Production for PC2*
+
+.. i18n: Now that the production has been completed, the product sold to the customer has been manufactured and the raw materials have been consumed and taken out of stock.
+.. i18n:  
+.. i18n: .. tip:: Automatic Actions
+.. i18n: 
+.. i18n:     As well as managing the use of materials and the production of stocks, manufacturing can have the following
+.. i18n:     automatic effects which are detailed further on in the chapter:
+.. i18n:     
+.. i18n:     * adding value to stock,
+.. i18n:     * generating operations for assembly staff,
+.. i18n:     * automatically creating analytical accounting entries.
+..
+
+Now that the production has been completed, the product sold to the customer has been manufactured and the raw materials have been consumed and taken out of stock.
+ 
+.. tip:: Automatic Actions
+
+    As well as managing the use of materials and the production of stocks, manufacturing can have the following
+    automatic effects which are detailed further on in the chapter:
+    
+    * adding value to stock,
+    * generating operations for assembly staff,
+    * automatically creating analytical accounting entries.
+
+.. i18n: Subproduct Production
+.. i18n: +++++++++++++++++++++
+..
+
+Subproduct Production
++++++++++++++++++++++
+
+.. i18n: If you need to manage subproducts, you should install the module :mod:`mrp_subproduct` (Reconfigure wizard, MRP Sub-
+.. i18n: products). The normal behaviour of manufacturing in OpenERP enables you to manufacture several units of the
+.. i18n: same finished product from raw materials (A + B > C). With Subproduct management, the manufacturing result can be to have both finished products and secondary products (A + B > C + D).
+..
+
+If you need to manage subproducts, you should install the module :mod:`mrp_subproduct` (Reconfigure wizard, MRP Sub-
+products). The normal behaviour of manufacturing in OpenERP enables you to manufacture several units of the
+same finished product from raw materials (A + B > C). With Subproduct management, the manufacturing result can be to have both finished products and secondary products (A + B > C + D).
+
+.. i18n: .. note:: Subproduct Material
+.. i18n: 
+.. i18n:     In OpenERP, subproduct material corresponds to secondary products that are a by-product of the main manufacturing
+.. i18n:     process. For example, cutting planks of timber will produce other planks but these bits of timber are too small 
+.. i18n:     (or the offcuts may have value for the company if they can be used elsewhere).
+..
+
+.. note:: Subproduct Material
+
+    In OpenERP, subproduct material corresponds to secondary products that are a by-product of the main manufacturing
+    process. For example, cutting planks of timber will produce other planks but these bits of timber are too small 
+    (or the offcuts may have value for the company if they can be used elsewhere).
+
+.. i18n: If the module :mod:`mrp_subproduct` has been installed, you get a new tab Sub products in the Bill of Material
+.. i18n: that lets you set secondary products resulting from the manufacturing of the finished product.
+..
+
+If the module :mod:`mrp_subproduct` has been installed, you get a new tab Sub products in the Bill of Material
+that lets you set secondary products resulting from the manufacturing of the finished product.
+
+.. i18n: .. figure:: images/mrp_bom_subproduct.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Definition of Subproducts*
+..
+
+.. figure:: images/mrp_bom_subproduct.png
+    :scale: 75
+    :align: center
+    
+    *Definition of Subproducts*
+
+.. i18n: When OpenERP generates a production order based on a bill of materials that uses a secondary product, you pick
+.. i18n: up the list of all products in the second tab of the production order ``Finished Products``.
+.. i18n:     
+.. i18n: .. figure:: images/mrp_production.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Production Order producing Several Finished Products*
+..
+
+When OpenERP generates a production order based on a bill of materials that uses a secondary product, you pick
+up the list of all products in the second tab of the production order ``Finished Products``.
+    
+.. figure:: images/mrp_production.png
+    :scale: 75
+    :align: center
+    
+    *Production Order producing Several Finished Products*
+
+.. i18n: Secondary products enable you to generate several types of products from the same raw materials and manufacturing methods - only these are not used in the calculation of requirements. Then, if you need the secondary products, OpenERP will not ask you to manufacture another product to use the waste products and secondary products of this production. In this case, you should enter another production order for the secondary product.
+..
+
+Secondary products enable you to generate several types of products from the same raw materials and manufacturing methods - only these are not used in the calculation of requirements. Then, if you need the secondary products, OpenERP will not ask you to manufacture another product to use the waste products and secondary products of this production. In this case, you should enter another production order for the secondary product.
+
+.. i18n: .. note:: Services in Manufacturing
+.. i18n: 
+.. i18n:     Unlike most software for production management, OpenERP manages services as well as stockable products. So
+.. i18n:     it is possible to put products of type Service in a bill of materials. These do not appear in the production 
+.. i18n:     order, but their requirements will be taken into account.
+.. i18n:     
+.. i18n:     If they are defined as Make to Order, OpenERP will generate a task for the manufacturing or a subcontract
+.. i18n:     order for the operations. The behaviour will depend on the Supply Method configured in the product form: Buy
+.. i18n:     or Produce.
+..
+
+.. note:: Services in Manufacturing
+
+    Unlike most software for production management, OpenERP manages services as well as stockable products. So
+    it is possible to put products of type Service in a bill of materials. These do not appear in the production 
+    order, but their requirements will be taken into account.
+    
+    If they are defined as Make to Order, OpenERP will generate a task for the manufacturing or a subcontract
+    order for the operations. The behaviour will depend on the Supply Method configured in the product form: Buy
+    or Produce.
+
+.. i18n: Scrapping
+.. i18n: +++++++++
+..
+
+Scrapping
++++++++++
+
+.. i18n: If you have to scrap the final product before it is finished, you will have to scrap every component allowed for this product. 
+..
+
+If you have to scrap the final product before it is finished, you will have to scrap every component allowed for this product. 
+
+.. i18n: .. figure:: images/mo_scrap.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Scrapping a Product to Finish*
+..
+
+.. figure:: images/mo_scrap.png
+    :scale: 75
+    :align: center
+    
+    *Scrapping a Product to Finish*
+
+.. i18n: If you scrap a Product to Finish, you will get the situation illustrated in the previous figure. A finished product will be *created* and put in the scrapped virtual location. A new Product to Finish has been added to the manufacturing order.
+..
+
+If you scrap a Product to Finish, you will get the situation illustrated in the previous figure. A finished product will be *created* and put in the scrapped virtual location. A new Product to Finish has been added to the manufacturing order.
+
+.. i18n: .. tip:: Scrap a product
+.. i18n: 
+.. i18n:     To scrap a product, you have to edit the manufacturing order and then select the product to be
+.. i18n:     scrapped by clicking the little pencil at the left of the item.
+..
+
+.. tip:: Scrap a product
+
+    To scrap a product, you have to edit the manufacturing order and then select the product to be
+    scrapped by clicking the little pencil at the left of the item.
+
+.. i18n: This new product has been added for the following reason: when you have to manufacture a product and if this product
+.. i18n: has to be scrapped, you have to produce another product to replace the scrapped one. The reason why 
+.. i18n: you have to scrap each component manually is that the production problem can come from one component.
+..
+
+This new product has been added for the following reason: when you have to manufacture a product and if this product
+has to be scrapped, you have to produce another product to replace the scrapped one. The reason why 
+you have to scrap each component manually is that the production problem can come from one component.
+
+.. i18n: If the production process is finished and you see that you have to scrap the finished product, you will
+.. i18n: not have to scrap the different components. They are already *consumed*. They are not available anymore
+.. i18n: for further manufacturing orders; they have been moved to the production Stock Location.
+..
+
+If the production process is finished and you see that you have to scrap the finished product, you will
+not have to scrap the different components. They are already *consumed*. They are not available anymore
+for further manufacturing orders; they have been moved to the production Stock Location.
+
+.. i18n: Production Orders
+.. i18n: +++++++++++++++++
+..
+
+Production Orders
++++++++++++++++++
+
+.. i18n: To open a Production Order, use the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders` and click the `New` button.
+.. i18n: You get a blank form to enter a new production order as shown in the figure :ref:`fig-mrpprdnew`.
+..
+
+To open a Production Order, use the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders` and click the `New` button.
+You get a blank form to enter a new production order as shown in the figure :ref:`fig-mrpprdnew`.
+
+.. i18n: .. _fig-mrpprdnew:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *New Production Order*
+..
+
+.. _fig-mrpprdnew:
+
+.. figure:: images/mrp_production_new.png
+   :scale: 75
+   :align: center
+
+   *New Production Order*
+
+.. i18n: The production order follows the process given by the figure :ref:`fig-mrpprdproc`.
+..
+
+The production order follows the process given by the figure :ref:`fig-mrpprdproc`.
+
+.. i18n: .. _fig-mrpprdproc:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_processus.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Process for Handling a Production Order*
+..
+
+.. _fig-mrpprdproc:
+
+.. figure:: images/mrp_production_processus.png
+   :scale: 75
+   :align: center
+
+   *Process for Handling a Production Order*
+
+.. i18n: The `Scheduled date` , `Product Qty` and `Reference`, are automatically completed when the form is first opened.
+.. i18n: Enter the product that you want to produce, and the quantity required. The :guilabel:`Product UOM` by
+.. i18n: default is completed automatically by OpenERP when the product is first selected.
+..
+
+The `Scheduled date` , `Product Qty` and `Reference`, are automatically completed when the form is first opened.
+Enter the product that you want to produce, and the quantity required. The :guilabel:`Product UOM` by
+default is completed automatically by OpenERP when the product is first selected.
+
+.. i18n: You then have to set two locations:
+..
+
+You then have to set two locations:
+
+.. i18n: 	* The location from which the required raw materials should be found, and
+.. i18n: 
+.. i18n: 	* The location for depositing the finished products.
+..
+
+	* The location from which the required raw materials should be found, and
+
+	* The location for depositing the finished products.
+
+.. i18n: For simplicity, put the ``Stock`` location in both places. The field :guilabel:`Bill of Materials` will
+.. i18n: automatically be completed by OpenERP when you select the product. You can then overwrite it with another BoM to specify something else to use for this specific manufacturing, then click the button :guilabel:`Compute Data`.
+..
+
+For simplicity, put the ``Stock`` location in both places. The field :guilabel:`Bill of Materials` will
+automatically be completed by OpenERP when you select the product. You can then overwrite it with another BoM to specify something else to use for this specific manufacturing, then click the button :guilabel:`Compute Data`.
+
+.. i18n: The tabs :guilabel:`Scheduled Products` and :guilabel:`Work Orders` are also completed automatically when you click
+.. i18n: :guilabel:`Compute Data` (in the :guilabel:`Work Orders` or :guilabel:`Scheduled Products` tabs). 
+.. i18n: You will find the raw materials there that are required for the production and the operations needed by the assembly staff.
+..
+
+The tabs :guilabel:`Scheduled Products` and :guilabel:`Work Orders` are also completed automatically when you click
+:guilabel:`Compute Data` (in the :guilabel:`Work Orders` or :guilabel:`Scheduled Products` tabs). 
+You will find the raw materials there that are required for the production and the operations needed by the assembly staff.
+
+.. i18n: If you want to start production, click the button :guilabel:`Confirm Production`, and OpenERP automatically completes the :guilabel:`Products to Consume` field in the :guilabel:`Consumed Products` tab and :guilabel:`Products to Finish` field in :guilabel:`Finished Products` tab.
+..
+
+If you want to start production, click the button :guilabel:`Confirm Production`, and OpenERP automatically completes the :guilabel:`Products to Consume` field in the :guilabel:`Consumed Products` tab and :guilabel:`Products to Finish` field in :guilabel:`Finished Products` tab.
+
+.. i18n: The information in the :guilabel:`Consumed Products` tab can be changed if:
+..
+
+The information in the :guilabel:`Consumed Products` tab can be changed if:
+
+.. i18n: * you want to enter a serial number for raw materials,
+.. i18n: 
+.. i18n: * you want to change the quantities consumed (lost during production).
+..
+
+* you want to enter a serial number for raw materials,
+
+* you want to change the quantities consumed (lost during production).
+
+.. i18n: For traceability, you can set lot numbers on the raw materials used, or on the finished
+.. i18n: products.
+.. i18n: Note the :guilabel:`Production Lot` and :guilabel:`Pack` numbers.
+..
+
+For traceability, you can set lot numbers on the raw materials used, or on the finished
+products.
+Note the :guilabel:`Production Lot` and :guilabel:`Pack` numbers.
+
+.. i18n: Once the order is confirmed, you should force the reservation of materials
+.. i18n: using the :guilabel:`Force Reservation` button. This means that you do not have
+.. i18n: to wait for the scheduler to assign and reserve the raw materials from your stock for this
+.. i18n: production run. This shortens the procurement process.
+..
+
+Once the order is confirmed, you should force the reservation of materials
+using the :guilabel:`Force Reservation` button. This means that you do not have
+to wait for the scheduler to assign and reserve the raw materials from your stock for this
+production run. This shortens the procurement process.
+
+.. i18n: If you do not want to change the priorities, just leave the production order in this state and the scheduler will create a plan based on the priority and your planned date.
+..
+
+If you do not want to change the priorities, just leave the production order in this state and the scheduler will create a plan based on the priority and your planned date.
+
+.. i18n: To start the production of products, click :guilabel:`Start Production`. The raw materials are then consumed automatically from stock, which means that the draft ( ``Waiting`` ) movements become ``Done``.
+..
+
+To start the production of products, click :guilabel:`Start Production`. The raw materials are then consumed automatically from stock, which means that the draft ( ``Waiting`` ) movements become ``Done``.
+
+.. i18n: Once the production is complete, click :guilabel:`Produce`. The finished products are now moved into stock.
+..
+
+Once the production is complete, click :guilabel:`Produce`. The finished products are now moved into stock.
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst'
--- i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst	1970-01-01 00:00:00 +0000
+++ i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,974 @@
+
+.. i18n: Forecasting and Supplying
+.. i18n: =========================
+..
+
+Forecasting and Supplying
+=========================
+
+.. i18n: Scheduler
+.. i18n: +++++++++
+..
+
+Scheduler
++++++++++
+
+.. i18n: The requirements scheduler is the calculation engine which plans and prioritises production and purchasing automatically according to the rules defined on products. By default, the scheduler is set to run once a day (OpenERP automatically creates a *Scheduled Action* for this). You can also start the scheduler manually from the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+.. i18n: The scheduler uses all the relevant parameters defined for products, suppliers and the company to determine the priorities between the different production orders, deliveries and supplier purchases.
+..
+
+The requirements scheduler is the calculation engine which plans and prioritises production and purchasing automatically according to the rules defined on products. By default, the scheduler is set to run once a day (OpenERP automatically creates a *Scheduled Action* for this). You can also start the scheduler manually from the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+The scheduler uses all the relevant parameters defined for products, suppliers and the company to determine the priorities between the different production orders, deliveries and supplier purchases.
+
+.. i18n: .. note:: Starting Time
+.. i18n: 
+.. i18n:         You can set the starting time of the scheduler by modifying the corresponding action in the menu :menuselection:`Administration --> Configuration --> Scheduler --> Scheduled Actions`. Modify the ``Run mrp Scheduler`` configuration document.
+..
+
+.. note:: Starting Time
+
+        You can set the starting time of the scheduler by modifying the corresponding action in the menu :menuselection:`Administration --> Configuration --> Scheduler --> Scheduled Actions`. Modify the ``Run mrp Scheduler`` configuration document.
+
+.. i18n: .. figure:: images/stock_cron.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Configuring the Start Time to Calculate Requirements*
+..
+
+.. figure:: images/stock_cron.png
+   :scale: 75
+   :align: center
+
+   *Configuring the Start Time to Calculate Requirements*
+
+.. i18n: .. tip::  Calculating Requirements / Scheduling
+.. i18n: 
+.. i18n:     Scheduling only validates procurements that are confirmed but not yet started. These procurement reservations
+.. i18n:     will themselves start production, tasks or purchases depending on the configuration of the requested product.
+..
+
+.. tip::  Calculating Requirements / Scheduling
+
+    Scheduling only validates procurements that are confirmed but not yet started. These procurement reservations
+    will themselves start production, tasks or purchases depending on the configuration of the requested product.
+
+.. i18n: You take into account the priority of operations when starting reservations and procurements.
+.. i18n: Urgent requests, those with a date in the past, or requests with a date earlier than the others will be started first. In case there are not enough products in stock to satisfy all the requests, you can be sure that the most urgent requests will be produced first.
+..
+
+You take into account the priority of operations when starting reservations and procurements.
+Urgent requests, those with a date in the past, or requests with a date earlier than the others will be started first. In case there are not enough products in stock to satisfy all the requests, you can be sure that the most urgent requests will be produced first.
+
+.. i18n: Planning
+.. i18n: ++++++++
+..
+
+Planning
+++++++++
+
+.. i18n: In OpenERP, you can plan the production in an easy way. Simply by going to :menuselection:`Manufacturing --> Planning`, you can plan manufacturing orders, work orders and/or work centers.
+..
+
+In OpenERP, you can plan the production in an easy way. Simply by going to :menuselection:`Manufacturing --> Planning`, you can plan manufacturing orders, work orders and/or work centers.
+
+.. i18n: By clicking ``Manufacturing Orders`` in the *Planning* menu, a calendar view will open in which you can select a day to create the order whenever you want. You will also see the already planned orders. By dragging and dropping a manufacturing order in Calendar view, you can change the starting date of the order.
+..
+
+By clicking ``Manufacturing Orders`` in the *Planning* menu, a calendar view will open in which you can select a day to create the order whenever you want. You will also see the already planned orders. By dragging and dropping a manufacturing order in Calendar view, you can change the starting date of the order.
+
+.. i18n: .. figure:: images/mo_plan.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Planning Manufacturing Orders*
+..
+
+.. figure:: images/mo_plan.png
+    :scale: 75
+    :align: center
+    
+    *Planning Manufacturing Orders*
+
+.. i18n: When you click in a day in the Calendar view, an empty manufacturing order window will open and let you choose which product you want to produce.
+..
+
+When you click in a day in the Calendar view, an empty manufacturing order window will open and let you choose which product you want to produce.
+
+.. i18n: .. figure:: images/newmo_plan.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *New Manufacturing Order*    
+..
+
+.. figure:: images/newmo_plan.png
+    :scale: 75
+    :align: center
+    
+    *New Manufacturing Order*    
+
+.. i18n: Scheduler and Just in Time
+.. i18n: --------------------------
+..
+
+Scheduler and Just in Time
+--------------------------
+
+.. i18n: When you want to work according to the *Just in Time* way, you should install the module :mod:`mrp_jit`.
+..
+
+When you want to work according to the *Just in Time* way, you should install the module :mod:`mrp_jit`.
+
+.. i18n: If you install this module, you will not have to run the regular procurement scheduler anymore (but you still need to run the minimum order point rule scheduler, or for example let it run daily.) 
+..
+
+If you install this module, you will not have to run the regular procurement scheduler anymore (but you still need to run the minimum order point rule scheduler, or for example let it run daily.) 
+
+.. i18n: All procurement orders will be processed immediately, which could in some cases entail a small performance impact. 
+..
+
+All procurement orders will be processed immediately, which could in some cases entail a small performance impact. 
+
+.. i18n: It may also increase your stock size because products are reserved as soon as possible and the scheduler time range is not taken into account anymore. In that case, you can no longer use priorities for the different picking orders. 
+..
+
+It may also increase your stock size because products are reserved as soon as possible and the scheduler time range is not taken into account anymore. In that case, you can no longer use priorities for the different picking orders. 
+
+.. i18n: Lead times
+.. i18n: ----------
+..
+
+Lead times
+----------
+
+.. i18n: All procurement operations (that is, the requirement for both production orders and purchase orders) are automatically calculated by the scheduler. But more than just creating each order, OpenERP plans the timing of each step. A planned date calculated by the system can be found on each order document.
+..
+
+All procurement operations (that is, the requirement for both production orders and purchase orders) are automatically calculated by the scheduler. But more than just creating each order, OpenERP plans the timing of each step. A planned date calculated by the system can be found on each order document.
+
+.. i18n: To organize the whole chain of manufacturing and procurement, OpenERP bases everything on the delivery date promised to the customer. This is given by the date of the confirmation in the order and the lead times shown in each product line of the order. This lead time is itself proposed automatically in the field :guilabel:`Customer Lead Time` shown in the product form. This Customer Lead Time is the difference between the time on an order and that of the delivery.
+..
+
+To organize the whole chain of manufacturing and procurement, OpenERP bases everything on the delivery date promised to the customer. This is given by the date of the confirmation in the order and the lead times shown in each product line of the order. This lead time is itself proposed automatically in the field :guilabel:`Customer Lead Time` shown in the product form. This Customer Lead Time is the difference between the time on an order and that of the delivery.
+
+.. i18n: To see a calculation of the lead times, take the example of the cabinet above. Suppose that the cabinet is assembled in two steps, using the two following bills of materials.
+..
+
+To see a calculation of the lead times, take the example of the cabinet above. Suppose that the cabinet is assembled in two steps, using the two following bills of materials.
+
+.. i18n: .. table:: Bill of Materials for 1 SHE100 Unit
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.25      m
+.. i18n:    LIN040        1         m
+.. i18n:    WOOD010       0.249     m
+.. i18n:    METC000       12        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 SHE100 Unit
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   SIDEPAN       2         PCE
+   WOOD002       0.25      m
+   LIN040        1         m
+   WOOD010       0.249     m
+   METC000       12        PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 2 SIDEPAN Units
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    WOOD002       0.17      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 2 SIDEPAN Units
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   WOOD002       0.17      m
+   ============  ========  ===============
+
+.. i18n: The SIDEPAN is made from an order using the workflow shown. The WOOD002 is purchased on order and the other products are all found in stock. An order for the product SHE100 will then generate two production orders (SHE100 and SIDEPAN) then produce two purchase orders for the product WOOD002.
+.. i18n: Product WOOD002 is used in the production of both SHE100 and SIDEPAN. Set the lead times on the product forms to the following:
+..
+
+The SIDEPAN is made from an order using the workflow shown. The WOOD002 is purchased on order and the other products are all found in stock. An order for the product SHE100 will then generate two production orders (SHE100 and SIDEPAN) then produce two purchase orders for the product WOOD002.
+Product WOOD002 is used in the production of both SHE100 and SIDEPAN. Set the lead times on the product forms to the following:
+
+.. i18n: .. table:: Lead Times
+.. i18n: 
+.. i18n:    ============ ================== ======================= ==================
+.. i18n:    Product Code Customer Lead Time Manufacturing Lead Time Supplier Lead Time
+.. i18n:    ============ ================== ======================= ==================
+.. i18n:    SHE100       30 days            5 days
+.. i18n:    SIDEPAN                         10 days
+.. i18n:    WOOD002                                                 5 days
+.. i18n:    ============ ================== ======================= ==================
+..
+
+.. table:: Lead Times
+
+   ============ ================== ======================= ==================
+   Product Code Customer Lead Time Manufacturing Lead Time Supplier Lead Time
+   ============ ================== ======================= ==================
+   SHE100       30 days            5 days
+   SIDEPAN                         10 days
+   WOOD002                                                 5 days
+   ============ ================== ======================= ==================
+
+.. i18n: A customer order placed on the 1st January will set up the following operations and lead times:
+..
+
+A customer order placed on the 1st January will set up the following operations and lead times:
+
+.. i18n: * Delivery SHE100: 31 January (=1st January + 30 days),
+.. i18n: 
+.. i18n: * Manufacture SHE100: 26 January (=31 January – 5 days),
+.. i18n: 
+.. i18n: * Manufacture SIDEPAN: 16 January (=26 January – 10 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SHE100): 21 January (=26 January – 5 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SIDEPAN): 11 January (=16 January – 5 days).
+..
+
+* Delivery SHE100: 31 January (=1st January + 30 days),
+
+* Manufacture SHE100: 26 January (=31 January – 5 days),
+
+* Manufacture SIDEPAN: 16 January (=26 January – 10 days),
+
+* Purchase WOOD002 (for SHE100): 21 January (=26 January – 5 days),
+
+* Purchase WOOD002 (for SIDEPAN): 11 January (=16 January – 5 days).
+
+.. i18n: In this example, OpenERP will propose placing two orders with the supplier of product WOOD002. Each of these orders can be for a different planned date. Before confirming these orders, the purchasing manager could group (merge) these orders into a single order.
+..
+
+In this example, OpenERP will propose placing two orders with the supplier of product WOOD002. Each of these orders can be for a different planned date. Before confirming these orders, the purchasing manager could group (merge) these orders into a single order.
+
+.. i18n: Security Days
+.. i18n: -------------
+..
+
+Security Days
+-------------
+
+.. i18n: The scheduler will plan all operations as a function of the time configured on the products. But it is also possible to configure these factors in the company. These factors are then global to the company, whatever the product concerned may be. In the description of the company, on the
+.. i18n: :guilabel:`Configuration` tab, you find the following parameters:
+..
+
+The scheduler will plan all operations as a function of the time configured on the products. But it is also possible to configure these factors in the company. These factors are then global to the company, whatever the product concerned may be. In the description of the company, on the
+:guilabel:`Configuration` tab, you find the following parameters:
+
+.. i18n: * `Scheduler Range Days`: all the procurement requests that are not between today and today plus the number of days specified here are not taken into account by the scheduler.
+.. i18n:   
+.. i18n: * `Manufacturing Lead Time`: number of additional days needed for manufacturing,
+.. i18n: 
+.. i18n: * `Purchase Lead Time`: additional days to include for all purchase orders with this supplier,
+.. i18n: 
+.. i18n: * `Security Days`: number of days to deduct from a system order to cope with any problems of procurement,
+..
+
+* `Scheduler Range Days`: all the procurement requests that are not between today and today plus the number of days specified here are not taken into account by the scheduler.
+  
+* `Manufacturing Lead Time`: number of additional days needed for manufacturing,
+
+* `Purchase Lead Time`: additional days to include for all purchase orders with this supplier,
+
+* `Security Days`: number of days to deduct from a system order to cope with any problems of procurement,
+
+.. i18n: .. note:: Purchase Lead Time
+.. i18n: 
+.. i18n:     The security delay for purchases is the average time between the order generated by OpenERP and
+.. i18n:     the real purchase time from the supplier by your purchasing department.
+.. i18n:     This delay takes into account the order process in your company, including order negotiation time.
+..
+
+.. note:: Purchase Lead Time
+
+    The security delay for purchases is the average time between the order generated by OpenERP and
+    the real purchase time from the supplier by your purchasing department.
+    This delay takes into account the order process in your company, including order negotiation time.
+
+.. i18n: Take for instance the following configuration:
+..
+
+Take for instance the following configuration:
+
+.. i18n: * `Manufacturing Lead Time` : 1,
+.. i18n: 
+.. i18n: * `Purchase Lead Time` : 3,
+.. i18n: 
+.. i18n: * `Security Days` : 2.
+..
+
+* `Manufacturing Lead Time` : 1,
+
+* `Purchase Lead Time` : 3,
+
+* `Security Days` : 2.
+
+.. i18n: The example above will then be given the following lead times:
+..
+
+The example above will then be given the following lead times:
+
+.. i18n: * Delivery SHE100: 29 January (= 1st January + 30 days – 2 days),
+.. i18n: 
+.. i18n: * Manufacture SHE100: 23 January (= 29 January – 5 days – 1 day),
+.. i18n: 
+.. i18n: * Manufacture SIDEPAN: 12 January (= 26 January – 10 days – 1 day),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SHE100): 15 January (= 26 January – 5 days – 3 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SIDEPAN): 4 January (= 12 January – 5 days – 3 days).
+..
+
+* Delivery SHE100: 29 January (= 1st January + 30 days – 2 days),
+
+* Manufacture SHE100: 23 January (= 29 January – 5 days – 1 day),
+
+* Manufacture SIDEPAN: 12 January (= 26 January – 10 days – 1 day),
+
+* Purchase WOOD002 (for SHE100): 15 January (= 26 January – 5 days – 3 days),
+
+* Purchase WOOD002 (for SIDEPAN): 4 January (= 12 January – 5 days – 3 days).
+
+.. i18n: Procurement
+.. i18n: +++++++++++
+..
+
+Procurement
++++++++++++
+
+.. i18n: In normal system use, you do not need to worry about procurement orders, because they are automatically generated by OpenERP and the user will usually work on the results of a procurement: a production order, a purchase order, a sales order and a task.
+..
+
+In normal system use, you do not need to worry about procurement orders, because they are automatically generated by OpenERP and the user will usually work on the results of a procurement: a production order, a purchase order, a sales order and a task.
+
+.. i18n: But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. Exception management allows you to solve possible issues.
+..
+
+But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. Exception management allows you to solve possible issues.
+
+.. i18n: Automating Purchasing and Replenishment
+.. i18n: ---------------------------------------
+..
+
+Automating Purchasing and Replenishment
+---------------------------------------
+
+.. i18n: In the ``Product`` form view, you can choose between two procurement methods:
+..
+
+In the ``Product`` form view, you can choose between two procurement methods:
+
+.. i18n:     * Make to Stock (MTS)
+.. i18n:     * Make to Order (MTO)
+..
+
+    * Make to Stock (MTS)
+    * Make to Order (MTO)
+
+.. i18n: These two methods will impact the way you have to configure your automatic purchasing and replenishment. For the MTS method, you will have to define Minimum Stock Rules to order products when the minimum threshold has been reached, as well as a supplier to define where to order the products. 
+.. i18n: For the MTO method, you have to define a supplier for the product in order to buy new products when a sales order or a manufacturing 
+.. i18n: order is confirmed.
+..
+
+These two methods will impact the way you have to configure your automatic purchasing and replenishment. For the MTS method, you will have to define Minimum Stock Rules to order products when the minimum threshold has been reached, as well as a supplier to define where to order the products. 
+For the MTO method, you have to define a supplier for the product in order to buy new products when a sales order or a manufacturing 
+order is confirmed.
+
+.. i18n: Managing Scheduler Exceptions
+.. i18n: -----------------------------
+..
+
+Managing Scheduler Exceptions
+-----------------------------
+
+.. i18n: In OpenERP, you can have different procurement exceptions. An exception appears in the ``Procurement Exception`` view when the system does not know what to do with an object, such as a Manufacturing Order or a Purchase Order.
+..
+
+In OpenERP, you can have different procurement exceptions. An exception appears in the ``Procurement Exception`` view when the system does not know what to do with an object, such as a Manufacturing Order or a Purchase Order.
+
+.. i18n: There are four types of exceptions:
+..
+
+There are four types of exceptions:
+
+.. i18n:     * No bill of materials defined for production: in this case you have got to create a BoM or indicate that the product can be purchased instead (change the ``Supply Method``).
+.. i18n: 
+.. i18n:     * No supplier available for a purchase: you have to define a supplier in the ``Supplier`` tab of the product form.
+.. i18n: 
+.. i18n:     * No address defined on the supplier partner: you have to complete an address for the supplier for the product in consideration.
+.. i18n: 
+.. i18n:     * Not enough stock: you have to create a rule for automatic procurement (for example, a minimum stock rule), or manually procure it.
+..
+
+    * No bill of materials defined for production: in this case you have got to create a BoM or indicate that the product can be purchased instead (change the ``Supply Method``).
+
+    * No supplier available for a purchase: you have to define a supplier in the ``Supplier`` tab of the product form.
+
+    * No address defined on the supplier partner: you have to complete an address for the supplier for the product in consideration.
+
+    * Not enough stock: you have to create a rule for automatic procurement (for example, a minimum stock rule), or manually procure it.
+
+.. i18n: .. figure:: images/procurement_exception.png
+.. i18n:     :align: center
+.. i18n:     :scale: 75
+.. i18n:     
+.. i18n:     *Procurement Exceptions*
+.. i18n:     
+.. i18n: Some problems are just timing issues and can be automatically corrected by the system (this will be temporary exceptions).
+..
+
+.. figure:: images/procurement_exception.png
+    :align: center
+    :scale: 75
+    
+    *Procurement Exceptions*
+    
+Some problems are just timing issues and can be automatically corrected by the system (this will be temporary exceptions).
+
+.. i18n: If a product has to be ‘in stock’ but is not available in your stores, OpenERP will make the exception as ‘temporary’ or ‘to be corrected’. The exception is temporary if the system can procure it automatically, for example, when a procurement rule has been defined for minimum stock.
+..
+
+If a product has to be ‘in stock’ but is not available in your stores, OpenERP will make the exception as ‘temporary’ or ‘to be corrected’. The exception is temporary if the system can procure it automatically, for example, when a procurement rule has been defined for minimum stock.
+
+.. i18n: When an exception is raised, you can check the configuration of your product in order to correct the misconfiguration. Then you
+.. i18n: can choose to relaunch the scheduler or you can retry to execute the action by selecting the line, and clicking the :guilabel:`Retry` button, then click :guilabel:`Run procurement`.
+..
+
+When an exception is raised, you can check the configuration of your product in order to correct the misconfiguration. Then you
+can choose to relaunch the scheduler or you can retry to execute the action by selecting the line, and clicking the :guilabel:`Retry` button, then click :guilabel:`Run procurement`.
+
+.. i18n: .. figure:: images/procurement_fix.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Correct a Procurement Exception*
+..
+
+.. figure:: images/procurement_fix.png
+    :scale: 75
+    :align: center
+    
+    *Correct a Procurement Exception*
+
+.. i18n: The exception related to the BoM definition comes from the fact that a product with a supply method set to *Produce* has no
+.. i18n: Bill of Materials. The system does not know how to produce this product and then raises an exception.    
+..
+
+The exception related to the BoM definition comes from the fact that a product with a supply method set to *Produce* has no
+Bill of Materials. The system does not know how to produce this product and then raises an exception.    
+
+.. i18n: Manual Procurement
+.. i18n: ------------------
+..
+
+Manual Procurement
+------------------
+
+.. i18n: To procure internally, you can create a procurement order manually. Use the menu :menuselection:`Warehouse --> Schedulers -->
+.. i18n: Procurement Exceptions` and click the New button to do this.
+..
+
+To procure internally, you can create a procurement order manually. Use the menu :menuselection:`Warehouse --> Schedulers -->
+Procurement Exceptions` and click the New button to do this.
+
+.. i18n: .. figure:: images/mrp_procurement.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Manual Procurement*
+..
+
+.. figure:: images/mrp_procurement.png
+    :scale: 75
+    :align: center
+    
+    *Manual Procurement*
+
+.. i18n: The procurement order will then be responsible for calculating a proposal for automatic procurement for the
+.. i18n: product concerned. This procurement will start a task, a purchase order for the supplier or a production
+.. i18n: depending on the product configuration.
+..
+
+The procurement order will then be responsible for calculating a proposal for automatic procurement for the
+product concerned. This procurement will start a task, a purchase order for the supplier or a production
+depending on the product configuration.
+
+.. i18n: .. figure:: images/mrp_procurement_flow.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Procurement Flow*
+..
+
+.. figure:: images/mrp_procurement_flow.png
+    :scale: 75
+    :align: center
+    
+    *Procurement Flow*
+
+.. i18n: It is better to encode a procurement order rather than direct purchasing or production. The procurement method has the following advantages:
+..
+
+It is better to encode a procurement order rather than direct purchasing or production. The procurement method has the following advantages:
+
+.. i18n: 1. The form is simpler, because OpenERP calculates the different values according to other values and defined rules: purchase date 
+.. i18n: calculated from order date, default supplier, raw materials needs, selection of the most suitable bill of materials, etc.
+.. i18n: 
+.. i18n: 2. The calculation of requirements prioritises the procurements. If you encode a purchase directly, you short-circuit the planning of different procurements.
+..
+
+1. The form is simpler, because OpenERP calculates the different values according to other values and defined rules: purchase date 
+calculated from order date, default supplier, raw materials needs, selection of the most suitable bill of materials, etc.
+
+2. The calculation of requirements prioritises the procurements. If you encode a purchase directly, you short-circuit the planning of different procurements.
+
+.. i18n: .. tip:: Shortcuts
+.. i18n: 
+.. i18n:     On the Product form you have an **action** shortcut button :guilabel:`Procurement Request` that lets you quickly 
+.. i18n:     create a new procurement order.
+.. i18n:         
+..
+
+.. tip:: Shortcuts
+
+    On the Product form you have an **action** shortcut button :guilabel:`Procurement Request` that lets you quickly 
+    create a new procurement order.
+        
+
+.. i18n: Working with Subcontractors
+.. i18n: ===========================
+..
+
+Working with Subcontractors
+===========================
+
+.. i18n: In OpenERP, you can also subcontract production operations (for example, painting and item assembly) at a supplier's. To do this, you should indicate on the relevant routing document a supplier location for stock management.
+..
+
+In OpenERP, you can also subcontract production operations (for example, painting and item assembly) at a supplier's. To do this, you should indicate on the relevant routing document a supplier location for stock management.
+
+.. i18n: Configure a location dedicated to this supplier with the following data:
+..
+
+Configure a location dedicated to this supplier with the following data:
+
+.. i18n: * :guilabel:`Location Type`: Supplier,
+.. i18n: 
+.. i18n: * :guilabel:`Location Address`: Select an address of the subcontracting partner,
+.. i18n: 
+.. i18n: * :guilabel:`Chained Location Type`: Fixed,
+.. i18n: 
+.. i18n: * :guilabel:`Chained Location if Fixed`: your Stock,
+.. i18n: 
+.. i18n: * :guilabel:`Chaining Lead Time`: number of days before receipt of the finished product.
+..
+
+* :guilabel:`Location Type`: Supplier,
+
+* :guilabel:`Location Address`: Select an address of the subcontracting partner,
+
+* :guilabel:`Chained Location Type`: Fixed,
+
+* :guilabel:`Chained Location if Fixed`: your Stock,
+
+* :guilabel:`Chaining Lead Time`: number of days before receipt of the finished product.
+
+.. i18n: Then once the manufacturing has been planned for the product concerned, OpenERP will generate the following steps:
+..
+
+Then once the manufacturing has been planned for the product concerned, OpenERP will generate the following steps:
+
+.. i18n: * Delivery of raw materials to the stores for the supplier,
+.. i18n: 
+.. i18n: * Production order for the products at the supplier's and receipt of the finished products in the stores.
+..
+
+* Delivery of raw materials to the stores for the supplier,
+
+* Production order for the products at the supplier's and receipt of the finished products in the stores.
+
+.. i18n: Once the production order has been confirmed, OpenERP automatically generates a delivery order to send to the raw materials supplier. The storesperson can access this delivery order from the menu :menuselection:`Warehouse --> Warehouse Management --> Internal Moves`. The raw materials will then be placed in stock at the supplier's stores.
+..
+
+Once the production order has been confirmed, OpenERP automatically generates a delivery order to send to the raw materials supplier. The storesperson can access this delivery order from the menu :menuselection:`Warehouse --> Warehouse Management --> Internal Moves`. The raw materials will then be placed in stock at the supplier's stores.
+
+.. i18n: Once the delivery of raw materials has been confirmed, OpenERP activates the production order. The supplier uses the raw materials to produce the finished goods which will automatically be put in your own stores. This manufacturing is confirmed when you receive the products from your supplier. Then you will indicate the quantities consumed by your supplier.
+..
+
+Once the delivery of raw materials has been confirmed, OpenERP activates the production order. The supplier uses the raw materials to produce the finished goods which will automatically be put in your own stores. This manufacturing is confirmed when you receive the products from your supplier. Then you will indicate the quantities consumed by your supplier.
+
+.. i18n: .. tip:: Subcontract without Routing
+.. i18n: 
+.. i18n:    If you do not use routing, you can always subcontract work orders by creating an empty routing in the subcontracting bill of materials.
+..
+
+.. tip:: Subcontract without Routing
+
+   If you do not use routing, you can always subcontract work orders by creating an empty routing in the subcontracting bill of materials.
+
+.. i18n: Production orders can be found in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. A production order is always carried out in two stages:
+..
+
+Production orders can be found in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. A production order is always carried out in two stages:
+
+.. i18n: #. Consumption of raw materials,
+.. i18n: 
+.. i18n: #. Production of finished products.
+..
+
+#. Consumption of raw materials,
+
+#. Production of finished products.
+
+.. i18n: Depending on the company's needs, you can specify that the first step is confirmed at the acknowledgement of the manufacturing supplier, and the second at the receipt of finished goods in the warehouse.
+..
+
+Depending on the company's needs, you can specify that the first step is confirmed at the acknowledgement of the manufacturing supplier, and the second at the receipt of finished goods in the warehouse.
+
+.. i18n: Matching Sales Orders and Bills of Materials
+.. i18n: ============================================
+..
+
+Matching Sales Orders and Bills of Materials
+============================================
+
+.. i18n: In OpenERP, you can define several bills of materials for the same product. In fact, you can have several manufacturing methods or several approved raw materials for a given product. You will see in the following section that the manufacturing procedure (the routing) is attached to the Bill of Materials, so the choice of bill of materials implicitly includes the operations to make it.
+..
+
+In OpenERP, you can define several bills of materials for the same product. In fact, you can have several manufacturing methods or several approved raw materials for a given product. You will see in the following section that the manufacturing procedure (the routing) is attached to the Bill of Materials, so the choice of bill of materials implicitly includes the operations to make it.
+
+.. i18n: Once several bills of materials have been defined for a particular product, you need to have a system to enable OpenERP to select one of them for use. By default, the bill of materials with the lowest sequence number is selected by the system.
+..
+
+Once several bills of materials have been defined for a particular product, you need to have a system to enable OpenERP to select one of them for use. By default, the bill of materials with the lowest sequence number is selected by the system.
+
+.. i18n: To gain more control over the process during selling or procuring, you can use **Properties**.
+.. i18n: The menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Properties` enables you to define properties, which can be set up arbitrarily to help you select a bill of materials when you have a choice of BoMs.
+..
+
+To gain more control over the process during selling or procuring, you can use **Properties**.
+The menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Properties` enables you to define properties, which can be set up arbitrarily to help you select a bill of materials when you have a choice of BoMs.
+
+.. i18n: .. note:: Properties
+.. i18n: 
+.. i18n:    Properties is a concept that enables the selection of a method to manufacture a product.
+.. i18n:    Properties define a common language between salespeople and technical people,
+.. i18n:    letting the salespeople have an influence on the manufacturing of the products using
+.. i18n:    non-technical language and the choices decided on by the technicians who define Bills
+.. i18n:    of Materials.
+..
+
+.. note:: Properties
+
+   Properties is a concept that enables the selection of a method to manufacture a product.
+   Properties define a common language between salespeople and technical people,
+   letting the salespeople have an influence on the manufacturing of the products using
+   non-technical language and the choices decided on by the technicians who define Bills
+   of Materials.
+
+.. i18n: For example, you can define the following property groups and properties:
+..
+
+For example, you can define the following property groups and properties:
+
+.. i18n: .. table:: Properties
+.. i18n: 
+.. i18n:    =====================  ============
+.. i18n:    Property Group         Property
+.. i18n:    =====================  ============
+.. i18n:    Warranty               3 years
+.. i18n:    Warranty               1 year
+.. i18n:    Method of Manufacture  Serial
+.. i18n:    Method of Manufacture  Batch
+.. i18n:    =====================  ============
+..
+
+.. table:: Properties
+
+   =====================  ============
+   Property Group         Property
+   =====================  ============
+   Warranty               3 years
+   Warranty               1 year
+   Method of Manufacture  Serial
+   Method of Manufacture  Batch
+   =====================  ============
+
+.. i18n: Once the bills of materials have been defined, you could associate the corresponding properties with them. Then when the salesperson enters a sales order line, he can attach the properties required (``Extra Info`` tab). If the product has to be manufactured, OpenERP will automatically choose the bill of materials that matches the defined properties in the order most closely.
+..
+
+Once the bills of materials have been defined, you could associate the corresponding properties with them. Then when the salesperson enters a sales order line, he can attach the properties required (``Extra Info`` tab). If the product has to be manufactured, OpenERP will automatically choose the bill of materials that matches the defined properties in the order most closely.
+
+.. i18n: .. note:: Extended View
+.. i18n: 
+.. i18n:         Note that the properties are only visible in the Bills of Materials and Sales Management if you are working in the ``Extended`` view mode. If you cannot see it on your screen, add the group ``Useability /Extended View`` to your user.
+..
+
+.. note:: Extended View
+
+        Note that the properties are only visible in the Bills of Materials and Sales Management if you are working in the ``Extended`` view mode. If you cannot see it on your screen, add the group ``Useability /Extended View`` to your user.
+
+.. i18n: .. figure:: images/sale_line_property.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Properties in a Customer Order Line*
+..
+
+.. figure:: images/sale_line_property.png
+   :scale: 75
+   :align: center
+
+   *Properties in a Customer Order Line*
+
+.. i18n: *Example: Manufacturing in a Batch or on a Production Line*
+..
+
+*Example: Manufacturing in a Batch or on a Production Line*
+
+.. i18n: As an example, take the manufacturing of the shelf presented above. You can imagine that the company has two methods of manufacturing for this cabinet:
+..
+
+As an example, take the manufacturing of the shelf presented above. You can imagine that the company has two methods of manufacturing for this cabinet:
+
+.. i18n: * Manually: the staff assembles the shelves one by one and cuts the wood plank by plank. This approach is
+.. i18n:   usually used to assemble prototypes. It gets you very rapid production, but at a high cost and
+.. i18n:   only in small quantities.
+.. i18n: 
+.. i18n: * On a production line: the staff uses machines that are capable of cutting wood by bandsaw. This method
+.. i18n:   is used for production runs of at least 50 items because the lead times using this method are quite
+.. i18n:   lengthy. The delay to start the production is much longer, yet the cost per unit is considerably lower
+.. i18n:   in this volume.
+..
+
+* Manually: the staff assembles the shelves one by one and cuts the wood plank by plank. This approach is
+  usually used to assemble prototypes. It gets you very rapid production, but at a high cost and
+  only in small quantities.
+
+* On a production line: the staff uses machines that are capable of cutting wood by bandsaw. This method
+  is used for production runs of at least 50 items because the lead times using this method are quite
+  lengthy. The delay to start the production is much longer, yet the cost per unit is considerably lower
+  in this volume.
+
+.. i18n: You define two bills of materials for the same cabinet. To distinguish between them, you will define two properties in the same group: ``manual assembly`` and ``production line assembly``. In the quotation, the salesperson can set the method of manufacture he wants on each order line,
+.. i18n: depending on the quantities and the lead time requested by the customer.
+..
+
+You define two bills of materials for the same cabinet. To distinguish between them, you will define two properties in the same group: ``manual assembly`` and ``production line assembly``. In the quotation, the salesperson can set the method of manufacture he wants on each order line,
+depending on the quantities and the lead time requested by the customer.
+
+.. i18n: .. index::
+.. i18n:    single: BoM, substitute products
+..
+
+.. index::
+   single: BoM, substitute products
+
+.. i18n: .. note:: Bills of Materials and Substitute Products
+.. i18n: 
+.. i18n:     In some software, you use the term ``substitute`` for this principle of configurable properties in
+.. i18n:     a bill of materials.
+..
+
+.. note:: Bills of Materials and Substitute Products
+
+    In some software, you use the term ``substitute`` for this principle of configurable properties in
+    a bill of materials.
+
+.. i18n: By putting a bill of materials on its own line, you can also implement substitute products. You set the bill of materials to type ``Sets/Phantom`` to make the substitution transparent and to prevent OpenERP from proposing an intermediate production order.
+..
+
+By putting a bill of materials on its own line, you can also implement substitute products. You set the bill of materials to type ``Sets/Phantom`` to make the substitution transparent and to prevent OpenERP from proposing an intermediate production order.
+
+.. i18n: Production and Services
+.. i18n: =======================
+..
+
+Production and Services
+=======================
+
+.. i18n: In OpenERP, you can handle three types of goods: two types of products (Stockable or Consumable products) and one type of services.
+..
+
+In OpenERP, you can handle three types of goods: two types of products (Stockable or Consumable products) and one type of services.
+
+.. i18n: For this last category, OpenERP can react in two different ways. Once a manufacturing order is generated for a product and this product contains a :guilabel:`Service`, a task can be automatically generated or not.
+..
+
+For this last category, OpenERP can react in two different ways. Once a manufacturing order is generated for a product and this product contains a :guilabel:`Service`, a task can be automatically generated or not.
+
+.. i18n: .. note:: Tasks
+.. i18n: 
+.. i18n:    In order to automatically generate a task, you have to install the module :mod:`project_mrp` which
+.. i18n:    requires the installation of the module :mod:`project`.
+..
+
+.. note:: Tasks
+
+   In order to automatically generate a task, you have to install the module :mod:`project_mrp` which
+   requires the installation of the module :mod:`project`.
+
+.. i18n: By default, the generated task is not linked to any project. You can change this behaviour by creating a project and link the service to this project. This can be done in the ``Product`` form, on the tab :guilabel:`Procurement & Locations` in the :guilabel:`Miscellaneous` section. Select the project to be linked in the ``Project`` field.
+..
+
+By default, the generated task is not linked to any project. You can change this behaviour by creating a project and link the service to this project. This can be done in the ``Product`` form, on the tab :guilabel:`Procurement & Locations` in the :guilabel:`Miscellaneous` section. Select the project to be linked in the ``Project`` field.
+
+.. i18n: .. figure:: images/service_prj.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Link a Service Product to a Project*
+..
+
+.. figure:: images/service_prj.png
+    :scale: 75
+    :align: center
+    
+    *Link a Service Product to a Project*
+
+.. i18n: To illustrate this process, follow the next example:
+..
+
+To illustrate this process, follow the next example:
+
+.. i18n: First, you have to create a project to which you want to link the service. We will call this project *Consulting*. After creating the project, we have to create a new product. Here are the characteristics of this product:
+.. i18n:    
+..
+
+First, you have to create a project to which you want to link the service. We will call this project *Consulting*. After creating the project, we have to create a new product. Here are the characteristics of this product:
+   
+
+.. i18n: .. table:: Configure a New Service
+.. i18n: 
+.. i18n:    ================== ==============
+.. i18n:    Field              Value
+.. i18n:    ================== ==============
+.. i18n:    Name               Consulting
+.. i18n:    Reference          CSLT
+.. i18n:    Product Type       Service
+.. i18n:    Procurement Method Make to Order
+.. i18n:    Supply Method      Produce
+.. i18n:    Default UoM        Hour
+.. i18n:    **Project**        **Consulting**
+.. i18n:    ================== ==============
+.. i18n:    
+.. i18n: Once you have configured your project and your product, you can create a Sales Order to order hours of consultancy. When you confirm the Sales Order, a task will be created.
+..
+
+.. table:: Configure a New Service
+
+   ================== ==============
+   Field              Value
+   ================== ==============
+   Name               Consulting
+   Reference          CSLT
+   Product Type       Service
+   Procurement Method Make to Order
+   Supply Method      Produce
+   Default UoM        Hour
+   **Project**        **Consulting**
+   ================== ==============
+   
+Once you have configured your project and your product, you can create a Sales Order to order hours of consultancy. When you confirm the Sales Order, a task will be created.
+
+.. i18n: .. figure:: images/soprj_tip.png
+.. i18n:     :scale: 100
+.. i18n:     :align: center
+.. i18n:     
+.. i18n: If you go to :menuselection:`Project --> Project --> Tasks`, you will find a new task called: :guilabel:`SO011:[CSLT] Consulting`. This task is linked to the project :guilabel`Consulting`. Note that the Sales Order number may be different in your database.
+..
+
+.. figure:: images/soprj_tip.png
+    :scale: 100
+    :align: center
+    
+If you go to :menuselection:`Project --> Project --> Tasks`, you will find a new task called: :guilabel:`SO011:[CSLT] Consulting`. This task is linked to the project :guilabel`Consulting`. Note that the Sales Order number may be different in your database.
+
+.. i18n: .. figure:: images/prj_so.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *A Product linked to a Task and a Project*    
+..
+
+.. figure:: images/prj_so.png
+    :scale: 75
+    :align: center
+    
+    *A Product linked to a Task and a Project*    
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst'
--- i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst	1970-01-01 00:00:00 +0000
+++ i18n/fr/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,559 @@
+
+.. i18n: Logistics and Manufacturing
+.. i18n: ===========================
+..
+
+Logistics and Manufacturing
+===========================
+
+.. i18n: Manufacturing Stock Locations
+.. i18n: +++++++++++++++++++++++++++++
+..
+
+Manufacturing Stock Locations
++++++++++++++++++++++++++++++
+
+.. i18n: OpenERP allows you to define a specific location to keep track of your manufacturing moves. 
+..
+
+OpenERP allows you to define a specific location to keep track of your manufacturing moves. 
+
+.. i18n: To get an overview of all stock moves, go to :menuselection:`Warehouse --> Traceability --> Stock Moves`. You can enter your Production location in the ``Location`` search field and then group by Source or Destination according to the moves you would like to check.
+..
+
+To get an overview of all stock moves, go to :menuselection:`Warehouse --> Traceability --> Stock Moves`. You can enter your Production location in the ``Location`` search field and then group by Source or Destination according to the moves you would like to check.
+
+.. i18n: Traceability
+.. i18n: ++++++++++++
+..
+
+Traceability
+++++++++++++
+
+.. i18n: With traceability you can easily track your production lots in the software. With this functionality you can
+.. i18n: quickly find where your products are in your warehouse. In counterpart, you will be forced to mention a
+.. i18n: number of lot to each product to be able to track it in the system.
+..
+
+With traceability you can easily track your production lots in the software. With this functionality you can
+quickly find where your products are in your warehouse. In counterpart, you will be forced to mention a
+number of lot to each product to be able to track it in the system.
+
+.. i18n: To enable traceability in the manufacturing process, go to :menuselection:`Warehouse --> Product --> Products`. In the ``Product`` form, you have to select the box :guilabel:`Track Manufacturing Lots` in the :guilabel:`Lots` section on the ``Information`` tab.
+..
+
+To enable traceability in the manufacturing process, go to :menuselection:`Warehouse --> Product --> Products`. In the ``Product`` form, you have to select the box :guilabel:`Track Manufacturing Lots` in the :guilabel:`Lots` section on the ``Information`` tab.
+
+.. i18n: In the manufacturing order, you have to mention a production lot number in order to continue the process.
+.. i18n: You can select the production lot in the :guilabel:`Manufacturing Order` form on the second tab, called :guilabel:`Finished Products`. You have to click the Products to Finish you want to trace, a new window will open. In the :guilabel:`Production Lot` field, click to link the manufacturing order to a production lot.
+..
+
+In the manufacturing order, you have to mention a production lot number in order to continue the process.
+You can select the production lot in the :guilabel:`Manufacturing Order` form on the second tab, called :guilabel:`Finished Products`. You have to click the Products to Finish you want to trace, a new window will open. In the :guilabel:`Production Lot` field, click to link the manufacturing order to a production lot.
+
+.. i18n: .. figure:: images/prod_lot.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Tracking a Manufacturing Order*
+..
+
+.. figure:: images/prod_lot.png
+    :scale: 75
+    :align: center
+    
+    *Tracking a Manufacturing Order*
+
+.. i18n: When you have linked some manufacturing orders to production lots, you can trace them from the menu :menuselection:`Warehouse --> Traceability --> Production Lots`. In this view, you see the different production lots linked to a product. If you select one lot, you will have the possibility to choose between :guilabel:`Upstream Traceability` or :guilabel:`Downstream Traceability`.
+..
+
+When you have linked some manufacturing orders to production lots, you can trace them from the menu :menuselection:`Warehouse --> Traceability --> Production Lots`. In this view, you see the different production lots linked to a product. If you select one lot, you will have the possibility to choose between :guilabel:`Upstream Traceability` or :guilabel:`Downstream Traceability`.
+
+.. i18n: .. figure:: images/production_lots.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Choosing between Upstream and Downstream Traceability*
+.. i18n:     
+.. i18n: .. tip:: Traceability
+.. i18n:     
+.. i18n:     **Upstream Traceability**: It starts from the raw materials received from the supplier and follows 
+.. i18n:     the chain to the finished products delivered to customers. Note that the name is confusing - this 
+.. i18n:     would often be considered a downstream direction. Think of it as **Where Used**.
+.. i18n:     
+.. i18n:     **Downstream Traceability**: It follows the product in the other direction, from customer to the different 
+.. i18n:     suppliers of raw material. Note that the name is confusing - this would often be considered an upstream 
+.. i18n:     direction. Think of it as **Where Supplied**.
+.. i18n: 
+.. i18n:         
+.. i18n: .. figure:: images/upstream_trace.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Upstream Traceability*
+..
+
+.. figure:: images/production_lots.png
+    :scale: 75
+    :align: center
+    
+    *Choosing between Upstream and Downstream Traceability*
+    
+.. tip:: Traceability
+    
+    **Upstream Traceability**: It starts from the raw materials received from the supplier and follows 
+    the chain to the finished products delivered to customers. Note that the name is confusing - this 
+    would often be considered a downstream direction. Think of it as **Where Used**.
+    
+    **Downstream Traceability**: It follows the product in the other direction, from customer to the different 
+    suppliers of raw material. Note that the name is confusing - this would often be considered an upstream 
+    direction. Think of it as **Where Supplied**.
+
+        
+.. figure:: images/upstream_trace.png
+    :scale: 75
+    :align: center
+    
+    *Upstream Traceability*
+
+.. i18n: The different lines show the stock moves attached to the production of the product. There are several
+.. i18n: stock moves that are traced due to the Bill of Materials attached to the product *[PC1] Basic PC*.
+.. i18n:     
+.. i18n:         
+.. i18n: .. figure:: images/downstream_trace.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Downstream Traceability*        
+..
+
+The different lines show the stock moves attached to the production of the product. There are several
+stock moves that are traced due to the Bill of Materials attached to the product *[PC1] Basic PC*.
+    
+        
+.. figure:: images/downstream_trace.png
+    :scale: 75
+    :align: center
+    
+    *Downstream Traceability*        
+
+.. i18n: In this window, you only see the move for the finished product. This is related to the definition of the  concept of Downstream Traceability, which only shows the flow from the customer to the supplier of raw materials.
+..
+
+In this window, you only see the move for the finished product. This is related to the definition of the  concept of Downstream Traceability, which only shows the flow from the customer to the supplier of raw materials.
+
+.. i18n: Managing Repairs: from Repair to Invoicing and Stock Movements
+.. i18n: ==============================================================
+..
+
+Managing Repairs: from Repair to Invoicing and Stock Movements
+==============================================================
+
+.. i18n: .. index::
+.. i18n:    single: module; mrp_repair
+..
+
+.. index::
+   single: module; mrp_repair
+
+.. i18n: The management of repairs is carried out through the module :mod:`mrp_repair`. Once installed, this module adds a new :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` menu under the ``Manufacturing`` menu to create repair jobs and review repairs in progress.
+..
+
+The management of repairs is carried out through the module :mod:`mrp_repair`. Once installed, this module adds a new :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` menu under the ``Manufacturing`` menu to create repair jobs and review repairs in progress.
+
+.. i18n: .. tip:: Repairs
+.. i18n: 
+.. i18n:         To install this module, you can also use the ``Reconfigure`` wizard. In the *MRP Application Configuration* screen, check the ``Repairs`` option.
+..
+
+.. tip:: Repairs
+
+        To install this module, you can also use the ``Reconfigure`` wizard. In the *MRP Application Configuration* screen, check the ``Repairs`` option.
+
+.. i18n: In OpenERP, a repair will have the following effects:
+..
+
+In OpenERP, a repair will have the following effects:
+
+.. i18n: * Use of materials: items for replacement,
+.. i18n: 
+.. i18n: * Production of products: items replaced from reserved stock,
+.. i18n: 
+.. i18n: * Quality control: tracking the reasons for repair,
+.. i18n: 
+.. i18n: * Accounting entries: following stock moves,
+.. i18n: 
+.. i18n: * Receipt and delivery of product from and to the end user,
+.. i18n: 
+.. i18n: * Adding operations that can be seen in the product's traceability,
+.. i18n: 
+.. i18n: * Invoicing items used and/or free for repairs.
+..
+
+* Use of materials: items for replacement,
+
+* Production of products: items replaced from reserved stock,
+
+* Quality control: tracking the reasons for repair,
+
+* Accounting entries: following stock moves,
+
+* Receipt and delivery of product from and to the end user,
+
+* Adding operations that can be seen in the product's traceability,
+
+* Invoicing items used and/or free for repairs.
+
+.. i18n: Entering Data for a New Repair
+.. i18n: ++++++++++++++++++++++++++++++
+..
+
+Entering Data for a New Repair
+++++++++++++++++++++++++++++++
+
+.. i18n: Use the menu :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` to enter a new repair into
+.. i18n: the system. You will see a blank form for the repair data, as shown in the figure :ref:`fig-mrprepnew2` below.
+..
+
+Use the menu :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` to enter a new repair into
+the system. You will see a blank form for the repair data, as shown in the figure :ref:`fig-mrprepnew2` below.
+
+.. i18n: .. _fig-mrprepnew2:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_repair_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Entering a New Repair*
+..
+
+.. _fig-mrprepnew2:
+
+.. figure:: images/mrp_repair_new.png
+   :scale: 75
+   :align: center
+
+   *Entering a New Repair*
+
+.. i18n: First enter the product to repair, then identify the product that will be repaired using the *product lot number*. OpenERP then automatically completes fields from the selected lot – the partner fields, address, delivery location and stock move.
+..
+
+First enter the product to repair, then identify the product that will be repaired using the *product lot number*. OpenERP then automatically completes fields from the selected lot – the partner fields, address, delivery location and stock move.
+
+.. i18n: If a warranty period has been defined in the product description, in months, OpenERP completes the field :guilabel:`Guarantee limit` with the correct warranty date.
+..
+
+If a warranty period has been defined in the product description, in months, OpenERP completes the field :guilabel:`Guarantee limit` with the correct warranty date.
+
+.. i18n: Now you have to specify the components that you will be adding, replacing or removing in the *Operations* part. On each line, you should specify the following:
+..
+
+Now you have to specify the components that you will be adding, replacing or removing in the *Operations* part. On each line, you should specify the following:
+
+.. i18n: Add or remove a component of the finished product:
+..
+
+Add or remove a component of the finished product:
+
+.. i18n: * `Product`,
+.. i18n: 
+.. i18n: * `Qty`,
+.. i18n: 
+.. i18n: * `UoM`,
+.. i18n: 
+.. i18n: * `Unit Price`,
+.. i18n: 
+.. i18n: * `To Invoice` or not.
+..
+
+* `Product`,
+
+* `Qty`,
+
+* `UoM`,
+
+* `Unit Price`,
+
+* `To Invoice` or not.
+
+.. i18n: Once the component has been selected, OpenERP automatically completes most of the fields:
+..
+
+Once the component has been selected, OpenERP automatically completes most of the fields:
+
+.. i18n: * :guilabel:`Qty`: 1,
+.. i18n: 
+.. i18n: * :guilabel:`UoM`: unit for managing stock defined in the product form,
+.. i18n: 
+.. i18n: * :guilabel:`Unit Price`: calculated from the customer list price,
+.. i18n: 
+.. i18n: * :guilabel:`Source Location`: given by the stock management,
+.. i18n: 
+.. i18n: * :guilabel:`To Invoice`: depends on the actual date and the guarantee period.
+..
+
+* :guilabel:`Qty`: 1,
+
+* :guilabel:`UoM`: unit for managing stock defined in the product form,
+
+* :guilabel:`Unit Price`: calculated from the customer list price,
+
+* :guilabel:`Source Location`: given by the stock management,
+
+* :guilabel:`To Invoice`: depends on the actual date and the guarantee period.
+
+.. i18n: This information is automatically proposed by the system, but you can modify it all yourself.
+..
+
+This information is automatically proposed by the system, but you can modify it all yourself.
+
+.. i18n: On the second tab of the ``Repair`` form, ``Invoicing``, you can select whether the repair has to be invoiced or not, and if invoiced whether it should be before or after the repair. You can also select the applicable list price, a specific address and encode additional charges that need to be added to the repair invoice.
+..
+
+On the second tab of the ``Repair`` form, ``Invoicing``, you can select whether the repair has to be invoiced or not, and if invoiced whether it should be before or after the repair. You can also select the applicable list price, a specific address and encode additional charges that need to be added to the repair invoice.
+
+.. i18n: .. figure:: images/mrp_repair_tab2.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Repair Form, Invoicing Tab*
+..
+
+.. figure:: images/mrp_repair_tab2.png
+   :scale: 75
+   :align: center
+
+   *Repair Form, Invoicing Tab*
+
+.. i18n: The third tab, ``Extra Info`` shows information about linked invoice and picking. You receive information about the current location, and you can change the ``Delivery Location``. The ``Notes`` tab allows you to register internal notes and information that should be written on the Quotation.
+..
+
+The third tab, ``Extra Info`` shows information about linked invoice and picking. You receive information about the current location, and you can change the ``Delivery Location``. The ``Notes`` tab allows you to register internal notes and information that should be written on the Quotation.
+
+.. i18n: Repair Workflow
+.. i18n: +++++++++++++++
+..
+
+Repair Workflow
++++++++++++++++
+
+.. i18n: A defined process handles a repair order – both the repair itself and the customer invoicing. The figure :ref:`fig-mrprepflow2` shows this repair process.
+..
+
+A defined process handles a repair order – both the repair itself and the customer invoicing. The figure :ref:`fig-mrprepflow2` shows this repair process.
+
+.. i18n: .. _fig-mrprepflow2:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_repair_workflow.png
+.. i18n:    :scale: 65
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Process to Handle a Repair*
+..
+
+.. _fig-mrprepflow2:
+
+.. figure:: images/mrp_repair_workflow.png
+   :scale: 65
+   :align: center
+
+   *Process to Handle a Repair*
+
+.. i18n: Once a repair has been entered in the system, it is in the ``Quotation`` state. In this state, a repair order has no impact on the rest of the system. You can print a quotation through the action `Quotation / Order`.
+..
+
+Once a repair has been entered in the system, it is in the ``Quotation`` state. In this state, a repair order has no impact on the rest of the system. You can print a quotation through the action `Quotation / Order`.
+
+.. i18n: On the second tab, you can specify the `Invoice Method`:
+..
+
+On the second tab, you can specify the `Invoice Method`:
+
+.. i18n: * ``No Invoice``,
+.. i18n: 
+.. i18n: * ``Before Repair``,
+.. i18n: 
+.. i18n: * ``After Repair``.
+..
+
+* ``No Invoice``,
+
+* ``Before Repair``,
+
+* ``After Repair``.
+
+.. i18n: You can then confirm the repair operation or create an invoice for the customer depending on the Invoice Method.
+..
+
+You can then confirm the repair operation or create an invoice for the customer depending on the Invoice Method.
+
+.. i18n: The repair quotation can now be sent to the customer. Once the customer approves the repair, click the `Confirm Repair` button. From the menu :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` you can easily find the confirmed repair orders by selecting the ``Confirmed`` button. Click `Start Repair` to indicate that you can start working on the repair. The Repair order will now be in the ``Under Repair`` state. When you finish the repair, click the ``End Repair`` button.
+..
+
+The repair quotation can now be sent to the customer. Once the customer approves the repair, click the `Confirm Repair` button. From the menu :menuselection:`Manufacturing --> Manufacturing --> Repair Orders` you can easily find the confirmed repair orders by selecting the ``Confirmed`` button. Click `Start Repair` to indicate that you can start working on the repair. The Repair order will now be in the ``Under Repair`` state. When you finish the repair, click the ``End Repair`` button.
+
+.. i18n: .. index::
+.. i18n:    pair: invoicing; repair
+..
+
+.. index::
+   pair: invoicing; repair
+
+.. i18n: Invoicing the Repair
+.. i18n: ++++++++++++++++++++
+..
+
+Invoicing the Repair
+++++++++++++++++++++
+
+.. i18n: When the repair is to be invoiced, a draft invoice is generated by the system. For an After Repair invoice, you can click the ``Make Invoice`` button. OpenERP will then show the draft invoice created at the top of the repair order (red text). You can easily go to that invoice simply by clicking the corresponding red text. This invoice contains the raw materials used (replaced components) and any other costs such as the time used for the repair. These other costs are entered on the second tab of the *Repair* form. Any information you entered for the quotation on the ``Notes`` tab will also be displayed on the invoice.
+..
+
+When the repair is to be invoiced, a draft invoice is generated by the system. For an After Repair invoice, you can click the ``Make Invoice`` button. OpenERP will then show the draft invoice created at the top of the repair order (red text). You can easily go to that invoice simply by clicking the corresponding red text. This invoice contains the raw materials used (replaced components) and any other costs such as the time used for the repair. These other costs are entered on the second tab of the *Repair* form. Any information you entered for the quotation on the ``Notes`` tab will also be displayed on the invoice.
+
+.. i18n: If the product to be repaired is still under guarantee, OpenERP automatically suggests that the components themselves are not invoiced, but will still use any other defined costs. You can override any of these default values while entering the data.
+..
+
+If the product to be repaired is still under guarantee, OpenERP automatically suggests that the components themselves are not invoiced, but will still use any other defined costs. You can override any of these default values while entering the data.
+
+.. i18n: .. note:: Extra Info
+.. i18n: 
+.. i18n:         The link to the generated invoice is shown on the ``Extra Info``tab of the repair document. To open the invoice, simply click the ``Invoice`` field.
+..
+
+.. note:: Extra Info
+
+        The link to the generated invoice is shown on the ``Extra Info``tab of the repair document. To open the invoice, simply click the ``Invoice`` field.
+
+.. i18n: Stock Movements and Repairs
+.. i18n: +++++++++++++++++++++++++++
+..
+
+Stock Movements and Repairs
++++++++++++++++++++++++++++
+
+.. i18n: When the repair has been carried out, OpenERP automatically carries out stock movements for components that have been removed, added or replaced on the finished product. From the menu :menuselection:`Warehouse --> Traceability --> Stock Moves`, you can for instance enter the production lot to see all moves for the repaired product.
+..
+
+When the repair has been carried out, OpenERP automatically carries out stock movements for components that have been removed, added or replaced on the finished product. From the menu :menuselection:`Warehouse --> Traceability --> Stock Moves`, you can for instance enter the production lot to see all moves for the repaired product.
+
+.. i18n: The move operations are carried out using the locations shown in the first tab of the ``Repair`` form. If a destination location has been specified, OpenERP automatically handles the final customer delivery order when the repair has been completed. This also lets you manage the delivery of the repaired products.
+..
+
+The move operations are carried out using the locations shown in the first tab of the ``Repair`` form. If a destination location has been specified, OpenERP automatically handles the final customer delivery order when the repair has been completed. This also lets you manage the delivery of the repaired products.
+
+.. i18n: For example, take the case of the shelf that was produced at the start of this chapter. If you have to replace the shelf SIDEPAN, you should enter data for the repair as shown in figure :ref:`fig-mrpreppan2`.
+..
+
+For example, take the case of the shelf that was produced at the start of this chapter. If you have to replace the shelf SIDEPAN, you should enter data for the repair as shown in figure :ref:`fig-mrpreppan2`.
+
+.. i18n: .. _fig-mrpreppan2:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_repair_panlat.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Repair for a Side Panel*
+..
+
+.. _fig-mrpreppan2:
+
+.. figure:: images/mrp_repair_panlat.png
+   :scale: 75
+   :align: center
+
+   *Repair for a Side Panel*
+
+.. i18n: In this example, you would carry out the following operations:
+..
+
+In this example, you would carry out the following operations:
+
+.. i18n: * Remove a SIDEPAN shelf in the cabinet and put the faulty shelf in the *Scrapped* location,
+.. i18n: 
+.. i18n: * Place a new SIDEPAN shelf that has been taken from stock.
+..
+
+* Remove a SIDEPAN shelf in the cabinet and put the faulty shelf in the *Scrapped* location,
+
+* Place a new SIDEPAN shelf that has been taken from stock.
+
+.. i18n: When the repair is ready to be confirmed, OpenERP will generate the following stock moves:
+..
+
+When the repair is ready to be confirmed, OpenERP will generate the following stock moves:
+
+.. i18n: * Put faulty SIDEPAN into suitable stock location *Default Production > Scrapped*,
+.. i18n: 
+.. i18n: * Consume SIDEPAN: *Stock > Production*.
+..
+
+* Put faulty SIDEPAN into suitable stock location *Default Production > Scrapped*,
+
+* Consume SIDEPAN: *Stock > Production*.
+
+.. i18n: If you analyze the traceability of this lot number, you will see all the repair operations in the
+.. i18n: upstream and downstream traceability lists of the products concerned.
+..
+
+If you analyze the traceability of this lot number, you will see all the repair operations in the
+upstream and downstream traceability lists of the products concerned.
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/5_15_Master_data.rst'
--- i18n/fr/source/book/5/5_15_Manufacturing/5_15_Master_data.rst	1970-01-01 00:00:00 +0000
+++ i18n/fr/source/book/5/5_15_Manufacturing/5_15_Master_data.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,1085 @@
+
+.. i18n: Bill of Materials and Components
+.. i18n: ================================
+..
+
+Bill of Materials and Components
+================================
+
+.. i18n: Using Bills of Materials
+.. i18n: ------------------------
+..
+
+Using Bills of Materials
+------------------------
+
+.. i18n: Bills of Materials are documents that describe the list of raw materials used to make a finished
+.. i18n: product. To illustrate the concept of specification, you will work on a shelf (or cabinet) where the
+.. i18n: manufacturing plan is given by the figure :ref:`fig-mrparm2`.
+..
+
+Bills of Materials are documents that describe the list of raw materials used to make a finished
+product. To illustrate the concept of specification, you will work on a shelf (or cabinet) where the
+manufacturing plan is given by the figure :ref:`fig-mrparm2`.
+
+.. i18n: .. _fig-mrparm2:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_armoire.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Plan of Construction of a Shelf*
+..
+
+.. _fig-mrparm2:
+
+.. figure:: images/mrp_armoire.png
+   :scale: 75
+   :align: center
+
+   *Plan of Construction of a Shelf*
+
+.. i18n: The shelf is assembled from raw materials and intermediate assemblies. The Image Code refers to the picture, the Product Reference is the corresponding code in OpenERP.
+..
+
+The shelf is assembled from raw materials and intermediate assemblies. The Image Code refers to the picture, the Product Reference is the corresponding code in OpenERP.
+
+.. i18n: Change the unit of the Wood Lintel 4m (LIN40) product to ``m`` instead of PCE.
+..
+
+Change the unit of the Wood Lintel 4m (LIN40) product to ``m`` instead of PCE.
+
+.. i18n: .. table:: Product Definitions before defining Bills of Materials (already defined)
+.. i18n: 
+.. i18n:    ========== ================= =========================
+.. i18n:    Image Code Product Reference Description
+.. i18n:    ========== ================= =========================
+.. i18n:    ARM100     SHE100            Shelf 100 cm
+.. i18n:    PANLAT     SIDEPAN           Side Panel
+.. i18n:    PANA100    RPAN100           Rear Panel SHE100
+.. i18n:    PROFIL     PROFIL            Assembly Section
+.. i18n:    ETA100     RCK100            Rack 100cm
+.. i18n:    BOIS002    WOOD002           Wood 2mm
+.. i18n:    TAQ000     METC000           Metal Cleats
+.. i18n:    LIN40      LIN40             Wood Lintel 4m
+.. i18n:    ========== ================= =========================
+..
+
+.. table:: Product Definitions before defining Bills of Materials (already defined)
+
+   ========== ================= =========================
+   Image Code Product Reference Description
+   ========== ================= =========================
+   ARM100     SHE100            Shelf 100 cm
+   PANLAT     SIDEPAN           Side Panel
+   PANA100    RPAN100           Rear Panel SHE100
+   PROFIL     PROFIL            Assembly Section
+   ETA100     RCK100            Rack 100cm
+   BOIS002    WOOD002           Wood 2mm
+   TAQ000     METC000           Metal Cleats
+   LIN40      LIN40             Wood Lintel 4m
+   ========== ================= =========================
+
+.. i18n: .. table:: New Products to be created before defining Bill of Materials
+.. i18n: 
+.. i18n:    ========== ================= =========================
+.. i18n:    Image Code Product Reference Description
+.. i18n:    ========== ================= =========================
+.. i18n:    PLET100    SPAN100           Shelf Panel
+.. i18n:    BOIS010    WOOD010           Wood 10mm
+.. i18n:    ========== ================= =========================
+..
+
+.. table:: New Products to be created before defining Bill of Materials
+
+   ========== ================= =========================
+   Image Code Product Reference Description
+   ========== ================= =========================
+   PLET100    SPAN100           Shelf Panel
+   BOIS010    WOOD010           Wood 10mm
+   ========== ================= =========================
+
+.. i18n: .. tip:: Copy
+.. i18n: 
+.. i18n:         To create the above products, duplicate existing ones, such as Side Panel and Wood 2mm, from the Purchase or Sales menu :menuselection:`Purchases --> Products --> Products`.
+..
+
+.. tip:: Copy
+
+        To create the above products, duplicate existing ones, such as Side Panel and Wood 2mm, from the Purchase or Sales menu :menuselection:`Purchases --> Products --> Products`.
+
+.. i18n: To describe how this shelf should be assembled, you define a bill of materials for each intermediate product and for the final shelf assembly. These are shown in the tables below. You can start from the demo data and complete them according to the specifications. To create or change a bill of materials, go to :menuselection:`Manufacturing --> Master Data --> Bill of Materials`.
+..
+
+To describe how this shelf should be assembled, you define a bill of materials for each intermediate product and for the final shelf assembly. These are shown in the tables below. You can start from the demo data and complete them according to the specifications. To create or change a bill of materials, go to :menuselection:`Manufacturing --> Master Data --> Bill of Materials`.
+
+.. i18n: .. table:: Bill of Materials for 1 SHE100 Unit (already defined)
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    PROFIL         4        PCE
+.. i18n:    SIDEPAN        2        PCE
+.. i18n:    METC000       12        PCE
+.. i18n:    RPAN100        1        PCE
+.. i18n:    RCK100         3        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 SHE100 Unit (already defined)
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   PROFIL         4        PCE
+   SIDEPAN        2        PCE
+   METC000       12        PCE
+   RPAN100        1        PCE
+   RCK100         3        PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 1 RCK100 PCE
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SPAN100       1         PCE
+.. i18n:    METC000       4         PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 RCK100 PCE
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   SPAN100       1         PCE
+   METC000       4         PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 1 SPAN100 PCE
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    WOOD010       0.083     m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 SPAN100 PCE
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   WOOD010       0.083     m
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 1 PROFIL PCE
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    LIN40         0.25      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 PROFIL PCE
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   LIN40         0.25      m
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 1 RPAN100 PCE
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    WOOD002       0.25      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 RPAN100 PCE
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   WOOD002       0.25      m
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 1 SIDEPAN PCE
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    WOOD002       0.083     m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 SIDEPAN PCE
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   WOOD002       0.083     m
+   ============  ========  ===============
+
+.. i18n: The bills of materials are then used by the software to calculate the raw material needs based on the
+.. i18n: requirements of the finished products. So if you want to manufacture 10 shelves, the system can
+.. i18n: calculate the actual products that will be consumed:
+..
+
+The bills of materials are then used by the software to calculate the raw material needs based on the
+requirements of the finished products. So if you want to manufacture 10 shelves, the system can
+calculate the actual products that will be consumed:
+
+.. i18n: .. table:: Total Quantities per Shelf
+.. i18n: 
+.. i18n:    ============  =========================  ===============
+.. i18n:    Product Code  Quantity                   Unit of Measure
+.. i18n:    ============  =========================  ===============
+.. i18n:    WOOD002       0.416 (2 * 0.083 + 0.25)   m
+.. i18n:    LIN40         1 (4 * 0.25)               m
+.. i18n:    WOOD010       0.249 (0.083 * 3)          m
+.. i18n:    METC000       132 ((3 * 4) + (10 * 12))  PCE
+.. i18n:    ============  =========================  ===============
+..
+
+.. table:: Total Quantities per Shelf
+
+   ============  =========================  ===============
+   Product Code  Quantity                   Unit of Measure
+   ============  =========================  ===============
+   WOOD002       0.416 (2 * 0.083 + 0.25)   m
+   LIN40         1 (4 * 0.25)               m
+   WOOD010       0.249 (0.083 * 3)          m
+   METC000       132 ((3 * 4) + (10 * 12))  PCE
+   ============  =========================  ===============
+
+.. i18n: .. tip:: Bill of Materials
+.. i18n: 
+.. i18n:    To see the bill of materials in tree view, use the menu :menuselection:`Manufacturing -->
+.. i18n:    Master Data --> Bill of Materials` then select the product and click the action `BOM Structure`.
+..
+
+.. tip:: Bill of Materials
+
+   To see the bill of materials in tree view, use the menu :menuselection:`Manufacturing -->
+   Master Data --> Bill of Materials` then select the product and click the action `BOM Structure`.
+
+.. i18n: .. figure:: images/mrp_bom_tree_new.png
+.. i18n:    :scale: 65
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Bill of Materials structure*
+..
+
+.. figure:: images/mrp_bom_tree_new.png
+   :scale: 65
+   :align: center
+
+   *Bill of Materials structure*
+
+.. i18n: Use the menu :menuselection:`Manufacturing --> Master Data --> Bill of Materials`
+.. i18n: and click the `New` button to define a new bill of materials.
+..
+
+Use the menu :menuselection:`Manufacturing --> Master Data --> Bill of Materials`
+and click the `New` button to define a new bill of materials.
+
+.. i18n: .. tip:: The Different Views
+.. i18n: 
+.. i18n:     To change the view in the bill of materials you can:
+.. i18n: 
+.. i18n:     * From the list, select a bill of materials name and then click :guilabel:`Form View`,
+.. i18n: 
+.. i18n:     * From a product form, use the menu :guilabel:`Product BoM Structure` to the right.
+..
+
+.. tip:: The Different Views
+
+    To change the view in the bill of materials you can:
+
+    * From the list, select a bill of materials name and then click :guilabel:`Form View`,
+
+    * From a product form, use the menu :guilabel:`Product BoM Structure` to the right.
+
+.. i18n: .. figure:: images/mrp_bom_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Defining a Bill of Materials (Extended view)*
+..
+
+.. figure:: images/mrp_bom_new.png
+   :scale: 75
+   :align: center
+
+   *Defining a Bill of Materials (Extended view)*
+
+.. i18n: In the ``Product`` field of the bill of materials, you should set the finished product, which will be
+.. i18n: manufactured or assembled. Once the product has been selected, OpenERP automatically completes the
+.. i18n: name of the bill of materials and the default Unit of Measure for this product.
+..
+
+In the ``Product`` field of the bill of materials, you should set the finished product, which will be
+manufactured or assembled. Once the product has been selected, OpenERP automatically completes the
+name of the bill of materials and the default Unit of Measure for this product.
+
+.. i18n: The type of BoM (:guilabel:`BoM Type` : ``Sets/Phantom`` or ``Normal BoM``) and
+.. i18n: the :guilabel:`Routing` field will be described in more detail later in the chapter.
+..
+
+The type of BoM (:guilabel:`BoM Type` : ``Sets/Phantom`` or ``Normal BoM``) and
+the :guilabel:`Routing` field will be described in more detail later in the chapter.
+
+.. i18n: Now you can select the raw materials (``Components``) that are used to manufacture the finished
+.. i18n: product. The quantities are set out based on the quantities of finished product and the quantities needed to produce them from the bill of materials.
+..
+
+Now you can select the raw materials (``Components``) that are used to manufacture the finished
+product. The quantities are set out based on the quantities of finished product and the quantities needed to produce them from the bill of materials.
+
+.. i18n: .. index::
+.. i18n:    single: BoM; revisions
+..
+
+.. index::
+   single: BoM; revisions
+
+.. i18n: The second tab, :guilabel:`Revisions`, is used to register all the changes made to the bill of materials. On each change, you can specify a revision number and some notes on the modifications you carried out.
+..
+
+The second tab, :guilabel:`Revisions`, is used to register all the changes made to the bill of materials. On each change, you can specify a revision number and some notes on the modifications you carried out.
+
+.. i18n: .. note:: Simplified View
+.. i18n: 
+.. i18n:    The `Revisions` tab is only visible if the user works in the ``Extended`` view mode
+.. i18n:    (which means that the user should belong to the group ``Useability / Extended View`` .
+..
+
+.. note:: Simplified View
+
+   The `Revisions` tab is only visible if the user works in the ``Extended`` view mode
+   (which means that the user should belong to the group ``Useability / Extended View`` .
+
+.. i18n: .. figure:: images/mrp_bom_revision_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Revisions of a Bill of Materials (Extended view)*
+..
+
+.. figure:: images/mrp_bom_revision_new.png
+   :scale: 75
+   :align: center
+
+   *Revisions of a Bill of Materials (Extended view)*
+
+.. i18n: In the third tab, :guilabel:`Properties`, you can put a free text reference to a plan,
+.. i18n: a sequence number that is used to determine the priorities between bills of materials, dates between which a bill of materials
+.. i18n: is valid, and values for rounding and production efficiency.
+..
+
+In the third tab, :guilabel:`Properties`, you can put a free text reference to a plan,
+a sequence number that is used to determine the priorities between bills of materials, dates between which a bill of materials
+is valid, and values for rounding and production efficiency.
+
+.. i18n: .. figure:: images/mrp_bom_properties.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Properties of a Bill of Materials*
+..
+
+.. figure:: images/mrp_bom_properties.png
+   :scale: 75
+   :align: center
+
+   *Properties of a Bill of Materials*
+
+.. i18n: :guilabel:`Rounding` is used to set the smallest :guilabel:`Unit of Measure`
+.. i18n: in which the quantities of the selected product can be expressed. So if you set the rounding to 1.00, you will not be able to manufacture half a piece. The :guilabel:`Efficiency` of the product lets you indicate the percentage you lose during manufacturing. This loss
+.. i18n: can be defined for the finished product or for each raw materials (components) line. The impact of this efficiency figure is that OpenERP will reserve more raw materials for manufacturing than you would otherwise use just from the Bill of Materials calculations.
+..
+
+:guilabel:`Rounding` is used to set the smallest :guilabel:`Unit of Measure`
+in which the quantities of the selected product can be expressed. So if you set the rounding to 1.00, you will not be able to manufacture half a piece. The :guilabel:`Efficiency` of the product lets you indicate the percentage you lose during manufacturing. This loss
+can be defined for the finished product or for each raw materials (components) line. The impact of this efficiency figure is that OpenERP will reserve more raw materials for manufacturing than you would otherwise use just from the Bill of Materials calculations.
+
+.. i18n: The final part of the third tab lets you set some properties for the product's manufacturing processes. These will be detailed further on in the chapter in the section about configurable products.
+..
+
+The final part of the third tab lets you set some properties for the product's manufacturing processes. These will be detailed further on in the chapter in the section about configurable products.
+
+.. i18n: .. index::
+.. i18n:    single: BoM; multi-level
+.. i18n:    single: multi-level BoM
+..
+
+.. index::
+   single: BoM; multi-level
+   single: multi-level BoM
+
+.. i18n: Multi-level Bills of Materials
+.. i18n: ------------------------------
+..
+
+Multi-level Bills of Materials
+------------------------------
+
+.. i18n: In OpenERP, each line of a bill of materials may itself be a bill of materials. This allows you to define BoMs with several levels. Instead of defining several BoMs for the shelf in the figure :ref:`fig-mrparm2`, you could define the single bill of materials below:
+..
+
+In OpenERP, each line of a bill of materials may itself be a bill of materials. This allows you to define BoMs with several levels. Instead of defining several BoMs for the shelf in the figure :ref:`fig-mrparm2`, you could define the single bill of materials below:
+
+.. i18n: .. table:: Single Bill of Materials for 1 SHE100 Unit
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SHE100        1         PCE
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.166     m
+.. i18n:    RPAN100       1         PCE
+.. i18n:    WOOD002       0.25      m
+.. i18n:    PROFIL        4         PCE
+.. i18n:    LIN40         1         m
+.. i18n:    RCK100        3         PCE
+.. i18n:    SPAN100       3         PCE
+.. i18n:    WOOD010       0.249     m
+.. i18n:    METC000       132       PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Single Bill of Materials for 1 SHE100 Unit
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SHE100        1         PCE
+   SIDEPAN       2         PCE
+   WOOD002       0.166     m
+   RPAN100       1         PCE
+   WOOD002       0.25      m
+   PROFIL        4         PCE
+   LIN40         1         m
+   RCK100        3         PCE
+   SPAN100       3         PCE
+   WOOD010       0.249     m
+   METC000       132       PCE
+   ============  ========  ===============
+
+.. i18n: OpenERP behaves differently depending on whether the bill of materials is defined in several small
+.. i18n: BoMs each on a single level or in one BoM tree-structured on several levels.
+..
+
+OpenERP behaves differently depending on whether the bill of materials is defined in several small
+BoMs each on a single level or in one BoM tree-structured on several levels.
+
+.. i18n: If you select a BoM using intermediate products that automatically generates production orders
+.. i18n: based on calculated requirements, OpenERP will propose to manufacture an intermediate product. To
+.. i18n: manufacture a shelf according to the different bills of materials defined, you would create 6 production orders:
+..
+
+If you select a BoM using intermediate products that automatically generates production orders
+based on calculated requirements, OpenERP will propose to manufacture an intermediate product. To
+manufacture a shelf according to the different bills of materials defined, you would create 6 production orders:
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SPAN100       3         PCE
+.. i18n:    WOOD010       0.249     m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SPAN100       3         PCE
+   WOOD010       0.249     m
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    RCK100        3         PCE
+.. i18n:    SPAN100       3         PCE
+.. i18n:    METC000       12        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   RCK100        3         PCE
+   SPAN100       3         PCE
+   METC000       12        PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    PROFIL        4         PCE
+.. i18n:    LIN40         1         m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   PROFIL        4         PCE
+   LIN40         1         m
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    RPAN100       1         PCE
+.. i18n:    WOOD002       0.25      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   RPAN100       1         PCE
+   WOOD002       0.25      m
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.17      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SIDEPAN       2         PCE
+   WOOD002       0.17      m
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SHE100         1        PCE
+.. i18n:    SIDEPAN        2        PCE
+.. i18n:    RPAN100        1        PCE
+.. i18n:    PROFIL         4        PCE
+.. i18n:    RCK100         3        PCE
+.. i18n:    METC000       12        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SHE100         1        PCE
+   SIDEPAN        2        PCE
+   RPAN100        1        PCE
+   PROFIL         4        PCE
+   RCK100         3        PCE
+   METC000       12        PCE
+   ============  ========  ===============
+
+.. i18n: In the case where a single bill of materials is defined in multiple levels, a single manufacturing
+.. i18n: order will be generated for each shelf, including all of the sub BoMs. You would then get the
+.. i18n: following production order:
+..
+
+In the case where a single bill of materials is defined in multiple levels, a single manufacturing
+order will be generated for each shelf, including all of the sub BoMs. You would then get the
+following production order:
+
+.. i18n: .. table:: Single Production from a tree-structured BoM
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SHE100        1         PCE
+.. i18n:    WOOD002       0.17      m
+.. i18n:    WOOD002       0.25      m
+.. i18n:    LIN40         1         m
+.. i18n:    WOOD010       0.249     m
+.. i18n:    METC000       132       PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Single Production from a tree-structured BoM
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SHE100        1         PCE
+   WOOD002       0.17      m
+   WOOD002       0.25      m
+   LIN40         1         m
+   WOOD010       0.249     m
+   METC000       132       PCE
+   ============  ========  ===============
+
+.. i18n: .. index::
+.. i18n:    pair: phantom; bill of materials
+..
+
+.. index::
+   pair: phantom; bill of materials
+
+.. i18n: Phantom Bills of Materials
+.. i18n: --------------------------
+..
+
+Phantom Bills of Materials
+--------------------------
+
+.. i18n: If a finished product is defined using intermediate products that are themselves defined using other
+.. i18n: BoMs, OpenERP will propose to manufacture each intermediate product. This will result in several production orders. If you only want a single production order, you can define a single BoM with several levels.
+..
+
+If a finished product is defined using intermediate products that are themselves defined using other
+BoMs, OpenERP will propose to manufacture each intermediate product. This will result in several production orders. If you only want a single production order, you can define a single BoM with several levels.
+
+.. i18n: Sometimes, however, it may be useful to define the intermediate product separately and not as part of a multi-level assembly, even if you do not want separate production orders for intermediate products.
+..
+
+Sometimes, however, it may be useful to define the intermediate product separately and not as part of a multi-level assembly, even if you do not want separate production orders for intermediate products.
+
+.. i18n: In the example, the intermediate product ``RCK100`` is used in the manufacturing of different shelves (SHE100, SHE200, ...). So you would prefer to define a unique BoM for it, even though you do not want any instances of this product to be built, nor would you want to rewrite these elements in a series of different multi-level BoMs.
+..
+
+In the example, the intermediate product ``RCK100`` is used in the manufacturing of different shelves (SHE100, SHE200, ...). So you would prefer to define a unique BoM for it, even though you do not want any instances of this product to be built, nor would you want to rewrite these elements in a series of different multi-level BoMs.
+
+.. i18n: If you only want a single production order for the complete shelf, and not one for the BoM itself, you
+.. i18n: can define the BoM line corresponding to product ``RCK100`` in the shelf's BoM as type :guilabel:`Sets/Phantom`. Then OpenERP will automatically put ``RCK100``'s BoM contents into the shelf's production order, even though it has been defined as multi-level.
+..
+
+If you only want a single production order for the complete shelf, and not one for the BoM itself, you
+can define the BoM line corresponding to product ``RCK100`` in the shelf's BoM as type :guilabel:`Sets/Phantom`. Then OpenERP will automatically put ``RCK100``'s BoM contents into the shelf's production order, even though it has been defined as multi-level.
+
+.. i18n: This way of representing the assembly is very useful, because it allows you to define reusable assembly elements and keep them isolated.
+..
+
+This way of representing the assembly is very useful, because it allows you to define reusable assembly elements and keep them isolated.
+
+.. i18n: If you define the BoM for the ``SHE100`` shelf in the way shown by the table below, you will get two production orders on confirmation of a sales order, as also shown in the tables.
+..
+
+If you define the BoM for the ``SHE100`` shelf in the way shown by the table below, you will get two production orders on confirmation of a sales order, as also shown in the tables.
+
+.. i18n: .. table:: Defining and Using Phantom BoMs
+.. i18n: 
+.. i18n:    ============  ========  ===============  ===========
+.. i18n:    Product Ref.  Quantity  Unit of Measure  Type of BoM
+.. i18n:    ============  ========  ===============  ===========
+.. i18n:    SHE100        1         PCE              normal
+.. i18n:    SIDEPAN       2         PCE              normal
+.. i18n:    RPAN100       1         PCE              phantom
+.. i18n:    PROFIL        4         PCE              phantom
+.. i18n:    RCK100        3         PCE              phantom
+.. i18n:    ============  ========  ===============  ===========
+..
+
+.. table:: Defining and Using Phantom BoMs
+
+   ============  ========  ===============  ===========
+   Product Ref.  Quantity  Unit of Measure  Type of BoM
+   ============  ========  ===============  ===========
+   SHE100        1         PCE              normal
+   SIDEPAN       2         PCE              normal
+   RPAN100       1         PCE              phantom
+   PROFIL        4         PCE              phantom
+   RCK100        3         PCE              phantom
+   ============  ========  ===============  ===========
+
+.. i18n: .. table:: Production Order from Phantom BoMs
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SHE100        1         PCE
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.25      m
+.. i18n:    LIN40         1         m
+.. i18n:    WOOD010       0.249     m
+.. i18n:    METC000       12        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order from Phantom BoMs
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SHE100        1         PCE
+   SIDEPAN       2         PCE
+   WOOD002       0.25      m
+   LIN40         1         m
+   WOOD010       0.249     m
+   METC000       12        PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Production Order from Normal BoM
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Ref.  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.17      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Production Order from Normal BoM
+
+   ============  ========  ===============
+   Product Ref.  Quantity  Unit of Measure
+   ============  ========  ===============
+   SIDEPAN       2         PCE
+   WOOD002       0.17      m
+   ============  ========  ===============
+
+.. i18n: Bills of Materials for Kits/Sets
+.. i18n: --------------------------------
+..
+
+Bills of Materials for Kits/Sets
+--------------------------------
+
+.. i18n: .. note:: Sales Bills of Materials
+.. i18n: 
+.. i18n:     In other software, this is sometimes called a Sales Bill of Materials.
+.. i18n:     In OpenERP, the term Kits/Sets is used, because the effect of the bill of materials is visible not
+.. i18n:     only in sales, but also elsewhere, for example, in the intermediate manufactured products.
+..
+
+.. note:: Sales Bills of Materials
+
+    In other software, this is sometimes called a Sales Bill of Materials.
+    In OpenERP, the term Kits/Sets is used, because the effect of the bill of materials is visible not
+    only in sales, but also elsewhere, for example, in the intermediate manufactured products.
+
+.. i18n: Kits/Sets bills of materials enable you to define assemblies that will be sold directly. These could also be used in deliveries and stock management rather than just sold separately. For example, if you deliver the shelf in pieces for self-assembly, set the ``SHE100`` BoM to type
+.. i18n: ``Sets / Phantom``.
+..
+
+Kits/Sets bills of materials enable you to define assemblies that will be sold directly. These could also be used in deliveries and stock management rather than just sold separately. For example, if you deliver the shelf in pieces for self-assembly, set the ``SHE100`` BoM to type
+``Sets / Phantom``.
+
+.. i18n: When a salesperson creates an order for a ``SHE100`` product, OpenERP automatically changes the ``SHE100``
+.. i18n: from a set of components into an identifiable package for sending to a customer.
+.. i18n: Then it asks the storesperson to pack 2 ``SIDEPAN``, 1 ``RPAN100``, 4 ``PROFIL``, 3 ``RCK100``.
+.. i18n: This is described as a ``SHE100``, not just the individual products delivered.
+..
+
+When a salesperson creates an order for a ``SHE100`` product, OpenERP automatically changes the ``SHE100``
+from a set of components into an identifiable package for sending to a customer.
+Then it asks the storesperson to pack 2 ``SIDEPAN``, 1 ``RPAN100``, 4 ``PROFIL``, 3 ``RCK100``.
+This is described as a ``SHE100``, not just the individual products delivered.
+
+.. i18n: Work Centers
+.. i18n: ============
+..
+
+Work Centers
+============
+
+.. i18n: Work centers represent units of production, capable of doing material transformation operations. You can distinguish two types of work centers: machines and human resources.
+..
+
+Work centers represent units of production, capable of doing material transformation operations. You can distinguish two types of work centers: machines and human resources.
+
+.. i18n: .. note:: Work Center
+.. i18n: 
+.. i18n:     Work centers are units of production consisting of one or several people and/or machines
+.. i18n:     that can be considered as a unit for the purpose of forecasting capacity and planning.
+..
+
+.. note:: Work Center
+
+    Work centers are units of production consisting of one or several people and/or machines
+    that can be considered as a unit for the purpose of forecasting capacity and planning.
+
+.. i18n: Use the menu :menuselection:`Manufacturing --> Configuration --> Resources --> Work Centers` to define a new work center. You get a form as shown in the figure :ref:`fig-mrpwkc2`.
+..
+
+Use the menu :menuselection:`Manufacturing --> Configuration --> Resources --> Work Centers` to define a new work center. You get a form as shown in the figure :ref:`fig-mrpwkc2`.
+
+.. i18n: .. _fig-mrpwkc2:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_workcenter.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Defining a Work Center*
+.. i18n:    
+.. i18n: .. tip:: Missing fields
+.. i18n: 
+.. i18n:         If some fields such as :guilabel:`Analytic Journal, General Account` in the view are missing, you have
+.. i18n:         to add the user group ``Useability / Analytic Accounting``.
+..
+
+.. _fig-mrpwkc2:
+
+.. figure:: images/mrp_workcenter.png
+   :scale: 75
+   :align: center
+
+   *Defining a Work Center*
+   
+.. tip:: Missing fields
+
+        If some fields such as :guilabel:`Analytic Journal, General Account` in the view are missing, you have
+        to add the user group ``Useability / Analytic Accounting``.
+
+.. i18n: A work center should have a name. You then assign a type: Machine or Human, a code and
+.. i18n: the operating hours, i.e. ``Working Period``. The Working Time(s) can be defined through the menu :menuselection:`Manufacturing --> Configuration --> Resources --> Working Time`. The figure :ref:`fig-mrpwkc2` represents the hours from Monday
+.. i18n: to Friday, from 08:00 to 18:00 with a break of an hour from 12:00.
+..
+
+A work center should have a name. You then assign a type: Machine or Human, a code and
+the operating hours, i.e. ``Working Period``. The Working Time(s) can be defined through the menu :menuselection:`Manufacturing --> Configuration --> Resources --> Working Time`. The figure :ref:`fig-mrpwkc2` represents the hours from Monday
+to Friday, from 08:00 to 18:00 with a break of an hour from 12:00.
+
+.. i18n: You can also add a description of the work center and its operations.
+..
+
+You can also add a description of the work center and its operations.
+
+.. i18n: Once the work center is defined, you should enter data about its production capacity.
+.. i18n: Depending on whether you have a machine or a person, a work center will be defined in cycles or hours. If it represents a set of machines and people you can use cycles and hours at the same time.
+..
+
+Once the work center is defined, you should enter data about its production capacity.
+Depending on whether you have a machine or a person, a work center will be defined in cycles or hours. If it represents a set of machines and people you can use cycles and hours at the same time.
+
+.. i18n: .. index::
+.. i18n:    single: work center, cycle
+..
+
+.. index::
+   single: work center, cycle
+
+.. i18n: .. note:: A Cycle
+.. i18n: 
+.. i18n:     A cycle corresponds to the time required to carry out an assembly operation.
+.. i18n:     The user is free to determine which is the reference operation for a given work center.
+.. i18n:     It should be represented by the cost and elapsed manufacturing time.
+.. i18n: 
+.. i18n:     For example, for a printing work center, a cycle might be the printing of 1 page or of 1000 pages
+.. i18n:     depending on the printer.
+..
+
+.. note:: A Cycle
+
+    A cycle corresponds to the time required to carry out an assembly operation.
+    The user is free to determine which is the reference operation for a given work center.
+    It should be represented by the cost and elapsed manufacturing time.
+
+    For example, for a printing work center, a cycle might be the printing of 1 page or of 1000 pages
+    depending on the printer.
+
+.. i18n: To define the capacity properly, it is necessary to know, for each work center, what will be the
+.. i18n: reference operation which determines the cycle. You can then define the data relative to the capacity.
+..
+
+To define the capacity properly, it is necessary to know, for each work center, what will be the
+reference operation which determines the cycle. You can then define the data relative to the capacity.
+
+.. i18n: `Capacity per Cycle` (CA): the number of operations that can be done in parallel during a
+.. i18n: cycle. Generally, the number defines the number of identical machines or people defined by the
+.. i18n: work center.
+..
+
+`Capacity per Cycle` (CA): the number of operations that can be done in parallel during a
+cycle. Generally, the number defines the number of identical machines or people defined by the
+work center.
+
+.. i18n: `Time for 1 cycle (hour)` (TC): the duration in hours for one cycle or the operations defined by a cycle.
+..
+
+`Time for 1 cycle (hour)` (TC): the duration in hours for one cycle or the operations defined by a cycle.
+
+.. i18n: `Time before production` (TS): the time in hours required to initialize production operations. Generally,
+.. i18n: this represents the machine setup time.
+..
+
+`Time before production` (TS): the time in hours required to initialize production operations. Generally,
+this represents the machine setup time.
+
+.. i18n: `Time after production` (TN): the delay in hours after the end of a production operation. Generally, this represents the cleaning time necessary after an operation.
+..
+
+`Time after production` (TN): the delay in hours after the end of a production operation. Generally, this represents the cleaning time necessary after an operation.
+
+.. i18n: `Efficiency factor` (ET): the factor that is applied to the TC, TS and TN times to determine the real production time. This factor enables you to readjust the different times progressively and as a measure of machine utilization. You cannot re-adjust the other times, because generally they are taken from the machine's data sheet. By default, the efficiency is set to 1, representing a load of 100%. When you set the efficiency to 2 (i.e. 200%), the load will be 50%.
+..
+
+`Efficiency factor` (ET): the factor that is applied to the TC, TS and TN times to determine the real production time. This factor enables you to readjust the different times progressively and as a measure of machine utilization. You cannot re-adjust the other times, because generally they are taken from the machine's data sheet. By default, the efficiency is set to 1, representing a load of 100%. When you set the efficiency to 2 (i.e. 200%), the load will be 50%.
+
+.. i18n: The total time for carrying out X operations is then given by the following formula:
+..
+
+The total time for carrying out X operations is then given by the following formula:
+
+.. i18n: ((X / CA) * TC + TS + TN ) * ET
+..
+
+((X / CA) * TC + TS + TN ) * ET
+
+.. i18n: In this formula the result of the division is rounded upwards. Then, if the
+.. i18n: capacity per cycle is 6, it takes 3 cycles to realize 15 operations (15/6 = 2.5, rounded upwards = 3).
+..
+
+In this formula the result of the division is rounded upwards. Then, if the
+capacity per cycle is 6, it takes 3 cycles to realize 15 operations (15/6 = 2.5, rounded upwards = 3).
+
+.. i18n: With the `Hour Account` and `Cycle Account` you define the links to analytical accounting, to report the costs of the work center operations. If you leave the different fields empty, it will not have any effect on the analytic accounts.
+..
+
+With the `Hour Account` and `Cycle Account` you define the links to analytical accounting, to report the costs of the work center operations. If you leave the different fields empty, it will not have any effect on the analytic accounts.
+
+.. i18n: Routings
+.. i18n: ========
+..
+
+Routings
+========
+
+.. i18n: Routings define the manufacturing operations to be done in work centers to produce a certain product. A routing is usually attached to bills of materials, which will define the assembly of products required for manufacturing or to produce finished products.
+..
+
+Routings define the manufacturing operations to be done in work centers to produce a certain product. A routing is usually attached to bills of materials, which will define the assembly of products required for manufacturing or to produce finished products.
+
+.. i18n: A routing can be defined directly in a bill of materials or through the menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Routings`. A routing has a name, and a code. You can also add a description. Later in this chapter you will see that a routing can also be associated with a stock location. This enables you to indicate where an assembly takes place.
+..
+
+A routing can be defined directly in a bill of materials or through the menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Routings`. A routing has a name, and a code. You can also add a description. Later in this chapter you will see that a routing can also be associated with a stock location. This enables you to indicate where an assembly takes place.
+
+.. i18n: .. figure:: images/mrp_routing.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Defining a routing with Three Operations*
+..
+
+.. figure:: images/mrp_routing.png
+   :scale: 75
+   :align: center
+
+   *Defining a routing with Three Operations*
+
+.. i18n: .. note:: Subcontracting Assembly
+.. i18n: 
+.. i18n:     You will see further on in this chapter that you can also link a routing to a stock location for the customer or the supplier.
+.. i18n:     You can use this functionality when you have subcontracted the assembly of a product to a supplier, for instance.
+..
+
+.. note:: Subcontracting Assembly
+
+    You will see further on in this chapter that you can also link a routing to a stock location for the customer or the supplier.
+    You can use this functionality when you have subcontracted the assembly of a product to a supplier, for instance.
+
+.. i18n: In the routing, you have to enter the list of operations that has to be executed. Each operation has to be done at a specific work center and includes a number of hours and/or cycles.
+..
+
+In the routing, you have to enter the list of operations that has to be executed. Each operation has to be done at a specific work center and includes a number of hours and/or cycles.
+
+.. i18n: .. tip:: Multi-level Routing
+.. i18n: 
+.. i18n:    It is possible to define routing on several levels to support multi-level bills of materials.
+.. i18n:    You can select the routing on each level of a bill of materials ( BoM in a BoM can have a different routing).
+.. i18n:    The levels are then linked to hierarchies of bills of materials.
+..
+
+.. tip:: Multi-level Routing
+
+   It is possible to define routing on several levels to support multi-level bills of materials.
+   You can select the routing on each level of a bill of materials ( BoM in a BoM can have a different routing).
+   The levels are then linked to hierarchies of bills of materials.
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/downstream_trace.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/downstream_trace.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/downstream_trace.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mo_plan.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mo_plan.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mo_plan.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mo_scrap.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mo_scrap.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mo_scrap.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_properties.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_properties.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_properties.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_revision_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_revision_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_revision_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_tree_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_tree_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_bom_tree_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_manual.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_manual.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_manual.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_product_bom_tree_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_product_bom_tree_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_product_bom_tree_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_end_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_end_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_end_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_form_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_end_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_end_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_end_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_production_list_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_sales_process_new.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_sales_process_new.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/mrp_sales_process_new.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/newmo_plan.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/newmo_plan.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/newmo_plan.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/prj_so.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/prj_so.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/prj_so.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_exception.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_exception.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_exception.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_fix.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_fix.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/procurement_fix.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/prod_lot.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/prod_lot.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/prod_lot.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/production_lots.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/production_lots.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/production_lots.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/service_prj.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/service_prj.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/service_prj.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/soprj_tip.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/soprj_tip.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/soprj_tip.png	2012-10-01 15:56:24 +0000 differ
=== added file 'i18n/fr/source/book/5/5_15_Manufacturing/images/upstream_trace.png'
Binary files i18n/fr/source/book/5/5_15_Manufacturing/images/upstream_trace.png	1970-01-01 00:00:00 +0000 and i18n/fr/source/book/5/5_15_Manufacturing/images/upstream_trace.png	2012-10-01 15:56:24 +0000 differ
=== modified file 'i18n/fr/source/book/5/5_15_Manufacturing/index.rst'
--- i18n/fr/source/book/5/5_15_Manufacturing/index.rst	2011-10-04 21:25:05 +0000
+++ i18n/fr/source/book/5/5_15_Manufacturing/index.rst	2012-10-01 15:56:24 +0000
@@ -8,18 +8,18 @@
    single: Manufacturing
    single: production; management
 
-.. i18n: .. _ch-mnf:
+.. i18n: .. _part3-man-manuf:
 .. i18n: 
-.. i18n: *************
-.. i18n: Manufacturing
-.. i18n: *************
+.. i18n: *************************
+.. i18n: Defining your Master Data
+.. i18n: *************************
 ..
 
-.. _ch-mnf:
+.. _part3-man-manuf:
 
-*************
-Manufacturing
-*************
+*************************
+Defining your Master Data
+*************************
 
 .. i18n:  *The management of manufacturing described in this chapter covers
 .. i18n:  planning, ordering, stocks and the manufacturing or assembly of products from raw materials and
@@ -34,13 +34,13 @@
  It also discusses consumption and production of products, as well as the necessary operations on
  machinery, tools or human resources.*
 
-.. i18n: The management of manufacturing in OpenERP is based on its stock management and, like it, is very
-.. i18n: flexible in both its operations and its financial control. It benefits particularly from the use of
+.. i18n: Manufacturing management in OpenERP is based on its stock management and equally very
+.. i18n: flexible in both its operations and its financial control. It particularly benefits from the use of
 .. i18n: double-entry stock management for production orders.
 ..
 
-The management of manufacturing in OpenERP is based on its stock management and, like it, is very
-flexible in both its operations and its financial control. It benefits particularly from the use of
+Manufacturing management in OpenERP is based on its stock management and equally very
+flexible in both its operations and its financial control. It particularly benefits from the use of
 double-entry stock management for production orders.
 
 .. i18n: .. index::
@@ -50,12 +50,12 @@
 .. index::
    single: module; mrp
 
-.. i18n: Manufacturing management is implemented by the :mod:`mrp` module. It is used for transforming all
-.. i18n: types of products:
+.. i18n: Manufacturing management is implemented by the :mod:`mrp` module. It is used to transform all
+.. i18n: kinds of products:
 ..
 
-Manufacturing management is implemented by the :mod:`mrp` module. It is used for transforming all
-types of products:
+Manufacturing management is implemented by the :mod:`mrp` module. It is used to transform all
+kinds of products:
 
 .. i18n: * Assemblies of parts: composite products, soldered or welded products, assemblies, packs,
 .. i18n: 
@@ -74,14 +74,12 @@
 
 * Mixtures: mixing, chemical processes, distillation.
 
-.. i18n: You will work in two areas: on products in the first part of this chapter, and on operations in the
-.. i18n: second part. The management of products depends on the concept of classifications while the
-.. i18n: management of operations depends on routing and workcenters.
+.. i18n: You will work in two areas: with products in the first part of this chapter, and with operations in the
+.. i18n: second part. The management of products depends on the concept of classifications while operations management is related to routing and workcenters.
 ..
 
-You will work in two areas: on products in the first part of this chapter, and on operations in the
-second part. The management of products depends on the concept of classifications while the
-management of operations depends on routing and workcenters.
+You will work in two areas: with products in the first part of this chapter, and with operations in the
+second part. The management of products depends on the concept of classifications while operations management is related to routing and workcenters.
 
 .. i18n: .. index::
 .. i18n:    single: bill of materials
@@ -114,11 +112,13 @@
     * Building: Plans.
 
 .. i18n: For this chapter you should start with a fresh database that includes demo data,
-.. i18n: with :mod:`mrp` and its dependencies installed and no particular chart of accounts configured.
+.. i18n: with :mod:`mrp` (``Manufacturing``) and its dependencies installed and a generic chart of accounts configured.
+.. i18n: As you will notice, when you select ``Manufacturing`` to be installed, OpenERP will install the linked applications automatically.
 ..
 
 For this chapter you should start with a fresh database that includes demo data,
-with :mod:`mrp` and its dependencies installed and no particular chart of accounts configured.
+with :mod:`mrp` (``Manufacturing``) and its dependencies installed and a generic chart of accounts configured.
+As you will notice, when you select ``Manufacturing`` to be installed, OpenERP will install the linked applications automatically.
 
 .. i18n: .. raw:: html
 .. i18n: 
@@ -130,10 +130,20 @@
     <div class="all-toctree">
 
 .. i18n: .. toctree::
+.. i18n: 
+.. i18n:    5_15_Master_data
+.. i18n:    5_15_Manufacturing
+.. i18n:    5_15_Manufacturing_logistic
+.. i18n:    5_15_Manufacturing_forecasting
 ..
 
 .. toctree::
 
+   5_15_Master_data
+   5_15_Manufacturing
+   5_15_Manufacturing_logistic
+   5_15_Manufacturing_forecasting
+
 .. i18n: .. raw:: html
 .. i18n: 
 .. i18n:     </div>

=== modified file 'i18n/fr/source/contribute/02_working_in_teams.rst'
=== modified file 'i18n/fr/source/contribute/05_developing_modules.rst'
--- i18n/fr/source/contribute/05_developing_modules.rst	2012-01-22 17:23:15 +0000
+++ i18n/fr/source/contribute/05_developing_modules.rst	2012-10-01 15:56:24 +0000
@@ -425,10 +425,10 @@
 Always start with the most relevant words, which are preferably names of other
 modules on which it depends.
 
-.. i18n: Exemple:
+.. i18n: Example:
 ..
 
-Exemple:
+Example:
 
 .. i18n:   * account_invoice_layout
 ..
@@ -575,7 +575,7 @@
 ..
 
 If you use folders that are clickable, their child must be of the
-same object type. (we suppose that inheritancies are the same objects)
+same object type. (we suppose that inheritances are the same objects)
 
 .. i18n: List are plurals:
 ..
@@ -724,17 +724,17 @@
   * The state field, if any, must be at the bottom left corner of the view
   * Buttons to make the state change at the right of this state field
 
-.. i18n: Search Criterions
-.. i18n: #################
-..
-
-Search Criterions
-#################
-
-.. i18n: Search criterions: search available on all columns of the list view
-..
-
-Search criterions: search available on all columns of the list view
+.. i18n: Search Criteria
+.. i18n: ###############
+..
+
+Search Criteria
+###############
+
+.. i18n: Search criteria: search available on all columns of the list view
+..
+
+Search criteria: search available on all columns of the list view
 
 .. i18n: Action Names
 .. i18n: ^^^^^^^^^^^^

=== modified file 'i18n/fr/source/contribute/11_bug_tracker.rst'
--- i18n/fr/source/contribute/11_bug_tracker.rst	2011-06-17 14:57:44 +0000
+++ i18n/fr/source/contribute/11_bug_tracker.rst	2012-10-01 15:56:24 +0000
@@ -338,12 +338,12 @@
 .. rubric:: Qualified Bug Importance
 
 .. i18n: Assessing the importance of a bug is a difficult and often subjective task.
-.. i18n: In order to have common criterions, we propose the following definition
+.. i18n: In order to have common criteria, we propose the following definition
 .. i18n: for the severity levels on Launchpad bugs
 ..
 
 Assessing the importance of a bug is a difficult and often subjective task.
-In order to have common criterions, we propose the following definition
+In order to have common criteria, we propose the following definition
 for the severity levels on Launchpad bugs
 
 .. i18n:     * **Critical**: security issue (e.g. system compromised or arbitrary 

=== modified file 'i18n/fr/source/developer/6_22_XML-RPC_web_services/index.rst'
--- i18n/fr/source/developer/6_22_XML-RPC_web_services/index.rst	2012-05-21 16:05:13 +0000
+++ i18n/fr/source/developer/6_22_XML-RPC_web_services/index.rst	2012-10-01 15:56:24 +0000
@@ -1102,10 +1102,10 @@
 PHP Example
 -----------
 
-.. i18n: Here is an example on how to insert a new partner using PHP. This example makes use the phpxmlrpc library, available on sourceforge.
+.. i18n: This example shows how to insert a new partner using PHP. It uses the phpxmlrpc library, available on sourceforge.
 ..
 
-Here is an example on how to insert a new partner using PHP. This example makes use the phpxmlrpc library, available on sourceforge.
+This example shows how to insert a new partner using PHP. It uses the phpxmlrpc library, available on sourceforge.
 
 .. i18n: .. code-block:: php
 .. i18n: 

=== modified file 'i18n/fr/source/technical_guide/account_analytic_default.rst'
--- i18n/fr/source/technical_guide/account_analytic_default.rst	2011-01-25 11:55:10 +0000
+++ i18n/fr/source/technical_guide/account_analytic_default.rst	2012-10-01 15:56:24 +0000
@@ -75,7 +75,7 @@
 
 .. i18n: ::
 .. i18n: 
-.. i18n:   Allows to automatically select analytic accounts based on criterions:
+.. i18n:   Allows to automatically select analytic accounts based on criteria:
 .. i18n:   * Product
 .. i18n:   * Partner
 .. i18n:   * User
@@ -85,7 +85,7 @@
 
 ::
 
-  Allows to automatically select analytic accounts based on criterions:
+  Allows to automatically select analytic accounts based on criteria:
   * Product
   * Partner
   * User

=== modified file 'i18n/fr/source/technical_guide/crm.rst'
--- i18n/fr/source/technical_guide/crm.rst	2011-07-04 22:45:52 +0000
+++ i18n/fr/source/technical_guide/crm.rst	2012-10-01 15:56:24 +0000
@@ -847,20 +847,20 @@
 
 :exclusif: Exclusive, boolean
 
-.. i18n:     *Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions*
+.. i18n:     *Check if the category is limited to partners that match the segmentation criteria. If checked, remove the category from partners that doesn't match segmentation criteria*
 ..
 
-    *Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions*
+    *Check if the category is limited to partners that match the segmentation criteria. If checked, remove the category from partners that doesn't match segmentation criteria*
 
 .. i18n: :categ_id: Partner Category, many2one, required
 ..
 
 :categ_id: Partner Category, many2one, required
 
-.. i18n:     *The partner category that will be added to partners that match the segmentation criterions after computation.*
+.. i18n:     *The partner category that will be added to partners that match the segmentation criteria after computation.*
 ..
 
-    *The partner category that will be added to partners that match the segmentation criterions after computation.*
+    *The partner category that will be added to partners that match the segmentation criteria after computation.*
 
 .. i18n: :som_interval: Days per Periode, integer
 ..

=== modified file 'i18n/fr/source/technical_guide/dm.rst'
--- i18n/fr/source/technical_guide/dm.rst	2011-07-19 23:36:54 +0000
+++ i18n/fr/source/technical_guide/dm.rst	2012-10-01 15:56:24 +0000
@@ -2616,12 +2616,12 @@
 
 :name: Name, char, required
 
-.. i18n: Object: Type of the adress list (dm.customers_list.type)
-.. i18n: ########################################################
+.. i18n: Object: Type of the address list (dm.customers_list.type)
+.. i18n: #########################################################
 ..
 
-Object: Type of the adress list (dm.customers_list.type)
-########################################################
+Object: Type of the address list (dm.customers_list.type)
+#########################################################
 
 .. i18n: :code: Code, char, required
 ..

=== modified file 'i18n/fr/source/technical_guide/esale_osc.rst'
--- i18n/fr/source/technical_guide/esale_osc.rst	2011-01-25 11:55:10 +0000
+++ i18n/fr/source/technical_guide/esale_osc.rst	2012-10-01 15:56:24 +0000
@@ -50,7 +50,7 @@
 .. i18n: :Version: 5.0.1.0
 .. i18n: :Author: Axelor/Zikzakmedia
 .. i18n: :Directory: esale_osc
-.. i18n: :Web: www.aulaerp.com/cursos-aulaerp/configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
+.. i18n: :Web: www.aulaerp.com/cursos/detail/3-cursos-para-administradores-de-openeerp/22-configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
 .. i18n: :Official module: no
 .. i18n: :Quality certified: no
 ..
@@ -62,7 +62,7 @@
 :Version: 5.0.1.0
 :Author: Axelor/Zikzakmedia
 :Directory: esale_osc
-:Web: www.aulaerp.com/cursos-aulaerp/configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
+:Web: www.aulaerp.com/cursos/detail/3-cursos-para-administradores-de-openeerp/22-configuracion-y-funcionamiento-del-conector-openerp-oscommerce.html
 :Official module: no
 :Quality certified: no
 

=== modified file 'i18n/it/source/bi/config_interface/config_interface.rst'
--- i18n/it/source/bi/config_interface/config_interface.rst	2012-05-21 21:36:46 +0000
+++ i18n/it/source/bi/config_interface/config_interface.rst	2012-10-01 15:56:24 +0000
@@ -178,11 +178,11 @@
         
 --------
 
-.. i18n: After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold , Dates, City etc.. to analyse the sales accordingly.
+.. i18n: After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold, Dates, City etc. to analyse the sales accordingly.
 .. i18n: We decide the measures to be used, for example items sold. So we can decide the dimension and measures:
 ..
 
-After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold , Dates, City etc.. to analyse the sales accordingly.
+After cube we can decide upon the dimensions to be used for the cube. For example we want to look on products sold, Dates, City etc. to analyse the sales accordingly.
 We decide the measures to be used, for example items sold. So we can decide the dimension and measures:
 
 .. i18n: .. image::  images/9.png

=== modified file 'i18n/it/source/bi/index.rst'
--- i18n/it/source/bi/index.rst	2011-06-10 09:39:31 +0000
+++ i18n/it/source/bi/index.rst	2012-10-01 15:56:24 +0000
@@ -17,6 +17,22 @@
 Part 1 : Introduction
 ---------------------
 
+.. i18n: .. sidebar:: Experimental Application
+.. i18n: 
+.. i18n:     This chapter describes an experimental BI Application that is not part of the
+.. i18n:     current quality-certified distribution of OpenERP.
+.. i18n:     The BI modules can be found in `OpenERP Apps <http://apps.openerp.com>`_, but are
+.. i18n:     not yet suitable for production use.
+..
+
+.. sidebar:: Experimental Application
+
+    This chapter describes an experimental BI Application that is not part of the
+    current quality-certified distribution of OpenERP.
+    The BI modules can be found in `OpenERP Apps <http://apps.openerp.com>`_, but are
+    not yet suitable for production use.
+
+
 .. i18n: .. toctree::
 .. i18n:     :maxdepth: 2
 .. i18n: 

=== modified file 'i18n/it/source/bi/installation/installation.rst'
--- i18n/it/source/bi/installation/installation.rst	2011-10-10 21:56:17 +0000
+++ i18n/it/source/bi/installation/installation.rst	2012-10-01 15:56:24 +0000
@@ -7,10 +7,7 @@
 ==================
 
 .. i18n: BI requires OpenERP Server and (preferably) OpenERP GTK client on the user system.
-..
-
-BI requires OpenERP Server and (preferably) OpenERP GTK client on the user system.
-
+.. i18n: 
 .. i18n: .. toctree::
 .. i18n: 	:maxdepth: 2
 .. i18n: 
@@ -18,8 +15,11 @@
 .. i18n: 	install_web
 ..
 
+BI requires OpenERP Server and (preferably) OpenERP GTK client on the user system.
+
 .. toctree::
 	:maxdepth: 2
 
 	Installing OpenERP Server and OLAP module <install_olap>
 	install_web
+

=== modified file 'i18n/it/source/book/0/index.rst'
=== modified file 'i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst'
--- i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst	2012-09-19 20:22:00 +0000
+++ i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_architecture.rst	2012-10-01 15:56:24 +0000
@@ -6,11 +6,11 @@
 .. index::
    single: architecture; OpenERP
 
-.. i18n: The architecture of OpenERP
+.. i18n: The Architecture of OpenERP
 .. i18n: ===========================
 ..
 
-The architecture of OpenERP
+The Architecture of OpenERP
 ===========================
 
 .. i18n: To access OpenERP you can:
@@ -62,22 +62,48 @@
    single: client; web (thin) and GTK (thick)
    single: client; caching
 
-.. i18n: .. note::   Web client and GTK client
+.. i18n: .. note::   Web Client and GTK Client
 .. i18n: 
 .. i18n:     There is little functional difference between the two OpenERP clients - the 
 .. i18n:     web client and the GTK client at present. 
-.. i18n:     The web client offers more functionality for instance for Calendar view, Gantt view, .
-.. i18n:     
+.. i18n:     The web client offers more functionality, for instance, the Corporate Intelligence feature, and the Gantt view.
+.. i18n:     
+<<<<<<< TREE
+=======
+.. i18n:     When you are changing the structure of your OpenERP installation (adding and
+.. i18n:     removing modules, perhaps changing labels), you might find the web client to be
+.. i18n:     irritating because of its use of **caching**. 
+.. i18n:     
+.. i18n:     Caching speeds it all up by keeping a copy of data somewhere between the server 
+.. i18n:     and your client, which is usually good. But you may 
+.. i18n:     have made changes to your installation that you cannot immediately see in
+.. i18n:     your browser. Many apparent faults are caused by this! The workaround is 
+.. i18n:     to use the GTK client during development and implementation where possible.
+.. i18n: 
+>>>>>>> MERGE-SOURCE
 .. i18n:     The OpenERP company will continue to support two clients for the foreseeable
 .. i18n:     future, so you can use whichever client you prefer.
 ..
 
-.. note::   Web client and GTK client
+.. note::   Web Client and GTK Client
 
     There is little functional difference between the two OpenERP clients - the 
     web client and the GTK client at present. 
-    The web client offers more functionality for instance for Calendar view, Gantt view, .
-    
+    The web client offers more functionality, for instance, the Corporate Intelligence feature, and the Gantt view.
+    
+<<<<<<< TREE
+=======
+    When you are changing the structure of your OpenERP installation (adding and
+    removing modules, perhaps changing labels), you might find the web client to be
+    irritating because of its use of **caching**. 
+    
+    Caching speeds it all up by keeping a copy of data somewhere between the server 
+    and your client, which is usually good. But you may 
+    have made changes to your installation that you cannot immediately see in
+    your browser. Many apparent faults are caused by this! The workaround is 
+    to use the GTK client during development and implementation where possible.
+
+>>>>>>> MERGE-SOURCE
     The OpenERP company will continue to support two clients for the foreseeable
     future, so you can use whichever client you prefer.
 
@@ -112,6 +138,54 @@
    
    *The architecture of OpenERP*
 
+<<<<<<< TREE
+=======
+.. i18n: .. note::   Terminology: Client-web – Server or Client?
+.. i18n: 
+.. i18n:     The client-web component can be thought of as a server or a client depending on
+.. i18n:     your viewpoint.
+.. i18n: 
+.. i18n:     It acts as a web server to an end user connecting from a web browser, but
+.. i18n:     it also acts as a client to the OpenERP application server just as a GTK
+.. i18n:     application client does.
+.. i18n: 
+.. i18n:     So in this book its context will determine whether the client-web component is referred to as
+.. i18n:     a server or a client.
+..
+
+.. note::   Terminology: Client-web – Server or Client?
+
+    The client-web component can be thought of as a server or a client depending on
+    your viewpoint.
+
+    It acts as a web server to an end user connecting from a web browser, but
+    it also acts as a client to the OpenERP application server just as a GTK
+    application client does.
+
+    So in this book its context will determine whether the client-web component is referred to as
+    a server or a client.
+
+.. i18n: .. index::
+.. i18n:    pair: eTiny; client-web
+..
+
+.. index::
+   pair: eTiny; client-web
+
+.. i18n: .. note::   eTiny
+.. i18n: 
+.. i18n:     The web application used to be known as “eTiny”.
+.. i18n:     Its name changed to “client-web” as Tiny ERP was renamed to OpenERP,
+.. i18n:     but its characteristics have generally stayed the same.
+..
+
+.. note::   eTiny
+
+    The web application used to be known as “eTiny”.
+    Its name changed to “client-web” as Tiny ERP was renamed to OpenERP,
+    but its characteristics have generally stayed the same.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. index::
 .. i18n:    single: PostgreSQL
 ..
@@ -136,15 +210,37 @@
     Operating System, from Unix/Linux to the various releases of Windows, via
     Mac OS X, Solaris, SunOS and BSD.
 
+<<<<<<< TREE
 .. i18n: Both components can be installed on the same server or
 .. i18n: distributed onto separate computer servers if performance considerations
+=======
+.. i18n: These three components can be installed on the same server or can be
+.. i18n: distributed onto separate computer servers, if performance considerations
+>>>>>>> MERGE-SOURCE
 .. i18n: require it.
 ..
 
+<<<<<<< TREE
 Both components can be installed on the same server or
 distributed onto separate computer servers if performance considerations
+=======
+These three components can be installed on the same server or can be
+distributed onto separate computer servers, if performance considerations
+>>>>>>> MERGE-SOURCE
 require it.
 
+<<<<<<< TREE
+=======
+.. i18n: If you choose to run only with GTK clients, you will not need the third component –
+.. i18n: the client-web server – at all. In this case, OpenERP's GTK client must be installed
+.. i18n: on the workstation of each OpenERP user in the company.
+..
+
+If you choose to run only with GTK clients, you will not need the third component –
+the client-web server – at all. In this case, OpenERP's GTK client must be installed
+on the workstation of each OpenERP user in the company.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. Copyright © Open Object Press. All rights reserved.
 ..
 

=== modified file 'i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst'
--- i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst	2011-06-10 09:39:31 +0000
+++ i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_db_create.rst	2012-10-01 15:56:24 +0000
@@ -19,13 +19,13 @@
 Database Creation
 =================
 
-.. i18n: Use the technique outlined in this section to create a new database, \ ``openerp_ch01``\  . This
+.. i18n: Use the technique outlined in this section to create a new database, \ ``openerp_ch01`` \. This
 .. i18n: database will contain the demonstration data provided with OpenERP and a large proportion of the
 .. i18n: core OpenERP functionality. You will need to know your super administrator password for this – or
 .. i18n: you will have to find somebody who does have it to create this database.
 ..
 
-Use the technique outlined in this section to create a new database, \ ``openerp_ch01``\  . This
+Use the technique outlined in this section to create a new database, \ ``openerp_ch01`` \. This
 database will contain the demonstration data provided with OpenERP and a large proportion of the
 core OpenERP functionality. You will need to know your super administrator password for this – or
 you will have to find somebody who does have it to create this database.
@@ -39,14 +39,14 @@
    single: password; super-administrator
    single: password; superadmin
 
-.. i18n: .. note:: The super-administrator password
+.. i18n: .. note:: The Super-administrator Password
 .. i18n: 
 .. i18n:    Anyone who knows the super-administrator password has complete access to the data on the server
 .. i18n:    – able to read, change and delete any of the data in any of the databases there.
 .. i18n: 
 .. i18n:    After first installation, the password is ``admin``. This is the hard-coded default, and
 .. i18n:    is used if there is no accessible server configuration file. If your system has been 
-.. i18n:    set up so that the server configuration file can be written to by the server then
+.. i18n:    set up so that the server configuration file can be written to by the server, then
 .. i18n:    you can change the password through the client. Or you could deliberately make the 
 .. i18n:    configuration file read-only so that there is no prospect of changing it from the client.
 .. i18n:    Either way, a server systems administrator can change it if you forget it.
@@ -60,14 +60,14 @@
 .. i18n:    the ``--config`` command line option.
 ..
 
-.. note:: The super-administrator password
+.. note:: The Super-administrator Password
 
    Anyone who knows the super-administrator password has complete access to the data on the server
    – able to read, change and delete any of the data in any of the databases there.
 
    After first installation, the password is ``admin``. This is the hard-coded default, and
    is used if there is no accessible server configuration file. If your system has been 
-   set up so that the server configuration file can be written to by the server then
+   set up so that the server configuration file can be written to by the server, then
    you can change the password through the client. Or you could deliberately make the 
    configuration file read-only so that there is no prospect of changing it from the client.
    Either way, a server systems administrator can change it if you forget it.
@@ -81,27 +81,27 @@
    the ``--config`` command line option.
 
 .. i18n: .. figure:: images/change_superadmin_pwd.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Changing the super-administrator password through the web client*
 ..
 
 .. figure:: images/change_superadmin_pwd.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Changing the super-administrator password through the web client*
 
 .. i18n: .. _sect-creatingdb:
 .. i18n: 
-.. i18n: Creating the database
+.. i18n: Creating the Database
 .. i18n: ---------------------
 ..
 
 .. _sect-creatingdb:
 
-Creating the database
+Creating the Database
 ---------------------
 
 .. i18n: If you are using the GTK client, choose :menuselection:`File --> Databases --> New database`  in
@@ -130,7 +130,7 @@
 .. i18n: :guilabel:`Create` on the database management page. Enter the super-administrator password, and the
 .. i18n: name of the new database you are creating.
 .. i18n:   
-.. i18n: In both cases you will see a checkbox that determines whether you load demonstration data or not.
+.. i18n: In both cases, you will see a checkbox that determines whether you load demonstration data or not.
 .. i18n: The consequences of checking this box or not affect the **whole use** of this database.
 ..
 
@@ -138,15 +138,15 @@
 :guilabel:`Create` on the database management page. Enter the super-administrator password, and the
 name of the new database you are creating.
   
-In both cases you will see a checkbox that determines whether you load demonstration data or not.
+In both cases, you will see a checkbox that determines whether you load demonstration data or not.
 The consequences of checking this box or not affect the **whole use** of this database.
 
-.. i18n: In both cases you will also see that you can choose the Administrator password. This makes your 
+.. i18n: In both cases, you will also see that you can choose the Administrator password. This makes your 
 .. i18n: database quite secure because you can ensure that it is unique from the outset.
 .. i18n: (In fact many people find it hard to resist ``admin`` as their password!)
 ..
 
-In both cases you will also see that you can choose the Administrator password. This makes your 
+In both cases, you will also see that you can choose the Administrator password. This makes your 
 database quite secure because you can ensure that it is unique from the outset.
 (In fact many people find it hard to resist ``admin`` as their password!)
 
@@ -166,12 +166,12 @@
 
 .. i18n: Wait for the message showing that the database has been successfully created, along with the user
 .. i18n: accounts and passwords (\ ``admin/XXXX``\   and \ ``demo/demo``\  ). Now that you have created this
-.. i18n: database you can extend it without having to know the super-administrator password.
+.. i18n: database, you can extend it without having to know the super-administrator password.
 ..
 
 Wait for the message showing that the database has been successfully created, along with the user
 accounts and passwords (\ ``admin/XXXX``\   and \ ``demo/demo``\  ). Now that you have created this
-database you can extend it without having to know the super-administrator password.
+database, you can extend it without having to know the super-administrator password.
 
 .. i18n: .. index::
 .. i18n:    single: access; LDAP
@@ -194,7 +194,7 @@
 .. i18n:  	.. index::
 .. i18n: 	   single: module; users_ldap
 .. i18n: 
-.. i18n: 	Alternatively you can install the :mod:`users_ldap` module, which manages the authentication of users
+.. i18n: 	Alternatively, you can install the :mod:`users_ldap` module, which manages the authentication of users
 .. i18n: 	in LDAP (the Lightweight Directory Access Protocol, a standard system), and connect it to several
 .. i18n: 	OpenERP databases. Using this, many databases can share the same user account details.
 ..
@@ -207,38 +207,38 @@
  	.. index::
 	   single: module; users_ldap
 
-	Alternatively you can install the :mod:`users_ldap` module, which manages the authentication of users
+	Alternatively, you can install the :mod:`users_ldap` module, which manages the authentication of users
 	in LDAP (the Lightweight Directory Access Protocol, a standard system), and connect it to several
 	OpenERP databases. Using this, many databases can share the same user account details.
 
-.. i18n: .. note::  Failure to create a database
+.. i18n: .. note::  Failure to Create a Database
 .. i18n: 
 .. i18n: 	How do you know if you have successfully created your new database?
 .. i18n: 	You are told if the database creation has been unsuccessful.
-.. i18n: 	If you have entered a database name using prohibited characters (or no name, or too short a name)
+.. i18n: 	If you have entered a database name using prohibited characters (or no name, or too short a name),
 .. i18n: 	you will be alerted by the dialog box :guilabel:`Bad database name!` explaining how to correct the error.
 .. i18n: 	If you have entered the wrong super-administrator password or a name already in use
 .. i18n: 	(some names can be reserved without your knowledge), you will be alerted by the dialog box
 .. i18n: 	:guilabel:`Error during database creation!`.
 ..
 
-.. note::  Failure to create a database
+.. note::  Failure to Create a Database
 
 	How do you know if you have successfully created your new database?
 	You are told if the database creation has been unsuccessful.
-	If you have entered a database name using prohibited characters (or no name, or too short a name)
+	If you have entered a database name using prohibited characters (or no name, or too short a name),
 	you will be alerted by the dialog box :guilabel:`Bad database name!` explaining how to correct the error.
 	If you have entered the wrong super-administrator password or a name already in use
 	(some names can be reserved without your knowledge), you will be alerted by the dialog box
 	:guilabel:`Error during database creation!`.
 
-.. i18n: Since this is the first time you have connected to this database you will be asked a series of questions to
+.. i18n: Since this is the first time you have connected to this database, you will be asked a series of questions to
 .. i18n: define the database parameters. You may choose to :guilabel:`Skip Configuration Wizards` or
 .. i18n: :guilabel:`Start Configuration`. If you choose to configure your application, you may proceed with the
 .. i18n: following steps:
 ..
 
-Since this is the first time you have connected to this database you will be asked a series of questions to
+Since this is the first time you have connected to this database, you will be asked a series of questions to
 define the database parameters. You may choose to :guilabel:`Skip Configuration Wizards` or
 :guilabel:`Start Configuration`. If you choose to configure your application, you may proceed with the
 following steps:
@@ -264,12 +264,12 @@
 	#.  :guilabel:`Install Applications` : check the applications you need and then click :guilabel:`Install`.
 	    For now, do not install any application.
 
-.. i18n: Once configuration is complete you are connected to your OpenERP system. Its functionality is very
+.. i18n: Once configuration is complete, you are connected to your OpenERP system. Its functionality is very
 .. i18n: limited because you have selected a :guilabel:`Simplified` interface with no application installed,
 .. i18n: but this is sufficient to demonstrate that your installation is working.
 ..
 
-Once configuration is complete you are connected to your OpenERP system. Its functionality is very
+Once configuration is complete, you are connected to your OpenERP system. Its functionality is very
 limited because you have selected a :guilabel:`Simplified` interface with no application installed,
 but this is sufficient to demonstrate that your installation is working.
 
@@ -293,29 +293,33 @@
 .. index::
    single: database; manage
 
+.. i18n: .. _sect-dbmanage:
+.. i18n: 
 .. i18n: Managing Databases
 .. i18n: ------------------
 ..
 
+.. _sect-dbmanage:
+
 Managing Databases
 ------------------
 
-.. i18n: As a super-administrator you do not only have rights to create new databases, but also to:
+.. i18n: As a super-administrator, you do not only have rights to create new databases, but also to:
 ..
 
-As a super-administrator you do not only have rights to create new databases, but also to:
+As a super-administrator, you do not only have rights to create new databases, but also to:
 
+.. i18n: * backup databases,
+.. i18n: 
 .. i18n: * delete databases,
 .. i18n: 
-.. i18n: * backup databases,
-.. i18n: 
 .. i18n: * restore databases.
 ..
 
+* backup databases,
+
 * delete databases,
 
-* backup databases,
-
 * restore databases.
 
 .. i18n: All of these operations can be carried out from the menu :menuselection:`File --> Databases...`
@@ -328,31 +332,95 @@
 :guilabel:`Login` screen.
 
 .. i18n: .. index::
+.. i18n:    single: database; backup
+..
+
+.. index::
+   single: database; backup
+
+.. i18n: .. tip:: Backup (copy) a Database
+.. i18n: 
+.. i18n:         To make a copy of a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Backup` button, select the database you want to copy and enter the super-administrator
+.. i18n: 	password. Click the :guilabel:`Backup` button to confirm that you want to copy the database.
+..
+
+.. tip:: Backup (copy) a Database
+
+        To make a copy of a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Backup` button, select the database you want to copy and enter the super-administrator
+	password. Click the :guilabel:`Backup` button to confirm that you want to copy the database.
+
+.. i18n: .. index::
+.. i18n:    single: database; drop
+..
+
+.. index::
+   single: database; drop
+
+.. i18n: .. tip:: Drop (delete) a Database
+.. i18n: 
+.. i18n:         To delete a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Drop` button, select the database you want to delete and enter the super-administrator
+.. i18n: 	password. Click the :guilabel:`Drop` button to confirm that you want to delete the database.
+..
+
+.. tip:: Drop (delete) a Database
+
+        To delete a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Drop` button, select the database you want to delete and enter the super-administrator
+	password. Click the :guilabel:`Drop` button to confirm that you want to delete the database.
+
+.. i18n: .. index::
+.. i18n:    single: database; restore
+..
+
+.. index::
+   single: database; restore
+
+.. i18n: .. tip:: Restore a Database
+.. i18n: 
+.. i18n:         To restore a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+.. i18n:         Then click the :guilabel:`Restore` button, click the :guilabel:`Choose File` button to select the database
+.. i18n:         you want to restore. Give the database a name and enter the super-administrator	password.
+.. i18n: 	Click the :guilabel:`Restore` button to confirm that you want to install a new copy of the selected database.
+.. i18n: 	To restore a database, you need to have an existing copy, of course.
+..
+
+.. tip:: Restore a Database
+
+        To restore a database, go to the web :guilabel:`Login` screen and click the :guilabel:`Databases` button.
+        Then click the :guilabel:`Restore` button, click the :guilabel:`Choose File` button to select the database
+        you want to restore. Give the database a name and enter the super-administrator	password.
+	Click the :guilabel:`Restore` button to confirm that you want to install a new copy of the selected database.
+	To restore a database, you need to have an existing copy, of course.
+
+.. i18n: .. index::
 .. i18n:    single: database; duplicate
 ..
 
 .. index::
    single: database; duplicate
 
-.. i18n: .. tip::   Duplicating a database
+.. i18n: .. tip::   Duplicating a Database
 .. i18n: 
-.. i18n: 	To duplicate a database you can:
+.. i18n: 	To duplicate a database, you can:
 .. i18n: 
 .. i18n:         #. make a backup file on your PC from this database.
 .. i18n: 
-.. i18n:         #. restore this database from the backup file on your PC, giving it a new name as you do so.
+.. i18n:         #. restore this database from the backup file on your PC, and give it a new name.
 .. i18n: 
 .. i18n: 	This can be a useful way of making a test database from a production database. You can try out the
 .. i18n: 	operation of a new configuration, new modules, or just the import of new data.
 ..
 
-.. tip::   Duplicating a database
+.. tip::   Duplicating a Database
 
-	To duplicate a database you can:
+	To duplicate a database, you can:
 
         #. make a backup file on your PC from this database.
 
-        #. restore this database from the backup file on your PC, giving it a new name as you do so.
+        #. restore this database from the backup file on your PC, and give it a new name.
 
 	This can be a useful way of making a test database from a production database. You can try out the
 	operation of a new configuration, new modules, or just the import of new data.
@@ -378,11 +446,11 @@
 You are now ready to use databases from your installation to familiarize yourself with the
 administration and use of OpenERP.
 
-.. i18n: New OpenERP functionality
+.. i18n: New OpenERP Functionality
 .. i18n: =========================
 ..
 
-New OpenERP functionality
+New OpenERP Functionality
 =========================
 
 .. i18n: The database you have created and managed so far is based on the core OpenERP functionality that you
@@ -426,12 +494,12 @@
 In both cases you will need to be a \ ``root`` \ user or \ ``Administrator`` \ of your
 OpenERP application server.
 
-.. i18n: Extending Open ERP
-.. i18n: ------------------
+.. i18n: Extending OpenERP
+.. i18n: -----------------
 ..
 
-Extending Open ERP
-------------------
+Extending OpenERP
+-----------------
 
 .. i18n: To extend OpenERP you will need to copy modules into the \ ``addons`` \ directory. That is in
 .. i18n: your server's \ ``openerp-server`` \ directory (which differs between Windows, Mac and some of the
@@ -499,7 +567,7 @@
 .. index::
    pair:  filesystem; permissions
 
-.. i18n: .. tip:: Changing permissions
+.. i18n: .. tip:: Changing Permissions
 .. i18n: 
 .. i18n: 	A very simple way of changing permissions on the Linux system you are using to develop an OpenERP
 .. i18n: 	application is to execute the command sudo chmod 777 <path_to_addons> (where <path_to_addons> is
@@ -507,7 +575,7 @@
 .. i18n: 	server/addons).
 ..
 
-.. tip:: Changing permissions
+.. tip:: Changing Permissions
 
 	A very simple way of changing permissions on the Linux system you are using to develop an OpenERP
 	application is to execute the command sudo chmod 777 <path_to_addons> (where <path_to_addons> is

=== modified file 'i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst'
--- i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst	2012-09-19 23:17:23 +0000
+++ i18n/it/source/book/1/1_1_Inst_Config/1_1_Inst_Config_install.rst	2012-10-01 15:56:24 +0000
@@ -204,12 +204,20 @@
 you are using, or you may want to install the database server and application server on
 separate hardware units.
 
+<<<<<<< TREE
 .. i18n: For this situation, you can get a separate installer for the OpenERP server from the same
+=======
+.. i18n: For this situation, you can get separate installers for the OpenERP server and client from the same
+>>>>>>> MERGE-SOURCE
 .. i18n: location as the all-in-one auto-installer. You will also have to download and install a suitable
 .. i18n: version of PostgreSQL independently.
 ..
 
+<<<<<<< TREE
 For this situation, you can get a separate installer for the OpenERP server from the same
+=======
+For this situation, you can get separate installers for the OpenERP server and client from the same
+>>>>>>> MERGE-SOURCE
 location as the all-in-one auto-installer. You will also have to download and install a suitable
 version of PostgreSQL independently.
 
@@ -1095,6 +1103,91 @@
 If your Linux server is protected by a firewall you will have to provide access to port 
  \ ``8069`` \ or \ ``8070`` \ for users on other computers with OpenERP GTK clients.
 
+<<<<<<< TREE
+=======
+.. i18n: .. index::
+.. i18n:    single: installation; eTiny web server
+.. i18n:    single: installation; OpenERP client-web server
+..
+
+.. index::
+   single: installation; eTiny web server
+   single: installation; OpenERP client-web server
+
+.. i18n: Installation of an OpenERP Web Server
+.. i18n: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+..
+
+Installation of an OpenERP Web Server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. i18n: Just as you installed a GTK client on a Linux server, you can also install the OpenERP client-web
+.. i18n: server.
+.. i18n: You can install it from sources after installing its dependencies from packages as you did
+.. i18n: with the OpenERP server,
+.. i18n: but OpenERP has provided a simpler way to do this for the web client – using a system known as ez_setup.
+..
+
+Just as you installed a GTK client on a Linux server, you can also install the OpenERP client-web
+server.
+You can install it from sources after installing its dependencies from packages as you did
+with the OpenERP server,
+but OpenERP has provided a simpler way to do this for the web client – using a system known as ez_setup.
+
+.. i18n: Before proceeding, confirm that your OpenERP installation is functioning correctly with a GTK
+.. i18n: client.
+.. i18n: If it is not, you will need to go back now and fix it, because you need to be able to fully use it for
+.. i18n: the next stages.
+..
+
+Before proceeding, confirm that your OpenERP installation is functioning correctly with a GTK
+client.
+If it is not, you will need to go back now and fix it, because you need to be able to fully use it for
+the next stages.
+
+.. i18n: To install client-web follow the up-to-date instructions in the installation document on the website.
+..
+
+To install client-web follow the up-to-date instructions in the installation document on the website.
+
+.. i18n: .. note:: Ez Tool
+.. i18n: 
+.. i18n: 	Ez is the packaging system used by Python. It enables the installation of programs as required just
+.. i18n: 	like the packages used by a Linux distribution. The software is downloaded across the network and
+.. i18n: 	installed on your computer by ez_install.
+.. i18n: 
+.. i18n: 	:program:`ez_setup` is a small program that installs ez_install automatically.
+..
+
+.. note:: Ez Tool
+
+	Ez is the packaging system used by Python. It enables the installation of programs as required just
+	like the packages used by a Linux distribution. The software is downloaded across the network and
+	installed on your computer by ez_install.
+
+	:program:`ez_setup` is a small program that installs ez_install automatically.
+
+.. i18n: The OpenERP Web server connects to the OpenERP server in the same way as an OpenERP client
+.. i18n: using the NET-RPC protocol. Its default setup corresponds to that of the OpenERP server
+.. i18n: you have just installed, so should connect directly at startup.
+..
+
+The OpenERP Web server connects to the OpenERP server in the same way as an OpenERP client
+using the NET-RPC protocol. Its default setup corresponds to that of the OpenERP server
+you have just installed, so should connect directly at startup.
+
+.. i18n: #.	At the same console as you've just been using, go to the OpenERP web directory by typing
+.. i18n: 	:command:`cd openerp-web-6.X`.
+.. i18n: 
+.. i18n: #. 	At a terminal window type :command:`openerp-web` to start the OpenERP Web server.
+..
+
+#.	At the same console as you've just been using, go to the OpenERP web directory by typing
+	:command:`cd openerp-web-6.X`.
+
+#. 	At a terminal window type :command:`openerp-web` to start the OpenERP Web server.
+
+>>>>>>> MERGE-SOURCE
 .. i18n: .. _fig-webwel:
 .. i18n:
 .. i18n:.. figure:: images/web_welcome.png

=== modified file 'i18n/it/source/book/1/1_1_Inst_Config/index.rst'
--- i18n/it/source/book/1/1_1_Inst_Config/index.rst	2012-09-14 12:39:28 +0000
+++ i18n/it/source/book/1/1_1_Inst_Config/index.rst	2012-10-01 15:56:24 +0000
@@ -68,8 +68,13 @@
 
 .. note:: Renaming from Tiny ERP to OpenERP
 
+<<<<<<< TREE
    Tiny ERP was renamed to OpenERP early in 2008 so anyone who has used Tiny ERP should be
    equally at home with OpenERP. Both names refer to the same software, so there is no
+=======
+   Tiny ERP was renamed to OpenERP early in 2008, so anyone who has used Tiny ERP should be
+   equally at home with OpenERP. The two names refer to the same software, so there is no
+>>>>>>> MERGE-SOURCE
    functional difference between versions 4.2.X of OpenERP and 4.2.X of Tiny ERP. This book
    applies to versions of OpenERP from 6.1.0 onwards, with references to earlier versions from
    time to time.

=== modified file 'i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst'
--- i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst	2012-09-20 11:10:08 +0000
+++ i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_connect_openerp.rst	2012-10-01 15:56:24 +0000
@@ -187,7 +187,20 @@
 	server's timezone. When the English users want to set up a meeting with an Indian user, the Indian
 	user's available time will be converted to English time.
 
-.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+<<<<<<< TREE
+.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+=======
+.. i18n: The :guilabel:`REQUESTS` link is found beside the :guilabel:`HOME` link. It is only visible if you are logged into
+.. i18n: a database. If your database is new it will show number of requests as 0. You can click on that link
+.. i18n: to look at requests that have been sent to you at any time.
+..
+
+The :guilabel:`REQUESTS` link is found beside the :guilabel:`HOME` link. It is only visible if you are logged into
+a database. If your database is new it will show number of requests as 0. You can click on that link
+to look at requests that have been sent to you at any time.
+
+.. i18n: The next element in the toolbar is a link to :guilabel:`EDIT PREFERENCES`. By clicking that link, you
+>>>>>>> MERGE-SOURCE
 .. i18n: get a dialog box where the current user can set his interface in the :guilabel:`Current Activity` tab;
 .. i18n: and in the :guilabel:`Preferences` tab, set his password, a timezone, a working language,
 .. i18n: e-mail and a signature:
@@ -365,6 +378,7 @@
 
 .. index:: requests
 
+<<<<<<< TREE
 .. i18n: Requests
 .. i18n: ^^^^^^^^
 .. i18n:
@@ -375,6 +389,183 @@
 ^^^^^^^^
 
 Requests have been removed in OpenERP 6.1 - a new internal communication system will be added in 7.0.
+=======
+.. i18n: Requests as a Mechanism for Internal Communication
+.. i18n: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+..
+
+Requests as a Mechanism for Internal Communication
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. i18n: Requests are a powerful communication mechanism between users of the system. They are also used by
+.. i18n: OpenERP itself to send system messages to users.
+..
+
+Requests are a powerful communication mechanism between users of the system. They are also used by
+OpenERP itself to send system messages to users.
+
+.. i18n: They have distinct advantages over traditional emails:
+..
+
+They have distinct advantages over traditional emails:
+
+.. i18n: * requests are linked to other OpenERP documents,
+.. i18n: 
+.. i18n: * an event's history is attached to the request,
+.. i18n: 
+.. i18n: * you can monitor events effectively from the messages they have sent.
+..
+
+* requests are linked to other OpenERP documents,
+
+* an event's history is attached to the request,
+
+* you can monitor events effectively from the messages they have sent.
+
+.. i18n: OpenERP uses this mechanism to inform users about certain system events. For example, if there is a
+.. i18n: problem concerning the procurement of a product, a request is sent by OpenERP to the production
+.. i18n: manager.
+..
+
+OpenERP uses this mechanism to inform users about certain system events. For example, if there is a
+problem concerning the procurement of a product, a request is sent by OpenERP to the production
+manager.
+
+.. i18n: Send a request to get an understanding of its functionality:
+..
+
+Send a request to get an understanding of its functionality:
+
+.. i18n: 	#. Click on the :guilabel:`REQUESTS` link that should currently be showing number of requests as 0.
+.. i18n: 	   This opens a window that lists all of your waiting requests.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`New` to create and send a new request.
+.. i18n: 
+.. i18n: 	#. Complete the subject of the request, such as \ ``How are things?``\  then give a description of the
+.. i18n: 	   enquiry in the field.
+.. i18n: 
+.. i18n: 	#. Click the :guilabel:`Search` button to the right of the :guilabel:`To` field in the
+.. i18n: 	   :guilabel:`Request` tab and select :guilabel:`Administrator` in the window that opens
+.. i18n: 	   (that is the user that you are already connected as).
+.. i18n: 
+.. i18n: 	#. You can then link this request to other system documents using the :guilabel:`References` field,
+.. i18n: 	   which could, for example, be a partner or a quotation or a disputed invoice.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`Send` to send the request to the intended recipient – that is yourself in this
+.. i18n: 	   case. Then click :guilabel:`HOME` to return to the original screen.
+..
+
+	#. Click on the :guilabel:`REQUESTS` link that should currently be showing number of requests as 0.
+	   This opens a window that lists all of your waiting requests.
+
+	#. Click :guilabel:`New` to create and send a new request.
+
+	#. Complete the subject of the request, such as \ ``How are things?``\  then give a description of the
+	   enquiry in the field.
+
+	#. Click the :guilabel:`Search` button to the right of the :guilabel:`To` field in the
+	   :guilabel:`Request` tab and select :guilabel:`Administrator` in the window that opens
+	   (that is the user that you are already connected as).
+
+	#. You can then link this request to other system documents using the :guilabel:`References` field,
+	   which could, for example, be a partner or a quotation or a disputed invoice.
+
+	#. Click :guilabel:`Send` to send the request to the intended recipient – that is yourself in this
+	   case. Then click :guilabel:`HOME` to return to the original screen.
+
+.. i18n: .. figure:: images/request_tab.png
+.. i18n:    :align: center
+.. i18n:    :scale: 80
+.. i18n: 
+.. i18n:    *Creating a new request*
+..
+
+.. figure:: images/request_tab.png
+   :align: center
+   :scale: 80
+
+   *Creating a new request*
+
+.. i18n: To check your requests:
+..
+
+To check your requests:
+
+.. i18n: 	#. Click on the :guilabel:`REQUESTS` link (which may now show the number of requests as 1)
+.. i18n: 	   to open a list of your requests. The list of requests then opens and you can see the
+.. i18n: 	   requests you have been sent there.
+.. i18n: 
+.. i18n: 	#. Click the :guilabel:`Edit` icon, represented by a pencil, at the left hand end of the request
+.. i18n: 	   line. That opens the request in edit mode.
+.. i18n: 
+.. i18n: 	#. You can then click the :guilabel:`Reply` button and make your response in the
+.. i18n: 	   :guilabel:`Description` field of the :guilabel:`Request` tab that appears in place of the original message.
+.. i18n: 
+.. i18n: 	#. Click :guilabel:`Send` to save your response and send it to the original sender.
+..
+
+	#. Click on the :guilabel:`REQUESTS` link (which may now show the number of requests as 1)
+	   to open a list of your requests. The list of requests then opens and you can see the
+	   requests you have been sent there.
+
+	#. Click the :guilabel:`Edit` icon, represented by a pencil, at the left hand end of the request
+	   line. That opens the request in edit mode.
+
+	#. You can then click the :guilabel:`Reply` button and make your response in the
+	   :guilabel:`Description` field of the :guilabel:`Request` tab that appears in place of the original message.
+
+	#. Click :guilabel:`Send` to save your response and send it to the original sender.
+
+.. i18n: .. note:: Requests vs. Email
+.. i18n: 
+.. i18n: 	The advantage of an OpenERP request compared with a set of emails about one thread of discussion
+.. i18n: 	is that a request contains all of the conversation in one place. You can easily monitor a whole
+.. i18n: 	discussion with the appropriate documents attached, and quickly review a list of incomplete
+.. i18n: 	discussions with the history within each request.
+..
+
+.. note:: Requests vs. Email
+
+	The advantage of an OpenERP request compared with a set of emails about one thread of discussion
+	is that a request contains all of the conversation in one place. You can easily monitor a whole
+	discussion with the appropriate documents attached, and quickly review a list of incomplete
+	discussions with the history within each request.
+
+.. i18n: To look at the request history (the user needs to set the interface as \ ``Extended`` \
+.. i18n: to use this feature), and close the request:
+..
+
+To look at the request history (the user needs to set the interface as \ ``Extended`` \
+to use this feature), and close the request:
+
+.. i18n: 	#. Click on the :guilabel:`History` tab in the :guilabel:`Request` form to see the
+.. i18n: 	   original request and all of the responses. By clicking on each line, you could get more information
+.. i18n: 	   on each element.
+.. i18n: 
+.. i18n: 	#. Return to the first tab, :guilabel:`Request` and click :guilabel:`Close` to set it to \
+.. i18n: 	   ``closed``\. This then appears greyed out.
+..
+
+	#. Click on the :guilabel:`History` tab in the :guilabel:`Request` form to see the
+	   original request and all of the responses. By clicking on each line, you could get more information
+	   on each element.
+
+	#. Return to the first tab, :guilabel:`Request` and click :guilabel:`Close` to set it to \
+	   ``closed``\. This then appears greyed out.
+
+.. i18n: .. tip:: Trigger Date
+.. i18n: 
+.. i18n: 	You can send a request with a future date. This request will not appear in the recipient's waiting
+.. i18n: 	list until the indicated date. This mechanism is very useful for setting up alerts before an
+.. i18n: 	important event.
+..
+
+.. tip:: Trigger Date
+
+	You can send a request with a future date. This request will not appear in the recipient's waiting
+	list until the indicated date. This mechanism is very useful for setting up alerts before an
+	important event.
+>>>>>>> MERGE-SOURCE
 
 .. i18n: .. index::
 .. i18n:    single: user; configuration

=== modified file 'i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst'
--- i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst	2011-06-10 09:39:31 +0000
+++ i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_db_create.rst	2012-10-01 15:56:24 +0000
@@ -1,20 +1,20 @@
 
-.. i18n: Database creation
+.. i18n: Database Creation
 .. i18n: =================
 ..
 
-Database creation
+Database Creation
 =================
 
 .. i18n: Use the technique outlined in :ref:`ch-inst` to create a new database, \ ``openerp_ch02``\  . This
 .. i18n: database will contain the demonstration data provided with OpenERP and a large proportion of the
-.. i18n: core Open ERP functionality. You will need to know your super administrator password for this – or
+.. i18n: core OpenERP functionality. You will need to know your super administrator password for this – or
 .. i18n: you will have to find somebody who does have it to create this seed database.
 ..
 
 Use the technique outlined in :ref:`ch-inst` to create a new database, \ ``openerp_ch02``\  . This
 database will contain the demonstration data provided with OpenERP and a large proportion of the
-core Open ERP functionality. You will need to know your super administrator password for this – or
+core OpenERP functionality. You will need to know your super administrator password for this – or
 you will have to find somebody who does have it to create this seed database.
 
 .. i18n: Start the database creation process from the :guilabel:`Login` page by clicking
@@ -50,3 +50,62 @@
 *  :guilabel:`Administrator password` : \ ``admin``\  (because it is easiest to remember at this stage, but obviously completely insecure),
 
 *  :guilabel:`Confirm password` : \ ``admin``\  .
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== modified file 'i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst'
--- i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst	2012-09-19 20:41:54 +0000
+++ i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_install_functionality.rst	2012-10-01 15:56:24 +0000
@@ -6,26 +6,26 @@
 .. index::
   single: module; new functionality
 
-.. i18n: Installing new functionality
-.. i18n: =============================
+.. i18n: Installing New Functionality
+.. i18n: ============================
 ..
 
-Installing new functionality
-=============================
+Installing New Functionality
+============================
 
-.. i18n: All of Open ERP's functionality is contained in its many and various modules. Many of these, the
+.. i18n: All of OpenERP's functionality is contained in its many and various modules. Many of these, the
 .. i18n: core modules, are automatically loaded during the initial installation of the system and can be
 .. i18n: updated online later. Although they are mostly not installed in your database at the outset, they are
 .. i18n: available on your computer for immediate installation. Additional modules can also be loaded online
-.. i18n: from the official Open ERP site http://openerp.com. These modules are inactive when they are loaded
+.. i18n: from the official OpenERP site http://openerp.com. These modules are inactive when they are loaded
 .. i18n: into the system, and can then be installed in a separate step.
 ..
 
-All of Open ERP's functionality is contained in its many and various modules. Many of these, the
+All of OpenERP's functionality is contained in its many and various modules. Many of these, the
 core modules, are automatically loaded during the initial installation of the system and can be
 updated online later. Although they are mostly not installed in your database at the outset, they are
 available on your computer for immediate installation. Additional modules can also be loaded online
-from the official Open ERP site http://openerp.com. These modules are inactive when they are loaded
+from the official OpenERP site http://openerp.com. These modules are inactive when they are loaded
 into the system, and can then be installed in a separate step.
 
 .. i18n: You will start by checking if there are any updates available online that apply to your initial
@@ -43,35 +43,35 @@
   single: module; upgrading
 
 .. i18n: Updating the Modules list
-.. i18n: ---------------------------
+.. i18n: -------------------------
 ..
 
 Updating the Modules list
----------------------------
+-------------------------
 
 .. i18n: Click :menuselection:`Administration --> Modules --> Update Modules List` to start the
 .. i18n: updating tool. The :guilabel:`Module Update` window opens notifying the user that
-.. i18n: Open ERP will look at the server side for adding new modules and updating
+.. i18n: OpenERP will look at the server side for adding new modules and updating
 .. i18n: existing ones.
 ..
 
 Click :menuselection:`Administration --> Modules --> Update Modules List` to start the
 updating tool. The :guilabel:`Module Update` window opens notifying the user that
-Open ERP will look at the server side for adding new modules and updating
+OpenERP will look at the server side for adding new modules and updating
 existing ones.
 
 .. i18n: Click :guilabel:`Update` to start the update on the server side. When it is
-.. i18n: complete you will see a :guilabel:`Module update result` section indicating how many new modules were added
+.. i18n: complete, you will see a :guilabel:`Module update result` section indicating how many new modules were added
 .. i18n: and how many existing modules were updated. Click :guilabel:`Open Modules` to return to the updated list.
 ..
 
 Click :guilabel:`Update` to start the update on the server side. When it is
-complete you will see a :guilabel:`Module update result` section indicating how many new modules were added
+complete, you will see a :guilabel:`Module update result` section indicating how many new modules were added
 and how many existing modules were updated. Click :guilabel:`Open Modules` to return to the updated list.
 
 .. i18n: .. note:: Modules
 .. i18n: 
-.. i18n: 	All the modules available on your computer can be found in the addons directory of your Open ERP
+.. i18n: 	All the modules available on your computer can be found in the addons directory of your OpenERP
 .. i18n: 	server. Each module there is represented by a directory carrying the name of the module or by a
 .. i18n: 	file with the module name and .zip appended to it. The file is in ZIP archive format and replicates
 .. i18n: 	the directory structure of unzipped modules.
@@ -79,7 +79,7 @@
 
 .. note:: Modules
 
-	All the modules available on your computer can be found in the addons directory of your Open ERP
+	All the modules available on your computer can be found in the addons directory of your OpenERP
 	server. Each module there is represented by a directory carrying the name of the module or by a
 	file with the module name and .zip appended to it. The file is in ZIP archive format and replicates
 	the directory structure of unzipped modules.
@@ -118,17 +118,25 @@
 .. index::
   single: module; installing
 
-.. i18n: The Configuration / Reconfigure wizard
+.. i18n: The Configuration / Reconfigure Wizard
 .. i18n: --------------------------------------
 ..
 
-The Configuration / Reconfigure wizard
+The Configuration / Reconfigure Wizard
 --------------------------------------
 
+<<<<<<< TREE
 .. i18n: One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web interface or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+=======
+.. i18n: One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web-client or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+>>>>>>> MERGE-SOURCE
 ..
 
+<<<<<<< TREE
 One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web interface or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+=======
+One of the new features of OpenERP is the :guilabel:`Configuration` wizard. Once run, the :guilabel:`Reconfigure` shortcut will appear. This wizard provides an easy way to install modules, thanks to its user-friendly and easy-to-use interface. The user may invoke this wizard at his own convenience using the shortcut :guilabel:`Reconfigure`, found just below the database and user name in the web-client or in the Shortcut menu in the GTK client. The same Configuration dialog box appears that you may have encountered at the time of installing a new database. Why did we call it the :guilabel:`Reconfigure` wizard? Indeed, because it allows the user to review installed applications and install related additional features or simply to install new applications on the fly.
+>>>>>>> MERGE-SOURCE
 
 .. i18n: When you go through the various steps in the wizard, you will come across some options that are checked and greyed. These are applications already installed. In the \ ``openerp_ch02`` \ database configuration, you may see that the \ ``Customer Relationship Management`` \ option is already checked because this Business Application has been installed in this database.
 .. i18n: Install extra applications simply by checking the corresponding options and clicking :guilabel:`Install` or click :guilabel:`Skip` to stop the configuration. You will eventually also come across the :guilabel:`CRM Application Configuration` step which you may use to add features to your CRM application. For now, select the \ ``Claims`` \ option and click :guilabel:`Configure`. This will in turn install the :mod:`crm_claim` module.
@@ -162,11 +170,11 @@
 
 .. note:: You can also change the Configuration Wizard through the :menuselection:`Administration --> Configuration --> Configuration Wizards --> Configuration Wizards`.
 
-.. i18n: Installing an application / module from the Modules list
+.. i18n: Installing an Application / Module from the Modules list
 .. i18n: --------------------------------------------------------
 ..
 
-Installing an application / module from the Modules list
+Installing an Application / Module from the Modules list
 --------------------------------------------------------
 
 .. i18n: .. index::
@@ -236,24 +244,24 @@
 form that appears. Close the window when the operation has completed. Return to the :guilabel:`Sales` menu; you will
 see the new menu :menuselection:`Products` has become available.
 
-.. i18n: .. tip::  Refreshing the menu in the GTK client
+.. i18n: .. tip::  Refreshing the menu in the GTK Client
 .. i18n: 
 .. i18n: 	After an update in the GTK client you will have to open a new menu to refresh the content –
-.. i18n: 	otherwise you will not see the new menu item. To do that use the window menu :menuselection:`Form -->
+.. i18n: 	otherwise you will not see the new menu item. To do that, use the window menu :menuselection:`Form -->
 .. i18n: 	Reload / Undo` or use the shortcut :kbd:`Ctrl+R`.
 ..
 
-.. tip::  Refreshing the menu in the GTK client
+.. tip::  Refreshing the menu in the GTK Client
 
 	After an update in the GTK client you will have to open a new menu to refresh the content –
-	otherwise you will not see the new menu item. To do that use the window menu :menuselection:`Form -->
+	otherwise you will not see the new menu item. To do that, use the window menu :menuselection:`Form -->
 	Reload / Undo` or use the shortcut :kbd:`Ctrl+R`.
 
-.. i18n: Installing a module with its dependencies
+.. i18n: Installing a Module with its Dependencies
 .. i18n: -----------------------------------------
 ..
 
-Installing a module with its dependencies
+Installing a Module with its Dependencies
 -----------------------------------------
 
 .. i18n: .. index::
@@ -301,22 +309,22 @@
 	#.  You will see details of all the features installed by the modules on a new
 	    :guilabel:`Features` tab on the module form. 
 
-.. i18n: When you return to the :menuselection:`Warehouse` menu you will find the new menu items under it like
+.. i18n: When you return to the :menuselection:`Warehouse` menu, you will find the new menu items under it like
 .. i18n: :menuselection:`Warehouse --> Warehouse Management --> Incoming Shipments`, :menuselection:`Warehouse --> Products Moves`,  which are a part of the Warehouse management system. You will also see all the accounting functions that are now available in the :menuselection:`Accounting` menu.
 ..
 
-When you return to the :menuselection:`Warehouse` menu you will find the new menu items under it like
+When you return to the :menuselection:`Warehouse` menu, you will find the new menu items under it like
 :menuselection:`Warehouse --> Warehouse Management --> Incoming Shipments`, :menuselection:`Warehouse --> Products Moves`,  which are a part of the Warehouse management system. You will also see all the accounting functions that are now available in the :menuselection:`Accounting` menu.
 
 .. i18n: There is no particular relationship between the modules installed and the menus added. Most of the
-.. i18n: core modules add complete menus but some also add submenus to menus already in the system. Other
-.. i18n: modules add menus and submenus as they need. Modules can also add additional fields to existing
+.. i18n: core modules add complete menus but some also add sub-menus to menus already in the system. Other
+.. i18n: modules add menus and sub-menus as they need. Modules can also add additional fields to existing
 .. i18n: forms, or simply additional demonstration data or some settings specific to a given requirement.
 ..
 
 There is no particular relationship between the modules installed and the menus added. Most of the
-core modules add complete menus but some also add submenus to menus already in the system. Other
-modules add menus and submenus as they need. Modules can also add additional fields to existing
+core modules add complete menus but some also add sub-menus to menus already in the system. Other
+modules add menus and sub-menus as they need. Modules can also add additional fields to existing
 forms, or simply additional demonstration data or some settings specific to a given requirement.
 
 .. i18n: .. index::
@@ -328,10 +336,10 @@
   single: module; dependencies
 ..
 
-.. i18n: .. note::  Dependencies between modules
+.. i18n: .. note::  Dependencies Between Modules
 .. i18n: 
 .. i18n: 	The module form shows two tabs before it is installed. 
-.. i18n: 	The first tab gives basic information about the module and the
+.. i18n: 	The first tab gives basic information about the module, and the
 .. i18n: 	second gives a list of modules that this module depends on. So when you install a module, OpenERP
 .. i18n: 	automatically selects all the necessary dependencies to install this module.
 .. i18n: 
@@ -339,10 +347,10 @@
 .. i18n: 	in your profile as a set of dependencies.
 ..
 
-.. note::  Dependencies between modules
+.. note::  Dependencies Between Modules
 
 	The module form shows two tabs before it is installed. 
-	The first tab gives basic information about the module and the
+	The first tab gives basic information about the module, and the
 	second gives a list of modules that this module depends on. So when you install a module, OpenERP
 	automatically selects all the necessary dependencies to install this module.
 
@@ -358,52 +366,52 @@
 fell swoop – you would have to uninstall module by module. Uninstalling is more complex than
 installing because you have to handle existing system data.
 
-.. i18n: .. note::  Uninstalling modules
+.. i18n: .. note::  Uninstalling Modules
 .. i18n: 
-.. i18n: 	Although it works quite well, uninstalling modules is not perfect in Open ERP. It is not guaranteed
+.. i18n: 	Although it works quite well, uninstalling modules is not perfect in OpenERP. It is not guaranteed
 .. i18n: 	to return the system exactly to the state it was in before installation.
 .. i18n: 
 .. i18n: 	So it is recommended that you make a backup of the database before installing your new modules so
-.. i18n: 	that you can test the new modules and decide whether they are suitable or not. If they are not then
+.. i18n: 	that you can test the new modules and decide whether they are suitable or not. If they are not, then
 .. i18n: 	you can return to your backup. If they are, then you will probably still reinstall the modules on
 .. i18n: 	your backup so that you do not have to delete all your test data.
 .. i18n: 
-.. i18n: 	If you wanted to uninstall you would use the menu :menuselection:`Administration --> Modules
+.. i18n: 	If you wanted to uninstall, you would use the menu :menuselection:`Administration --> Modules
 .. i18n: 	--> Modules` and then uninstall them in the inverse order of their
 .. i18n: 	dependencies: ``stock``, ``account``.
 ..
 
-.. note::  Uninstalling modules
+.. note::  Uninstalling Modules
 
-	Although it works quite well, uninstalling modules is not perfect in Open ERP. It is not guaranteed
+	Although it works quite well, uninstalling modules is not perfect in OpenERP. It is not guaranteed
 	to return the system exactly to the state it was in before installation.
 
 	So it is recommended that you make a backup of the database before installing your new modules so
-	that you can test the new modules and decide whether they are suitable or not. If they are not then
+	that you can test the new modules and decide whether they are suitable or not. If they are not, then
 	you can return to your backup. If they are, then you will probably still reinstall the modules on
 	your backup so that you do not have to delete all your test data.
 
-	If you wanted to uninstall you would use the menu :menuselection:`Administration --> Modules
+	If you wanted to uninstall, you would use the menu :menuselection:`Administration --> Modules
 	--> Modules` and then uninstall them in the inverse order of their
 	dependencies: ``stock``, ``account``.
 
-.. i18n: Installing additional functionality
-.. i18n: -------------------------------------
+.. i18n: Installing Additional Functionality
+.. i18n: -----------------------------------
 ..
 
-Installing additional functionality
--------------------------------------
+Installing Additional Functionality
+-----------------------------------
 
-.. i18n: To discover the full range of OpenERP's possibilities you can install many additional modules.
+.. i18n: To discover the full range of OpenERP's possibilities, you can install many additional modules.
 .. i18n: Installing them with their demonstration data provides a convenient way of exploring the whole core
-.. i18n: system. When you build on the \ ``openerp_ch02``\   database you will automatically include
+.. i18n: system. When you build on the \ ``openerp_ch02``\   database, you will automatically include
 .. i18n: demonstration data because you checked the :guilabel:`Load Demonstration Data` checkbox when you originally
 .. i18n: created the database.
 ..
 
-To discover the full range of OpenERP's possibilities you can install many additional modules.
+To discover the full range of OpenERP's possibilities, you can install many additional modules.
 Installing them with their demonstration data provides a convenient way of exploring the whole core
-system. When you build on the \ ``openerp_ch02``\   database you will automatically include
+system. When you build on the \ ``openerp_ch02``\   database, you will automatically include
 demonstration data because you checked the :guilabel:`Load Demonstration Data` checkbox when you originally
 created the database.
 
@@ -423,11 +431,11 @@
 Click :menuselection:`Administration --> Modules --> Modules` to give you an
 overview of all of the modules available for installation.
 
-.. i18n: To test several modules you will not have to install them all one by one. You can use the dependencies
+.. i18n: To test several modules, you will not have to install them all one by one. You can use the dependencies
 .. i18n: between modules to load several at once.
 ..
 
-To test several modules you will not have to install them all one by one. You can use the dependencies
+To test several modules, you will not have to install them all one by one. You can use the dependencies
 between modules to load several at once.
 
 .. i18n: .. Copyright © Open Object Press. All rights reserved.

=== modified file 'i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst'
--- i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst	2012-09-21 09:06:06 +0000
+++ i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_newfeatures.rst	2012-10-01 15:56:24 +0000
@@ -1,11 +1,11 @@
 
 .. i18n: *********************
-.. i18n: What's new in OpenERP
+.. i18n: What's New in OpenERP
 .. i18n: *********************
 ..
 
 *********************
-What's new in OpenERP
+What's New in OpenERP
 *********************
 
 .. i18n: .. index::
@@ -52,11 +52,13 @@
 .. i18n: 
 .. i18n: * Create your own e-mail templates for use throughout OpenERP,
 .. i18n: 
-.. i18n: * Use the Scheduler for other objects than Manufacturing,
+.. i18n: * Use the Scheduler for objects other than Manufacturing too,
 .. i18n: 
 .. i18n: * Click the `star` in the web version to quickly create a shortcut for a screen you often use,
 .. i18n: 
-.. i18n: * When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned. 
+.. i18n: * When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned,
+.. i18n: 
+.. i18n: * Updated configuration wizard to install new features using OpenERP modules in user friendly way.
 ..
 
 * OpenERP has been structured as Business Applications and its menu has been changed to match this,
@@ -87,11 +89,13 @@
 
 * Create your own e-mail templates for use throughout OpenERP,
 
-* Use the Scheduler for other objects than Manufacturing,
+* Use the Scheduler for objects other than Manufacturing too,
 
 * Click the `star` in the web version to quickly create a shortcut for a screen you often use,
 
-* When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned. 
+* When you perform an action in List view in the web version, (i.e. change the status of a lead), OpenERP will display a bar containing information about this change. You can click the link to open the lead concerned,
+
+* Updated configuration wizard to install new features using OpenERP modules in user friendly way.
 
 .. i18n: Business Application-related Features
 .. i18n: =====================================
@@ -111,19 +115,15 @@
 .. i18n: 
 .. i18n: * Manage your Marketing Campaigns and send automated e-mails based on your own templates,
 .. i18n: 
-.. i18n: * For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,  
+.. i18n: * For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,
 .. i18n: 
 .. i18n: * Create your company wiki for Sales FAQ,
 .. i18n: 
 .. i18n: * History tab in the Customer form to keep track of all events,
-.. i18n:  
-.. i18n: *Warehouse Management*
-.. i18n: 
-.. i18n: * Push & Pull rules for stock locations have been extended and integrated with multicompany,
-.. i18n: 
-.. i18n: * Configure units of measure by reference unit, bigger then / smaller then reference unit,
-.. i18n: 
-.. i18n: * Update stock level from the Product form and automatically create a physical inventory for it.
+.. i18n: 
+.. i18n: * When you convert a lead to an opportunity, you now have the option to not create a partner, but just keep the contact data in the opportunity,
+.. i18n: 
+.. i18n: * Create a new partner from a lead or an opportunity, or merge with an existing partner.
 ..
 
 * CRM has been integrated in the Sales Management Business Application,
@@ -132,17 +132,31 @@
 
 * Manage your Marketing Campaigns and send automated e-mails based on your own templates,
 
-* For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,  
+* For Leads, OpenERP will check the email address of the contact and when found for an existing partner, it will propose to merge the new contact with the corresponding partner,
 
 * Create your company wiki for Sales FAQ,
 
 * History tab in the Customer form to keep track of all events,
- 
+
+* When you convert a lead to an opportunity, you now have the option to not create a partner, but just keep the contact data in the opportunity,
+
+* Create a new partner from a lead or an opportunity, or merge with an existing partner.
+
+.. i18n: *Warehouse Management*
+..
+
 *Warehouse Management*
 
+.. i18n: * Push & Pull rules for stock locations have been extended and integrated with multicompany,
+.. i18n: 
+.. i18n: * Configure units of measure by reference unit, bigger than / smaller then reference unit,
+.. i18n: 
+.. i18n: * Update stock level from the Product form and automatically create a physical inventory for it.
+..
+
 * Push & Pull rules for stock locations have been extended and integrated with multicompany,
 
-* Configure units of measure by reference unit, bigger then / smaller then reference unit,
+* Configure units of measure by reference unit, bigger than / smaller then reference unit,
 
 * Update stock level from the Product form and automatically create a physical inventory for it.
 
@@ -151,17 +165,25 @@
 
 *Accounting & Financial Management*
 
+<<<<<<< TREE
 .. i18n: * By default, only one Entry Sequence is available for a journal. If you want to use two sequences for your journal numbering, please install the :mod:`account_sequence` module,
 .. i18n: 
 .. i18n: * Separate numbering now also available for Bank Journals,
 .. i18n: 
 .. i18n: * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries, 
+=======
+.. i18n: * By default, only one Entry Sequence is available for a journal. If you want to have two sequences to be used for your journal numbering, please install the :mod:`account_sequence` module,
+.. i18n: 
+.. i18n: * Separate numbering is now also available for Bank Journals,
+.. i18n: 
+.. i18n: * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries,
+>>>>>>> MERGE-SOURCE
 .. i18n: 
 .. i18n: * Chart of Accounts and Chart of Taxes can be displayed for a selected period,
 .. i18n: 
-.. i18n: * OpenERP added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You shouldn't use both Invoicing and Accounting,
+.. i18n: * OpenERP has added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You should not use both Invoicing and Accounting,
 .. i18n: 
-.. i18n: * Use the Financial Management Configuration Wizard to easily select features you want to use.
+.. i18n: * Use the Financial Management Configuration Wizard to easily select features you want to use,
 .. i18n: 
 .. i18n: * On installation of a predefined Chart of Accounts, the wizard also proposes default bank and cash accounts, and default Sales and Purchase taxes,
 .. i18n: 
@@ -174,17 +196,25 @@
 .. i18n: * Cash Box, possible to keep a real cash register.
 ..
 
+<<<<<<< TREE
 * By default, only one Entry Sequence is available for a journal. If you want to use two sequences for your journal numbering, please install the :mod:`account_sequence` module,
 
 * Separate numbering now also available for Bank Journals,
 
 * Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries, 
+=======
+* By default, only one Entry Sequence is available for a journal. If you want to have two sequences to be used for your journal numbering, please install the :mod:`account_sequence` module,
+
+* Separate numbering is now also available for Bank Journals,
+
+* Quickly enter Journal Entries from List View from the Journal Items menu. Configure your journal with default debit & credit accounts, select the journal in the Journal Items List View, click New and start creating new entries,
+>>>>>>> MERGE-SOURCE
 
 * Chart of Accounts and Chart of Taxes can be displayed for a selected period,
 
-* OpenERP added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You shouldn't use both Invoicing and Accounting,
+* OpenERP has added a flexible, easy Invoicing module allowing you to keep track of your accounting, even when you are not an accountant. If you install the Invoicing module, in Simplified view, you will only have the Invoicing items. You should not use both Invoicing and Accounting,
 
-* Use the Financial Management Configuration Wizard to easily select features you want to use.
+* Use the Financial Management Configuration Wizard to easily select features you want to use,
 
 * On installation of a predefined Chart of Accounts, the wizard also proposes default bank and cash accounts, and default Sales and Purchase taxes,
 
@@ -214,10 +244,10 @@
 
 * On creation of a new project, OpenERP automatically creates the corresponding Analytic Account in the Projects chart of accounts. You no longer have access to the analytic account from the Project.
 
-.. i18n: *Manufacturing Management* 
+.. i18n: *Manufacturing Management*
 ..
 
-*Manufacturing Management* 
+*Manufacturing Management*
 
 .. i18n: * Scrap consumed or finished goods and have the related stock moves automatically,
 .. i18n: 
@@ -235,12 +265,16 @@
 
 .. i18n: * Manage your evaluation process,
 .. i18n: 
-.. i18n: * Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments.
+.. i18n: * Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments,
+.. i18n: 
+.. i18n: * A complete integration of payroll management system with accounting application.
 ..
 
 * Manage your evaluation process,
 
-* Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments.
+* Keep track of your recruitments and receive applicant mails directly in OpenERP, including attachments,
+
+* A complete integration of payroll management system with accounting application.
 
 .. i18n: .. Copyright © Open Object Press. All rights reserved.
 ..

=== modified file 'i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst'
--- i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst	2011-07-25 16:42:59 +0000
+++ i18n/it/source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst	2012-10-01 15:56:24 +0000
@@ -1,40 +1,40 @@
 
 .. i18n: ****************************
-.. i18n: Getting started with OpenERP
+.. i18n: Getting Started with OpenERP
 .. i18n: ****************************
 ..
 
 ****************************
-Getting started with OpenERP
+Getting Started with OpenERP
 ****************************
 
 .. i18n: You will now explore the database \ ``openerp_ch02``\   with these profile modules installed to give
-.. i18n: you an insight into the coverage of the core Open ERP software.
+.. i18n: you an insight into the coverage of the core OpenERP software.
 ..
 
 You will now explore the database \ ``openerp_ch02``\   with these profile modules installed to give
-you an insight into the coverage of the core Open ERP software.
+you an insight into the coverage of the core OpenERP software.
 
-.. i18n: .. tip:: Translating new modules
+.. i18n: .. tip:: Translating New Modules
 .. i18n: 
-.. i18n: 	When you have installed a new module and are using additional languages to English you have to reload
+.. i18n: 	When you have installed a new module and are using additional languages to English, you have to reload
 .. i18n: 	the translation file. New terms introduced in these modules are not translated by default. To do
 .. i18n: 	this use :menuselection:`Administration --> Translations --> Load an Official Translation`.
 ..
 
-.. tip:: Translating new modules
+.. tip:: Translating New Modules
 
-	When you have installed a new module and are using additional languages to English you have to reload
+	When you have installed a new module and are using additional languages to English, you have to reload
 	the translation file. New terms introduced in these modules are not translated by default. To do
 	this use :menuselection:`Administration --> Translations --> Load an Official Translation`.
 
-.. i18n: Depending on the user you are connected as the page appears differently.
+.. i18n: Depending on the user you are connected as, the page appears differently.
 .. i18n: Using the installation sequence above, certain dashboards may be assigned as various
 .. i18n: users' home pages. They show a summary of the information required to start the day effectively. A
 .. i18n: project dashboard might contain:
 ..
 
-Depending on the user you are connected as the page appears differently.
+Depending on the user you are connected as, the page appears differently.
 Using the installation sequence above, certain dashboards may be assigned as various
 users' home pages. They show a summary of the information required to start the day effectively. A
 project dashboard might contain:
@@ -68,31 +68,31 @@
 
 * a graph of Open Issues by Creation Date.
 
-.. i18n: Each of the lists can be reordered simply by clicking the heading of a column – first in ascending then in descending order as you click repeatedly. To get more information about any particular entry click on the name in the first column, or if you want to show a particular panel click :guilabel:`Zoom` above it.
+.. i18n: Each of the lists can be reordered simply by clicking the heading of a column – first in ascending, then in descending order as you click repeatedly. To get more information about any particular entry, click on the name in the first column, or if you want to show a particular panel, click :guilabel:`Zoom` above it.
 ..
 
-Each of the lists can be reordered simply by clicking the heading of a column – first in ascending then in descending order as you click repeatedly. To get more information about any particular entry click on the name in the first column, or if you want to show a particular panel click :guilabel:`Zoom` above it.
+Each of the lists can be reordered simply by clicking the heading of a column – first in ascending, then in descending order as you click repeatedly. To get more information about any particular entry, click on the name in the first column, or if you want to show a particular panel, click :guilabel:`Zoom` above it.
 
 .. i18n: .. figure:: images/admin_project_dashboard.png
 .. i18n:    :align: center
-.. i18n:    :scale: 75
+.. i18n:    :scale: 65
 .. i18n: 
 .. i18n:    *Project Dashboard*
 ..
 
 .. figure:: images/admin_project_dashboard.png
    :align: center
-   :scale: 75
+   :scale: 65
 
    *Project Dashboard*
 
 .. i18n: A user's home page is automatically reassigned during the creation or upgrading of a database. It is
-.. i18n: custom to assign a dashboard to someone's home page but any OpenERP screen can be assigned to the
+.. i18n: customary to assign a dashboard to someone's home page, but any OpenERP screen can be assigned to the
 .. i18n: home page of any user.
 ..
 
 A user's home page is automatically reassigned during the creation or upgrading of a database. It is
-custom to assign a dashboard to someone's home page but any OpenERP screen can be assigned to the
+customary to assign a dashboard to someone's home page, but any OpenERP screen can be assigned to the
 home page of any user.
 
 .. i18n: .. index::
@@ -102,24 +102,24 @@
 .. index::
    single: shortcut
 
-.. i18n: .. tip:: Creating shortcuts
+.. i18n: .. tip:: Creating Shortcuts
 .. i18n: 
 .. i18n: 	Each user has access to many menu items from the menu. But in
-.. i18n: 	general an employee uses only a small part of the system's functions.
+.. i18n: 	general, an employee uses only a small part of the system's functions.
 .. i18n: 
 .. i18n: 	So you can define shortcuts for the most-used menus. These shortcuts are personal for each user. To
-.. i18n: 	create a new shortcut just click the '*' of the header of the view in web client.
+.. i18n: 	create a new shortcut, just click the '*' of the header of the view in web client.
 .. i18n: 
 .. i18n: 	To remove a shortcut just click the link and again click '*' of the header of the view.
 ..
 
-.. tip:: Creating shortcuts
+.. tip:: Creating Shortcuts
 
 	Each user has access to many menu items from the menu. But in
-	general an employee uses only a small part of the system's functions.
+	general, an employee uses only a small part of the system's functions.
 
 	So you can define shortcuts for the most-used menus. These shortcuts are personal for each user. To
-	create a new shortcut just click the '*' of the header of the view in web client.
+	create a new shortcut, just click the '*' of the header of the view in web client.
 
 	To remove a shortcut just click the link and again click '*' of the header of the view.
 
@@ -171,11 +171,11 @@
 .. index::
    single: partner; search
 
-.. i18n: Search for a partner
+.. i18n: Search for a Partner
 .. i18n: ^^^^^^^^^^^^^^^^^^^^
 ..
 
-Search for a partner
+Search for a Partner
 ^^^^^^^^^^^^^^^^^^^^
 
 .. i18n: Above the partner list you will see a search form that enables you to quickly filter the partners.
@@ -183,10 +183,10 @@
 
 Above the partner list you will see a search form that enables you to quickly filter the partners.
 
-.. i18n: The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons this list shows only the first few partners. If you want to display other records you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
+.. i18n: The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons, this list shows only the first few partners. If you want to display other records, you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
 ..
 
-The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons this list shows only the first few partners. If you want to display other records you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
+The \ ``Customers`` \ filter is enabled by default showing partners who are customers. If you have applied no filter, the list shows every partner in the system. For space reasons, this list shows only the first few partners. If you want to display other records, you can search for them or navigate through the whole list using the :guilabel:`First`, :guilabel:`Previous`, :guilabel:`Next`, :guilabel:`Last` arrows.
 
 .. i18n: .. figure:: images/partner_search_tab.png
 .. i18n:    :scale: 75
@@ -201,42 +201,42 @@
 
    *Standard partner search*
 
-.. i18n: .. note:: List limits
+.. i18n: .. note:: List Limits
 .. i18n: 
-.. i18n: 	By default the list in the GTK client shows only the first 80 records, to avoid overloading the
+.. i18n: 	By default, the list in the GTK client shows only the first 80 records, to avoid overloading the
 .. i18n: 	network and the server.
 .. i18n: 
 .. i18n: 	But you can change that limit by clicking the selection widget (showing 80 by default) to the
 .. i18n: 	right of the search criteria.
 .. i18n: 
-.. i18n: 	Similarly the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
+.. i18n: 	Similarly, the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
 .. i18n: 
 .. i18n: 	The actual number can be switched by clicking the link between the PREVIOUS and NEXT buttons
 .. i18n: 	and selecting one of the other limits.
 ..
 
-.. note:: List limits
+.. note:: List Limits
 
-	By default the list in the GTK client shows only the first 80 records, to avoid overloading the
+	By default, the list in the GTK client shows only the first 80 records, to avoid overloading the
 	network and the server.
 
 	But you can change that limit by clicking the selection widget (showing 80 by default) to the
 	right of the search criteria.
 
-	Similarly the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
+	Similarly, the list in the web client shows only the first 20, 50, 100, 500 or unlimited records.
 
 	The actual number can be switched by clicking the link between the PREVIOUS and NEXT buttons
 	and selecting one of the other limits.
 
 .. i18n: In the web version, if you click the name of a partner, the form view corresponding to that partner opens in Read-Only
 .. i18n: mode. In the list you could alternatively click the pencil icon to open the same form in Edit mode.
-.. i18n: Once you have a form you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
+.. i18n: Once you have a form, you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
 .. i18n: Edit mode and :guilabel:`Edit` when in Read-Only mode.
 ..
 
 In the web version, if you click the name of a partner, the form view corresponding to that partner opens in Read-Only
 mode. In the list you could alternatively click the pencil icon to open the same form in Edit mode.
-Once you have a form you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
+Once you have a form, you can toggle between the two modes by clicking :guilabel:`Save` or :guilabel:`Cancel` when in
 Edit mode and :guilabel:`Edit` when in Read-Only mode.
 
 .. i18n: .. index::
@@ -246,11 +246,11 @@
 .. index::
    single: partner; view form
 
-.. i18n: Partner form
+.. i18n: Partner Form
 .. i18n: ^^^^^^^^^^^^
 ..
 
-Partner form
+Partner Form
 ^^^^^^^^^^^^
 
 .. i18n: The partner form contains several tabs, all referring to the current record:
@@ -363,19 +363,19 @@
 .. index::
    single: buttons; reports, actions, links
 
-.. i18n: .. tip:: Reports, Actions and Links in the GTK client
+.. i18n: .. tip:: Reports, Actions and Links in the GTK Client
 .. i18n: 
 .. i18n: 	When you are viewing a form in the GTK client, the buttons to the right of the form are shortcuts to
 .. i18n: 	the same Reports, Actions and Links as described in the text. When you are viewing a list (such as
-.. i18n: 	the partner list) those buttons are not available to you. Instead, you can reach Reports and Actions
+.. i18n: 	the partner list), those buttons are not available to you. Instead, you can reach Reports and Actions
 .. i18n: 	through two of the buttons in the toolbar at the top of the list – Print and Action.
 ..
 
-.. tip:: Reports, Actions and Links in the GTK client
+.. tip:: Reports, Actions and Links in the GTK Client
 
 	When you are viewing a form in the GTK client, the buttons to the right of the form are shortcuts to
 	the same Reports, Actions and Links as described in the text. When you are viewing a list (such as
-	the partner list) those buttons are not available to you. Instead, you can reach Reports and Actions
+	the partner list), those buttons are not available to you. Instead, you can reach Reports and Actions
 	through two of the buttons in the toolbar at the top of the list – Print and Action.
 
 .. i18n: Partners are used throughout the OpenERP system in other documents. For example, the menu
@@ -385,7 +385,7 @@
 Partners are used throughout the OpenERP system in other documents. For example, the menu
 :menuselection:`Sales --> Sales Orders` brings up all the Sales Orders in list view. Open an order in form view and click the name of a partner, even when the form is read-only. The Partner form will open.
 
-.. i18n: .. tip:: Right-clicks and shortcuts
+.. i18n: .. tip:: Right-clicks and Shortcuts
 .. i18n: 
 .. i18n: 	In the GTK client you do not get hyperlinks to other document types. Instead, you can right-click in
 .. i18n: 	a list view to show the linked fields (that is fields having a link to other forms) on that line.
@@ -402,7 +402,7 @@
 .. i18n: 	both read-only and in edit mode, or with the GTK client.
 ..
 
-.. tip:: Right-clicks and shortcuts
+.. tip:: Right-clicks and Shortcuts
 
 	In the GTK client you do not get hyperlinks to other document types. Instead, you can right-click in
 	a list view to show the linked fields (that is fields having a link to other forms) on that line.
@@ -419,14 +419,14 @@
 	both read-only and in edit mode, or with the GTK client.
 
 .. i18n: .. figure:: images/familiarization_sale_partner.png
-.. i18n:    :scale: 75
+.. i18n:    :scale: 85
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Links for a partner appear in an order form*
 ..
 
 .. figure:: images/familiarization_sale_partner.png
-   :scale: 75
+   :scale: 85
    :align: center
 
    *Links for a partner appear in an order form*
@@ -454,10 +454,10 @@
 In OpenERP, `product` is used to define a raw material, a stockable product, a consumable or a service. You can
 work with whole products or with templates that separate the definition of products and variants (*extra module*).
 
-.. i18n: For example if you sell t-shirts in different sizes and colors:
+.. i18n: For example, if you sell t-shirts in different sizes and colors:
 ..
 
-For example if you sell t-shirts in different sizes and colors:
+For example, if you sell t-shirts in different sizes and colors:
 
 .. i18n: * the product template is the “T-shirt” which contains information common to all sizes and all
 .. i18n:   colors,
@@ -465,7 +465,7 @@
 .. i18n: * the variants are “Size:S” and “Color:Red”, which define the parameters for that size and
 .. i18n:   color,
 .. i18n: 
-.. i18n: * the final product is thus the combination of the two – t-shirt in size S and color Red.
+.. i18n: * the final product is thus the combination of the two – T-shirt in size S and color Red.
 ..
 
 * the product template is the “T-shirt” which contains information common to all sizes and all
@@ -474,16 +474,16 @@
 * the variants are “Size:S” and “Color:Red”, which define the parameters for that size and
   color,
 
-* the final product is thus the combination of the two – t-shirt in size S and color Red.
+* the final product is thus the combination of the two – T-shirt in size S and color Red.
 
-.. i18n: The value of this approach for some sectors is that you can just define a template in detail and all
-.. i18n: of its available variants briefly rather than every item as an entire product.
+.. i18n: The value of this approach, for some sectors, is that you can just define a template in detail and all
+.. i18n: of its available variants briefly, rather than every item as an entire product.
 ..
 
-The value of this approach for some sectors is that you can just define a template in detail and all
-of its available variants briefly rather than every item as an entire product.
+The value of this approach, for some sectors, is that you can just define a template in detail and all
+of its available variants briefly, rather than every item as an entire product.
 
-.. i18n: 	.. note::  *Example Product templates and variants*
+.. i18n: 	.. note::  *Example Product Templates and Variants*
 .. i18n: 
 .. i18n: 			A product can be defined as a whole or as a product template and several variants. The variants
 .. i18n: 			can be in one or several dimensions, depending on the installed modules.
@@ -504,11 +504,11 @@
 .. i18n: 			This separation of variant types requires the optional module :mod:`product_variant_multi`.
 .. i18n: 			Using it
 .. i18n: 			means that you can avoid an explosion in the number of products to manage in the database. If you
-.. i18n: 			take the example above it is easier to manage a template with 15 variants in four different types
+.. i18n: 			take the example above, it is easier to manage a template with 15 variants in four different types
 .. i18n: 			than 160 completely different products. This module is available in ``extra-addons``.
 ..
 
-	.. note::  *Example Product templates and variants*
+	.. note::  *Example Product Templates and Variants*
 
 			A product can be defined as a whole or as a product template and several variants. The variants
 			can be in one or several dimensions, depending on the installed modules.
@@ -529,7 +529,7 @@
 			This separation of variant types requires the optional module :mod:`product_variant_multi`.
 			Using it
 			means that you can avoid an explosion in the number of products to manage in the database. If you
-			take the example above it is easier to manage a template with 15 variants in four different types
+			take the example above, it is easier to manage a template with 15 variants in four different types
 			than 160 completely different products. This module is available in ``extra-addons``.
 
 .. i18n: The :menuselection:`Sales --> Products` menu gives you access to the definition of products and their templates and variants.
@@ -546,7 +546,7 @@
 
 .. i18n: .. tip::  Consumables
 .. i18n: 
-.. i18n: 	In OpenERP a consumable is a physical product which is treated like a stockable product, with the exception
+.. i18n: 	In OpenERP, a consumable is a physical product which is treated like a stockable product, with the exception
 .. i18n: 	that stock management is not taken into account by the system. You could buy it, deliver it or
 .. i18n: 	produce it but OpenERP will always assume that there is enough of it in stock. It never triggers a
 .. i18n: 	procurement exception.
@@ -554,7 +554,7 @@
 
 .. tip::  Consumables
 
-	In OpenERP a consumable is a physical product which is treated like a stockable product, with the exception
+	In OpenERP, a consumable is a physical product which is treated like a stockable product, with the exception
 	that stock management is not taken into account by the system. You could buy it, deliver it or
 	produce it but OpenERP will always assume that there is enough of it in stock. It never triggers a
 	procurement exception.
@@ -808,11 +808,11 @@
 =================
 
 .. i18n: The chapters in :ref:`part-genacct` in this book are dedicated to general and analytic accounting.
-.. i18n: A brief overview of the functions to introduce you to this Business Application.
+.. i18n: Following is a  brief overview of the functions to introduce you to this Business Application.
 ..
 
 The chapters in :ref:`part-genacct` in this book are dedicated to general and analytic accounting.
-A brief overview of the functions to introduce you to this Business Application.
+Following is a  brief overview of the functions to introduce you to this Business Application.
 
 .. i18n: Accounting is totally integrated into all of the company's functions, whether it is general,
 .. i18n: analytic, budgetary or auxiliary accounting. OpenERP's accounting function is double-entry and
@@ -836,15 +836,15 @@
 documents are being processed. You can avoid entering data twice in OpenERP, which is commonly a
 source of errors and delays.
 
-.. i18n: So OpenERP's accounting is not just for financial reporting – it is also the anchorpoint for many
-.. i18n: of a company's management processes. For example if one of your accountants puts a customer on
-.. i18n: credit hold then that will immediately block any other action related to that company's credit (such
+.. i18n: So OpenERP's accounting is not just for financial reporting – it is also the anchor-point for many
+.. i18n: of the company's management processes. For example, if one of your accountants puts a customer on
+.. i18n: credit hold, then that will immediately block any other action related to that company's credit (such
 .. i18n: as sales or delivery).
 ..
 
-So OpenERP's accounting is not just for financial reporting – it is also the anchorpoint for many
-of a company's management processes. For example if one of your accountants puts a customer on
-credit hold then that will immediately block any other action related to that company's credit (such
+So OpenERP's accounting is not just for financial reporting – it is also the anchor-point for many
+of the company's management processes. For example, if one of your accountants puts a customer on
+credit hold, then that will immediately block any other action related to that company's credit (such
 as sales or delivery).
 
 .. i18n: OpenERP also provides integrated analytical accounting, which enables management by business
@@ -858,10 +858,10 @@
 based on business management needs, rather than on the charts of accounts that generally meet only
 statutory requirements.
 
-.. i18n: OpenERP added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller business to keep track of their payments without having to implement a complete accounting system.
+.. i18n: OpenERP has added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller businesses to keep track of their payments without having to implement a complete accounting system.
 ..
 
-OpenERP added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller business to keep track of their payments without having to implement a complete accounting system.
+OpenERP has added a flexible, easy **Invoicing** module allowing you to keep track of your documents and payments, even when you are not an accountant. This will allow smaller businesses to keep track of their payments without having to implement a complete accounting system.
 
 .. i18n: Keep track of your Cash Moves by using the new OpenERP Cash Box.
 ..
@@ -923,12 +923,12 @@
    single: modules; hr_
    single: module; hr
 
-.. i18n: Most of these functions are provided from optional modules whose name starts with \ ``hr_``\
+.. i18n: Most of these functions are provided from optional modules whose name starts with \ ``hr_`` \
 .. i18n: rather than the core :mod:`hr` module, but they are all loaded into the main :menuselection:`Human
 .. i18n: Resources` menu.
 ..
 
-Most of these functions are provided from optional modules whose name starts with \ ``hr_``\
+Most of these functions are provided from optional modules whose name starts with \ ``hr_`` \
 rather than the core :mod:`hr` module, but they are all loaded into the main :menuselection:`Human
 Resources` menu.
 
@@ -966,14 +966,14 @@
 All projects are hierarchically structured. You can review all of the projects from the menu :menuselection:`Project --> Projects`. Then select :guilabel:`Gantt view` to obtain a graphical representation of the project.
 
 .. i18n: .. figure:: images/project_gantt.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Project Planning*
 ..
 
 .. figure:: images/project_gantt.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Project Planning*
@@ -1144,13 +1144,13 @@
 has a counterpart somewhere.
 
 .. i18n: Most stock management software is limited to generating lists of products in warehouses. Because of
-.. i18n: its double-entry system OpenERP automatically manages customer and suppliers stocks as well, which
+.. i18n: its double-entry system, OpenERP automatically manages customer and suppliers stocks as well, which
 .. i18n: has many advantages: complete traceability from supplier to customer, management of consigned stock,
 .. i18n: and analysis of counterpart stock moves.
 ..
 
 Most stock management software is limited to generating lists of products in warehouses. Because of
-its double-entry system OpenERP automatically manages customer and suppliers stocks as well, which
+its double-entry system, OpenERP automatically manages customer and suppliers stocks as well, which
 has many advantages: complete traceability from supplier to customer, management of consigned stock,
 and analysis of counterpart stock moves.
 
@@ -1170,17 +1170,17 @@
    single: Production Management
    single: Manufacturing
 
-.. i18n: Get Manufacturing done
+.. i18n: Get Manufacturing Done
 .. i18n: ======================
 ..
 
-Get Manufacturing done
+Get Manufacturing Done
 ======================
 
-.. i18n: OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute subassemblies dynamically, at the time of sales ordering. You can create virtual subassemblies for re-use on several products with phantom bills of materials.
+.. i18n: OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute sub-assemblies dynamically, at the time of sales ordering. You can create virtual sub-assemblies for re-use on several products with phantom bills of materials.
 ..
 
-OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute subassemblies dynamically, at the time of sales ordering. You can create virtual subassemblies for re-use on several products with phantom bills of materials.
+OpenERP's production management capabilities enable companies to plan, automate and track manufacturing and product assembly. OpenERP supports multi-level bills of materials and lets you substitute sub-assemblies dynamically, at the time of sales ordering. You can create virtual sub-assemblies for re-use on several products with phantom bills of materials.
 
 .. i18n: .. index::
 .. i18n:    single: bill of materials
@@ -1191,7 +1191,7 @@
    single: bill of materials
    single: BOM
 
-.. i18n: .. note:: BOMs, routing, workcenters
+.. i18n: .. note:: BOMs, Routing, Workcenters
 .. i18n: 
 .. i18n: 	These documents describe the materials that make up a larger assembly. They are commonly called
 .. i18n: 	Bills of Materials or BOMs.
@@ -1202,7 +1202,7 @@
 .. i18n: 	Each operation is carried out at a workcenter, which can be a machine or a person.
 ..
 
-.. note:: BOMs, routing, workcenters
+.. note:: BOMs, Routing, Workcenters
 
 	These documents describe the materials that make up a larger assembly. They are commonly called
 	Bills of Materials or BOMs.
@@ -1295,10 +1295,10 @@
 Measure your Business Performance
 =================================
 
-.. i18n: To measure your business performance OpenERP provides two interesting features:
+.. i18n: To measure your business performance OpenERP, provides two interesting features:
 ..
 
-To measure your business performance OpenERP provides two interesting features:
+To measure your business performance OpenERP, provides two interesting features:
 
 .. i18n: * Dashboards
 .. i18n: * Statistical Reports
@@ -1308,34 +1308,34 @@
 * Statistical Reports
 
 .. i18n: On a single page, Dashboards give you an overview of all the information that is important to you.
-.. i18n: In OpenERP each application has its own dashboard which opens by default when you select the specific application.
-.. i18n: As for example `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
+.. i18n: In OpenERP, each application has its own dashboard which opens by default when you select the specific application.
+.. i18n: For example, `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
 ..
 
 On a single page, Dashboards give you an overview of all the information that is important to you.
-In OpenERP each application has its own dashboard which opens by default when you select the specific application.
-As for example `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
+In OpenERP, each application has its own dashboard which opens by default when you select the specific application.
+For example, `Administration Dashboard` will open when you click the :menuselection:`Administration` menu.
 
 .. i18n: .. note:: Dashboards
 .. i18n: 
-.. i18n: 	Unlike most other ERP systems and classic statistically-based systems,
+.. i18n: 	Unlike most other ERP systems and classic statistic-based systems,
 .. i18n: 	OpenERP can provide dashboards for all system users, and not just managers and accountants.
 .. i18n: 
 .. i18n: 	Each user can have his own dashboard, adapted to his needs,
 .. i18n: 	enabling him to manage his own work effectively.
-.. i18n: 	For example a developer using the :guilabel:`Project Dashboard` can see information such
+.. i18n: 	For example, a developer using the :guilabel:`Project Dashboard` can see information such
 .. i18n: 	as a list of open tasks, tasks delegated to him and an analysis of the progress of
 .. i18n: 	the relevant projects.
 ..
 
 .. note:: Dashboards
 
-	Unlike most other ERP systems and classic statistically-based systems,
+	Unlike most other ERP systems and classic statistic-based systems,
 	OpenERP can provide dashboards for all system users, and not just managers and accountants.
 
 	Each user can have his own dashboard, adapted to his needs,
 	enabling him to manage his own work effectively.
-	For example a developer using the :guilabel:`Project Dashboard` can see information such
+	For example, a developer using the :guilabel:`Project Dashboard` can see information such
 	as a list of open tasks, tasks delegated to him and an analysis of the progress of
 	the relevant projects.
 
@@ -1353,25 +1353,25 @@
 
 Dashboards can be customized to fit the needs of each user and each company.
 
-.. i18n: .. note:: Creating or customizing dashboards
+.. i18n: .. note:: Creating or Customizing Dashboards
 .. i18n: 
 .. i18n: 	OpenERP contains a Dashboard Editor. Create your own dashboard to fit your
 .. i18n: 	specific needs in only a few clicks. Go to the :menuselection:`Administration --> Customization --> Reporting --> Dashboard Definition` menu to define your own dashboard.
 ..
 
-.. note:: Creating or customizing dashboards
+.. note:: Creating or Customizing Dashboards
 
 	OpenERP contains a Dashboard Editor. Create your own dashboard to fit your
 	specific needs in only a few clicks. Go to the :menuselection:`Administration --> Customization --> Reporting --> Dashboard Definition` menu to define your own dashboard.
 
-.. i18n: The `Statistical Analysis` is one of the crucial thing for decision making process in any business. The OpenERP provides
-.. i18n: Statistical Reports for each application. As for example you can access the statistical analysis of Sales-related information
+.. i18n: The `Statistical Analysis` is one of the crucial thing for decision making process in any business. OpenERP provides
+.. i18n: Statistical Reports for each application. For example, you can access the statistical analysis of Sales-related information
 .. i18n: from the menu :menuselection:`Sales --> Reporting --> Sales Analysis`. You can search and group the data using this
 .. i18n: `Statistical Report`.
 ..
 
-The `Statistical Analysis` is one of the crucial thing for decision making process in any business. The OpenERP provides
-Statistical Reports for each application. As for example you can access the statistical analysis of Sales-related information
+The `Statistical Analysis` is one of the crucial thing for decision making process in any business. OpenERP provides
+Statistical Reports for each application. For example, you can access the statistical analysis of Sales-related information
 from the menu :menuselection:`Sales --> Reporting --> Sales Analysis`. You can search and group the data using this
 `Statistical Report`.
 
@@ -1392,14 +1392,14 @@
 then click the :guilabel:`?` button above its form to see the full process.
 
 .. i18n: .. figure:: images/guided_tour_process.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 55
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Process for a Sales Order*
 ..
 
 .. figure:: images/guided_tour_process.png
-   :scale: 50
+   :scale: 55
    :align: center
 
    *Process for a Sales Order*
@@ -1427,14 +1427,14 @@
 the :guilabel:`Print Workflow` or the :guilabel:`Print Workflow (Complex)` option.
 
 .. i18n: .. figure:: images/purchase_workflow.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 65
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Workflow for a Purchase Order*
 ..
 
 .. figure:: images/purchase_workflow.png
-   :scale: 50
+   :scale: 65
    :align: center
 
    *Workflow for a Purchase Order*
@@ -1446,11 +1446,11 @@
 Alongside the document management system, the process visualization features make OpenERP
 far better for documentation than similar systems.
 
-.. i18n: Need more?
+.. i18n: Need More?
 .. i18n: ==========
 ..
 
-Need more?
+Need More?
 ==========
 
 .. i18n: You have been guided through a brisk, brief overview of many of the main functional areas of OpenERP.
@@ -1607,10 +1607,10 @@
    Ctrl+Esc      Close window without Saving
    ============  ===============================
 
-.. i18n: * Shortcuts in relation field
+.. i18n: * Shortcuts in a relation field
 ..
 
-* Shortcuts in relation field
+* Shortcuts in a relation field
 
 .. i18n: .. table::
 .. i18n: 
@@ -1708,14 +1708,14 @@
 menu :menuselection:`Project --> Reporting --> Tasks Analysis` when you have installed the `Project Management` module.
 
 .. i18n: .. figure:: images/filter_task_analysis.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 75
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Task Analysis*
 ..
 
 .. figure:: images/filter_task_analysis.png
-   :scale: 50
+   :scale: 75
    :align: center
 
    *Task Analysis*
@@ -1730,10 +1730,10 @@
 
 You can filter the information of a task according to the Group by features.
 
-.. i18n: Click for instance the `Stage` button in Group by, and then click Task to analyse your tasks by stage and then by task.
+.. i18n: Click, for instance, the `Stage` button in Group by, and then click `Task` to analyse your tasks by stage and then by task.
 ..
 
-Click for instance the `Stage` button in Group by, and then click Task to analyse your tasks by stage and then by task.
+Click, for instance, the `Stage` button in Group by, and then click `Task` to analyse your tasks by stage and then by task.
 
 .. i18n: This `Advanced Search View` can also be attached to any `List View` of an object and hence increase the
 .. i18n: search facility when a user looks up the record in list view.
@@ -1743,14 +1743,14 @@
 search facility when a user looks up the record in list view.
 
 .. i18n: .. figure:: images/filter_task_list_view.png
-.. i18n:    :scale: 50
+.. i18n:    :scale: 75
 .. i18n:    :align: center
 .. i18n: 
 .. i18n:    *Search the Tasks which are `In Progress` with Group by Project and State*
 ..
 
 .. figure:: images/filter_task_list_view.png
-   :scale: 50
+   :scale: 75
    :align: center
 
    *Search the Tasks which are `In Progress` with Group by Project and State*

=== modified file 'i18n/it/source/book/4/4_11_HR/4_11_HR_timesheet.rst'
--- i18n/it/source/book/4/4_11_HR/4_11_HR_timesheet.rst	2011-07-25 16:38:07 +0000
+++ i18n/it/source/book/4/4_11_HR/4_11_HR_timesheet.rst	2012-10-01 15:56:24 +0000
@@ -68,7 +68,7 @@
 .. index::
    pair: cost; allocation
 
-.. i18n: .. note:: Don't confuse timesheets and attendence compliance
+.. i18n: .. note:: Don't confuse timesheets and attendance compliance
 .. i18n: 
 .. i18n: 	The timesheet system is not intended to be a disguised attendance form. There is no control over the
 .. i18n: 	service times and the employee is free to encode 8 or 9 hours or more of services each day if they
@@ -79,7 +79,7 @@
 .. i18n: 	they'll be entering – but to track the tasks running and the allocation of costs between them.
 ..
 
-.. note:: Don't confuse timesheets and attendence compliance
+.. note:: Don't confuse timesheets and attendance compliance
 
 	The timesheet system is not intended to be a disguised attendance form. There is no control over the
 	service times and the employee is free to encode 8 or 9 hours or more of services each day if they

=== added file 'i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst'
--- i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst	1970-01-01 00:00:00 +0000
+++ i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,757 @@
+
+.. i18n: Manufacturing Orders
+.. i18n: ====================
+..
+
+Manufacturing Orders
+====================
+
+.. i18n: Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route according to the needs of the company.
+..
+
+Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route according to the needs of the company.
+
+.. i18n: Production orders can be proposed automatically by the system depending on several criteria described in the preceding chapter:
+..
+
+Production orders can be proposed automatically by the system depending on several criteria described in the preceding chapter:
+
+.. i18n: * Using the ``Make to Order`` rules,
+.. i18n: 
+.. i18n: * Using the ``Order Point`` (Minimum Stock) rules,
+.. i18n: 
+.. i18n: * Using the Production plan.
+..
+
+* Using the ``Make to Order`` rules,
+
+* Using the ``Order Point`` (Minimum Stock) rules,
+
+* Using the Production plan.
+
+.. i18n: Of course, you can also start production manually by clicking the button :guilabel:`New` in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+..
+
+Of course, you can also start production manually by clicking the button :guilabel:`New` in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+
+.. i18n: .. figure:: images/mrp_manual.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Manufacturing Order*
+..
+
+.. figure:: images/mrp_manual.png
+   :scale: 75
+   :align: center
+
+   *Manufacturing Order*
+
+.. i18n: .. index::
+.. i18n:    single: module; mrp_jit
+..
+
+.. index::
+   single: module; mrp_jit
+
+.. i18n: If you have not installed the Just-in-Time planning module :mod:`mrp_jit`, you should start using OpenERP to schedule the Production Orders automatically using the various system rules. To do this, use the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+..
+
+If you have not installed the Just-in-Time planning module :mod:`mrp_jit`, you should start using OpenERP to schedule the Production Orders automatically using the various system rules. To do this, use the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+
+.. i18n: .. tip:: Procurement Exceptions
+.. i18n: 
+.. i18n:         Pay attention to the fact that you have to define `minimum stock rules` for each product set as ``Make to Stock``.
+..
+
+.. tip:: Procurement Exceptions
+
+        Pay attention to the fact that you have to define `minimum stock rules` for each product set as ``Make to Stock``.
+
+.. i18n: Complete Production Workflow
+.. i18n: ============================
+..
+
+Complete Production Workflow
+============================
+
+.. i18n: To understand the usefulness and the functioning of the system you should test a complete workflow
+.. i18n: on the database installed with the demonstration data. We will show you:
+..
+
+To understand the usefulness and the functioning of the system you should test a complete workflow
+on the database installed with the demonstration data. We will show you:
+
+.. i18n: * How to create a sales order,
+.. i18n: 
+.. i18n: * The manufacturing workflow for an intermediate product,
+.. i18n: 
+.. i18n: * The manufacturing of an ordered product,
+.. i18n: 
+.. i18n: * The delivery of products to a customer,
+.. i18n: 
+.. i18n: * Invoicing at the end of the month,
+.. i18n: 
+.. i18n: * Traceability for after-sales service.
+..
+
+* How to create a sales order,
+
+* The manufacturing workflow for an intermediate product,
+
+* The manufacturing of an ordered product,
+
+* The delivery of products to a customer,
+
+* Invoicing at the end of the month,
+
+* Traceability for after-sales service.
+
+.. i18n: .. tip:: Demonstration data
+.. i18n: 
+.. i18n:     To exactly follow the workflow as shown below, you should keep the same quantities as in the
+.. i18n:     example and start from a new database. Then you will not run into exceptions resulting from a lack of stock.
+..
+
+.. tip:: Demonstration data
+
+    To exactly follow the workflow as shown below, you should keep the same quantities as in the
+    example and start from a new database. Then you will not run into exceptions resulting from a lack of stock.
+
+.. i18n: This more advanced case of handling problems in procurement will be sorted out later in the chapter.
+..
+
+This more advanced case of handling problems in procurement will be sorted out later in the chapter.
+
+.. i18n: To be able to do the following step, add ``Sales Management`` through the Reconfigure wizard.
+..
+
+To be able to do the following step, add ``Sales Management`` through the Reconfigure wizard.
+
+.. i18n: The Sales Order
+.. i18n: +++++++++++++++
+..
+
+The Sales Order
++++++++++++++++
+
+.. i18n: .. index:: quotation
+.. i18n: .. index:: sales order
+..
+
+.. index:: quotation
+.. index:: sales order
+
+.. i18n: Begin by encoding a sales (or customer) order through the menu :menuselection:`Sales --> Sales Orders -> New Quotation`. Enter the following information:
+..
+
+Begin by encoding a sales (or customer) order through the menu :menuselection:`Sales --> Sales Orders -> New Quotation`. Enter the following information:
+
+.. i18n: * :guilabel:`Customer` : Agrolait,
+.. i18n: 
+.. i18n: * :guilabel:`Shipping Policy` : Invoice from the picking (``Other Information`` tab),
+.. i18n: 
+.. i18n: * :guilabel:`Sales Order Lines`, click `New`:
+.. i18n: 
+.. i18n:   * :guilabel:`Product` : PC2 – Basic PC (assembly on order),
+.. i18n: 
+.. i18n:   * :guilabel:`Quantity (UoM)` : 1,
+.. i18n: 
+.. i18n:   * :guilabel:`Product UoM` : PCE,
+.. i18n: 
+.. i18n:   * :guilabel:`Procurement Method` : on order.
+..
+
+* :guilabel:`Customer` : Agrolait,
+
+* :guilabel:`Shipping Policy` : Invoice from the picking (``Other Information`` tab),
+
+* :guilabel:`Sales Order Lines`, click `New`:
+
+  * :guilabel:`Product` : PC2 – Basic PC (assembly on order),
+
+  * :guilabel:`Quantity (UoM)` : 1,
+
+  * :guilabel:`Product UoM` : PCE,
+
+  * :guilabel:`Procurement Method` : on order.
+
+.. i18n: Once the quotation has been entered, you can confirm it immediately by clicking the button
+.. i18n: :guilabel:`Confirm Order` at the bottom to the right. Keep note of the order reference because this
+.. i18n: follows all through the process. Usually, in a new database, this will be ``SO007`` . At this stage,
+.. i18n: you can look at the process linked to your order using the :guilabel:`Question Mark` button next to the ``Sales Orders`` title.
+..
+
+Once the quotation has been entered, you can confirm it immediately by clicking the button
+:guilabel:`Confirm Order` at the bottom to the right. Keep note of the order reference because this
+follows all through the process. Usually, in a new database, this will be ``SO007`` . At this stage,
+you can look at the process linked to your order using the :guilabel:`Question Mark` button next to the ``Sales Orders`` title.
+
+.. i18n: .. figure:: images/mrp_sales_process_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Process for Handling Sales Order SO007*
+..
+
+.. figure:: images/mrp_sales_process_new.png
+   :scale: 75
+   :align: center
+
+   *Process for Handling Sales Order SO007*
+
+.. i18n: Start the requirements calculation using the menu :menuselection:`Manufacturing --> Compute All Schedulers`.
+..
+
+Start the requirements calculation using the menu :menuselection:`Manufacturing --> Compute All Schedulers`.
+
+.. i18n: .. index::
+.. i18n:    single: semi-finished product
+..
+
+.. index::
+   single: semi-finished product
+
+.. i18n: Producing an Intermediate Product
+.. i18n: +++++++++++++++++++++++++++++++++
+..
+
+Producing an Intermediate Product
++++++++++++++++++++++++++++++++++
+
+.. i18n: To understand the implications of requirements calculation, you should know the configuration of the sold product. To do this, go to the form for product PC2 and click the link :guilabel:`Product BoM Structure` to the right. You get the scheme shown in :ref:`fig-mrpbomtree` which is the composition of the selected product.
+..
+
+To understand the implications of requirements calculation, you should know the configuration of the sold product. To do this, go to the form for product PC2 and click the link :guilabel:`Product BoM Structure` to the right. You get the scheme shown in :ref:`fig-mrpbomtree` which is the composition of the selected product.
+
+.. i18n: .. _fig-mrpbomtree:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_product_bom_tree_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Composition of PC2*
+..
+
+.. _fig-mrpbomtree:
+
+.. figure:: images/mrp_product_bom_tree_new.png
+   :scale: 75
+   :align: center
+
+   *Composition of PC2*
+
+.. i18n: The PC2 computer has to be manufactured in two steps:
+..
+
+The PC2 computer has to be manufactured in two steps:
+
+.. i18n: 1: The intermediate product: CPU_GEN
+..
+
+1: The intermediate product: CPU_GEN
+
+.. i18n: 2: The finished product using that intermediate product: PC2
+..
+
+2: The finished product using that intermediate product: PC2
+
+.. i18n: The manufacturing supervisor can then consult the production orders using the menu
+.. i18n: :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. You then get a
+.. i18n: list of orders to start (``Ready to Produce``) and the estimated start date (``Scheduled Date``) to meet the customer delivery date.
+..
+
+The manufacturing supervisor can then consult the production orders using the menu
+:menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. You then get a
+list of orders to start (``Ready to Produce``) and the estimated start date (``Scheduled Date``) to meet the customer delivery date.
+
+.. i18n: .. figure:: images/mrp_production_list_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *List of Manufacturing Orders*
+..
+
+.. figure:: images/mrp_production_list_new.png
+   :scale: 75
+   :align: center
+
+   *List of Manufacturing Orders*
+
+.. i18n: You will see the production order for CPU_GEN, but not the one for PC2 because it depends on an intermediate product that has to be produced first. Return to the production order for CPU_GEN and click it. If there are several of them, select the one corresponding to your order using the source document that contains your order number (in this example ``SO007`` ).
+..
+
+You will see the production order for CPU_GEN, but not the one for PC2 because it depends on an intermediate product that has to be produced first. Return to the production order for CPU_GEN and click it. If there are several of them, select the one corresponding to your order using the source document that contains your order number (in this example ``SO007`` ).
+
+.. i18n: .. figure:: images/mrp_production_form_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Details of a Production Order*
+..
+
+.. figure:: images/mrp_production_form_new.png
+   :scale: 75
+   :align: center
+
+   *Details of a Production Order*
+
+.. i18n: The system shows you that you have to manufacture product CPU_GEN using the components: MB1, CPU1, FAN, RAM. You can then confirm the production twice:
+..
+
+The system shows you that you have to manufacture product CPU_GEN using the components: MB1, CPU1, FAN, RAM. You can then confirm the production twice:
+
+.. i18n: Start production: consumption of raw materials,
+..
+
+Start production: consumption of raw materials,
+
+.. i18n: Produce: manufacturing of finished product.
+..
+
+Produce: manufacturing of finished product.
+
+.. i18n: Click the ``Start Production`` button, then click the ``Edit`` button, and edit the line for the product MB1. Enter a lot number for it by putting the cursor in the field :guilabel:`Production Lot` and pressing :kbd:`<F1>` to create a new lot. Enter an internal reference, for example: ``MB1345678``. The system may then show you a warning because this lot is not in stock, but you can ignore this message.
+..
+
+Click the ``Start Production`` button, then click the ``Edit`` button, and edit the line for the product MB1. Enter a lot number for it by putting the cursor in the field :guilabel:`Production Lot` and pressing :kbd:`<F1>` to create a new lot. Enter an internal reference, for example: ``MB1345678``. The system may then show you a warning because this lot is not in stock, but you can ignore this message.
+
+.. i18n: Click the ``Produce`` button to manufacture the finished product.
+..
+
+Click the ``Produce`` button to manufacture the finished product.
+
+.. i18n: The production order has to be in the closed state as shown in the figure :ref:`fig-mrpprdfrm`.
+..
+
+The production order has to be in the closed state as shown in the figure :ref:`fig-mrpprdfrm`.
+
+.. i18n: .. _fig-mrpprdfrm:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_form_end_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Production Order after the Different Stages*
+..
+
+.. _fig-mrpprdfrm:
+
+.. figure:: images/mrp_production_form_end_new.png
+   :scale: 75
+   :align: center
+
+   *Production Order after the Different Stages*
+
+.. i18n: Finished Product Manufacturing
+.. i18n: ++++++++++++++++++++++++++++++
+..
+
+Finished Product Manufacturing
+++++++++++++++++++++++++++++++
+
+.. i18n: Having manufactured the intermediate product CPU_GEN, OpenERP automatically proposes the manufacturing
+.. i18n: of the computer PC2 using the order created earlier. Return to the Manufacturing Orders menu and look at the orders Ready to Produce through  :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+..
+
+Having manufactured the intermediate product CPU_GEN, OpenERP automatically proposes the manufacturing
+of the computer PC2 using the order created earlier. Return to the Manufacturing Orders menu and look at the orders Ready to Produce through  :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`.
+
+.. i18n: You will find computer PC2 which has been sold to the customer (source document SO007), as shown in the figure hereafter.
+..
+
+You will find computer PC2 which has been sold to the customer (source document SO007), as shown in the figure hereafter.
+
+.. i18n: .. figure:: images/mrp_production_list_end_new.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Completed Production for PC2*
+..
+
+.. figure:: images/mrp_production_list_end_new.png
+    :scale: 75
+    :align: center
+    
+    *Completed Production for PC2*
+
+.. i18n: Now that the production has been completed, the product sold to the customer has been manufactured and the raw materials have been consumed and taken out of stock.
+.. i18n:  
+.. i18n: .. tip:: Automatic Actions
+.. i18n: 
+.. i18n:     As well as managing the use of materials and the production of stocks, manufacturing can have the following
+.. i18n:     automatic effects which are detailed further on in the chapter:
+.. i18n:     
+.. i18n:     * adding value to stock,
+.. i18n:     * generating operations for assembly staff,
+.. i18n:     * automatically creating analytical accounting entries.
+..
+
+Now that the production has been completed, the product sold to the customer has been manufactured and the raw materials have been consumed and taken out of stock.
+ 
+.. tip:: Automatic Actions
+
+    As well as managing the use of materials and the production of stocks, manufacturing can have the following
+    automatic effects which are detailed further on in the chapter:
+    
+    * adding value to stock,
+    * generating operations for assembly staff,
+    * automatically creating analytical accounting entries.
+
+.. i18n: Subproduct Production
+.. i18n: +++++++++++++++++++++
+..
+
+Subproduct Production
++++++++++++++++++++++
+
+.. i18n: If you need to manage subproducts, you should install the module :mod:`mrp_subproduct` (Reconfigure wizard, MRP Sub-
+.. i18n: products). The normal behaviour of manufacturing in OpenERP enables you to manufacture several units of the
+.. i18n: same finished product from raw materials (A + B > C). With Subproduct management, the manufacturing result can be to have both finished products and secondary products (A + B > C + D).
+..
+
+If you need to manage subproducts, you should install the module :mod:`mrp_subproduct` (Reconfigure wizard, MRP Sub-
+products). The normal behaviour of manufacturing in OpenERP enables you to manufacture several units of the
+same finished product from raw materials (A + B > C). With Subproduct management, the manufacturing result can be to have both finished products and secondary products (A + B > C + D).
+
+.. i18n: .. note:: Subproduct Material
+.. i18n: 
+.. i18n:     In OpenERP, subproduct material corresponds to secondary products that are a by-product of the main manufacturing
+.. i18n:     process. For example, cutting planks of timber will produce other planks but these bits of timber are too small 
+.. i18n:     (or the offcuts may have value for the company if they can be used elsewhere).
+..
+
+.. note:: Subproduct Material
+
+    In OpenERP, subproduct material corresponds to secondary products that are a by-product of the main manufacturing
+    process. For example, cutting planks of timber will produce other planks but these bits of timber are too small 
+    (or the offcuts may have value for the company if they can be used elsewhere).
+
+.. i18n: If the module :mod:`mrp_subproduct` has been installed, you get a new tab Sub products in the Bill of Material
+.. i18n: that lets you set secondary products resulting from the manufacturing of the finished product.
+..
+
+If the module :mod:`mrp_subproduct` has been installed, you get a new tab Sub products in the Bill of Material
+that lets you set secondary products resulting from the manufacturing of the finished product.
+
+.. i18n: .. figure:: images/mrp_bom_subproduct.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Definition of Subproducts*
+..
+
+.. figure:: images/mrp_bom_subproduct.png
+    :scale: 75
+    :align: center
+    
+    *Definition of Subproducts*
+
+.. i18n: When OpenERP generates a production order based on a bill of materials that uses a secondary product, you pick
+.. i18n: up the list of all products in the second tab of the production order ``Finished Products``.
+.. i18n:     
+.. i18n: .. figure:: images/mrp_production.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Production Order producing Several Finished Products*
+..
+
+When OpenERP generates a production order based on a bill of materials that uses a secondary product, you pick
+up the list of all products in the second tab of the production order ``Finished Products``.
+    
+.. figure:: images/mrp_production.png
+    :scale: 75
+    :align: center
+    
+    *Production Order producing Several Finished Products*
+
+.. i18n: Secondary products enable you to generate several types of products from the same raw materials and manufacturing methods - only these are not used in the calculation of requirements. Then, if you need the secondary products, OpenERP will not ask you to manufacture another product to use the waste products and secondary products of this production. In this case, you should enter another production order for the secondary product.
+..
+
+Secondary products enable you to generate several types of products from the same raw materials and manufacturing methods - only these are not used in the calculation of requirements. Then, if you need the secondary products, OpenERP will not ask you to manufacture another product to use the waste products and secondary products of this production. In this case, you should enter another production order for the secondary product.
+
+.. i18n: .. note:: Services in Manufacturing
+.. i18n: 
+.. i18n:     Unlike most software for production management, OpenERP manages services as well as stockable products. So
+.. i18n:     it is possible to put products of type Service in a bill of materials. These do not appear in the production 
+.. i18n:     order, but their requirements will be taken into account.
+.. i18n:     
+.. i18n:     If they are defined as Make to Order, OpenERP will generate a task for the manufacturing or a subcontract
+.. i18n:     order for the operations. The behaviour will depend on the Supply Method configured in the product form: Buy
+.. i18n:     or Produce.
+..
+
+.. note:: Services in Manufacturing
+
+    Unlike most software for production management, OpenERP manages services as well as stockable products. So
+    it is possible to put products of type Service in a bill of materials. These do not appear in the production 
+    order, but their requirements will be taken into account.
+    
+    If they are defined as Make to Order, OpenERP will generate a task for the manufacturing or a subcontract
+    order for the operations. The behaviour will depend on the Supply Method configured in the product form: Buy
+    or Produce.
+
+.. i18n: Scrapping
+.. i18n: +++++++++
+..
+
+Scrapping
++++++++++
+
+.. i18n: If you have to scrap the final product before it is finished, you will have to scrap every component allowed for this product. 
+..
+
+If you have to scrap the final product before it is finished, you will have to scrap every component allowed for this product. 
+
+.. i18n: .. figure:: images/mo_scrap.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Scrapping a Product to Finish*
+..
+
+.. figure:: images/mo_scrap.png
+    :scale: 75
+    :align: center
+    
+    *Scrapping a Product to Finish*
+
+.. i18n: If you scrap a Product to Finish, you will get the situation illustrated in the previous figure. A finished product will be *created* and put in the scrapped virtual location. A new Product to Finish has been added to the manufacturing order.
+..
+
+If you scrap a Product to Finish, you will get the situation illustrated in the previous figure. A finished product will be *created* and put in the scrapped virtual location. A new Product to Finish has been added to the manufacturing order.
+
+.. i18n: .. tip:: Scrap a product
+.. i18n: 
+.. i18n:     To scrap a product, you have to edit the manufacturing order and then select the product to be
+.. i18n:     scrapped by clicking the little pencil at the left of the item.
+..
+
+.. tip:: Scrap a product
+
+    To scrap a product, you have to edit the manufacturing order and then select the product to be
+    scrapped by clicking the little pencil at the left of the item.
+
+.. i18n: This new product has been added for the following reason: when you have to manufacture a product and if this product
+.. i18n: has to be scrapped, you have to produce another product to replace the scrapped one. The reason why 
+.. i18n: you have to scrap each component manually is that the production problem can come from one component.
+..
+
+This new product has been added for the following reason: when you have to manufacture a product and if this product
+has to be scrapped, you have to produce another product to replace the scrapped one. The reason why 
+you have to scrap each component manually is that the production problem can come from one component.
+
+.. i18n: If the production process is finished and you see that you have to scrap the finished product, you will
+.. i18n: not have to scrap the different components. They are already *consumed*. They are not available anymore
+.. i18n: for further manufacturing orders; they have been moved to the production Stock Location.
+..
+
+If the production process is finished and you see that you have to scrap the finished product, you will
+not have to scrap the different components. They are already *consumed*. They are not available anymore
+for further manufacturing orders; they have been moved to the production Stock Location.
+
+.. i18n: Production Orders
+.. i18n: +++++++++++++++++
+..
+
+Production Orders
++++++++++++++++++
+
+.. i18n: To open a Production Order, use the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders` and click the `New` button.
+.. i18n: You get a blank form to enter a new production order as shown in the figure :ref:`fig-mrpprdnew`.
+..
+
+To open a Production Order, use the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders` and click the `New` button.
+You get a blank form to enter a new production order as shown in the figure :ref:`fig-mrpprdnew`.
+
+.. i18n: .. _fig-mrpprdnew:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_new.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *New Production Order*
+..
+
+.. _fig-mrpprdnew:
+
+.. figure:: images/mrp_production_new.png
+   :scale: 75
+   :align: center
+
+   *New Production Order*
+
+.. i18n: The production order follows the process given by the figure :ref:`fig-mrpprdproc`.
+..
+
+The production order follows the process given by the figure :ref:`fig-mrpprdproc`.
+
+.. i18n: .. _fig-mrpprdproc:
+.. i18n: 
+.. i18n: .. figure:: images/mrp_production_processus.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Process for Handling a Production Order*
+..
+
+.. _fig-mrpprdproc:
+
+.. figure:: images/mrp_production_processus.png
+   :scale: 75
+   :align: center
+
+   *Process for Handling a Production Order*
+
+.. i18n: The `Scheduled date` , `Product Qty` and `Reference`, are automatically completed when the form is first opened.
+.. i18n: Enter the product that you want to produce, and the quantity required. The :guilabel:`Product UOM` by
+.. i18n: default is completed automatically by OpenERP when the product is first selected.
+..
+
+The `Scheduled date` , `Product Qty` and `Reference`, are automatically completed when the form is first opened.
+Enter the product that you want to produce, and the quantity required. The :guilabel:`Product UOM` by
+default is completed automatically by OpenERP when the product is first selected.
+
+.. i18n: You then have to set two locations:
+..
+
+You then have to set two locations:
+
+.. i18n: 	* The location from which the required raw materials should be found, and
+.. i18n: 
+.. i18n: 	* The location for depositing the finished products.
+..
+
+	* The location from which the required raw materials should be found, and
+
+	* The location for depositing the finished products.
+
+.. i18n: For simplicity, put the ``Stock`` location in both places. The field :guilabel:`Bill of Materials` will
+.. i18n: automatically be completed by OpenERP when you select the product. You can then overwrite it with another BoM to specify something else to use for this specific manufacturing, then click the button :guilabel:`Compute Data`.
+..
+
+For simplicity, put the ``Stock`` location in both places. The field :guilabel:`Bill of Materials` will
+automatically be completed by OpenERP when you select the product. You can then overwrite it with another BoM to specify something else to use for this specific manufacturing, then click the button :guilabel:`Compute Data`.
+
+.. i18n: The tabs :guilabel:`Scheduled Products` and :guilabel:`Work Orders` are also completed automatically when you click
+.. i18n: :guilabel:`Compute Data` (in the :guilabel:`Work Orders` or :guilabel:`Scheduled Products` tabs). 
+.. i18n: You will find the raw materials there that are required for the production and the operations needed by the assembly staff.
+..
+
+The tabs :guilabel:`Scheduled Products` and :guilabel:`Work Orders` are also completed automatically when you click
+:guilabel:`Compute Data` (in the :guilabel:`Work Orders` or :guilabel:`Scheduled Products` tabs). 
+You will find the raw materials there that are required for the production and the operations needed by the assembly staff.
+
+.. i18n: If you want to start production, click the button :guilabel:`Confirm Production`, and OpenERP automatically completes the :guilabel:`Products to Consume` field in the :guilabel:`Consumed Products` tab and :guilabel:`Products to Finish` field in :guilabel:`Finished Products` tab.
+..
+
+If you want to start production, click the button :guilabel:`Confirm Production`, and OpenERP automatically completes the :guilabel:`Products to Consume` field in the :guilabel:`Consumed Products` tab and :guilabel:`Products to Finish` field in :guilabel:`Finished Products` tab.
+
+.. i18n: The information in the :guilabel:`Consumed Products` tab can be changed if:
+..
+
+The information in the :guilabel:`Consumed Products` tab can be changed if:
+
+.. i18n: * you want to enter a serial number for raw materials,
+.. i18n: 
+.. i18n: * you want to change the quantities consumed (lost during production).
+..
+
+* you want to enter a serial number for raw materials,
+
+* you want to change the quantities consumed (lost during production).
+
+.. i18n: For traceability, you can set lot numbers on the raw materials used, or on the finished
+.. i18n: products.
+.. i18n: Note the :guilabel:`Production Lot` and :guilabel:`Pack` numbers.
+..
+
+For traceability, you can set lot numbers on the raw materials used, or on the finished
+products.
+Note the :guilabel:`Production Lot` and :guilabel:`Pack` numbers.
+
+.. i18n: Once the order is confirmed, you should force the reservation of materials
+.. i18n: using the :guilabel:`Force Reservation` button. This means that you do not have
+.. i18n: to wait for the scheduler to assign and reserve the raw materials from your stock for this
+.. i18n: production run. This shortens the procurement process.
+..
+
+Once the order is confirmed, you should force the reservation of materials
+using the :guilabel:`Force Reservation` button. This means that you do not have
+to wait for the scheduler to assign and reserve the raw materials from your stock for this
+production run. This shortens the procurement process.
+
+.. i18n: If you do not want to change the priorities, just leave the production order in this state and the scheduler will create a plan based on the priority and your planned date.
+..
+
+If you do not want to change the priorities, just leave the production order in this state and the scheduler will create a plan based on the priority and your planned date.
+
+.. i18n: To start the production of products, click :guilabel:`Start Production`. The raw materials are then consumed automatically from stock, which means that the draft ( ``Waiting`` ) movements become ``Done``.
+..
+
+To start the production of products, click :guilabel:`Start Production`. The raw materials are then consumed automatically from stock, which means that the draft ( ``Waiting`` ) movements become ``Done``.
+
+.. i18n: Once the production is complete, click :guilabel:`Produce`. The finished products are now moved into stock.
+..
+
+Once the production is complete, click :guilabel:`Produce`. The finished products are now moved into stock.
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst'
--- i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst	1970-01-01 00:00:00 +0000
+++ i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_forecasting.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,974 @@
+
+.. i18n: Forecasting and Supplying
+.. i18n: =========================
+..
+
+Forecasting and Supplying
+=========================
+
+.. i18n: Scheduler
+.. i18n: +++++++++
+..
+
+Scheduler
++++++++++
+
+.. i18n: The requirements scheduler is the calculation engine which plans and prioritises production and purchasing automatically according to the rules defined on products. By default, the scheduler is set to run once a day (OpenERP automatically creates a *Scheduled Action* for this). You can also start the scheduler manually from the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+.. i18n: The scheduler uses all the relevant parameters defined for products, suppliers and the company to determine the priorities between the different production orders, deliveries and supplier purchases.
+..
+
+The requirements scheduler is the calculation engine which plans and prioritises production and purchasing automatically according to the rules defined on products. By default, the scheduler is set to run once a day (OpenERP automatically creates a *Scheduled Action* for this). You can also start the scheduler manually from the menu :menuselection:`Warehouse --> Schedulers --> Compute Schedulers`.
+The scheduler uses all the relevant parameters defined for products, suppliers and the company to determine the priorities between the different production orders, deliveries and supplier purchases.
+
+.. i18n: .. note:: Starting Time
+.. i18n: 
+.. i18n:         You can set the starting time of the scheduler by modifying the corresponding action in the menu :menuselection:`Administration --> Configuration --> Scheduler --> Scheduled Actions`. Modify the ``Run mrp Scheduler`` configuration document.
+..
+
+.. note:: Starting Time
+
+        You can set the starting time of the scheduler by modifying the corresponding action in the menu :menuselection:`Administration --> Configuration --> Scheduler --> Scheduled Actions`. Modify the ``Run mrp Scheduler`` configuration document.
+
+.. i18n: .. figure:: images/stock_cron.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Configuring the Start Time to Calculate Requirements*
+..
+
+.. figure:: images/stock_cron.png
+   :scale: 75
+   :align: center
+
+   *Configuring the Start Time to Calculate Requirements*
+
+.. i18n: .. tip::  Calculating Requirements / Scheduling
+.. i18n: 
+.. i18n:     Scheduling only validates procurements that are confirmed but not yet started. These procurement reservations
+.. i18n:     will themselves start production, tasks or purchases depending on the configuration of the requested product.
+..
+
+.. tip::  Calculating Requirements / Scheduling
+
+    Scheduling only validates procurements that are confirmed but not yet started. These procurement reservations
+    will themselves start production, tasks or purchases depending on the configuration of the requested product.
+
+.. i18n: You take into account the priority of operations when starting reservations and procurements.
+.. i18n: Urgent requests, those with a date in the past, or requests with a date earlier than the others will be started first. In case there are not enough products in stock to satisfy all the requests, you can be sure that the most urgent requests will be produced first.
+..
+
+You take into account the priority of operations when starting reservations and procurements.
+Urgent requests, those with a date in the past, or requests with a date earlier than the others will be started first. In case there are not enough products in stock to satisfy all the requests, you can be sure that the most urgent requests will be produced first.
+
+.. i18n: Planning
+.. i18n: ++++++++
+..
+
+Planning
+++++++++
+
+.. i18n: In OpenERP, you can plan the production in an easy way. Simply by going to :menuselection:`Manufacturing --> Planning`, you can plan manufacturing orders, work orders and/or work centers.
+..
+
+In OpenERP, you can plan the production in an easy way. Simply by going to :menuselection:`Manufacturing --> Planning`, you can plan manufacturing orders, work orders and/or work centers.
+
+.. i18n: By clicking ``Manufacturing Orders`` in the *Planning* menu, a calendar view will open in which you can select a day to create the order whenever you want. You will also see the already planned orders. By dragging and dropping a manufacturing order in Calendar view, you can change the starting date of the order.
+..
+
+By clicking ``Manufacturing Orders`` in the *Planning* menu, a calendar view will open in which you can select a day to create the order whenever you want. You will also see the already planned orders. By dragging and dropping a manufacturing order in Calendar view, you can change the starting date of the order.
+
+.. i18n: .. figure:: images/mo_plan.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Planning Manufacturing Orders*
+..
+
+.. figure:: images/mo_plan.png
+    :scale: 75
+    :align: center
+    
+    *Planning Manufacturing Orders*
+
+.. i18n: When you click in a day in the Calendar view, an empty manufacturing order window will open and let you choose which product you want to produce.
+..
+
+When you click in a day in the Calendar view, an empty manufacturing order window will open and let you choose which product you want to produce.
+
+.. i18n: .. figure:: images/newmo_plan.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *New Manufacturing Order*    
+..
+
+.. figure:: images/newmo_plan.png
+    :scale: 75
+    :align: center
+    
+    *New Manufacturing Order*    
+
+.. i18n: Scheduler and Just in Time
+.. i18n: --------------------------
+..
+
+Scheduler and Just in Time
+--------------------------
+
+.. i18n: When you want to work according to the *Just in Time* way, you should install the module :mod:`mrp_jit`.
+..
+
+When you want to work according to the *Just in Time* way, you should install the module :mod:`mrp_jit`.
+
+.. i18n: If you install this module, you will not have to run the regular procurement scheduler anymore (but you still need to run the minimum order point rule scheduler, or for example let it run daily.) 
+..
+
+If you install this module, you will not have to run the regular procurement scheduler anymore (but you still need to run the minimum order point rule scheduler, or for example let it run daily.) 
+
+.. i18n: All procurement orders will be processed immediately, which could in some cases entail a small performance impact. 
+..
+
+All procurement orders will be processed immediately, which could in some cases entail a small performance impact. 
+
+.. i18n: It may also increase your stock size because products are reserved as soon as possible and the scheduler time range is not taken into account anymore. In that case, you can no longer use priorities for the different picking orders. 
+..
+
+It may also increase your stock size because products are reserved as soon as possible and the scheduler time range is not taken into account anymore. In that case, you can no longer use priorities for the different picking orders. 
+
+.. i18n: Lead times
+.. i18n: ----------
+..
+
+Lead times
+----------
+
+.. i18n: All procurement operations (that is, the requirement for both production orders and purchase orders) are automatically calculated by the scheduler. But more than just creating each order, OpenERP plans the timing of each step. A planned date calculated by the system can be found on each order document.
+..
+
+All procurement operations (that is, the requirement for both production orders and purchase orders) are automatically calculated by the scheduler. But more than just creating each order, OpenERP plans the timing of each step. A planned date calculated by the system can be found on each order document.
+
+.. i18n: To organize the whole chain of manufacturing and procurement, OpenERP bases everything on the delivery date promised to the customer. This is given by the date of the confirmation in the order and the lead times shown in each product line of the order. This lead time is itself proposed automatically in the field :guilabel:`Customer Lead Time` shown in the product form. This Customer Lead Time is the difference between the time on an order and that of the delivery.
+..
+
+To organize the whole chain of manufacturing and procurement, OpenERP bases everything on the delivery date promised to the customer. This is given by the date of the confirmation in the order and the lead times shown in each product line of the order. This lead time is itself proposed automatically in the field :guilabel:`Customer Lead Time` shown in the product form. This Customer Lead Time is the difference between the time on an order and that of the delivery.
+
+.. i18n: To see a calculation of the lead times, take the example of the cabinet above. Suppose that the cabinet is assembled in two steps, using the two following bills of materials.
+..
+
+To see a calculation of the lead times, take the example of the cabinet above. Suppose that the cabinet is assembled in two steps, using the two following bills of materials.
+
+.. i18n: .. table:: Bill of Materials for 1 SHE100 Unit
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    SIDEPAN       2         PCE
+.. i18n:    WOOD002       0.25      m
+.. i18n:    LIN040        1         m
+.. i18n:    WOOD010       0.249     m
+.. i18n:    METC000       12        PCE
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 1 SHE100 Unit
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   SIDEPAN       2         PCE
+   WOOD002       0.25      m
+   LIN040        1         m
+   WOOD010       0.249     m
+   METC000       12        PCE
+   ============  ========  ===============
+
+.. i18n: .. table:: Bill of Materials for 2 SIDEPAN Units
+.. i18n: 
+.. i18n:    ============  ========  ===============
+.. i18n:    Product Code  Quantity  Unit of Measure
+.. i18n:    ============  ========  ===============
+.. i18n:    WOOD002       0.17      m
+.. i18n:    ============  ========  ===============
+..
+
+.. table:: Bill of Materials for 2 SIDEPAN Units
+
+   ============  ========  ===============
+   Product Code  Quantity  Unit of Measure
+   ============  ========  ===============
+   WOOD002       0.17      m
+   ============  ========  ===============
+
+.. i18n: The SIDEPAN is made from an order using the workflow shown. The WOOD002 is purchased on order and the other products are all found in stock. An order for the product SHE100 will then generate two production orders (SHE100 and SIDEPAN) then produce two purchase orders for the product WOOD002.
+.. i18n: Product WOOD002 is used in the production of both SHE100 and SIDEPAN. Set the lead times on the product forms to the following:
+..
+
+The SIDEPAN is made from an order using the workflow shown. The WOOD002 is purchased on order and the other products are all found in stock. An order for the product SHE100 will then generate two production orders (SHE100 and SIDEPAN) then produce two purchase orders for the product WOOD002.
+Product WOOD002 is used in the production of both SHE100 and SIDEPAN. Set the lead times on the product forms to the following:
+
+.. i18n: .. table:: Lead Times
+.. i18n: 
+.. i18n:    ============ ================== ======================= ==================
+.. i18n:    Product Code Customer Lead Time Manufacturing Lead Time Supplier Lead Time
+.. i18n:    ============ ================== ======================= ==================
+.. i18n:    SHE100       30 days            5 days
+.. i18n:    SIDEPAN                         10 days
+.. i18n:    WOOD002                                                 5 days
+.. i18n:    ============ ================== ======================= ==================
+..
+
+.. table:: Lead Times
+
+   ============ ================== ======================= ==================
+   Product Code Customer Lead Time Manufacturing Lead Time Supplier Lead Time
+   ============ ================== ======================= ==================
+   SHE100       30 days            5 days
+   SIDEPAN                         10 days
+   WOOD002                                                 5 days
+   ============ ================== ======================= ==================
+
+.. i18n: A customer order placed on the 1st January will set up the following operations and lead times:
+..
+
+A customer order placed on the 1st January will set up the following operations and lead times:
+
+.. i18n: * Delivery SHE100: 31 January (=1st January + 30 days),
+.. i18n: 
+.. i18n: * Manufacture SHE100: 26 January (=31 January – 5 days),
+.. i18n: 
+.. i18n: * Manufacture SIDEPAN: 16 January (=26 January – 10 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SHE100): 21 January (=26 January – 5 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SIDEPAN): 11 January (=16 January – 5 days).
+..
+
+* Delivery SHE100: 31 January (=1st January + 30 days),
+
+* Manufacture SHE100: 26 January (=31 January – 5 days),
+
+* Manufacture SIDEPAN: 16 January (=26 January – 10 days),
+
+* Purchase WOOD002 (for SHE100): 21 January (=26 January – 5 days),
+
+* Purchase WOOD002 (for SIDEPAN): 11 January (=16 January – 5 days).
+
+.. i18n: In this example, OpenERP will propose placing two orders with the supplier of product WOOD002. Each of these orders can be for a different planned date. Before confirming these orders, the purchasing manager could group (merge) these orders into a single order.
+..
+
+In this example, OpenERP will propose placing two orders with the supplier of product WOOD002. Each of these orders can be for a different planned date. Before confirming these orders, the purchasing manager could group (merge) these orders into a single order.
+
+.. i18n: Security Days
+.. i18n: -------------
+..
+
+Security Days
+-------------
+
+.. i18n: The scheduler will plan all operations as a function of the time configured on the products. But it is also possible to configure these factors in the company. These factors are then global to the company, whatever the product concerned may be. In the description of the company, on the
+.. i18n: :guilabel:`Configuration` tab, you find the following parameters:
+..
+
+The scheduler will plan all operations as a function of the time configured on the products. But it is also possible to configure these factors in the company. These factors are then global to the company, whatever the product concerned may be. In the description of the company, on the
+:guilabel:`Configuration` tab, you find the following parameters:
+
+.. i18n: * `Scheduler Range Days`: all the procurement requests that are not between today and today plus the number of days specified here are not taken into account by the scheduler.
+.. i18n:   
+.. i18n: * `Manufacturing Lead Time`: number of additional days needed for manufacturing,
+.. i18n: 
+.. i18n: * `Purchase Lead Time`: additional days to include for all purchase orders with this supplier,
+.. i18n: 
+.. i18n: * `Security Days`: number of days to deduct from a system order to cope with any problems of procurement,
+..
+
+* `Scheduler Range Days`: all the procurement requests that are not between today and today plus the number of days specified here are not taken into account by the scheduler.
+  
+* `Manufacturing Lead Time`: number of additional days needed for manufacturing,
+
+* `Purchase Lead Time`: additional days to include for all purchase orders with this supplier,
+
+* `Security Days`: number of days to deduct from a system order to cope with any problems of procurement,
+
+.. i18n: .. note:: Purchase Lead Time
+.. i18n: 
+.. i18n:     The security delay for purchases is the average time between the order generated by OpenERP and
+.. i18n:     the real purchase time from the supplier by your purchasing department.
+.. i18n:     This delay takes into account the order process in your company, including order negotiation time.
+..
+
+.. note:: Purchase Lead Time
+
+    The security delay for purchases is the average time between the order generated by OpenERP and
+    the real purchase time from the supplier by your purchasing department.
+    This delay takes into account the order process in your company, including order negotiation time.
+
+.. i18n: Take for instance the following configuration:
+..
+
+Take for instance the following configuration:
+
+.. i18n: * `Manufacturing Lead Time` : 1,
+.. i18n: 
+.. i18n: * `Purchase Lead Time` : 3,
+.. i18n: 
+.. i18n: * `Security Days` : 2.
+..
+
+* `Manufacturing Lead Time` : 1,
+
+* `Purchase Lead Time` : 3,
+
+* `Security Days` : 2.
+
+.. i18n: The example above will then be given the following lead times:
+..
+
+The example above will then be given the following lead times:
+
+.. i18n: * Delivery SHE100: 29 January (= 1st January + 30 days – 2 days),
+.. i18n: 
+.. i18n: * Manufacture SHE100: 23 January (= 29 January – 5 days – 1 day),
+.. i18n: 
+.. i18n: * Manufacture SIDEPAN: 12 January (= 26 January – 10 days – 1 day),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SHE100): 15 January (= 26 January – 5 days – 3 days),
+.. i18n: 
+.. i18n: * Purchase WOOD002 (for SIDEPAN): 4 January (= 12 January – 5 days – 3 days).
+..
+
+* Delivery SHE100: 29 January (= 1st January + 30 days – 2 days),
+
+* Manufacture SHE100: 23 January (= 29 January – 5 days – 1 day),
+
+* Manufacture SIDEPAN: 12 January (= 26 January – 10 days – 1 day),
+
+* Purchase WOOD002 (for SHE100): 15 January (= 26 January – 5 days – 3 days),
+
+* Purchase WOOD002 (for SIDEPAN): 4 January (= 12 January – 5 days – 3 days).
+
+.. i18n: Procurement
+.. i18n: +++++++++++
+..
+
+Procurement
++++++++++++
+
+.. i18n: In normal system use, you do not need to worry about procurement orders, because they are automatically generated by OpenERP and the user will usually work on the results of a procurement: a production order, a purchase order, a sales order and a task.
+..
+
+In normal system use, you do not need to worry about procurement orders, because they are automatically generated by OpenERP and the user will usually work on the results of a procurement: a production order, a purchase order, a sales order and a task.
+
+.. i18n: But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. Exception management allows you to solve possible issues.
+..
+
+But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. Exception management allows you to solve possible issues.
+
+.. i18n: Automating Purchasing and Replenishment
+.. i18n: ---------------------------------------
+..
+
+Automating Purchasing and Replenishment
+---------------------------------------
+
+.. i18n: In the ``Product`` form view, you can choose between two procurement methods:
+..
+
+In the ``Product`` form view, you can choose between two procurement methods:
+
+.. i18n:     * Make to Stock (MTS)
+.. i18n:     * Make to Order (MTO)
+..
+
+    * Make to Stock (MTS)
+    * Make to Order (MTO)
+
+.. i18n: These two methods will impact the way you have to configure your automatic purchasing and replenishment. For the MTS method, you will have to define Minimum Stock Rules to order products when the minimum threshold has been reached, as well as a supplier to define where to order the products. 
+.. i18n: For the MTO method, you have to define a supplier for the product in order to buy new products when a sales order or a manufacturing 
+.. i18n: order is confirmed.
+..
+
+These two methods will impact the way you have to configure your automatic purchasing and replenishment. For the MTS method, you will have to define Minimum Stock Rules to order products when the minimum threshold has been reached, as well as a supplier to define where to order the products. 
+For the MTO method, you have to define a supplier for the product in order to buy new products when a sales order or a manufacturing 
+order is confirmed.
+
+.. i18n: Managing Scheduler Exceptions
+.. i18n: -----------------------------
+..
+
+Managing Scheduler Exceptions
+-----------------------------
+
+.. i18n: In OpenERP, you can have different procurement exceptions. An exception appears in the ``Procurement Exception`` view when the system does not know what to do with an object, such as a Manufacturing Order or a Purchase Order.
+..
+
+In OpenERP, you can have different procurement exceptions. An exception appears in the ``Procurement Exception`` view when the system does not know what to do with an object, such as a Manufacturing Order or a Purchase Order.
+
+.. i18n: There are four types of exceptions:
+..
+
+There are four types of exceptions:
+
+.. i18n:     * No bill of materials defined for production: in this case you have got to create a BoM or indicate that the product can be purchased instead (change the ``Supply Method``).
+.. i18n: 
+.. i18n:     * No supplier available for a purchase: you have to define a supplier in the ``Supplier`` tab of the product form.
+.. i18n: 
+.. i18n:     * No address defined on the supplier partner: you have to complete an address for the supplier for the product in consideration.
+.. i18n: 
+.. i18n:     * Not enough stock: you have to create a rule for automatic procurement (for example, a minimum stock rule), or manually procure it.
+..
+
+    * No bill of materials defined for production: in this case you have got to create a BoM or indicate that the product can be purchased instead (change the ``Supply Method``).
+
+    * No supplier available for a purchase: you have to define a supplier in the ``Supplier`` tab of the product form.
+
+    * No address defined on the supplier partner: you have to complete an address for the supplier for the product in consideration.
+
+    * Not enough stock: you have to create a rule for automatic procurement (for example, a minimum stock rule), or manually procure it.
+
+.. i18n: .. figure:: images/procurement_exception.png
+.. i18n:     :align: center
+.. i18n:     :scale: 75
+.. i18n:     
+.. i18n:     *Procurement Exceptions*
+.. i18n:     
+.. i18n: Some problems are just timing issues and can be automatically corrected by the system (this will be temporary exceptions).
+..
+
+.. figure:: images/procurement_exception.png
+    :align: center
+    :scale: 75
+    
+    *Procurement Exceptions*
+    
+Some problems are just timing issues and can be automatically corrected by the system (this will be temporary exceptions).
+
+.. i18n: If a product has to be ‘in stock’ but is not available in your stores, OpenERP will make the exception as ‘temporary’ or ‘to be corrected’. The exception is temporary if the system can procure it automatically, for example, when a procurement rule has been defined for minimum stock.
+..
+
+If a product has to be ‘in stock’ but is not available in your stores, OpenERP will make the exception as ‘temporary’ or ‘to be corrected’. The exception is temporary if the system can procure it automatically, for example, when a procurement rule has been defined for minimum stock.
+
+.. i18n: When an exception is raised, you can check the configuration of your product in order to correct the misconfiguration. Then you
+.. i18n: can choose to relaunch the scheduler or you can retry to execute the action by selecting the line, and clicking the :guilabel:`Retry` button, then click :guilabel:`Run procurement`.
+..
+
+When an exception is raised, you can check the configuration of your product in order to correct the misconfiguration. Then you
+can choose to relaunch the scheduler or you can retry to execute the action by selecting the line, and clicking the :guilabel:`Retry` button, then click :guilabel:`Run procurement`.
+
+.. i18n: .. figure:: images/procurement_fix.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Correct a Procurement Exception*
+..
+
+.. figure:: images/procurement_fix.png
+    :scale: 75
+    :align: center
+    
+    *Correct a Procurement Exception*
+
+.. i18n: The exception related to the BoM definition comes from the fact that a product with a supply method set to *Produce* has no
+.. i18n: Bill of Materials. The system does not know how to produce this product and then raises an exception.    
+..
+
+The exception related to the BoM definition comes from the fact that a product with a supply method set to *Produce* has no
+Bill of Materials. The system does not know how to produce this product and then raises an exception.    
+
+.. i18n: Manual Procurement
+.. i18n: ------------------
+..
+
+Manual Procurement
+------------------
+
+.. i18n: To procure internally, you can create a procurement order manually. Use the menu :menuselection:`Warehouse --> Schedulers -->
+.. i18n: Procurement Exceptions` and click the New button to do this.
+..
+
+To procure internally, you can create a procurement order manually. Use the menu :menuselection:`Warehouse --> Schedulers -->
+Procurement Exceptions` and click the New button to do this.
+
+.. i18n: .. figure:: images/mrp_procurement.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Manual Procurement*
+..
+
+.. figure:: images/mrp_procurement.png
+    :scale: 75
+    :align: center
+    
+    *Manual Procurement*
+
+.. i18n: The procurement order will then be responsible for calculating a proposal for automatic procurement for the
+.. i18n: product concerned. This procurement will start a task, a purchase order for the supplier or a production
+.. i18n: depending on the product configuration.
+..
+
+The procurement order will then be responsible for calculating a proposal for automatic procurement for the
+product concerned. This procurement will start a task, a purchase order for the supplier or a production
+depending on the product configuration.
+
+.. i18n: .. figure:: images/mrp_procurement_flow.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Procurement Flow*
+..
+
+.. figure:: images/mrp_procurement_flow.png
+    :scale: 75
+    :align: center
+    
+    *Procurement Flow*
+
+.. i18n: It is better to encode a procurement order rather than direct purchasing or production. The procurement method has the following advantages:
+..
+
+It is better to encode a procurement order rather than direct purchasing or production. The procurement method has the following advantages:
+
+.. i18n: 1. The form is simpler, because OpenERP calculates the different values according to other values and defined rules: purchase date 
+.. i18n: calculated from order date, default supplier, raw materials needs, selection of the most suitable bill of materials, etc.
+.. i18n: 
+.. i18n: 2. The calculation of requirements prioritises the procurements. If you encode a purchase directly, you short-circuit the planning of different procurements.
+..
+
+1. The form is simpler, because OpenERP calculates the different values according to other values and defined rules: purchase date 
+calculated from order date, default supplier, raw materials needs, selection of the most suitable bill of materials, etc.
+
+2. The calculation of requirements prioritises the procurements. If you encode a purchase directly, you short-circuit the planning of different procurements.
+
+.. i18n: .. tip:: Shortcuts
+.. i18n: 
+.. i18n:     On the Product form you have an **action** shortcut button :guilabel:`Procurement Request` that lets you quickly 
+.. i18n:     create a new procurement order.
+.. i18n:         
+..
+
+.. tip:: Shortcuts
+
+    On the Product form you have an **action** shortcut button :guilabel:`Procurement Request` that lets you quickly 
+    create a new procurement order.
+        
+
+.. i18n: Working with Subcontractors
+.. i18n: ===========================
+..
+
+Working with Subcontractors
+===========================
+
+.. i18n: In OpenERP, you can also subcontract production operations (for example, painting and item assembly) at a supplier's. To do this, you should indicate on the relevant routing document a supplier location for stock management.
+..
+
+In OpenERP, you can also subcontract production operations (for example, painting and item assembly) at a supplier's. To do this, you should indicate on the relevant routing document a supplier location for stock management.
+
+.. i18n: Configure a location dedicated to this supplier with the following data:
+..
+
+Configure a location dedicated to this supplier with the following data:
+
+.. i18n: * :guilabel:`Location Type`: Supplier,
+.. i18n: 
+.. i18n: * :guilabel:`Location Address`: Select an address of the subcontracting partner,
+.. i18n: 
+.. i18n: * :guilabel:`Chained Location Type`: Fixed,
+.. i18n: 
+.. i18n: * :guilabel:`Chained Location if Fixed`: your Stock,
+.. i18n: 
+.. i18n: * :guilabel:`Chaining Lead Time`: number of days before receipt of the finished product.
+..
+
+* :guilabel:`Location Type`: Supplier,
+
+* :guilabel:`Location Address`: Select an address of the subcontracting partner,
+
+* :guilabel:`Chained Location Type`: Fixed,
+
+* :guilabel:`Chained Location if Fixed`: your Stock,
+
+* :guilabel:`Chaining Lead Time`: number of days before receipt of the finished product.
+
+.. i18n: Then once the manufacturing has been planned for the product concerned, OpenERP will generate the following steps:
+..
+
+Then once the manufacturing has been planned for the product concerned, OpenERP will generate the following steps:
+
+.. i18n: * Delivery of raw materials to the stores for the supplier,
+.. i18n: 
+.. i18n: * Production order for the products at the supplier's and receipt of the finished products in the stores.
+..
+
+* Delivery of raw materials to the stores for the supplier,
+
+* Production order for the products at the supplier's and receipt of the finished products in the stores.
+
+.. i18n: Once the production order has been confirmed, OpenERP automatically generates a delivery order to send to the raw materials supplier. The storesperson can access this delivery order from the menu :menuselection:`Warehouse --> Warehouse Management --> Internal Moves`. The raw materials will then be placed in stock at the supplier's stores.
+..
+
+Once the production order has been confirmed, OpenERP automatically generates a delivery order to send to the raw materials supplier. The storesperson can access this delivery order from the menu :menuselection:`Warehouse --> Warehouse Management --> Internal Moves`. The raw materials will then be placed in stock at the supplier's stores.
+
+.. i18n: Once the delivery of raw materials has been confirmed, OpenERP activates the production order. The supplier uses the raw materials to produce the finished goods which will automatically be put in your own stores. This manufacturing is confirmed when you receive the products from your supplier. Then you will indicate the quantities consumed by your supplier.
+..
+
+Once the delivery of raw materials has been confirmed, OpenERP activates the production order. The supplier uses the raw materials to produce the finished goods which will automatically be put in your own stores. This manufacturing is confirmed when you receive the products from your supplier. Then you will indicate the quantities consumed by your supplier.
+
+.. i18n: .. tip:: Subcontract without Routing
+.. i18n: 
+.. i18n:    If you do not use routing, you can always subcontract work orders by creating an empty routing in the subcontracting bill of materials.
+..
+
+.. tip:: Subcontract without Routing
+
+   If you do not use routing, you can always subcontract work orders by creating an empty routing in the subcontracting bill of materials.
+
+.. i18n: Production orders can be found in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. A production order is always carried out in two stages:
+..
+
+Production orders can be found in the menu :menuselection:`Manufacturing --> Manufacturing --> Manufacturing Orders`. A production order is always carried out in two stages:
+
+.. i18n: #. Consumption of raw materials,
+.. i18n: 
+.. i18n: #. Production of finished products.
+..
+
+#. Consumption of raw materials,
+
+#. Production of finished products.
+
+.. i18n: Depending on the company's needs, you can specify that the first step is confirmed at the acknowledgement of the manufacturing supplier, and the second at the receipt of finished goods in the warehouse.
+..
+
+Depending on the company's needs, you can specify that the first step is confirmed at the acknowledgement of the manufacturing supplier, and the second at the receipt of finished goods in the warehouse.
+
+.. i18n: Matching Sales Orders and Bills of Materials
+.. i18n: ============================================
+..
+
+Matching Sales Orders and Bills of Materials
+============================================
+
+.. i18n: In OpenERP, you can define several bills of materials for the same product. In fact, you can have several manufacturing methods or several approved raw materials for a given product. You will see in the following section that the manufacturing procedure (the routing) is attached to the Bill of Materials, so the choice of bill of materials implicitly includes the operations to make it.
+..
+
+In OpenERP, you can define several bills of materials for the same product. In fact, you can have several manufacturing methods or several approved raw materials for a given product. You will see in the following section that the manufacturing procedure (the routing) is attached to the Bill of Materials, so the choice of bill of materials implicitly includes the operations to make it.
+
+.. i18n: Once several bills of materials have been defined for a particular product, you need to have a system to enable OpenERP to select one of them for use. By default, the bill of materials with the lowest sequence number is selected by the system.
+..
+
+Once several bills of materials have been defined for a particular product, you need to have a system to enable OpenERP to select one of them for use. By default, the bill of materials with the lowest sequence number is selected by the system.
+
+.. i18n: To gain more control over the process during selling or procuring, you can use **Properties**.
+.. i18n: The menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Properties` enables you to define properties, which can be set up arbitrarily to help you select a bill of materials when you have a choice of BoMs.
+..
+
+To gain more control over the process during selling or procuring, you can use **Properties**.
+The menu :menuselection:`Manufacturing --> Configuration --> Master Bill of Materials --> Properties` enables you to define properties, which can be set up arbitrarily to help you select a bill of materials when you have a choice of BoMs.
+
+.. i18n: .. note:: Properties
+.. i18n: 
+.. i18n:    Properties is a concept that enables the selection of a method to manufacture a product.
+.. i18n:    Properties define a common language between salespeople and technical people,
+.. i18n:    letting the salespeople have an influence on the manufacturing of the products using
+.. i18n:    non-technical language and the choices decided on by the technicians who define Bills
+.. i18n:    of Materials.
+..
+
+.. note:: Properties
+
+   Properties is a concept that enables the selection of a method to manufacture a product.
+   Properties define a common language between salespeople and technical people,
+   letting the salespeople have an influence on the manufacturing of the products using
+   non-technical language and the choices decided on by the technicians who define Bills
+   of Materials.
+
+.. i18n: For example, you can define the following property groups and properties:
+..
+
+For example, you can define the following property groups and properties:
+
+.. i18n: .. table:: Properties
+.. i18n: 
+.. i18n:    =====================  ============
+.. i18n:    Property Group         Property
+.. i18n:    =====================  ============
+.. i18n:    Warranty               3 years
+.. i18n:    Warranty               1 year
+.. i18n:    Method of Manufacture  Serial
+.. i18n:    Method of Manufacture  Batch
+.. i18n:    =====================  ============
+..
+
+.. table:: Properties
+
+   =====================  ============
+   Property Group         Property
+   =====================  ============
+   Warranty               3 years
+   Warranty               1 year
+   Method of Manufacture  Serial
+   Method of Manufacture  Batch
+   =====================  ============
+
+.. i18n: Once the bills of materials have been defined, you could associate the corresponding properties with them. Then when the salesperson enters a sales order line, he can attach the properties required (``Extra Info`` tab). If the product has to be manufactured, OpenERP will automatically choose the bill of materials that matches the defined properties in the order most closely.
+..
+
+Once the bills of materials have been defined, you could associate the corresponding properties with them. Then when the salesperson enters a sales order line, he can attach the properties required (``Extra Info`` tab). If the product has to be manufactured, OpenERP will automatically choose the bill of materials that matches the defined properties in the order most closely.
+
+.. i18n: .. note:: Extended View
+.. i18n: 
+.. i18n:         Note that the properties are only visible in the Bills of Materials and Sales Management if you are working in the ``Extended`` view mode. If you cannot see it on your screen, add the group ``Useability /Extended View`` to your user.
+..
+
+.. note:: Extended View
+
+        Note that the properties are only visible in the Bills of Materials and Sales Management if you are working in the ``Extended`` view mode. If you cannot see it on your screen, add the group ``Useability /Extended View`` to your user.
+
+.. i18n: .. figure:: images/sale_line_property.png
+.. i18n:    :scale: 75
+.. i18n:    :align: center
+.. i18n: 
+.. i18n:    *Properties in a Customer Order Line*
+..
+
+.. figure:: images/sale_line_property.png
+   :scale: 75
+   :align: center
+
+   *Properties in a Customer Order Line*
+
+.. i18n: *Example: Manufacturing in a Batch or on a Production Line*
+..
+
+*Example: Manufacturing in a Batch or on a Production Line*
+
+.. i18n: As an example, take the manufacturing of the shelf presented above. You can imagine that the company has two methods of manufacturing for this cabinet:
+..
+
+As an example, take the manufacturing of the shelf presented above. You can imagine that the company has two methods of manufacturing for this cabinet:
+
+.. i18n: * Manually: the staff assembles the shelves one by one and cuts the wood plank by plank. This approach is
+.. i18n:   usually used to assemble prototypes. It gets you very rapid production, but at a high cost and
+.. i18n:   only in small quantities.
+.. i18n: 
+.. i18n: * On a production line: the staff uses machines that are capable of cutting wood by bandsaw. This method
+.. i18n:   is used for production runs of at least 50 items because the lead times using this method are quite
+.. i18n:   lengthy. The delay to start the production is much longer, yet the cost per unit is considerably lower
+.. i18n:   in this volume.
+..
+
+* Manually: the staff assembles the shelves one by one and cuts the wood plank by plank. This approach is
+  usually used to assemble prototypes. It gets you very rapid production, but at a high cost and
+  only in small quantities.
+
+* On a production line: the staff uses machines that are capable of cutting wood by bandsaw. This method
+  is used for production runs of at least 50 items because the lead times using this method are quite
+  lengthy. The delay to start the production is much longer, yet the cost per unit is considerably lower
+  in this volume.
+
+.. i18n: You define two bills of materials for the same cabinet. To distinguish between them, you will define two properties in the same group: ``manual assembly`` and ``production line assembly``. In the quotation, the salesperson can set the method of manufacture he wants on each order line,
+.. i18n: depending on the quantities and the lead time requested by the customer.
+..
+
+You define two bills of materials for the same cabinet. To distinguish between them, you will define two properties in the same group: ``manual assembly`` and ``production line assembly``. In the quotation, the salesperson can set the method of manufacture he wants on each order line,
+depending on the quantities and the lead time requested by the customer.
+
+.. i18n: .. index::
+.. i18n:    single: BoM, substitute products
+..
+
+.. index::
+   single: BoM, substitute products
+
+.. i18n: .. note:: Bills of Materials and Substitute Products
+.. i18n: 
+.. i18n:     In some software, you use the term ``substitute`` for this principle of configurable properties in
+.. i18n:     a bill of materials.
+..
+
+.. note:: Bills of Materials and Substitute Products
+
+    In some software, you use the term ``substitute`` for this principle of configurable properties in
+    a bill of materials.
+
+.. i18n: By putting a bill of materials on its own line, you can also implement substitute products. You set the bill of materials to type ``Sets/Phantom`` to make the substitution transparent and to prevent OpenERP from proposing an intermediate production order.
+..
+
+By putting a bill of materials on its own line, you can also implement substitute products. You set the bill of materials to type ``Sets/Phantom`` to make the substitution transparent and to prevent OpenERP from proposing an intermediate production order.
+
+.. i18n: Production and Services
+.. i18n: =======================
+..
+
+Production and Services
+=======================
+
+.. i18n: In OpenERP, you can handle three types of goods: two types of products (Stockable or Consumable products) and one type of services.
+..
+
+In OpenERP, you can handle three types of goods: two types of products (Stockable or Consumable products) and one type of services.
+
+.. i18n: For this last category, OpenERP can react in two different ways. Once a manufacturing order is generated for a product and this product contains a :guilabel:`Service`, a task can be automatically generated or not.
+..
+
+For this last category, OpenERP can react in two different ways. Once a manufacturing order is generated for a product and this product contains a :guilabel:`Service`, a task can be automatically generated or not.
+
+.. i18n: .. note:: Tasks
+.. i18n: 
+.. i18n:    In order to automatically generate a task, you have to install the module :mod:`project_mrp` which
+.. i18n:    requires the installation of the module :mod:`project`.
+..
+
+.. note:: Tasks
+
+   In order to automatically generate a task, you have to install the module :mod:`project_mrp` which
+   requires the installation of the module :mod:`project`.
+
+.. i18n: By default, the generated task is not linked to any project. You can change this behaviour by creating a project and link the service to this project. This can be done in the ``Product`` form, on the tab :guilabel:`Procurement & Locations` in the :guilabel:`Miscellaneous` section. Select the project to be linked in the ``Project`` field.
+..
+
+By default, the generated task is not linked to any project. You can change this behaviour by creating a project and link the service to this project. This can be done in the ``Product`` form, on the tab :guilabel:`Procurement & Locations` in the :guilabel:`Miscellaneous` section. Select the project to be linked in the ``Project`` field.
+
+.. i18n: .. figure:: images/service_prj.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *Link a Service Product to a Project*
+..
+
+.. figure:: images/service_prj.png
+    :scale: 75
+    :align: center
+    
+    *Link a Service Product to a Project*
+
+.. i18n: To illustrate this process, follow the next example:
+..
+
+To illustrate this process, follow the next example:
+
+.. i18n: First, you have to create a project to which you want to link the service. We will call this project *Consulting*. After creating the project, we have to create a new product. Here are the characteristics of this product:
+.. i18n:    
+..
+
+First, you have to create a project to which you want to link the service. We will call this project *Consulting*. After creating the project, we have to create a new product. Here are the characteristics of this product:
+   
+
+.. i18n: .. table:: Configure a New Service
+.. i18n: 
+.. i18n:    ================== ==============
+.. i18n:    Field              Value
+.. i18n:    ================== ==============
+.. i18n:    Name               Consulting
+.. i18n:    Reference          CSLT
+.. i18n:    Product Type       Service
+.. i18n:    Procurement Method Make to Order
+.. i18n:    Supply Method      Produce
+.. i18n:    Default UoM        Hour
+.. i18n:    **Project**        **Consulting**
+.. i18n:    ================== ==============
+.. i18n:    
+.. i18n: Once you have configured your project and your product, you can create a Sales Order to order hours of consultancy. When you confirm the Sales Order, a task will be created.
+..
+
+.. table:: Configure a New Service
+
+   ================== ==============
+   Field              Value
+   ================== ==============
+   Name               Consulting
+   Reference          CSLT
+   Product Type       Service
+   Procurement Method Make to Order
+   Supply Method      Produce
+   Default UoM        Hour
+   **Project**        **Consulting**
+   ================== ==============
+   
+Once you have configured your project and your product, you can create a Sales Order to order hours of consultancy. When you confirm the Sales Order, a task will be created.
+
+.. i18n: .. figure:: images/soprj_tip.png
+.. i18n:     :scale: 100
+.. i18n:     :align: center
+.. i18n:     
+.. i18n: If you go to :menuselection:`Project --> Project --> Tasks`, you will find a new task called: :guilabel:`SO011:[CSLT] Consulting`. This task is linked to the project :guilabel`Consulting`. Note that the Sales Order number may be different in your database.
+..
+
+.. figure:: images/soprj_tip.png
+    :scale: 100
+    :align: center
+    
+If you go to :menuselection:`Project --> Project --> Tasks`, you will find a new task called: :guilabel:`SO011:[CSLT] Consulting`. This task is linked to the project :guilabel`Consulting`. Note that the Sales Order number may be different in your database.
+
+.. i18n: .. figure:: images/prj_so.png
+.. i18n:     :scale: 75
+.. i18n:     :align: center
+.. i18n:     
+.. i18n:     *A Product linked to a Task and a Project*    
+..
+
+.. figure:: images/prj_so.png
+    :scale: 75
+    :align: center
+    
+    *A Product linked to a Task and a Project*    
+
+.. i18n: .. Copyright © Open Object Press. All rights reserved.
+..
+
+.. Copyright © Open Object Press. All rights reserved.
+
+.. i18n: .. You may take electronic copy of this publication and distribute it if you don't
+.. i18n: .. change the content. You can also print a copy to be read by yourself only.
+..
+
+.. You may take electronic copy of this publication and distribute it if you don't
+.. change the content. You can also print a copy to be read by yourself only.
+
+.. i18n: .. We have contracts with different publishers in different countries to sell and
+.. i18n: .. distribute paper or electronic based versions of this book (translated or not)
+.. i18n: .. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. i18n: .. also helps us to create incentives to pay contributors and authors using author
+.. i18n: .. rights of these sales.
+..
+
+.. We have contracts with different publishers in different countries to sell and
+.. distribute paper or electronic based versions of this book (translated or not)
+.. in bookstores. This helps to distribute and promote the OpenERP product. It
+.. also helps us to create incentives to pay contributors and authors using author
+.. rights of these sales.
+
+.. i18n: .. Due to this, grants to translate, modify or sell this book are strictly
+.. i18n: .. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. i18n: .. written authorisation for this.
+..
+
+.. Due to this, grants to translate, modify or sell this book are strictly
+.. forbidden, unless Tiny SPRL (representing Open Object Press) gives you a
+.. written authorisation for this.
+
+.. i18n: .. Many of the designations used by manufacturers and suppliers to distinguish their
+.. i18n: .. products are claimed as trademarks. Where those designations appear in this book,
+.. i18n: .. and Open Object Press was aware of a trademark claim, the designations have been
+.. i18n: .. printed in initial capitals.
+..
+
+.. Many of the designations used by manufacturers and suppliers to distinguish their
+.. products are claimed as trademarks. Where those designations appear in this book,
+.. and Open Object Press was aware of a trademark claim, the designations have been
+.. printed in initial capitals.
+
+.. i18n: .. While every precaution has been taken in the preparation of this book, the publisher
+.. i18n: .. and the authors assume no responsibility for errors or omissions, or for damages
+.. i18n: .. resulting from the use of the information contained herein.
+..
+
+.. While every precaution has been taken in the preparation of this book, the publisher
+.. and the authors assume no responsibility for errors or omissions, or for damages
+.. resulting from the use of the information contained herein.
+
+.. i18n: .. Published by Open Object Press, Grand Rosière, Belgium
+..
+
+.. Published by Open Object Press, Grand Rosière, Belgium

=== added file 'i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst'
--- i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst	1970-01-01 00:00:00 +0000
+++ i18n/it/source/book/5/5_15_Manufacturing/5_15_Manufacturing_logistic.rst	2012-10-01 15:56:24 +0000
@@ -0,0 +1,559 @@
+
+.. i18n: Logistics and Manufacturing
+.. i18n: ===========================
+..
+
+Logistics and Manufacturing
+===========================
+
+.. i18n: Manufacturing Stock Locations
+.. i18n: +++++++++++++++++++++++++++++
+..
+
+Manufacturing Stock Locations
++++++++++++++++++++++++++++++
+
+.. i18n: OpenERP allows you to define a specific location to keep track of your manufacturing moves. 
+..
+
+OpenERP allows you to define a specific location to keep track of your manufacturing moves. 
+
+.. i18n: To get an overview of all stock moves, go to :menuselection:`Warehouse --> Traceability --> Stock Moves`. You can enter your Production location in the ``Location`` search field and then group by Source or Destination according to the moves you would like to check.
+..
+
+To get an overview of all stock moves, go to :menuselection:`Warehouse --> Traceability --> Stock Moves`. You can enter your Production location in the ``Location`` search field and then group by Source or Destination according to the moves you would like to check.
+
+.. i18n: Traceability
+.. i18n: ++++++++++++
+..
+
+Traceability
+++++++++++++
+
+.. i18n: With traceability you can easily track your production lots in the software. With this functionality you can
+.. i18n: quickly find where your products are in your warehouse. In counterpart, you will be forced to mention a
+.. i18n: number of lot to each product to be able to track it in the syste

Follow ups