Merge branch '12.0' into 13.0

mga-odoo · May 10, 2020 · 4880f66 · 4880f66
2 parents 0fc56a5 + 82ebee9
commit 4880f66
Show file tree

Hide file tree

Showing 40 changed files with 294 additions and 227 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+bin/
+pyvenv.cfg
 .Python
 .DS_Store
 build/

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Documentation Status](https://readthedocs.org/projects/odoobooks/badge/?version=latest)](http://odoobooks.com/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/odoobooks/badge/?version=12.0)](http://odoobooks.com/en/12.0/?badge=12.0)
 
 Read book at https://odoobooks.com
 

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -8,6 +8,7 @@
   	height: 392px;
   }
 </style>
+<meta name="google-site-verification" content="rF_YUUKiMldqe4r_XXAQdjf3g49-S_iBjgVwFgtu_tI" />
 <meta name="google-site-verification" content="rKELnLnT-Vm9xKLXSPS-13bPq_r5VPzCUxnMDfNFPHY" />
 <meta name="google-site-verification" content="jQjkkn8yDzYdYe0ib6IDXXlhHf4fulQRmjW3F3ovWtw" />
 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-530c64087def677e"></script>

diff --git a/docs/images/odoo-12-book-small.png b/docs/images/odoo-12-book-small.png
diff --git a/docs/images/odoo-12-book-title-small.png b/docs/images/odoo-12-book-title-small.png
diff --git a/docs/images/odoo-12-book.png b/docs/images/odoo-12-book.png
diff --git a/docs/index.rst b/docs/index.rst
@@ -7,7 +7,7 @@
    single: Home
 
 .. meta::
-  :description: Odoo 12 Best Practices
+  :description: Odoo 13 Best Practices
   :keywords: Odoo Book, Odoo Online, Online Odoo Book, Odoo Functional Book, Version 12.0
 
 Odoo 13 Best Practices
@@ -17,7 +17,7 @@ business application out-of-the box for their business.
 
 **Odoo 13 Best Practices Book** is an online book written based on
 Community and Enterprise Edition. This book covers best implementation practice
-for most used applications such as Sales, Purchase, Inventory,
+for most used applications such as Sales, Purchase, Inventory, 
 Financial Accounting and Manufacturing.
 
 .. note:: Please comment on the page below, if you have any question related to
@@ -28,11 +28,6 @@ Financial Accounting and Manufacturing.
 
 Search the topics by :ref:`genindex` or start reading the book by :ref:`toc`.
 
-.. tip:: Get access to all the cool new feature and apps coming to `Odoo Version 13.0 <https://www.youtube.com/playlist?list=PL7QQBoSEJJH4LC61pM0gPELlCL85cXyvl>`_.
-
-  All the videos are created without demo data, so you can actually see how easy
-  to configure the feature in order to test the feature.
-
 .. toctree::
    :maxdepth: 3
 

diff --git a/docs/sales/delivery/add_margin_to_delivery_price.rst b/docs/sales/delivery/add_margin_to_delivery_price.rst
diff --git a/...les/delivery/delivery_based_on_weight.rst → ...hipping-rates-based-on-product-weight.rst b/...les/delivery/delivery_based_on_weight.rst → ...hipping-rates-based-on-product-weight.rst
@@ -61,10 +61,10 @@ it will add a line with the name of the delivery method as a product.
 
 Video
 -----
-Access the video at https://www.youtube.com/watch?v=o1QOCiWOnwk
+Access the video at https://www.youtube.com/watch?v=4gng3eRd13A
 
 .. raw:: html
 
