diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png deleted file mode 100644 index bdbf34c4205..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png deleted file mode 100644 index 151a0ca88dd..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png deleted file mode 100644 index c491c0a6602..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png deleted file mode 100644 index 63701a3cb29..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png deleted file mode 100644 index d016ec053f5..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png b/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png deleted file mode 100644 index 2fc511c01f3..00000000000 Binary files a/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code.png b/erpnext/docs/assets/img/articles/Supplier Item Code.png deleted file mode 100644 index cea3f1445df..00000000000 Binary files a/erpnext/docs/assets/img/articles/Supplier Item Code.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/editing-uom-in-po.gif b/erpnext/docs/assets/img/articles/editing-uom-in-po.gif new file mode 100644 index 00000000000..d59ff58f233 Binary files /dev/null and b/erpnext/docs/assets/img/articles/editing-uom-in-po.gif differ diff --git a/erpnext/docs/assets/img/articles/for-supplier-1.gif b/erpnext/docs/assets/img/articles/for-supplier-1.gif new file mode 100644 index 00000000000..821bc28d550 Binary files /dev/null and b/erpnext/docs/assets/img/articles/for-supplier-1.gif differ diff --git a/erpnext/docs/assets/img/articles/for-supplier-2.png b/erpnext/docs/assets/img/articles/for-supplier-2.png new file mode 100644 index 00000000000..20ebde726a0 Binary files /dev/null and b/erpnext/docs/assets/img/articles/for-supplier-2.png differ diff --git a/erpnext/docs/assets/img/articles/for-supplier-3.png b/erpnext/docs/assets/img/articles/for-supplier-3.png new file mode 100644 index 00000000000..4d00d5e1122 Binary files /dev/null and b/erpnext/docs/assets/img/articles/for-supplier-3.png differ diff --git a/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png b/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png new file mode 100644 index 00000000000..e076e2e394f Binary files /dev/null and b/erpnext/docs/assets/img/articles/item-purchase-uom-conversion.png differ diff --git a/erpnext/docs/assets/img/articles/kb_po_forsupp.png b/erpnext/docs/assets/img/articles/kb_po_forsupp.png deleted file mode 100644 index 4c336af10d3..00000000000 Binary files a/erpnext/docs/assets/img/articles/kb_po_forsupp.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/kb_po_itemtable.png b/erpnext/docs/assets/img/articles/kb_po_itemtable.png deleted file mode 100644 index ec7b406e59e..00000000000 Binary files a/erpnext/docs/assets/img/articles/kb_po_itemtable.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/kb_po_popup.png b/erpnext/docs/assets/img/articles/kb_po_popup.png deleted file mode 100644 index f642fdd2e24..00000000000 Binary files a/erpnext/docs/assets/img/articles/kb_po_popup.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/po-conversion-factor.png b/erpnext/docs/assets/img/articles/po-conversion-factor.png new file mode 100644 index 00000000000..00ef8cd3ff8 Binary files /dev/null and b/erpnext/docs/assets/img/articles/po-conversion-factor.png differ diff --git a/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png b/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png new file mode 100644 index 00000000000..48381f6dad9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/po-qty-in-stock-uom.png differ diff --git a/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png b/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png new file mode 100644 index 00000000000..14bbc64db40 Binary files /dev/null and b/erpnext/docs/assets/img/articles/po-stock-uom-ledger.png differ diff --git a/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png b/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png new file mode 100644 index 00000000000..ad00657859c Binary files /dev/null and b/erpnext/docs/assets/img/articles/supplier-item-code-in-purchase-order.png differ diff --git a/erpnext/docs/assets/img/articles/supplier-item-code.png b/erpnext/docs/assets/img/articles/supplier-item-code.png new file mode 100644 index 00000000000..1ad1b164fc9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/supplier-item-code.png differ diff --git a/erpnext/docs/current/models/accounts/payment_gateway_account.html b/erpnext/docs/current/models/accounts/payment_gateway_account.html index 68d369b8c02..d48bdcdfe79 100644 --- a/erpnext/docs/current/models/accounts/payment_gateway_account.html +++ b/erpnext/docs/current/models/accounts/payment_gateway_account.html @@ -38,16 +38,25 @@ - + 1 - gateway_acount_details + gateway - Section Break + Link - Gateway Acount Details + Payment Gateway + + + + + + + +Payment Gateway + + - @@ -64,23 +73,14 @@ 3 - gateway + column_break_4 + + Column Break - Link - - Gateway - - - - - - - -Payment Gateway - - + + @@ -124,7 +124,7 @@ Section Break - Payment Request Message + @@ -136,7 +136,7 @@ Text Editor - + Default Payment Request Message diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt index c0ed867e5b3..5ae36580975 100644 --- a/erpnext/docs/user/manual/en/buying/articles/index.txt +++ b/erpnext/docs/user/manual/en/buying/articles/index.txt @@ -1,3 +1,3 @@ maintaining-suppliers-part-no-in-item -managing-purchase-uom-and-stock-uom -select-material-requests-based-on-supplier \ No newline at end of file +purchasing-in-different-unit +pull-items-in-purchase-order-based-on-supplier \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md index 52f4c977922..2a925813b7c 100644 --- a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md +++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md @@ -1,20 +1,20 @@ -

