Merge branch '12.0' of https://github.com/mga-odoo/odoobooks into 12.0

mga-odoo · Aug 24, 2019 · 5b0266e · 5b0266e
2 parents c933690 + 3ba1bd0
commit 5b0266e
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 342 deletions.
diff --git a/docs/_static/default.css b/docs/_static/default.css
@@ -10,3 +10,7 @@
 .section>img {
 	border: 1px solid #CCC;
 }
+
+.youtube-video {
+	height: 392px;
+}
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -2,7 +2,12 @@
 
 {%- block extrahead %}
 {{ super() }}
-<link rel="stylesheet" href="../_static/default.css" type="text/css">
+<link rel="stylesheet" href="../../_static/default.css" type="text/css"/>
+<style>
+  .youtube-video {
+  	height: 392px;
+  }
+</style>
 <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>
@@ -18,15 +23,20 @@
 {% endblock %}
 
 {% block comments %}
-  <div id="disqus_thread"></div>
-    <script>
-      (function() { // DON'T EDIT BELOW THIS LINE
-      var d = document, s = d.createElement('script');
-      s.src = 'https://openerpbook.disqus.com/embed.js';
-      s.setAttribute('data-timestamp', +new Date());
-      (d.head || d.body).appendChild(s);
-    })();
-    </script>
-  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-  <script id="dsq-count-scr" src="//openerpbook.disqus.com/count.js" async></script>
+<div class="admonition note">
+  <p class="first admonition-title">Note</p>
+  <p class="last">If you have any question about this page, do not hesitate to drop your question in below comment box.</p>
+</div>
+
+<div id="disqus_thread"></div>
+  <script>
+    (function() { // DON'T EDIT BELOW THIS LINE
+    var d = document, s = d.createElement('script');
+    s.src = 'https://openerpbook.disqus.com/embed.js';
+    s.setAttribute('data-timestamp', +new Date());
+    (d.head || d.body).appendChild(s);
+  })();
+  </script>
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<script id="dsq-count-scr" src="//openerpbook.disqus.com/count.js" async></script>
 {% endblock %}
diff --git a/docs/sales/quotation/apply_default_tax.rst → ...fault-taxes-when-creating-new-product.rst b/docs/sales/quotation/apply_default_tax.rst → ...fault-taxes-when-creating-new-product.rst
@@ -3,8 +3,8 @@
    single: Default tax on product
    single: Default tax on quotation
 
-Apply default taxes on products or sales order
-==============================================
+Apply default taxes when creating new product
+=============================================
 
 Taxes applied in your country are installed automatically for most
 localizations. Default taxes set in orders and invoices come from each
@@ -47,15 +47,14 @@ on which product.
 
 Video
 -----
-Access the video at https://www.youtube.com/watch?v=o9sVx6AIg5Q
+Access the video at https://www.youtube.com/watch?v=d4CdJY9RANA
 
 .. 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/o9sVx6AIg5Q" 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/d4CdJY9RANA" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
 
-
 .. |image0| image:: static/apply_default_tax/media/image6.png
 
 .. |image1| image:: static/apply_default_tax/media/image5.png

diff --git a/docs/sales/quotation/change_your_quotation_layout.rst b/docs/sales/quotation/change_your_quotation_layout.rst
diff --git a/docs/sales/quotation/compute_sales_margin.rst b/docs/sales/quotation/compute_sales_margin.rst
diff --git a/docs/sales/quotation/create-first-quotation-and-apply-discount.rst b/docs/sales/quotation/create-first-quotation-and-apply-discount.rst
@@ -16,5 +16,5 @@ Access the video at https://www.youtube.com/watch?v=Lc8q1DZcET0
 .. raw:: html
 
     <div style="text-align: center; margin-bottom: 2em;">
-    <iframe width="100%" height="380" src="https://www.youtube.com/embed/Lc8q1DZcET0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/Lc8q1DZcET0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
diff --git a/docs/sales/quotation/index.rst b/docs/sales/quotation/index.rst
@@ -8,8 +8,6 @@
 
    create-first-quotation-and-apply-discount.rst
    send-quotation-by-email-customer-sign-online.rst
-   change_your_quotation_layout.rst
-   set_default_terms_and_conditions.rst
-   apply_default_tax.rst
-   sections_on_sales_orders.rst
-   compute_sales_margin.rst
+   set-default-terms-and-condition-on-quotation.rst
+   apply-default-taxes-when-creating-new-product.rst
+   sections-on-quotation-to-separate-the-material-and-service.rst
diff --git a/.../sales/quotation/sections-on-quotation-to-separate-the-material-and-service.rst b/.../sales/quotation/sections-on-quotation-to-separate-the-material-and-service.rst
@@ -0,0 +1,19 @@
+
+.. index::
+   single: Sections on sales orders
+
+Sections on quotation to separate the material and service
+==========================================================
+Let’s take an example of the trading and service company who wants to
+send the quotation for Air-condition, related material, installation and annual
+maintenance contract service.
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=B2n3lxzpIHg
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/B2n3lxzpIHg" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>
diff --git a/docs/sales/quotation/sections_on_sales_orders.rst b/docs/sales/quotation/sections_on_sales_orders.rst
diff --git a/docs/sales/quotation/send-quotation-by-email-customer-sign-online.rst b/docs/sales/quotation/send-quotation-by-email-customer-sign-online.rst
@@ -14,5 +14,5 @@ Access the video at https://www.youtube.com/watch?v=J8LRXLinPXY
 .. raw:: html
 
     <div style="text-align: center; margin-bottom: 2em;">
-    <iframe width="100%" height="375" src="https://www.youtube.com/embed/J8LRXLinPXY" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/J8LRXLinPXY" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
     </div>
diff --git a/docs/sales/quotation/set-default-terms-and-condition-on-quotation.rst b/docs/sales/quotation/set-default-terms-and-condition-on-quotation.rst
@@ -0,0 +1,29 @@
+
+.. index::
+   single: Set default terms and condition
+
+Set default terms and condition on quotation
+============================================
+Let’s take an example of the trading company, they want to define the terms and
+conditions should be applied on all the quotation created by any salesman.
+
+They want to set the below point as a default terms and conditions:
+
+- This proposal is valid for 30 days
+- The goods will be delivered within 10 working days
+- All the taxes will be charged extra
+- The payment should be released immediately with confirmed order
+
+.. tip:: The payment terms will be added automatically at the end of
+  every quotation as a part of the terms and conditions in the printed
+  quotation if any.
+
+Video
+-----
+Access the video at https://www.youtube.com/watch?v=ch8qi47qzCI
+
+.. raw:: html
+
+    <div style="text-align: center; margin-bottom: 2em;">
+    <iframe width="100%" class="youtube-video" src="https://www.youtube.com/embed/ch8qi47qzCI" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+    </div>