-    <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
-        <iframe src="https://www.youtube.com/embed/o1QOCiWOnwk" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 700px; height: 385px;"></iframe>
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/4gng3eRd13A" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
diff --git a/docs/sales/delivery/delivery-price-based-on-the-area-zip-code-state-or-country.rst b/docs/sales/delivery/delivery-price-based-on-the-area-zip-code-state-or-country.rst
@@ -0,0 +1,17 @@
+
+.. index::
+   single: Delivery charges based on zip code, state or country
+
+=============================================================
+Delivery price based on the area (zip code, state or country)
+=============================================================
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=7QiYpRAVlKE
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/7QiYpRAVlKE" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/delivery/free_delivery.rst → ...the-order-total-is-more-than-usd-2000.rst b/docs/sales/delivery/free_delivery.rst → ...the-order-total-is-more-than-usd-2000.rst
@@ -5,7 +5,7 @@
    single: Free delivery
 
 ===============================================
-Free delivery if order total is more then $2000
+Free delivery if order total is more than $2000
 ===============================================
 Odoo can handle various delivery methods, but it is not activated by default.
 Delivery methods can be used for normal sale of you can also use for your e-commerce order.
@@ -57,10 +57,10 @@ it will add a line with the name of the delivery method as a product.
 
 Video
 -----
-Access the video at https://www.youtube.com/watch?v=JPpUPbTeJD0
+Access the video at https://www.youtube.com/watch?v=JDmpvFqVmzw
 
 .. raw:: html
 
-    <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
-        <iframe src="https://www.youtube.com/embed/JPpUPbTeJD0" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 700px; height: 385px;"></iframe>
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/JDmpvFqVmzw" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
diff --git a/docs/sales/delivery/index.rst b/docs/sales/delivery/index.rst
@@ -5,7 +5,7 @@
 .. toctree::
    :maxdepth: 1
 
-   free_delivery.rst
-   delivery_based_on_weight.rst
-   restrict_delivery_area.rst
-   add_margin_to_delivery_price.rst
+   free-delivery-if-the-order-total-is-more-than-usd-2000.rst
+   calculate-shipping-rates-based-on-product-weight.rst
+   delivery-price-based-on-the-area-zip-code-state-or-country.rst
+   manage-delivery-price-fluctuation-apply-margin-on-the-delivery-charges.rst
diff --git a/...very/manage-delivery-price-fluctuation-apply-margin-on-the-delivery-charges.rst b/...very/manage-delivery-price-fluctuation-apply-margin-on-the-delivery-charges.rst
@@ -0,0 +1,17 @@
+
+.. index::
+   single: Margin on the delivery charges
+
+=======================================================================
+Manage delivery price fluctuation, apply margin on the delivery charges
+=======================================================================
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=2nbCQNYtWHY
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/2nbCQNYtWHY" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/delivery/restrict_delivery_area.rst b/docs/sales/delivery/restrict_delivery_area.rst
diff --git a/docs/sales/index.rst b/docs/sales/index.rst
@@ -59,6 +59,12 @@ Invoicing
 
   invoicing/index.rst
 
+Customer Portal
+---------------
+  .. toctree::
+    :maxdepth: 1
+
+    customer-portal/index.rst
 
 Delivery Charges
 ----------------
@@ -87,10 +93,3 @@ Subscription
   :maxdepth: 1
 
   subscription/index.rst
-
-Customer Portal
----------------
-.. toctree::
-  :maxdepth: 1
-
-  customer-portal/index.rst
diff --git a/.../inventory/consignment_stock_transfer.rst → ...voice-when-stock-sold-by-the-retailer.rst b/.../inventory/consignment_stock_transfer.rst → ...voice-when-stock-sold-by-the-retailer.rst
@@ -22,10 +22,10 @@ returns for the unsold items.
 
 Video
 -----
-Access the video at https://www.youtube.com/watch?v=1GAACoZorr4
+Access the video at https://www.youtube.com/watch?v=qDkSGfP1a7E
 
 .. raw:: html
 
-    <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
-        <iframe src="https://www.youtube.com/embed/1GAACoZorr4" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 700px; height: 385px;"></iframe>
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/qDkSGfP1a7E" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
diff --git a/docs/sales/inventory/create-a-purchase-order-for-products-based-on-sales-order.rst b/docs/sales/inventory/create-a-purchase-order-for-products-based-on-sales-order.rst
@@ -0,0 +1,18 @@
+.. _maketoordersale:
+
+.. index::
+   single: Sales that create purchase order
+
+=========================================================
+Create a purchase order for products based on sales order
+=========================================================
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=CPaDx5KSp6w
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/CPaDx5KSp6w" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/inventory/index.rst b/docs/sales/inventory/index.rst
@@ -5,7 +5,7 @@
 .. toctree::
    :maxdepth: 1
 
