diff --git a/erpnext/docs/assets/img/customize/kanban-board-1.png b/erpnext/docs/assets/img/customize/kanban-board-1.png new file mode 100644 index 00000000000..43826a2ebbc Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-1.png differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-2.png b/erpnext/docs/assets/img/customize/kanban-board-2.png new file mode 100644 index 00000000000..552fa64d85a Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-2.png differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-3.gif b/erpnext/docs/assets/img/customize/kanban-board-3.gif new file mode 100644 index 00000000000..beb4c9b10f4 Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-3.gif differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-4.gif b/erpnext/docs/assets/img/customize/kanban-board-4.gif new file mode 100644 index 00000000000..111995b47f4 Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-4.gif differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-5.gif b/erpnext/docs/assets/img/customize/kanban-board-5.gif new file mode 100644 index 00000000000..eb4310e9287 Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-5.gif differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-6.gif b/erpnext/docs/assets/img/customize/kanban-board-6.gif new file mode 100644 index 00000000000..35ca27aa56a Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-6.gif differ diff --git a/erpnext/docs/assets/img/customize/kanban-board-7.gif b/erpnext/docs/assets/img/customize/kanban-board-7.gif new file mode 100644 index 00000000000..29b5e4577ef Binary files /dev/null and b/erpnext/docs/assets/img/customize/kanban-board-7.gif differ diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md new file mode 100644 index 00000000000..4e48be442d3 --- /dev/null +++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -0,0 +1,44 @@ +#Kanban Board + +Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line. + +In ERPNext Kanban board can be an laternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team. + +###Create new Kanban Board + +To create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board. + ++Add New Kanban Board + +###Add new Card/Document + +To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details. + ++Add New Kanban Board + +###Update Cards/Document Status + +Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working. + ++Add New Kanban Board + +###Manage Columns + +To add more columns in the Kanban board click Add columns. + ++Add New Kanban Board + +To move columns based on the priority drag and drop the columns as per requirement. + ++Add New Kanban Board + +To set Colors to a Card click drop down menu on the card and assign color to it. + ++Add New Kanban Board + +You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board. + ++Add New Kanban Board + + + diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM b/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM new file mode 100644 index 00000000000..b435e958742 --- /dev/null +++ b/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM @@ -0,0 +1,25 @@ +#Selling in Different Unit (UoM) + +A sell price unit of measure (UOM) is the UOM with which you price items. You can have multiple sell price UOMs for any inventory item. However, when Customer places, UoM for an item could change. + +For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make Sales Order for Pen in Box. + +Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors +In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10. + + + +Setp 2: In the Sale Order, you will find two UoM field. +UoM +Stock UoM +In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case). Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM. + + +Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10. + + +Stock Ledger Posting + +Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM. + + diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md index 563568acdce..70aa0f55305 100644 --- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md +++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md @@ -32,12 +32,12 @@ in the data below the column headings. Download Template -Then export your template or save it as a **Comma Separated Values** (CSV) -file. +Then export your template or save it as a **Excel** or **Comma Separated Values** (CSV) +file. To export te document in Excel check the box for Download in Excel File Format Download Template -### 3\. Upload the .csv File +### 3\. Upload the File ethier in .xls or .csv Finally attach the .csv file in the section. Click on the "Upload and Import" button.