Merge pull request #1 from mga-odoo/master

sales section changes
mga-odoo · Sep 1, 2018 · aa92057 · aa92057
2 parents 9b9d1f3 + 2af2af1
commit aa92057
Show file tree

Hide file tree

Showing 86 changed files with 126 additions and 173 deletions.
diff --git a/docs/sales/confirm_and_pay_online.rst → ...ustomer_portal/confirm_and_pay_online.rst b/docs/sales/confirm_and_pay_online.rst → ...ustomer_portal/confirm_and_pay_online.rst
diff --git a/docs/sales/online_approval.rst → ...sales/customer_portal/online_approval.rst b/docs/sales/online_approval.rst → ...sales/customer_portal/online_approval.rst
@@ -3,9 +3,12 @@
 .. index::
    single: Online customer approval on quotation
 
-==================================================================
-How to get customer approval on quotation through customer portal?
-==================================================================
+=======================================================
+Ask your customer to approve a quotation through portal
+=======================================================
+
+Video
+-----
 Access the video at https://www.youtube.com/watch?v=IEl0v3968kk
 
 .. raw:: html

diff --git a/docs/sales/online_payment.rst → .../sales/customer_portal/online_payment.rst b/docs/sales/online_payment.rst → .../sales/customer_portal/online_payment.rst
@@ -3,9 +3,9 @@
 .. index::
    single: Online approval and payment on order
 
-===============================================================
-How to get online payment on quotation through customer portal?
-===============================================================
+===================================================================
+Ask your customer to pay online payment on quotation through portal
+===================================================================
 
 Video
 -----

diff --git a/docs/sales/delivery_based_on_weight.rst → ...les/delivery/delivery_based_on_weight.rst b/docs/sales/delivery_based_on_weight.rst → ...les/delivery/delivery_based_on_weight.rst
@@ -17,7 +17,7 @@ Configuration
 -------------
 Activate the Shipping Costs feature form ``Sales / Configuration / Settings``.
 
-.. image:: images/chapter_02_21.png
+.. image:: ../images/chapter_02_21.png
    :alt: Shipping Costs Configuration
    :align: center
 
@@ -28,22 +28,22 @@ Setup the delivery charges
 Let's assume that you deliver the product to your customer through postal service and the service changres you based on weight.
 Postal service deliver to all over the USA at $20 fixed rates if the weight upto 1kg, when weight is above 1kg, they charge $8 for every 1kg.
 
-.. image:: images/chapter_02_22.png
+.. image:: ../images/chapter_02_22.png
    :alt: Delivery Cost Grid
    :align: center
 
 Goto ``Sales / Configure / Delivery Methods`` and create a new method *Postal Delivery*,
 select *Based on Rule* for **Provide** as the delivery cost is based on the weight and create a two rules.
 
-.. image:: images/chapter_02_23.png
+.. image:: ../images/chapter_02_23.png
    :alt: Delivery Rules
    :align: center
 
 Setup product weight
 ~~~~~~~~~~~~~~~~~~~~
 Do not forget to add the correct product weight while creating the products.
 
-.. image:: images/chapter_02_24.png
+.. image:: ../images/chapter_02_24.png
    :alt: Product Weight
    :align: center
 
@@ -55,7 +55,7 @@ You can now choose the Delivery Method on your sale order.
 If you want to invoice the price of the delivery charge on the sale order, click on Set price,
 it will add a line with the name of the delivery method as a product.
 
-.. image:: images/chapter_02_25.png
+.. image:: ../images/chapter_02_25.png
    :alt: Product Weight
    :align: center
 

diff --git a/docs/sales/free_delivery.rst → docs/sales/delivery/free_delivery.rst b/docs/sales/free_delivery.rst → docs/sales/delivery/free_delivery.rst
@@ -18,7 +18,7 @@ Configuration
 -------------
 Activate the Shipping Costs feature form ``Sales / Configuration / Settings``.
 
-.. image:: images/chapter_02_21.png
+.. image:: ../images/chapter_02_21.png
    :alt: Sales Settings
    :align: center
 
@@ -28,7 +28,7 @@ Setup the delivery charges
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 Let's assume that you deliver the product at fixed $50 and you deliver for free when total order value is more than $2000.
 
-.. image:: images/chapter_02_26.png
+.. image:: ../images/chapter_02_26.png
    :alt: Delivery Cost Grid
    :align: center
 
