diff --git a/content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst b/content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst index 258b4b73ae..add55e0b3b 100644 --- a/content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst +++ b/content/applications/inventory_and_mrp/purchase/manage_deals/manage.rst @@ -14,39 +14,25 @@ vendor. Vendor bills record payables as they arrive from vendors, and can includ the goods and/or services purchased, sales taxes, freight and delivery charges, and more. In Odoo, a vendor bill can be created at different points in the purchasing process, depending on -the *bill control* policy chosen in the *Purchase* app's settings. +the *bill control* policy selected on the product's settings. Bill control policies ===================== -To configure the default bill control policy, navigate to :menuselection:`Purchase app --> -Configuration --> Settings`, and scroll to the :guilabel:`Invoicing` section. +To configure a product's bill control policy, navigate to :menuselection:`Purchase app --> Products +Products`, and click on the desired product to open it. Then, click on the :guilabel:`Purchase` tab. +Under the *Vendor Bills* section, the *Control Policy* field lists two policy options: -The :guilabel:`Bill Control` feature lists two policy options: :guilabel:`Ordered quantities` and -:guilabel:`Received quantities`. - -The policy selected acts as the default for any new product created. Each policy acts as follows: - -- :guilabel:`Ordered quantities`: creates a vendor bill as soon as a purchase order is confirmed. +- :guilabel:`On ordered quantities`: creates a vendor bill as soon as a purchase order is confirmed. The products and quantities in the purchase order are used to generate a draft bill. -- :guilabel:`Received quantities`: a bill is only created **after** all (or part) of the total order - has been received. The products and quantities received are used to generate a draft bill. +- :guilabel:`On received quantities`: a bill is only created **after** all (or part) of the total + order has been received. The products and quantities received are used to generate a draft bill. .. image:: manage/manage-configuration-settings.png - :align: center - :alt: Bill control policies in purchase app settings. + :alt: Bill control policies on a product record. Once a policy is selected, click :guilabel:`Save` to save the changes. -.. tip:: - If a product needs a different control policy than the one set in the *Purchase* app settings, - that product's control policy can be overridden by going to the :guilabel:`Purchase` tab on a - product form, and selecting the desired policy in the :guilabel:`Control Policy` field. - - .. image:: manage/manage-product-form.png - :align: center - :alt: Control policy field on product form. - 3-way matching -------------- @@ -62,105 +48,6 @@ Tick the checkbox next to :guilabel:`3-way matching`, and click :guilabel:`Save` The :guilabel:`3-way matching` feature is **only** intended to work with the :guilabel:`Bill Control` policy set to :guilabel:`Received quantities`. -Create and manage vendor bills on receipts -========================================== - -When products are received into a company's warehouse, receipts are created. Once the company -processes the received quantities, they can choose to create a vendor bill directly from the -warehouse receipt form. - -Depending on the bill control policy chosen in the settings, vendor bill creation is completed at -different steps of the procurement process. - -Ordered quantities ------------------- - -To create and manage vendor bills for receipts with the *Bill Control* policy set to *Ordered -Quantities*, first navigate to the :menuselection:`Purchase app`, and click :guilabel:`New` from the -:guilabel:`Requests for Quotation` dashboard. - -Doing so opens a new :guilabel:`Request for Quotation` (RfQ) form. On the blank |RfQ| form, add a -:guilabel:`Vendor`, and click :guilabel:`Add a line` under the :guilabel:`Product` tab to add -products to the order. - -On the product line, select a product from the drop-down menu in the :guilabel:`Product` field, and -enter the quantity to order in the :guilabel:`Quantity` field. - -Once ready, click :guilabel:`Confirm Order` to confirm the |RfQ| into a |PO|. - -Then, click :guilabel:`Create Bill` to create a vendor bill. This opens a :guilabel:`Vendor Bill` -form in the :guilabel:`Draft` state. From here, add a billing date in the :guilabel:`Bill Date` -field. - -Once ready, confirm the bill by clicking :guilabel:`Confirm` on the :guilabel:`Vendor Bill` page. - -.. tip:: - Since the bill control policy is set to *Ordered quantities*, the draft bill can be confirmed as - soon as it is created, before any products have been received. - -Once a payment has been received, click :guilabel:`Register Payment` at the top of the bill to -record it. - -Doing so causes a :guilabel:`Register Payment` pop-up window to appear, wherein a payment -:guilabel:`Journal` can be chosen, and a :guilabel:`Payment Method` selected. - -Additionally, the bill :guilabel:`Amount`, :guilabel:`Payment Date`, and :guilabel:`Memo` -(:dfn:`Reference Number`) can be edited from this pop-up window, if necessary. - -Once ready, click :guilabel:`Create Payment` to finish creating the :guilabel:`Vendor Bill`. Doing -so displays a green :guilabel:`Paid` banner on the |RfQ| form. - -.. image:: manage/manage-draft-vendor-bill.png - :align: center - :alt: Vendor bill form for ordered quantities control policy. - -Received quantities -------------------- - -To create and manage vendor bills for receipts with the bill control policy set to *Received -quantities*, first navigate to the :menuselection:`Purchase` app, and click :guilabel:`New`. - -Doing so opens a new |RfQ| form. On the blank |RfQ| form, add a :guilabel:`Vendor`, and click -:guilabel:`Add a line` under the :guilabel:`Product` tab to add products to the order. - -On the product line, select a product from the drop-down menu in the :guilabel:`Product` field, and -enter the quantity to order in the :guilabel:`Quantity` field. - -Once ready, click :guilabel:`Confirm Order` to confirm the |RfQ| into a |PO|. - -.. important:: - When using the *Received quantities* control policy, clicking :guilabel:`Create Bill` before any - products are received causes an :guilabel:`Invalid Operation` pop-up window to appear. - - Odoo requires at least partial quantities of the items included in the |PO| to be received in - order to create a vendor bill. - - .. image:: manage/manage-user-error-popup.png - :align: center - :alt: User error pop-up for received quantities control policy. - -On the |PO|, click the :guilabel:`Receipt` smart button to view the warehouse receipt form. - -From here, click :guilabel:`Validate` to register the :guilabel:`Done` (received) quantities. - -Then, navigate back to the |PO|, via the breadcrumb, and click :guilabel:`Create Bill`. - -This opens a :guilabel:`Vendor Bill` form in the :guilabel:`Draft` state. From here, add a billing -date in the :guilabel:`Bill Date` field. Once ready, confirm the bill by clicking -:guilabel:`Confirm` at the top of the draft. - -Once a payment has been received, click :guilabel:`Register Payment` at the top of the bill to -record it. - -Doing so causes a :guilabel:`Register Payment` pop-up window to appear, wherein a payment -:guilabel:`Journal` can be chosen, and a :guilabel:`Payment Method` selected. - -Additionally, the bill :guilabel:`Amount`, :guilabel:`Payment Date`, and :guilabel:`Memo` -(:dfn:`Reference Number`) can be edited from this pop-up window, if necessary. - -Once ready, click :guilabel:`Create Payment` to finish creating the :guilabel:`Vendor Bill`. Doing -so displays a green :guilabel:`Paid` banner on the |RfQ| form. - Manage vendor bills in Accounting ================================= diff --git a/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-configuration-settings.png b/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-configuration-settings.png index 6f4c0c6262..84698a307f 100644 Binary files a/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-configuration-settings.png and b/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-configuration-settings.png differ diff --git a/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-product-form.png b/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-product-form.png deleted file mode 100644 index 244fdabca9..0000000000 Binary files a/content/applications/inventory_and_mrp/purchase/manage_deals/manage/manage-product-form.png and /dev/null differ