-   make_to_order.rst
+   create-a-purchase-order-for-products-based-on-sales-order.rst
    sell_product_stored_at_other_then_stock_locaion.rst
-   consignment_stock_transfer.rst
-   receive_buy_back_item_and_apply_buy_back_discount.rst
+   consignment-stock-transfer-raise-an-invoice-when-stock-sold-by-the-retailer.rst
+   manage-sell-and-buy-back-of-used-product.rst
diff --git a/docs/sales/inventory/make_to_order.rst b/docs/sales/inventory/make_to_order.rst
diff --git a/docs/sales/inventory/manage-sell-and-buy-back-of-used-product.rst b/docs/sales/inventory/manage-sell-and-buy-back-of-used-product.rst
@@ -0,0 +1,24 @@
+.. _subcontracting:
+
+.. meta::
+   :description: Receive buy back product in Inventory, reduce invoice value according to the product's buyback price
+   :keywords: Odoo, Inventory, BuyBack, Receive Old Items, Sell new Items, Apply BuyBack Discount
+
+.. index::
+   single: Buy-back of used product
+   single: Buy-back Discount
+
+========================================
+Manage sell and buy-back of used product
+========================================
+
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=lVgtMqoLHbs
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/lVgtMqoLHbs" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/inventory/receive_buy_back_item_and_apply_buy_back_discount.rst b/docs/sales/inventory/receive_buy_back_item_and_apply_buy_back_discount.rst
diff --git a/docs/sales/inventory/sell_product_stored_at_other_then_stock_locaion.rst b/docs/sales/inventory/sell_product_stored_at_other_then_stock_locaion.rst
@@ -26,10 +26,3 @@ you would like to make the delivery.
 
 Video
 -----
-Access the video at https://www.youtube.com/watch?v=wYLSMSQjtr0
-
-.. raw:: html
-
-    <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
-        <iframe src="https://www.youtube.com/embed/wYLSMSQjtr0" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 700px; height: 385px;"></iframe>
-    </div>
diff --git a/docs/sales/invoicing/create-credit-note-from-sale-order.rst b/docs/sales/invoicing/create-credit-note-from-sale-order.rst
@@ -0,0 +1,30 @@
+.. _creditnotefromorder:
+
+.. index::
+   single: Create credit note from sales order
+
+=====================================================================
+Create credit note from sales order, when customer return the product
+=====================================================================
+
+Business Case
+-------------
+Assume that your customer place bulk order, so the invoicing policy you follow
+is to send the invoice just after the delivery based on the delivery.
+
+But, for you the biggest challenge is how to control the invoice or credit note
+based on the sale delivery or return of some products when inventory is not
+managed in Odoo.
+
+Let's see how to create an invoice or credit note based on the delivery or return
+when inventory application is not managed in Odoo.
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=vjdgXq5tC2c
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/vjdgXq5tC2c" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/invoicing/create-invoice-based-on-the-delivered-quantity.rst b/docs/sales/invoicing/create-invoice-based-on-the-delivered-quantity.rst
@@ -0,0 +1,29 @@
+.. _invoiceondeliverqty:
+
+.. index::
+   single: Invoice based on delivered quantity (no inventory app)
+
+==============================================
+Create invoice based on the delivered quantity
+==============================================
+
+Business Case
+-------------
+Assume that your customer place bulk order, you need long time to deliver order.
+So, you would like to send the invoice just after the delivery based on the delivery.
+
+But, for you the biggest challenge is how to control the invoice based on the delivery
+when inventory is not managed in Odoo.
+
+Let's see how to create an invoice based on the delivery when inventory application
+is not managed in Odoo.
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=d7aPQQkXV-o
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/d7aPQQkXV-o" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>