@@ -41,7 +41,7 @@ Setup product price
 ~~~~~~~~~~~~~~~~~~~
 Do not forget to add the correct product price when creating the products.
 
-.. image:: images/chapter_02_27.png
+.. image:: ../images/chapter_02_27.png
    :alt: Product Weight
    :align: center
 
@@ -51,7 +51,7 @@ You can now choose the Delivery Method on your sale order.
 If you want to invoice the price of the delivery charge on the sale order, click on Set price,
 it will add a line with the name of the delivery method as a product.
 
-.. image:: images/chapter_02_28.png
+.. image:: ../images/chapter_02_28.png
   :alt: Product Weight
   :align: center
 

diff --git a/docs/sales/index.rst b/docs/sales/index.rst
@@ -13,91 +13,86 @@ Sales Quotation
 .. toctree::
    :maxdepth: 1
 
-   create_my_first_quotation
-   send_quotation_by_email.rst
-   change_your_quotation_layout.rst
-   set_default_terms_and_conditions.rst
-   apply_default_tax.rst
-   sections_on_sales_orders.rst
+   ./quotation/create_my_first_quotation
+   ./quotation/send_quotation_by_email.rst
+   ./quotation/change_your_quotation_layout.rst
+   ./quotation/set_default_terms_and_conditions.rst
+   ./quotation/apply_default_tax.rst
+   ./quotation/sections_on_sales_orders.rst
+   ./quotation/compute_sales_margin.rst
 
 Quotation Template
 ------------------
 .. toctree::
    :maxdepth: 1
 
-   quick_create_quotation_using_quotation_template.rst
-   increase_your_sales_with_suggested_products.rst
-   online_customer_approval_on_quotation.rst
-   online_customer_approval_and_payment_on_quotation.rst
+   ./quotation_template/quick_create_quotation_using_quotation_template.rst
+   ./quotation_template/increase_your_sales_with_suggested_products.rst
+   ./quotation_template/online_customer_approval_on_quotation.rst
+   ./quotation_template/online_customer_approval_and_payment_on_quotation.rst
 
-Product and Pricing
--------------------
+Discounts and Pricelist
+-----------------------
 .. toctree::
    :maxdepth: 1
 
-   apply_manual_discount.rst
-   adapt_price_based_on_customer_segment.rst
-   adapt_price_based_on_customer_location.rst
-   compute_and_apply_discount_from_pricelist.rst
+   ./pricelist_discount/apply_manual_discount.rst
+   ./pricelist_discount/adapt_price_based_on_customer_segment.rst
+   ./pricelist_discount/adapt_price_based_on_customer_location.rst
+   ./pricelist_discount/compute_and_apply_discount_from_pricelist.rst
    ../inventory/inventory_costing/average_costing.rst
-   product_price_per_company.rst
-
-Sales Margin
-------------
-.. toctree::
-  :maxdepth: 1
-
-  compute_sales_margin.rst
+   ./pricelist_discount/product_price_per_company.rst
 
 Unit of Measure
 ---------------
 .. toctree::
    :maxdepth: 1
 
-   product_unit_of_measure.rst
-   pricelist_for_uom.rst
+   ./unit_of_measure/product_unit_of_measure.rst
+   ./unit_of_measure/pricelist_for_uom.rst
+   ./unit_of_measure/product_packaging.rst
 
 Product and Tax
 ---------------
 .. toctree::
    :maxdepth: 1
 
-   price_including_tax.rst
-   price_including_tax_and_excluding_tax.rst
+   ./product_tax/price_including_tax.rst
+   ./product_tax/price_including_tax_and_excluding_tax.rst
 
 Invoicing
 ---------
 .. toctree::
   :maxdepth: 1
 
-  pro-forma.rst
-  invoice_on_order_qty.rst
-  invoice_on_deliver_qty.rst
-  credit_note_from_order.rst
-  single_order_for_multiple_orders.rst
+  ./invoicing/pro-forma.rst
+  ./invoicing/invoice_on_order_qty.rst
+  ./invoicing/invoice_on_deliver_qty.rst
+  ./invoicing/credit_note_from_order.rst
+  ./invoicing/single_order_for_multiple_orders.rst
 
 Delivery Charges
 ----------------
 .. toctree::
    :maxdepth: 1
 
