diff --git a/foundation/www/docs/assets/img/articles/global-search/__init__.py b/foundation/www/docs/assets/img/articles/global-search/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/assets/img/crm/like.gif b/foundation/www/docs/assets/img/crm/like.gif new file mode 100644 index 00000000..b015948c Binary files /dev/null and b/foundation/www/docs/assets/img/crm/like.gif differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-item-job-card.png b/foundation/www/docs/assets/img/manufacturing/bom-item-job-card.png new file mode 100644 index 00000000..9413ba3e Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/bom-item-job-card.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-operation-rounting.png b/foundation/www/docs/assets/img/manufacturing/bom-operation-rounting.png new file mode 100644 index 00000000..f637d322 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/bom-operation-rounting.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-operrations-job-card.png b/foundation/www/docs/assets/img/manufacturing/bom-operrations-job-card.png new file mode 100644 index 00000000..71d5ce22 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/bom-operrations-job-card.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-routing-job-card-work-order.png b/foundation/www/docs/assets/img/manufacturing/bom-routing-job-card-work-order.png new file mode 100644 index 00000000..775a4d60 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/bom-routing-job-card-work-order.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/job-card-form.png b/foundation/www/docs/assets/img/manufacturing/job-card-form.png new file mode 100644 index 00000000..5de39fa2 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/job-card-form.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material-request-against-job-card.png b/foundation/www/docs/assets/img/manufacturing/material-request-against-job-card.png new file mode 100644 index 00000000..9db29b25 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material-request-against-job-card.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/work-order-job-card-completion.png b/foundation/www/docs/assets/img/manufacturing/work-order-job-card-completion.png new file mode 100644 index 00000000..8cf3d08a Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/work-order-job-card-completion.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/work-order-job-card-creation.png b/foundation/www/docs/assets/img/manufacturing/work-order-job-card-creation.png new file mode 100644 index 00000000..562f6f7e Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/work-order-job-card-creation.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/work-order-transfer-against-job-card.png b/foundation/www/docs/assets/img/manufacturing/work-order-transfer-against-job-card.png new file mode 100644 index 00000000..c5aa1f69 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/work-order-transfer-against-job-card.png differ diff --git a/foundation/www/docs/assets/img/selling/sales-analytics-filters.png b/foundation/www/docs/assets/img/selling/sales-analytics-filters.png new file mode 100644 index 00000000..b32a2bb8 Binary files /dev/null and b/foundation/www/docs/assets/img/selling/sales-analytics-filters.png differ diff --git a/foundation/www/docs/assets/img/selling/sales-analytics-result.png b/foundation/www/docs/assets/img/selling/sales-analytics-result.png new file mode 100644 index 00000000..5b3a6ed1 Binary files /dev/null and b/foundation/www/docs/assets/img/selling/sales-analytics-result.png differ diff --git a/foundation/www/docs/assets/img/selling/sales-analytics-sections.png b/foundation/www/docs/assets/img/selling/sales-analytics-sections.png new file mode 100644 index 00000000..bd289b98 Binary files /dev/null and b/foundation/www/docs/assets/img/selling/sales-analytics-sections.png differ diff --git a/foundation/www/docs/user/manual/en/accounts/reverse-journal-entry.md b/foundation/www/docs/user/manual/en/accounts/reverse-journal-entry.md index ff99853b..322ea267 100644 --- a/foundation/www/docs/user/manual/en/accounts/reverse-journal-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/reverse-journal-entry.md @@ -1,3 +1,5 @@ -In ERPNext, one can make a reverse Journal Entry very easily. In any submitted Journal Entry, there is a dedicated button to reverse a Journal Entry. On clicking the button, the system creates a new Journal Entry by reversing debit and credit amount against all the accounts. +# Reverse Journal Entry + +In any submitted Journal Entry, there is a dedicated button to reverse a Journal Entry. On clicking the button, the system creates a new Journal Entry by reversing debit and credit amount against all the accounts. Reverse Journal Entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/share/index.txt b/foundation/www/docs/user/manual/en/accounts/share/index.txt new file mode 100644 index 00000000..7c7e56d2 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/index.txt @@ -0,0 +1,4 @@ +shareholder +share_transfer +share_ledger +share_balance \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/__init__.py b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/manufacturing/index.txt b/foundation/www/docs/user/manual/en/manufacturing/index.txt index 9befc663..c21527cc 100755 --- a/foundation/www/docs/user/manual/en/manufacturing/index.txt +++ b/foundation/www/docs/user/manual/en/manufacturing/index.txt @@ -1,8 +1,9 @@ introduction -bill-of-materials -work-order workstation operation +bill-of-materials +work-order +job-card subcontracting item-alternative tools diff --git a/foundation/www/docs/user/manual/en/manufacturing/job-card.md b/foundation/www/docs/user/manual/en/manufacturing/job-card.md new file mode 100644 index 00000000..f697557e --- /dev/null +++ b/foundation/www/docs/user/manual/en/manufacturing/job-card.md @@ -0,0 +1,73 @@ +# Job Card + +A Job Card is created from the Work Order and given to each of the workstation in the manufacturing floor to start the production of an item with a certain quantity in each of the operations defined in the Work Order. + +The Job Card extends the functionality of the Work Order in the manufacturing process by adding/defining phase of operations in work orders and assigning each operations into their respective workstation. + +Job Card allows each operation's workstation to issue a “Material Request” and “Stock Transfer to Manufacture” for raw material required against a “Job Card” order assigned to them. + +Job Card completion will change the production status in Work Order, we can track completion of production progress for each of the operations defined in the work order. + +> Manufacturing > Work Order > Create Job Card + +### Job Card creation based on BOM + +In the Work Order, the Operations and Workstations are fetched from the BOM of an Item. Hence, you should ensure that Routing (master of Operations and Production) is configured in the BOM. Here are the steps for the same. + +- Define the Item BOM for production, select “With Operations” on the checklist. + +Create Shareholder + +- Define the production flow by selecting operations in BOM. + +Create Shareholder + +- Select Item required for production, assign each of the Item into Operations. + +Create Shareholder + +> You can select “Transfer Material Against Job Card” to transfer raw material for production based on the Job Card, and not by Work Order. + +Define “Operations” cycle/flow involved in the Item +Select the Item required and assign material to operations for manufacturing. + +Create Shareholder + +You can select “Transfer Material Against Job Card” on the Bill of Material to transfer Material for Production based on Job Card. + +### Routing in Work Order + +Job Card will be created upon submission of the Work Order based on the Operations defined in the Bill of Material. Each Job Card represents job order for each Workstations on the manufacturing floor. + +#### Select Work Order with Item to Manufacture + +In the Work Order, define if you want to transfer material against a Job Order or no. + +Create Shareholder + +#### Job Card Creation + +On submission of Work Order, Job Cards will be auto-created based on the values in the Routing table. + +Create Shareholder + +### Job Card + +Each Job Card created will have Workstation & Operations assigned. Raw material required from each source warehouse will be calculated based on quantity required for production. + +Employee assignment and timing detail will also be defined in Job Card. + +Create Shareholder + +#### Material Request against Job Card + +A Material Request will be raised from the Job Card as a basis/order to prepare raw-material required for manufacturing process. The Material Request raised will have its reference to the original Job Card number. + +Create Shareholder + +Track the Manufacturing Progress in The Work Order by The Completion of Each Operations defined in Work Order. + +Job Card completion allow us to track the manufacturing progress inside the Work Order by looking of the completion of each Operations that are related in the Work Order. + +Create Shareholder + diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-plan.md b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md index 64cc7f0f..4cb44c85 100755 --- a/foundation/www/docs/user/manual/en/manufacturing/production-plan.md +++ b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md @@ -1,4 +1,3 @@ - # Production Plan Production Plan helps user to plan production aginst the multiple sales orders or the material requests. Also, it helps in Material Procuremnt planning for the raw-material item, based on the quantity of finished product to be manufactured. @@ -51,4 +50,4 @@ To use the Production Plan, go to: # Options To Make Work Order and Material Request -Make PO or MR +Make PO or MR \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/sales-analytics.md b/foundation/www/docs/user/manual/en/selling/articles/sales-analytics.md new file mode 100644 index 00000000..fb9c940c --- /dev/null +++ b/foundation/www/docs/user/manual/en/selling/articles/sales-analytics.md @@ -0,0 +1,19 @@ +# Sales Analytics Report + +With the ability to see and analyze your sales data in different views, data is able to diagnose and analyze to better understand how sales are performing. The data allows for filters to be altered dynamically with criteria selections through filters. There are three window areas that make up the Sales Analytics Report. The Filter Toolbar Window, the Graph Window and the Data Window. Please see the example below. + +Sales Analytics Sections + +### The Filter Toolbar Window + +The toolbar provides for filtering to select what data is to be used. Using the dropdown selections, data selections can be refined in a compounding fashion. As the selections are made, data is reflected in the data window as well as the graph window. + +Sales Analytics Filters + +### Data Analytics and Charts + +Within the data window, selections can be made to expand or compress the data to be analyzed. At the left of the window, (blue), are selection boxes. Each box can be selected for use. There is no restriction for the data comparison, so an hire level can be compared to lower levels. The data column to the right, (orange), contains selection boxes with + and minus selections. Selecting a + will expand the data and selecting a – will compress the data. As this is performed, the Graph Window is dynamically altered allowing rapid data analysis. + +Sales Analytics Result + +Within a few minutes, mastery of the sales data can be achieved. With sales analytics in hand, sales teams can be better supported. Please see the expanded view below to see the complete report. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/index.txt b/foundation/www/docs/user/manual/en/stock/articles/index.txt index 4875de51..9b6be7d8 100755 --- a/foundation/www/docs/user/manual/en/stock/articles/index.txt +++ b/foundation/www/docs/user/manual/en/stock/articles/index.txt @@ -1,3 +1,4 @@ +sales-return-use-cases allow-over-delivery-billing-against-sales-order-upto-certain-limit auto-creation-of-material-request depreciation-entry diff --git a/foundation/www/docs/user/manual/en/stock/articles/sales-return-use-cases.md b/foundation/www/docs/user/manual/en/stock/articles/sales-return-use-cases.md index 23b53a71..9ad81639 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/sales-return-use-cases.md +++ b/foundation/www/docs/user/manual/en/stock/articles/sales-return-use-cases.md @@ -1,3 +1,33 @@ # Sales Return Management -In the case of \ No newline at end of file +In an event of Sales Return, the following adjustment pertaining to stock and accounting can be handled in multiple ways. Let's check what stock and accounts posting would be posted based on the Sales Return adjustment. + +### Return Without Payment + +If a customer request for the returns even before processing a payment, then you can simply: + +1. Cancel the Sales Invoice. +2. Create a Sales Return against a Delivery Note + +If your statutory laws don't allow you to cancel the Sales Invoice, you can create a Credit Note against a Sales Invoice as well. + +### Paid Sales Invoice - Adjustment via Credit Note + +This is a scenario where the customer purchased an item from you for which Sales Invoice as submitted, and also paid. + +1. Create a Credit Note against a Sales Invoice. +2. In the Sales Invoice, check field "Is Paid". Ensure that Payment Account / Mode of Payment is selected in the relevant table. +3. If you wish to also return items via Sales Invoice itself, check field "Update Stock". +4. Save and Submit Credit Note. + +Create Shareholder + +As per this entry, the sold items will be accepted back in your Warehouse. Also, the payment received from the Customer will be reversed. + +After the Credit Note creation, the Outstanding Balance of Sales Invoice will turn negative. This will give you scope to adjust this Sales Invoice (with a negative balance) to adjust against the future outstanding Sales Invoice. + +### Unpaid Sales Invoice - Credit Note + +In the case of Sales Return where the customer didn't process any payment, you can simply create a Credit Note. On creation of Credit Note, Outstanding of the Sales Invoice will become negative. + +For the Adjustment of stock, you can create a Sales Return against Delivery Note or in the Credit Note itself, check field "Update Stock". \ No newline at end of file