Maintaining Supplier's Item Code in the Item master

+#Maintaining Supplier's Item Code in the Item master -Since each company has their own item coding standards, for each item, your item code differ from supplier's Item Code. ERPNext allows you to track Supplier's Item Code in your item master, so that you refer to each others item code while transacting. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code. +For each item, code assigned might differ from the code your supplier has given to that same item. ERPNext allows you to track Supplier's Item Code in the item master. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code. #### 1. Updating Supplier Item Code In Item -Under Purchase section in the Item master, you will find table to track Item Code for each Supplier. +In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item. -![Item Supplier Item Code]({{docs_base_url}}/assets/img/articles/Supplier Item Code.png) +Supplier Item Code #### 2. Supplier's Item Code in Transactions -Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form). +Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html) Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master. -![Supplier Item Code in transaction]({{docs_base_url}}/assets/img/articles/Supplier Item Code in Purchase Order.png) +Supplier Item Code in transaction \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md deleted file mode 100644 index d4d97be99d7..00000000000 --- a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md +++ /dev/null @@ -1,47 +0,0 @@ -

Managing Purchase UoM and Stock UoM

- -When purchasing an item, you can set purchase UoM (Unit of Measurement) which could be different from item's stock UoM. - -### Scenario: - -Item ABC is stocked in Nos, but purchased in Cartons. Hence in the Purchase Order, you will need to update UoM as Carton. - -### 1. Editing Purchase UoM - - -#### Step 1.1: Edit UoM in the Purchase Order - -In the Purchase Order, you will find two UoM fied. - -- UoM -- Stock UoM - -In both the fields, default UoM of an item will be updated. You should edit UoM field, and select Purchase UoM (Carton in this case). - -![Item Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png) - -#### Step 1.2: Update UoM Conversion Factor - -In one Carton, if you get 20 Nos. of item ABC, then UoM Conversion Factor would be 20. - -![Item Conversion Factor]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png) - -Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one carton, then Qty in the stock UoM will be set as 20. - -![Purchase Qty in Default UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png) - -### 2. Stock Ledger Posting - -Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item only. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM. - -With this, we can conclude that, updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM. - -![Print Format in Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png) - -### 3. Setting Conversion Factor in the Item master - -In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor. - -![Purchase UoM master]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png) - - \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md new file mode 100644 index 00000000000..80f52833f1c --- /dev/null +++ b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md @@ -0,0 +1,35 @@ +#Pull Items in Purchase Order based on Supplier + +**Question:** + +Our Material Request has many items, each purchased from different suppliers. How to pull items from all open Material Request which are to be purchased from common Supplier? + +**Answer:** + +To pull items from Material Request for specific Supplier only, follow below given steps. + +####Step 1: Default Supplier + +Update Default Supplier in the Item master. + +Item Purchase UoM + +####Step 2: New Purchase Order + +`Buying > Document > Purchase Order > New` + +####Step 3: Select for Supplier + +From the options available to pull data in the Purchase Order, click on `For Supplier`. + +Item Purchase UoM + +####Step 4: Get Items + +Select Supplier name and click on `Get`. + +Item Purchase UoM + +####Step 5: Edit Items + +All the items associated with a Material Request and having the default Supplier will be fetched in the Items Table. You can further edit items to enter rate, qty etc. Also items which are not to be ordered can be removed from Item table. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md new file mode 100644 index 00000000000..e95f0e35e12 --- /dev/null +++ b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md @@ -0,0 +1,42 @@ +#Purchasing in Different Unit (UoM) + +Each item has stock unit of measument (UoM) associated to it. For example UoM of pen is nos. and sand stocked kgs. But item could be purchased in different UoM, like 1 set/box of pen, or one truck of sand. In ERPNex, you can create purchase transaction for an item having different UoM than item's stock UoM. + +### Scenario: + +Item `Pen` is stocked in Nos, but purchased in Box. Hence we will make Purchase Order for Pen in Box. + +#### Step 1: Edit UoM in the Purchase Order + +In the Purchase Order, you will find two UoM fied. + +- UoM +- Stock UoM + +In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Purchase UoM (Box in this case). Updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM. + +Item Purchase UoM + +#### Step 2: Update UoM Conversion Factors + +In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20. + +Item Conversion Factor + +Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one Box, then Qty in the stock UoM will be set as 20. + +Purchase Qty in Default UoM + +### Stock Ledger Posting + +Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM. + +Print Format in Purchase UoM + +### Set Conversion Factor in Item + +In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor. + +Purchase UoM master + + \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md deleted file mode 100644 index 6b596950469..00000000000 --- a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md +++ /dev/null @@ -1,19 +0,0 @@ -

Select Material Requests based on Supplier

- -Question: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?
-
Answer: -
-
Material Requests can be individually fetched from Purchase Orders using the 'From Material Request' button. However this procedure becomes tedious when there are multiple Material Requests for items that are purchased from a single supplier.
-
A more efficient way; -
-
Step 1: When creating a Purchase order use the 'For Supplier' button in the form. -
-

-
Step 2: In the 'Get From Supplier' pop-up enter the Supplier name and click on 'Get'. -
-

-
Step 3: All the items associated with a Material Request and having the default Supplier, will be fetched in the Items Table. Any Item that is not required can be deleted. -
-

-
Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.
-
\ No newline at end of file