-   free_delivery.rst
-   delivery_based_on_weight.rst
+   ./delivery/free_delivery.rst
+   ./delivery/delivery_based_on_weight.rst
 
 Manage Inventory
 ----------------
 .. toctree::
    :maxdepth: 1
 
-   make_to_order.rst
+   ./inventory/make_to_order.rst
 
 Service Product
 ---------------
 .. toctree::
   :maxdepth: 1
 
-  invoice_milestones.rst
-  invoice_based_on_timesheet.rst
+  ./service/invoice_milestones.rst
+  ./service/invoice_based_on_timesheet.rst
 
 Subscription
 ------------
@@ -113,6 +108,6 @@ Customer Portal
 .. toctree::
   :maxdepth: 1
 
-  online_approval.rst
-  online_payment.rst
-  confirm_and_pay_online.rst
+  ./customer_portal/online_approval.rst
+  ./customer_portal/online_payment.rst
+  ./customer_portal/confirm_and_pay_online.rst
diff --git a/docs/sales/make_to_order.rst → docs/sales/inventory/make_to_order.rst b/docs/sales/make_to_order.rst → docs/sales/inventory/make_to_order.rst
@@ -3,9 +3,9 @@
 .. index::
    single: Sales that create purchase order
 
-=======================================================
-How to trigger the purchase of products based on sales?
-=======================================================
+=========================================================
+Create a purchase order for products based on sales order
+=========================================================
 
 Video
 -----

diff --git a/docs/sales/credit_note_from_order.rst → ...ales/invoicing/credit_note_from_order.rst b/docs/sales/credit_note_from_order.rst → ...ales/invoicing/credit_note_from_order.rst
diff --git a/docs/sales/invoice_on_deliver_qty.rst → ...ales/invoicing/invoice_on_deliver_qty.rst b/docs/sales/invoice_on_deliver_qty.rst → ...ales/invoicing/invoice_on_deliver_qty.rst
diff --git a/docs/sales/invoice_on_order_qty.rst → .../sales/invoicing/invoice_on_order_qty.rst b/docs/sales/invoice_on_order_qty.rst → .../sales/invoicing/invoice_on_order_qty.rst
diff --git a/docs/sales/pro-forma.rst → docs/sales/invoicing/pro-forma.rst b/docs/sales/pro-forma.rst → docs/sales/invoicing/pro-forma.rst
diff --git a/...ales/single_order_for_multiple_orders.rst → ...cing/single_order_for_multiple_orders.rst b/...ales/single_order_for_multiple_orders.rst → ...cing/single_order_for_multiple_orders.rst
@@ -3,9 +3,9 @@
 .. index::
    single: Single invoice form multiple sale orders
 
-========================================================
-How to create single invoice from multiple sales orders?
-========================================================
+================================================
+Create single invoice from multiple sales orders
+================================================
 
 Video
 -----

diff --git a/...dapt_price_based_on_customer_location.rst → ...dapt_price_based_on_customer_location.rst b/...dapt_price_based_on_customer_location.rst → ...dapt_price_based_on_customer_location.rst
@@ -160,26 +160,17 @@ Access the video at https://www.youtube.com/watch?v=YMXc4W5cHNg
 
 
 .. |image0| image:: static/price_based_on_customer/media/image15.png
-   :width: 6.5in
-   :height: 2.76389in
+
 .. |image1| image:: static/price_based_on_customer/media/image9.png
-   :width: 6.5in
-   :height: 2.72222in
+
 .. |image2| image:: static/price_based_on_customer/media/image13.png
-   :width: 6.5in
-   :height: 2.18056in
+
 .. |image3| image:: static/price_based_on_customer/media/image11.png
-   :width: 6.5in
-   :height: 2.80556in
+
 .. |image4| image:: static/price_based_on_customer/media/image16.png
-   :width: 6.5in
-   :height: 4.02778in
+
 .. |image5| image:: static/price_based_on_customer/media/image8.png
-   :width: 6.5in
-   :height: 3.04167in
+
 .. |image6| image:: static/price_based_on_customer/media/image10.png
-   :width: 6.5in
-   :height: 2.34722in
+
 .. |image7| image:: static/price_based_on_customer/media/image14.png
