diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-1.png b/erpnext/docs/assets/img/articles/allowance-percentage-1.png deleted file mode 100644 index 4fbed90f712..00000000000 Binary files a/erpnext/docs/assets/img/articles/allowance-percentage-1.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-2.png b/erpnext/docs/assets/img/articles/allowance-percentage-2.png deleted file mode 100644 index a7b968834ce..00000000000 Binary files a/erpnext/docs/assets/img/articles/allowance-percentage-2.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/limit-1.png b/erpnext/docs/assets/img/articles/limit-1.png new file mode 100644 index 00000000000..5e3cb27cafd Binary files /dev/null and b/erpnext/docs/assets/img/articles/limit-1.png differ diff --git a/erpnext/docs/assets/img/articles/limit-2.png b/erpnext/docs/assets/img/articles/limit-2.png new file mode 100644 index 00000000000..ffa72b37990 Binary files /dev/null and b/erpnext/docs/assets/img/articles/limit-2.png differ diff --git a/erpnext/docs/assets/img/human-resources/employee-job-profile.png b/erpnext/docs/assets/img/human-resources/employee-job-profile.png new file mode 100644 index 00000000000..a0decd48ad2 Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/employee-job-profile.png differ diff --git a/erpnext/docs/assets/img/human-resources/employee-view.gif b/erpnext/docs/assets/img/human-resources/employee-view.gif new file mode 100644 index 00000000000..52633d0472a Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/employee-view.gif differ diff --git a/erpnext/docs/assets/img/human-resources/employee.png b/erpnext/docs/assets/img/human-resources/employee.png index ec2e70e2007..0120a76f023 100644 Binary files a/erpnext/docs/assets/img/human-resources/employee.png and b/erpnext/docs/assets/img/human-resources/employee.png differ diff --git a/erpnext/docs/assets/img/human-resources/supplier1.1.png b/erpnext/docs/assets/img/human-resources/supplier1.1.png new file mode 100644 index 00000000000..48aa4853445 Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/supplier1.1.png differ diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png new file mode 100644 index 00000000000..dd37fee109e Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png differ diff --git a/erpnext/docs/assets/img/manufacturing/scrap-1.png b/erpnext/docs/assets/img/manufacturing/scrap-1.png new file mode 100644 index 00000000000..3be19e3ce86 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/scrap-1.png differ diff --git a/erpnext/docs/assets/img/manufacturing/scrap-2.gif b/erpnext/docs/assets/img/manufacturing/scrap-2.gif new file mode 100644 index 00000000000..0b9d42ed8b6 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/scrap-2.gif differ diff --git a/erpnext/docs/assets/img/project/profitability-analysis.png b/erpnext/docs/assets/img/project/profitability-analysis.png new file mode 100644 index 00000000000..2c43adfcc89 Binary files /dev/null and b/erpnext/docs/assets/img/project/profitability-analysis.png differ diff --git a/erpnext/docs/assets/img/project/project-1.1.png b/erpnext/docs/assets/img/project/project-1.1.png new file mode 100644 index 00000000000..ea23665566f Binary files /dev/null and b/erpnext/docs/assets/img/project/project-1.1.png differ diff --git a/erpnext/docs/assets/img/project/project-1.png b/erpnext/docs/assets/img/project/project-1.png new file mode 100644 index 00000000000..f416cd67cf3 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-1.png differ diff --git a/erpnext/docs/assets/img/project/project-2.png b/erpnext/docs/assets/img/project/project-2.png new file mode 100644 index 00000000000..cadb20d37da Binary files /dev/null and b/erpnext/docs/assets/img/project/project-2.png differ diff --git a/erpnext/docs/assets/img/project/project-budgeting.png b/erpnext/docs/assets/img/project/project-budgeting.png new file mode 100644 index 00000000000..989cff2acb8 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-budgeting.png differ diff --git a/erpnext/docs/assets/img/project/project-expense-claim-1.png b/erpnext/docs/assets/img/project/project-expense-claim-1.png new file mode 100644 index 00000000000..3ed5955935d Binary files /dev/null and b/erpnext/docs/assets/img/project/project-expense-claim-1.png differ diff --git a/erpnext/docs/assets/img/project/project-expense-claim-2.png b/erpnext/docs/assets/img/project/project-expense-claim-2.png new file mode 100644 index 00000000000..380a9a61bd5 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-expense-claim-2.png differ diff --git a/erpnext/docs/assets/img/project/project-percent-complete.png b/erpnext/docs/assets/img/project/project-percent-complete.png deleted file mode 100644 index cebfde321e0..00000000000 Binary files a/erpnext/docs/assets/img/project/project-percent-complete.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project-portal-2.png b/erpnext/docs/assets/img/project/project-portal-2.png new file mode 100644 index 00000000000..f86d70755f5 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-portal-2.png differ diff --git a/erpnext/docs/assets/img/project/project-portal-user.png b/erpnext/docs/assets/img/project/project-portal-user.png new file mode 100644 index 00000000000..c12f2036047 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-portal-user.png differ diff --git a/erpnext/docs/assets/img/project/project-portal.gif b/erpnext/docs/assets/img/project/project-portal.gif new file mode 100644 index 00000000000..a89fb0b4b25 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-portal.gif differ diff --git a/erpnext/docs/assets/img/project/project-profitability-1.png b/erpnext/docs/assets/img/project/project-profitability-1.png new file mode 100644 index 00000000000..1928ee2a77f Binary files /dev/null and b/erpnext/docs/assets/img/project/project-profitability-1.png differ diff --git a/erpnext/docs/assets/img/project/project-profitability-2.png b/erpnext/docs/assets/img/project/project-profitability-2.png new file mode 100644 index 00000000000..39ba059f6d8 Binary files /dev/null and b/erpnext/docs/assets/img/project/project-profitability-2.png differ diff --git a/erpnext/docs/assets/img/project/project.png b/erpnext/docs/assets/img/project/project.png deleted file mode 100644 index c6bcd9233d0..00000000000 Binary files a/erpnext/docs/assets/img/project/project.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_cost_center.png b/erpnext/docs/assets/img/project/project_cost_center.png deleted file mode 100644 index 09bd5579c51..00000000000 Binary files a/erpnext/docs/assets/img/project/project_cost_center.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_costing.png b/erpnext/docs/assets/img/project/project_costing.png deleted file mode 100644 index c55976d078f..00000000000 Binary files a/erpnext/docs/assets/img/project/project_costing.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_expense_claim_link.png b/erpnext/docs/assets/img/project/project_expense_claim_link.png deleted file mode 100644 index 077cea19ac7..00000000000 Binary files a/erpnext/docs/assets/img/project/project_expense_claim_link.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_gantt_chart.png b/erpnext/docs/assets/img/project/project_gantt_chart.png deleted file mode 100644 index 3eba4436bb4..00000000000 Binary files a/erpnext/docs/assets/img/project/project_gantt_chart.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_sales_order.png b/erpnext/docs/assets/img/project/project_sales_order.png deleted file mode 100644 index ff4030d4617..00000000000 Binary files a/erpnext/docs/assets/img/project/project_sales_order.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_task.png b/erpnext/docs/assets/img/project/project_task.png deleted file mode 100644 index 88f1e685e6c..00000000000 Binary files a/erpnext/docs/assets/img/project/project_task.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_task_grid.png b/erpnext/docs/assets/img/project/project_task_grid.png deleted file mode 100644 index 935fba6f1d1..00000000000 Binary files a/erpnext/docs/assets/img/project/project_task_grid.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_task_list.png b/erpnext/docs/assets/img/project/project_task_list.png deleted file mode 100644 index 2a59caf3cb8..00000000000 Binary files a/erpnext/docs/assets/img/project/project_task_list.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_time_log_link.png b/erpnext/docs/assets/img/project/project_time_log_link.png deleted file mode 100644 index 08ac36cf77c..00000000000 Binary files a/erpnext/docs/assets/img/project/project_time_log_link.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_time_log_list.png b/erpnext/docs/assets/img/project/project_time_log_list.png deleted file mode 100644 index 3b3724b599f..00000000000 Binary files a/erpnext/docs/assets/img/project/project_time_log_list.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_total_expense_claim.png b/erpnext/docs/assets/img/project/project_total_expense_claim.png deleted file mode 100644 index cbd3c01fb9a..00000000000 Binary files a/erpnext/docs/assets/img/project/project_total_expense_claim.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_view_expense_claim.png b/erpnext/docs/assets/img/project/project_view_expense_claim.png deleted file mode 100644 index 32056ca53f6..00000000000 Binary files a/erpnext/docs/assets/img/project/project_view_expense_claim.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_view_gantt_chart.png b/erpnext/docs/assets/img/project/project_view_gantt_chart.png deleted file mode 100644 index 7039a45f0e7..00000000000 Binary files a/erpnext/docs/assets/img/project/project_view_gantt_chart.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_view_task.png b/erpnext/docs/assets/img/project/project_view_task.png deleted file mode 100644 index dfdff8b0806..00000000000 Binary files a/erpnext/docs/assets/img/project/project_view_task.png and /dev/null differ diff --git a/erpnext/docs/assets/img/project/project_view_time_log.png b/erpnext/docs/assets/img/project/project_view_time_log.png deleted file mode 100644 index dbf184e6868..00000000000 Binary files a/erpnext/docs/assets/img/project/project_view_time_log.png and /dev/null differ diff --git a/erpnext/docs/assets/img/stock/customer-warehouse-2.png b/erpnext/docs/assets/img/stock/customer-warehouse-2.png new file mode 100644 index 00000000000..d44f88fc65c Binary files /dev/null and b/erpnext/docs/assets/img/stock/customer-warehouse-2.png differ diff --git a/erpnext/docs/assets/img/stock/customer-warehouse.gif b/erpnext/docs/assets/img/stock/customer-warehouse.gif new file mode 100644 index 00000000000..c587b98a421 Binary files /dev/null and b/erpnext/docs/assets/img/stock/customer-warehouse.gif differ diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md index f116c889e03..2f8a15463d4 100644 --- a/erpnext/docs/user/manual/en/buying/supplier.md +++ b/erpnext/docs/user/manual/en/buying/supplier.md @@ -6,18 +6,11 @@ You can create a new Supplier from: `Explore > Supplier > New Supplier` -Supplier Master - -
-
- -
-
+Supplier Master ### Contacts and Addresses -Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find option to create Contact and Address for that Supplier. +Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find the option to create Contact and Address for that Supplier. Supplier Master @@ -37,8 +30,12 @@ If you don't want to customize payable account, and proceed with default payable You can add multiple companies in your ERPNext instance, and one Supplier can be used across multiple companies. In this case, you should define Companywise Payable Account for the Supplier in the "Default Payable Accounts" table. - -(Check from 2:20) +
+
+ +
+
### Place Supplier On Hold In the Supplier form, check the "Block Supplier" checkbox. Next, choose the "Hold Type". diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md index 092d11d672c..c6aed2419f9 100644 --- a/erpnext/docs/user/manual/en/human-resources/employee.md +++ b/erpnext/docs/user/manual/en/human-resources/employee.md @@ -1,6 +1,20 @@ # Employee -There are many fields you can add in your Employee records. +An individual who works part-time or full-time under a contract of employment, and has recognized rights and duties is your Employee. + +In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details. + +Employee + +You can further use this Employee master for performing various HR functions like: + +1. Processing Payroll +1. Leave Allocation and Application +1. Employee Advance and Expense Claim +1. Loan Application +1. Performance Appraisal + +### New Employee To create new Employee go to: @@ -8,6 +22,14 @@ To create new Employee go to: Employee +### Employee Deputation + +Once an Employee is created, you can update Department, Designation, Employee to whom he/she will report to etc. + +Employee + +
+
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md b/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md new file mode 100644 index 00000000000..25c1eeae455 --- /dev/null +++ b/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md @@ -0,0 +1,23 @@ +# Production Scrap Management + +Scrap means waste that either has no economic value or only the value of its basic material content recoverable through recycling. + +Scrap is generally availed at the end of the manufacture process. Also you can find some products that are damaged or that are unusable due to expiry or for some other reason, which needs to be scraped. + +In ERPNext, at the end of manufacturing process, scrap items are accounted in the scrap warehouse.s + +### Scrap in Bill of Materials + +You can update estimated scrap quantity of an item in the BOM, Scrap table. If required, you can reselect a raw-material item as scrap. + +Scrap in BOM + +### Scrap in Manufacture Entry + +When production is completed, Finish / Manufacture Entry is created against a Production Order. In this entry, scrap item is fetched in the Item table, with only Target Warehouse updated for it. Ensure that Valuation Rate is updated for this item for the accounts posting purposes. + +Scrap in Manufacture Entry + +> Scrap from the BOM will only work if Manufacture Entry is created based on BOM, and not based on Material Transfer. This is configurable from Manufacturing Settings. + +Manufacturing Settings \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/index.txt b/erpnext/docs/user/manual/en/projects/index.txt index 2f450ac5360..11f5901c1e0 100644 --- a/erpnext/docs/user/manual/en/projects/index.txt +++ b/erpnext/docs/user/manual/en/projects/index.txt @@ -1,7 +1,9 @@ tasks project -time-log-batch +timesheet +project-customer-portal +project-profitability +project-expense-claims activity-type activity-cost articles -timesheet diff --git a/erpnext/docs/user/manual/en/projects/project-customer-portal.md b/erpnext/docs/user/manual/en/projects/project-customer-portal.md new file mode 100644 index 00000000000..24ea099a144 --- /dev/null +++ b/erpnext/docs/user/manual/en/projects/project-customer-portal.md @@ -0,0 +1,21 @@ +# Project from Customer Portal + +If you are doing a Project for a Customer, then Customer will need to be updated on its progress on timely bases. In ERPNext, since it is a Customer Portal feature, you can let Customer update oneself on the Project's progress via Customer Portal. + +### Add User as a Website User + +For a Customer to be able to access Project from the portal, should be added as a Website User. A Customer can also sign up from the Login Page of your ERPNext account, using the same Email ID as mentioned in the Contact master. Or you can invite that User from the Contact master. + +Customer in Project + +### Add Customer and User in Project + +In the Project master, check Customer Details section. Select a Customer and Sales Order associated with this Project. + +Customer in Project + +### Portal View of Project + +When a Customer logins from the Portal, he/she will be able to view all the Task for that Project. Also, the customer will be able to update the status of the Tasks or comment when needed. + +Customer in Project \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/project-expense-claims.md b/erpnext/docs/user/manual/en/projects/project-expense-claims.md new file mode 100644 index 00000000000..76e0389879b --- /dev/null +++ b/erpnext/docs/user/manual/en/projects/project-expense-claims.md @@ -0,0 +1,15 @@ +# Project and Managing Expenses + +The Employees working on the Project incur various expenses, sometimes from their own pocket. In ERPNext, then can claim such expenses using [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html) + +In this Expense Claim, they can also select a Project for which that expense was incurred. + +Based on the Expense Claims made for a particular project, total Expense Claim Amount is updated in the Project master, under project costing section. + +* You can create an Expense Claims directly and link it to the Project. + +Project - Link Expense Claim + +* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section + +Project - Total Expense Claim \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/project-profitability.md b/erpnext/docs/user/manual/en/projects/project-profitability.md new file mode 100644 index 00000000000..cea7050e09a --- /dev/null +++ b/erpnext/docs/user/manual/en/projects/project-profitability.md @@ -0,0 +1,36 @@ +# Project Profitability + +Project and related activities are generally active for longer time periods. While developments happen on the Project, there are various income and expense incurred against it. Hence, it becomes important to track the Profitability of a Project and ensure that you don't overspend. + +### Project in Sales Transactions + +You can link a Project in all the sales transactions like Sales Order, Delivery Note, Sales Invoice, and Payment. Linking Project with the sales transactions will help you in tracking income received against that Project. + +In sales transactions, Project field is generally available in the More Information section. + +Project in Sales + + +#### Project in Purchase Transactions + +The project can also be linked to the purchase transactions like Purchase Order, Purchase Receipt, and Purchase Invoice. + +In the purchase transactions, Project's link field is available in the Item table. This is because you could be procuring material for multiple Projects from the same purchase entry. + +Project in Purchases + +### Budgeting against Project + +You can create Budget for a Project as well. The expense limit defined in the Budget master will be validated in the expense transactions. + +Project Budgeting + +### Project Profitability + +Based on the all the income and expense entries created for the Project, you can get its profitability. + +> Accounts > Profitability Analysis + +Filter report based on Project to check Projectwise Profitability. + +Project Profitability \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md index 82f0e6dd6f6..a8091b8a284 100644 --- a/erpnext/docs/user/manual/en/projects/project.md +++ b/erpnext/docs/user/manual/en/projects/project.md @@ -1,13 +1,20 @@ # Project -Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it. +The project is an individual or collaborative enterprise, possibly involving research or design, that is carefully planned, usually by a project team, to achieve a particular aim -Project +In ERPNext, Project management in is Task driven. You can a create Project and divide into multiple and assignable Tasks. -
- -
+Project + +### Managing Tasks + +The project is generally has a broader scope, and hence not assignable to an individual. Hence, you can divide the Project into multiple Tasks. These can be assigned to an individual and tracked better. + +These Tasks can be created from a Project itself or a [Task](/docs/user/manual/en/projects/tasks.html) can be created separately as well. + +Project + +### Task Completion You can also track % Completion of a Project using different methods. @@ -15,100 +22,39 @@ You can also track % Completion of a Project using different methods. 2. Task Progress 3. Task Weight -Project +Project 2 Some examples of how the % Completion is calculated based on Tasks. -Project +Project 3 -Project +Project 4 -### Managing tasks -Project can be divided into multiple Tasks. -Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html) - -Project - -* To view Task made against a Project click on 'Tasks' - -Project - View Task - -Project - Task List - -* You can also view the Tasks from the Project document itself - -Project - Task Grid - -* To add Weights to Tasks you can follow the below steps - -Project - Task Grid -Project - Task Grid - - -### Managing time - -ERPNext uses [Time Log](/docs/user/manual/en/projects/time-log.html) to track the progress of a Project. -You can create Time Logs against each task. -The Actual Start and End Time along with the costing shall then be updated based on the Time Log. - -* To view Time Log made against a Project click on 'Time Logs' - -Project - View Time Log - -Project - Time Log List - -* You can also create a Time Log directlly and link it to the Project. - -Project - Link Time Log - -### Managing expenses - -You can book [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html) against a project task. -The system shall update the total amount from expense claims in the project costing section. - -* To view Expense Claims made against a Project click on 'Expense Claims' - -Project - View Expense Claim - -* You can also create a Expense Claims directlly and link it to the Project. - -Project - Link Expense Claim - -* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section - -Project - Total Expense Claim - -### Cost Center - -You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project. - -Project - Cost Center - -###Project Costing +### Project Costing The Project Costing section helps you track the time, expenses and purchases incurred against the project. Project - Costing -* The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project. +* The Total Cost is composed of the costing amount from timesheets, the total cost of expense claims and the total cost of purchase invoices created against this project. * The Gross Margin is the difference between Total Billed Amount and the Total Cost Amount for this project. -###Billing +### Gantt Chart -You can make/link a [Sales Order](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project. +ERPNext gives you an illustrated view of tasks scheduled for that project in Gantt Chart View. -Project - Sales Order +* To view Gantt chart against a project, go to the Task list and Apply filter on the Project. -###Gantt Chart +Project Gantt -A Gantt Chart illustrates a project schedule. -ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View. +### Project Help Video -* To view gantt chart against a project, go to that project and click on 'Gantt Chart' +This is a tutorial video on how to manage Project and associate Tasks in ERPNext. -Project - View Gantt Chart +
+ +
-Project - Gantt Chart - -{next} +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md deleted file mode 100644 index 6904f4ed862..00000000000 --- a/erpnext/docs/user/manual/en/projects/time-log-batch.md +++ /dev/null @@ -1,25 +0,0 @@ -# Time Log Batch - -You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to - -> Projects > Time Sheet > New Time Sheet - -OR - -Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" button and these Time Logs will be selected. - -Time Log - Drag Calender - -###Making Sales Invoice - -* After submitting the Time Sheet, "Make Invoice" button shall appear. - -Time Log - Drag Calender - -* Click on that button to raise a Sales Invoice against the Time Sheet. - -Time Log - Drag Calender - -* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed". - -{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index 9b140a64a95..f5a589ddc8c 100644 --- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -1,22 +1,24 @@ #Allow Over Delivery/Billing -While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. +When creating a Delivery Note, system validates if item's qty is same as in the Sales Order. If item's qty has been increased, you will get the validation message of over-delivery or receipt. -Item wise Allowance percentage +Considering the case fo sales, if you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. -Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions. +Itemised Limit Percentage -For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50%, then you are allowed to make Purchase Receipt for upto 150 units. +When creating an invoice, item's rate is also validated based on the preceding transaction like Sales Order. This also applies when creating Purchase Receipt or Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions. + +For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50, then you are allowed to make Purchase Receipt for upto 150 units. Update global value for "Allow over delivery or receipt upto this percent" from Stock Settings. Value updated here will be applicable for all the items. 1. Go to `Stock > Setup > Stock Settings` -2. Set `Allowance Percentage`. +2. Set `Limit Percentage`. 3. Save Stock Settings. -Item wise Allowance percentage +Item wise Allowance percentage diff --git a/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md b/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md new file mode 100644 index 00000000000..02bdadf816c --- /dev/null +++ b/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md @@ -0,0 +1,29 @@ +# Material Transfer from Delivery Note + +In ERPNext, you can create Material Transfer entry from [Stock Entry](/docs/user/manual/en/stock/stock-entry.html) document. However, there are some scenarios in the Material Transfer where it needs to be presented as a Delivery Note. + +### Scenarios + +1. One of the examples is when you transfer a Material from your stores to project site, however, you need to present it as a Delivery Note to the client. + +2. Also, there are statutory requirements where taxes are to be applied on each transfer of Material. It is easier to manage in a transaction like Delivery Note, than in the Stock Entry. + +Considering these scenarios, the provision of Material Transfer has been added in the Delivery Note as well. Following are the steps to use Delivery Note for creating Material Transfer entry. + +### Steps + +#### Enable Customer Warehouse + +Delivery Note Item doctype as a hidden field of Customer Warehouse. You can enable it from [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html). Here is the quick demonstration of the same. + +Delivery Note Material Transfer + +### Select Warehouses + +When creating a Delivery Note for Material Transfer, for an item select source Warehouse as From Warehouse. + +In the Customer Warehouse, select a Warehouse where Material is to be transferred or select a target warehouse. + +Delivery Note Material Transfer + +On the submission of a Delivery Note, item's stock will be deducted from "From Warehouse" and added to the "Customer Warehouse". \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/advance-payments.md b/erpnext/docs/user/videos/learn/advance-payments.md index f08053f0b18..5abcd83bcb0 100644 --- a/erpnext/docs/user/videos/learn/advance-payments.md +++ b/erpnext/docs/user/videos/learn/advance-payments.md @@ -1,7 +1,7 @@ # Advance Payment - + -**Duration: 2:52** +**Duration: 3:11** In sales and purchase transaction, generally advance payments are involved. This tutorial covers how you can create advance payment entries against Sales Order and Purchase Order, and adjust the same in the final invoice. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/discounts.md b/erpnext/docs/user/videos/learn/discounts.md new file mode 100644 index 00000000000..e4668bbc5f3 --- /dev/null +++ b/erpnext/docs/user/videos/learn/discounts.md @@ -0,0 +1,7 @@ +# Applying Discounts + + + +**Duration: 2:23** + +This is a video tutorial on how to apply discounts in the sales and purchase transactions. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/email-account.md b/erpnext/docs/user/videos/learn/email-account.md index 0ac4e98fc5d..b2b40d69baf 100644 --- a/erpnext/docs/user/videos/learn/email-account.md +++ b/erpnext/docs/user/videos/learn/email-account.md @@ -1,7 +1,7 @@ # Email Account - + -**Duration: 2:27** +**Duration: 4:00** This video walks you through setting up Email Account for incoming and outgoing emails. For hosted users, outgoing email gateway is set by default. Based on incoming email, you can have new document (like Issue, Lead etc.) auto-created, and have email received on these id's appended to specified document. diff --git a/erpnext/docs/user/videos/learn/email-inbox.md b/erpnext/docs/user/videos/learn/email-inbox.md new file mode 100644 index 00000000000..dd69bb8818e --- /dev/null +++ b/erpnext/docs/user/videos/learn/email-inbox.md @@ -0,0 +1,7 @@ +# Email Inbox + + + +**Duration: 2:51** + +This is video tutorial on how a user can configure an Email Inbox for his/her ID. Email Inbox is integrated well with other functionalities like Support Issues, Opportuniies and Communication. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/employee-advance.md b/erpnext/docs/user/videos/learn/employee-advance.md new file mode 100644 index 00000000000..48b9f085ee6 --- /dev/null +++ b/erpnext/docs/user/videos/learn/employee-advance.md @@ -0,0 +1,7 @@ +# Employee Advance + + + +**Duration: 3:46** + +In this video, we will learn how an advance amount is given to an Employee, and how to adjust the same against an Expense Claim. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md index f10061c5cc2..fde6b489767 100644 --- a/erpnext/docs/user/videos/learn/index.md +++ b/erpnext/docs/user/videos/learn/index.md @@ -79,9 +79,17 @@ Opening Account Balances 4:40 +
  • + Opening Invoices Creation Tool + 2:30 +
  • Email Account - 2:27 + 4:00 +
    • +
  • + Email Inbox + 2:51
  • File Manager @@ -119,6 +127,14 @@ Drop Ship 2:26
    • +
  • + Pricing Rule + 3:56 +
    • +
  • + Discounts + 2:23 +

    • Buying

    @@ -143,6 +159,14 @@ Taxes 5:13 +
  • + Pricing Rule + 3:56 +
    • +
  • + Discounts + 2:23 +

    • Stock

    @@ -201,12 +225,16 @@
  • Advance Payments - 2:52 + 3:11
  • Budgeting 3:26
    • +
  • + Subscription Management + 2:09 +

    • Manufacturing

    @@ -245,6 +273,10 @@ Expense Claims 2:52 +
  • + Employee Advance + 3:46 +

    • Retail

    diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt index 956703b9544..116ac6ce2d9 100644 --- a/erpnext/docs/user/videos/learn/index.txt +++ b/erpnext/docs/user/videos/learn/index.txt @@ -42,4 +42,10 @@ report-builder services distributors manufacturing-make-to-order -manufacturing-enigneer-to-order \ No newline at end of file +manufacturing-enigneer-to-order +opening-invoice-creation-tool +pricing-rule +discounts +email-inbox +subscription +employee-advance \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md b/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md new file mode 100644 index 00000000000..0670fa151e9 --- /dev/null +++ b/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md @@ -0,0 +1,7 @@ +# Opening Invoices Creation Tool + + + +**Duration: 2:30** + +An important on-boarding step for an E R P software includes updating opening sales and purchase invoices. In E R P Next, it is made simple with Opening Invoices Creation Tool. You can use this tool for quickly creatio opening Sales and Purchase Invoices. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/payment-terms.md b/erpnext/docs/user/videos/learn/payment-terms.md index 1832b7f6660..a3821a88e31 100644 --- a/erpnext/docs/user/videos/learn/payment-terms.md +++ b/erpnext/docs/user/videos/learn/payment-terms.md @@ -5,10 +5,8 @@ -**Duration: 2:55** +**Duration: 2:56** This tutorial shows you how to set payment terms in ERPNext. Payment Terms help in defining the multiple payment slabs during sales or purchase transactions. In Payment Terms you can define the breakup of the payment to be received (or made) in terms of different payment modes and the period after the due date. You can also create templates to quickly load the payment terms in a transaction. - - diff --git a/erpnext/docs/user/videos/learn/pricing-rule.md b/erpnext/docs/user/videos/learn/pricing-rule.md new file mode 100644 index 00000000000..fcc808a652d --- /dev/null +++ b/erpnext/docs/user/videos/learn/pricing-rule.md @@ -0,0 +1,8 @@ +# Pricing Rule + + + +**Duration: 3:56** + +If you apply discounts on the item based on certain conditions, you can use Pricing Rule to define these conditions. In the Pricing Rule, you define criterias based on these parameters for the auto application +of discount or margin. diff --git a/erpnext/docs/user/videos/learn/product-bundle.md b/erpnext/docs/user/videos/learn/product-bundle.md index c17456a95fb..c63fe897c9c 100644 --- a/erpnext/docs/user/videos/learn/product-bundle.md +++ b/erpnext/docs/user/videos/learn/product-bundle.md @@ -1,6 +1,6 @@ # Product Bundle - + **Duration: 2:31** diff --git a/erpnext/docs/user/videos/learn/serialized-inventory.md b/erpnext/docs/user/videos/learn/serialized-inventory.md index e3b97e176a3..da2c03657ad 100644 --- a/erpnext/docs/user/videos/learn/serialized-inventory.md +++ b/erpnext/docs/user/videos/learn/serialized-inventory.md @@ -1,8 +1,8 @@ # Serialized Inventory - + -**Duration: 4:11** +**Duration: 5:33** If an Item is serialized, a Serial Number (Serial No) record is maintained for each unit of that Item. This information is helpful in tracking the location of the Serial No, its warranty and end-of-life (expiry) information. diff --git a/erpnext/docs/user/videos/learn/subscription.md b/erpnext/docs/user/videos/learn/subscription.md new file mode 100644 index 00000000000..8193e58e683 --- /dev/null +++ b/erpnext/docs/user/videos/learn/subscription.md @@ -0,0 +1,7 @@ +# Subscription Management + + + +**Duration: 2:09** + +In this video, we will learn about subscription management in ERPNext. Let's suppose you have to create a purchase invoice every month for paying the property rent. You should only create first Purchase Invoice manually, and then create a Subscription for it, so that purchase invoice is auto-created for subsequent each month. \ No newline at end of file