Merge pull request #4658 from umairsy/20-jan

Updated articles in Buying

erpnext/docs/current/models/accounts/payment_gateway_account.html

@@ -38,16 +38,25 @@
     </thead>
     <tbody>
         
-        <tr class="info">
+        <tr >
             <td>1</td>
-            <td ><code>gateway_acount_details</code></td>
+            <td class="danger" title="Mandatory"><code>gateway</code></td>
             <td >
-                Section Break</td>
+                Link</td>
             <td >
-                Gateway Acount Details
+                Payment Gateway
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway">Payment Gateway</a>
+
+
                 
             </td>
-            <td></td>
         </tr>
         
         <tr >
@@ -64,23 +73,14 @@
         
         <tr >
             <td>3</td>
-            <td class="danger" title="Mandatory"><code>gateway</code></td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
             <td >
-                Link</td>
-            <td >
-                Gateway
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway">Payment Gateway</a>
-
-
+                
                 
             </td>
+            <td></td>
         </tr>
         
         <tr >
@@ -124,7 +124,7 @@
             <td >
                 Section Break</td>
             <td >
-                Payment Request Message
+                
                 
             </td>
             <td></td>
@@ -136,7 +136,7 @@
             <td >
                 Text Editor</td>
             <td >
-                
+                Default Payment Request Message
                 
             </td>
             <td></td>

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
+purchasing-in-different-unit
+pull-items-in-purchase-order-based-on-supplier

erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md

@@ -1,20 +1,20 @@
-<h1>Maintaining Supplier's Item Code in the Item master</h1>
+#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)
+<img alt="Supplier Item Code" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code.png">
 
 #### 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)
+<img alt="Supplier Item Code in transaction" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code-in-purchase-order.png">
 
 
 <!-- markdown -->

erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md

@@ -1,47 +0,0 @@
-<h1>Managing Purchase UoM and Stock UoM</h1>
-
-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)
-
-<!-- markdown -->

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.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-2.png">
+
+####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`.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-1.gif">
+
+####Step 4: Get Items
+
+Select Supplier name and click on `Get`.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-3.png">
+
+####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.

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.
+
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/editing-uom-in-po.gif">
+
+#### Step 2: Update UoM Conversion Factors
+
+In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20. 
+
+<img alt="Item Conversion Factor" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-conversion-factor.png">
+
+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.
+
+<img alt="Purchase Qty in Default UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-qty-in-stock-uom.png">
+
+### 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.
+
+<img alt="Print Format in Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-stock-uom-ledger.png">
+
+### 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.
+
+<img alt="Purchase UoM master" class="screenshot" src="{{docs_base_url}}/assets/img/articles/item-purchase-uom-conversion.png">
+
+<!-- markdown -->

erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md

@@ -1,19 +0,0 @@
-<h1>Select Material Requests based on Supplier</h1>
-
-<b>Question</b>: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?<br>
-<br><b>Answer</b>:
-<br>
-<br>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.<br>
-<br>A more efficient way;
-<br>
-<br><u><b>Step 1:</b></u> When creating a Purchase order use the <i>'For Supplier'</i> button in the form.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_forsupp.png" height="238" width="747"><br>
-<br><u><b>Step 2:</b></u> In the 'Get From Supplier' pop-up enter the Supplier name and click on <i>'Get'</i>.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_popup.png"><br>
-<br><u><b>Step 3:</b></u> 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.
-<br>
-<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_itemtable.png" height="388" width="645"><br>
-<br><div class="well">Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.</div>
-<br>