-   :width: 6.5in
-   :height: 3.02778in
diff --git a/...adapt_price_based_on_customer_segment.rst → ...adapt_price_based_on_customer_segment.rst b/...adapt_price_based_on_customer_segment.rst → ...adapt_price_based_on_customer_segment.rst
@@ -122,14 +122,9 @@ Access the video at https://www.youtube.com/watch?v=MKStY2Tt1l0
     </div>
 
 .. |image0| image:: static/price_based_on_currency/media/image7.png
-   :width: 6.5in
-   :height: 2.72222in
+
 .. |image1| image:: static/price_based_on_currency/media/image3.png
-   :width: 6.5in
-   :height: 2.80556in
+
 .. |image2| image:: static/price_based_on_currency/media/image8.png
-   :width: 6.5in
-   :height: 3.77778in
+
 .. |image3| image:: static/price_based_on_currency/media/image6.png
-   :width: 6.5in
-   :height: 3.02778in
diff --git a/docs/sales/apply_manual_discount.rst → ...celist_discount/apply_manual_discount.rst b/docs/sales/apply_manual_discount.rst → ...celist_discount/apply_manual_discount.rst
@@ -75,8 +75,5 @@ Access the video at https://www.youtube.com/watch?v=tq3e17Ccjxk
     </div>
 
 .. |image0| image:: static/apply_manual_discount/media/image4.png
-   :width: 6.5in
-   :height: 2.11111in
+
 .. |image1| image:: static/apply_manual_discount/media/image2.png
-   :width: 6.5in
-   :height: 2.88889in
diff --git a/...ute_and_apply_discount_from_pricelist.rst → ...ute_and_apply_discount_from_pricelist.rst b/...ute_and_apply_discount_from_pricelist.rst → ...ute_and_apply_discount_from_pricelist.rst
@@ -122,14 +122,9 @@ Access the video at https://www.youtube.com/watch?v=J41EpiT0a5g
     </div>
 
 .. |image0| image:: static/compute_and_apply_discount_from_pricelist/media/image6.png
-   :width: 6.5in
-   :height: 3.09722in
+
 .. |image1| image:: static/compute_and_apply_discount_from_pricelist/media/image7.png
-   :width: 6.5in
-   :height: 2.80556in
+
 .. |image2| image:: static/compute_and_apply_discount_from_pricelist/media/image8.png
-   :width: 6.5in
-   :height: 4.02778in
+
 .. |image3| image:: static/compute_and_apply_discount_from_pricelist/media/image5.png
