[BOT] post-merge updates

README.md

@@ -52,12 +52,13 @@ addon | version | maintainers | summary
 [mrp_bom_line_net_qty](mrp_bom_line_net_qty/) | 12.0.1.1.0 |  | MRP BoM Line Net and Gross Quantity
 [mrp_bom_print](mrp_bom_print/) | 12.0.1.1.3 |  | Manage the various useful prints for Bill of Materials
 [mrp_bom_product_variant](mrp_bom_product_variant/) | 12.0.0.1.2 |  | MRP BoM Product Variant
-[mrp_bom_purchase](mrp_bom_purchase/) | 12.0.1.1.5 |  | Handle purchase from your Bill of Materials
+[mrp_bom_purchase](mrp_bom_purchase/) | 12.0.1.2.0 |  | Handle purchase from your Bill of Materials
 [mrp_bom_sale_product_margin](mrp_bom_sale_product_margin/) | 12.0.1.2.0 |  | Handle Sale price for product's bom with margin
 [mrp_bom_simple_report](mrp_bom_simple_report/) | 12.0.1.0.1 |  | Print simple report for your Bill of Materials
 [mrp_bom_tag](mrp_bom_tag/) | 12.0.1.1.3 |  | Add tags on your BoM to find it easily
 [mrp_business](mrp_business/) | 12.0.1.2.0 |  | MRP functions that meet the business needs of GRAP,adapted for food-related professions
 [mrp_food](mrp_food/) | 12.0.2.0.3 |  | MRP modules adapted for food-related professions
+[mrp_sale_grouped](mrp_sale_grouped/) | 12.0.1.2.0 |  | Quickly manage what you need to produce thanks to grouped sales
 [product_main_seller](product_main_seller/) | 12.0.1.1.6 |  | Product Attribute - Main seller for a product
 [product_supplierinfo_standard_price](product_supplierinfo_standard_price/) | 12.0.0.1.4 |  | Product supplier easily connected to product's standard price
 [server_environment_files](server_environment_files/) | 12.0.1.0.5 |  | Add custom CSS and extra text on PoS ticket depending on the environment

mrp_bom_purchase/README.rst

@@ -7,7 +7,7 @@ MRP BoM Purchase
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5ee0fbfc3202f8131ac6b4a8dbc8f687f2aa55da7397f1fc7b0326f757bfef70
+   !! source digest: sha256:8b3963dc02aa3d6af1bff0bd6c19aceedadb0e028e423cfb2862105578eb693e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

mrp_bom_purchase/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "MRP BoM Purchase",
     "summary": "Handle purchase from your Bill of Materials",
-    "version": "12.0.1.1.5",
+    "version": "12.0.1.2.0",
     "category": "GRAP - Custom",
     "author": "GRAP",
     "website": "https://github.com/grap/grap-odoo-custom",

mrp_sale_grouped/README.rst

@@ -0,0 +1,81 @@
+================================
+MRP Grouped Sales and Production
+================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:d636f5c5caf0e2bf8564bc6ffd044b199935f47dc635a5bc95a65d33e4d03372
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-grap%2Fgrap--odoo--custom-lightgray.png?logo=github
+    :target: https://github.com/grap/grap-odoo-custom/tree/12.0/mrp_sale_grouped
+    :alt: grap/grap-odoo-custom
+
+|badge1| |badge2| |badge3|
+
+Quickly manage what you need to produce thanks to grouped sales
+
+.. figure:: https://raw.githubusercontent.com/grap/grap-odoo-custom/12.0/mrp_sale_grouped/static/description/mrp_sale_grouped.png
+
+1 : Create and name your sale grouped sales
+2 : Associate sales
+3 : Retrieve sales and production order created thanks to this sales
+4 : Adjust quantities with Matrix2D view
+5 and 6 : Confirme sale orders one by one or all at once
+7 : Print PDF that sum up sales by product and sale
+8 : Handle your production with wizard assistant, you can handle what components
+you have to buy, intermediate and finished products you have to produce.
+
+.. figure:: https://raw.githubusercontent.com/grap/grap-odoo-custom/12.0/mrp_sale_grouped/static/description/report_sales_sum_up.png
+
+.. figure:: https://raw.githubusercontent.com/grap/grap-odoo-custom/12.0/mrp_sale_grouped/static/description/production_wizard.png
+.. figure:: https://raw.githubusercontent.com/grap/grap-odoo-custom/12.0/mrp_sale_grouped/static/description/production_wizard_report.png
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+* To use wizard production assistant, you need to create BoMs for your products
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/grap/grap-odoo-custom/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/grap/grap-odoo-custom/issues/new?body=module:%20mrp_sale_grouped%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* GRAP
+
+Contributors
+~~~~~~~~~~~~
+
+* Quentin Dupont (quentin.dupont@grap.coop)
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `grap/grap-odoo-custom <https://github.com/grap/grap-odoo-custom/tree/12.0/mrp_sale_grouped>`_ project on GitHub.
+
+You are welcome to contribute.

mrp_sale_grouped/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "MRP Grouped Sales and Production",
     "summary": "Quickly manage what you need to produce thanks to grouped sales",
-    "version": "12.0.1.1.0",
+    "version": "12.0.1.2.0",
     "category": "GRAP - Custom",
     "author": "GRAP",
     "website": "https://github.com/grap/grap-odoo-custom",