-   :width: 6.5in
-   :height: 3.02778in
diff --git a/docs/sales/product_price_per_company.rst → ...st_discount/product_price_per_company.rst b/docs/sales/product_price_per_company.rst → ...st_discount/product_price_per_company.rst
diff --git a/...ic/apply_manual_discount/media/image2.png → ...ic/apply_manual_discount/media/image2.png b/...ic/apply_manual_discount/media/image2.png → ...ic/apply_manual_discount/media/image2.png
diff --git a/...ic/apply_manual_discount/media/image4.png → ...ic/apply_manual_discount/media/image4.png b/...ic/apply_manual_discount/media/image4.png → ...ic/apply_manual_discount/media/image4.png
diff --git a/..._discount_from_pricelist/media/image5.png → ..._discount_from_pricelist/media/image5.png b/..._discount_from_pricelist/media/image5.png → ..._discount_from_pricelist/media/image5.png
diff --git a/..._discount_from_pricelist/media/image6.png → ..._discount_from_pricelist/media/image6.png b/..._discount_from_pricelist/media/image6.png → ..._discount_from_pricelist/media/image6.png
diff --git a/..._discount_from_pricelist/media/image7.png → ..._discount_from_pricelist/media/image7.png b/..._discount_from_pricelist/media/image7.png → ..._discount_from_pricelist/media/image7.png
diff --git a/..._discount_from_pricelist/media/image8.png → ..._discount_from_pricelist/media/image8.png b/..._discount_from_pricelist/media/image8.png → ..._discount_from_pricelist/media/image8.png
diff --git a/.../price_based_on_currency/media/image3.png → .../price_based_on_currency/media/image3.png b/.../price_based_on_currency/media/image3.png → .../price_based_on_currency/media/image3.png
diff --git a/.../price_based_on_currency/media/image6.png → .../price_based_on_currency/media/image6.png b/.../price_based_on_currency/media/image6.png → .../price_based_on_currency/media/image6.png
diff --git a/.../price_based_on_currency/media/image7.png → .../price_based_on_currency/media/image7.png b/.../price_based_on_currency/media/image7.png → .../price_based_on_currency/media/image7.png
diff --git a/.../price_based_on_currency/media/image8.png → .../price_based_on_currency/media/image8.png b/.../price_based_on_currency/media/image8.png → .../price_based_on_currency/media/image8.png
diff --git a/...price_based_on_customer/media/image10.png → ...price_based_on_customer/media/image10.png b/...price_based_on_customer/media/image10.png → ...price_based_on_customer/media/image10.png
diff --git a/...price_based_on_customer/media/image11.png → ...price_based_on_customer/media/image11.png b/...price_based_on_customer/media/image11.png → ...price_based_on_customer/media/image11.png
diff --git a/...price_based_on_customer/media/image13.png → ...price_based_on_customer/media/image13.png b/...price_based_on_customer/media/image13.png → ...price_based_on_customer/media/image13.png
diff --git a/...price_based_on_customer/media/image14.png → ...price_based_on_customer/media/image14.png b/...price_based_on_customer/media/image14.png → ...price_based_on_customer/media/image14.png
diff --git a/...price_based_on_customer/media/image15.png → ...price_based_on_customer/media/image15.png b/...price_based_on_customer/media/image15.png → ...price_based_on_customer/media/image15.png
diff --git a/...price_based_on_customer/media/image16.png → ...price_based_on_customer/media/image16.png b/...price_based_on_customer/media/image16.png → ...price_based_on_customer/media/image16.png
diff --git a/.../price_based_on_customer/media/image8.png → .../price_based_on_customer/media/image8.png b/.../price_based_on_customer/media/image8.png → .../price_based_on_customer/media/image8.png
diff --git a/.../price_based_on_customer/media/image9.png → .../price_based_on_customer/media/image9.png b/.../price_based_on_customer/media/image9.png → .../price_based_on_customer/media/image9.png
diff --git a/docs/sales/price_including_tax.rst → ...sales/product_tax/price_including_tax.rst b/docs/sales/price_including_tax.rst → ...sales/product_tax/price_including_tax.rst
@@ -4,9 +4,9 @@
    single: Tax Included in Price
    single: Business to Customer Prices (Tax included)
 
-=============================================================
-How to manage prices for Business to Customer (tax included)?
-=============================================================
+=====================================================
+Manage prices for Business to Customer (tax included)
+=====================================================
 
 Video
 -----

diff --git a/...price_including_tax_and_excluding_tax.rst → ...price_including_tax_and_excluding_tax.rst b/...price_including_tax_and_excluding_tax.rst → ...price_including_tax_and_excluding_tax.rst
@@ -4,9 +4,9 @@
    single: Tax Included in Price
    single: Tax Excluded from Price
 
-===========================================================================
-How to manage product prices for B2B (tax excluded) and B2C (tax included)?
-===========================================================================
+===================================================================
+Manage product prices for B2B (tax excluded) and B2C (tax included)
+===================================================================
 
 Video
 -----

diff --git a/docs/sales/apply_default_tax.rst → docs/sales/quotation/apply_default_tax.rst b/docs/sales/apply_default_tax.rst → docs/sales/quotation/apply_default_tax.rst
@@ -57,11 +57,7 @@ Access the video at https://www.youtube.com/watch?v=tq3e17Ccjxk
 
 
 .. |image0| image:: static/apply_default_tax/media/image6.png
-   :width: 6.5in
-   :height: 1.91667in
+
 .. |image1| image:: static/apply_default_tax/media/image5.png
-   :width: 6.5in
-   :height: 2.02778in
+
 .. |image2| image:: static/apply_default_tax/media/image3.png
-   :width: 6.5in
-   :height: 2.63889in
diff --git a/docs/sales/change_your_quotation_layout.rst → ...uotation/change_your_quotation_layout.rst b/docs/sales/change_your_quotation_layout.rst → ...uotation/change_your_quotation_layout.rst
@@ -43,8 +43,5 @@ configuration, now your quotation will be printed with the new layout.
 |image1|
 
 .. |image0| image:: static/change_your_quotatio_layout/media/image4.png
-   :width: 6.5in
-   :height: 2.26389in
+
 .. |image1| image:: static/change_your_quotatio_layout/media/image2.png
-   :width: 4.71943in
-   :height: 6.11979in