+ 
ERPNext Demo
ERPNext is Open Source under the GNU General Public Licence v3 and has been -listed as one of the Best Open Source Softwares in the world by my online +listed as one of the Best Open Source Softwares in the world by many online blogs.
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt index f06bb19baa..d7c405acc5 100644 --- a/erpnext/docs/user/manual/en/accounts/index.txt +++ b/erpnext/docs/user/manual/en/accounts/index.txt @@ -1,21 +1,19 @@ -journal-entry -sales-invoice -purchase-invoice -payment-request chart-of-accounts +opening-accounts +sales-invoice +point-of-sale-pos-invoice +purchase-invoice +journal-entry payment-entry +multi-currency-accounting advance-payment-entry payment-request credit-limit -opening-entry accounting-reports accounting-entries managing-fixed-assets budgeting -opening-accounts -item-wise-tax -point-of-sale-pos-invoice -multi-currency-accounting +item-wise-taxation recurring-orders-and-invoices pricing-rule tools diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-tax.md b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md similarity index 99% rename from erpnext/docs/user/manual/en/accounts/item-wise-tax.md rename to erpnext/docs/user/manual/en/accounts/item-wise-taxation.md index 8c1fc8625f..bc51de9de9 100644 --- a/erpnext/docs/user/manual/en/accounts/item-wise-tax.md +++ b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md @@ -1,4 +1,3 @@ - Taxes selected in the Tax and Other Charges in transactions are applied on all the items. If you need different taxes applied on items selected in the same transaction, you should setup you item and tax master as explained in the steps below. ####Step 1: Mention Tax Applicable in the Item master diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md index fc86cdd3cd..11e4acb80a 100644 --- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md +++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md @@ -1,82 +1,99 @@ - Now that you have completed most of the setup, its time to start moving in! +#Updating Opening Balance in Accounts -There are two important sets of data you need to enter before you start your -operations. +If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software - * Opening Account balances. - * Opening Stock balances. +We recommend that you start using accounting in a new financial year, but you could start midway too. To setup your accounts, you will need the following for the “day” you start using accounting in ERPNext: -To setup your accounts and stock correctly you will need accurate data to work -with. Make sure you have the data setup for this. +* Opening capital accounts - like your shareholder’s (or owner’) capital, loans, bank balances on that day. -### Opening Accounts +* List of outstanding sales and purchase invoices (Payables and Receivables). -We usually recommend that you start using accounting in a new financial year, -but you could start midway too. To setup your accounts, you will need the -following for the “day” you start using accounting in ERPNext: +If you were using another accounting software before, firstly you should close financial statements in that software. The closing balance of the accounts should be updated as an opening balance in the ERPNext. Before starting to update opening balance, ensure that your [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) has all the Accounts required. -Opening capital accounts - like your shareholder’s (or owner’) capital, loans, -bank balances on that day. List of outstanding sales and purchase invoices -(Payables and Receivables). +> Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement. -Based on Voucher Type + * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account. + + * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account. -You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced. +###Opening Entry + +####Step 1: New Journal Entry + +To open new Journal Entry, go to: + +`Explore > Accounts > Journal Entry` + +####Step 2: Entry Type + +If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
- Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts.
+####Step 3: Posting Date
-#### Temporary Accounts
+Select Posting Date on which Accounts Opening Balance will be updated.
-A nice way to simplify opening is to use a temporary account just for opening. These accounts will become zero once all your old invoices and opening balances of bank, debt stock etc are entered. In the standard chart of accounts, a **Temporary Opening** account is created under assets
+####Step 4: Enter Debit/Credit Value
-#### The Opening Entry
+For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
-In ERPNext Opening Accounts are setup by submitting a special Journal Entries
-(Journal Entry).
+
-Note: Make sure to set “Is Opening” as “Yes” in the More Info section.
+####Step 5: Is Opening
-> Setup > Opening Accounts and Stock > Opening Accounting Entries.
+Set field `Is Opening` as `Yes`.
-Complete Journal Entries on the Debit and Credit side.
+
-
+####Step 6: Save and Submit
- To update opening balance is to make Journal Entry for an individual/group of accounts.
+After enter opening balance for each account, Save and Submit Journal Entry. To check if Opening Balance for an account is updated correctly, you can check Trial Balance report.
-For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
+###Selecting Accounts Manually
-
+If your Balance Sheet has many Accounts, then updating Account Opening balance from single Journal Entry can lead to performance issues. In such a scenario, you can multiple Journal Entries to update opening balance in all the Accounts.
-
+If you are updating account opening balance in few accounts at a time, you can use **Temporary Opening** account for balancing purpose. In the standard chart of accounts, a Temporary Opening Account is auto-created under Assets.
-Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing.
+
-This way, you can update opening balance in Asset and Liability accounts.
+In the Journal Entry, manually select an Account for which opening balance is to be updated. For each Account, enter opening balance value in the Debit or Credit column, based on it's Account Type (Asset or Liability).
-You can make two Opening Journal Entrys:
+For example, if you want to update balance in bank accounts, create Journal Entry as following.
- * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account.
- * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account.
- * In this method you can update opening balance of specific balancesheet accounts and not for all.
- * Opening entry is only for balance sheet accounts and not for expense or Income accounts.
+
+
+Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero!
+
+###Trial Balance
After completing the accounting entries, the trial balance report will look like the one given below:
-
+
-#### Outstanding Invoices
+###Stock Opening
-After your Opening Journal Entrys are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+To track stock balance in the Chart of Account, an Account is created for each Warehouse.
-Since you have already booked the income or expense on these invoices in the previous period, select the temp opening account **Temporary Opening** in the “Income” and “Expense” accounts.
+`Chart of Accounts > Assets > Current Asset > StocK Assets > (Warehouse Account)`
+
+
+
+To update stock opening balance, create [Stock Reconciliation entry]({{docs_base_url}}/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account.
+
+###Fixed Asset Opening
+
+Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master]({{docs_base_url}}/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
+
+### Outstanding Invoices
+
+After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+
+Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts.
> Note: Make sure to set each invoice as “Is Opening”!
If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem.
-Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero!
-
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/opening-entry.md b/erpnext/docs/user/manual/en/accounts/opening-entry.md
deleted file mode 100644
index da0b0f9097..0000000000
--- a/erpnext/docs/user/manual/en/accounts/opening-entry.md
+++ /dev/null
@@ -1,7 +0,0 @@
-If you are a new company you can start using ERPNext accounting module by
-going to chart of accounts.
-
-However, if you are migrating from a legacy accounting system like Tally or a
-Fox Pro based software, please visit [Opening Entry.]({{docs_base_url}}/user/manual/en/accounts/opening-accounts.html)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index b0b6bcc135..6a697b1d85 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -6,7 +6,7 @@ For retail operations, the delivery of goods, accrual of sale and payment all ha
###Offline POS
-POS transactions are generally quick, hence should have as less dependency as possible. In ERPNext, you can create POS Invoices even when not connected to the internet.
+In the retails business, invoicing needs to done very quickly, hence should less dependency. In the ERPNext, you can create POS Invoices, even when not connected to the internet.
POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7)
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
index de68bbf1e3..248a49a33a 100644
--- a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -1,4 +1,4 @@
-Human Resources Reports
+# Human Resources Reports
### Employee Leave Balance
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 59aedee9ff..80b594663a 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -4,4 +4,5 @@ print-headings
letter-head
address-template
terms-and-conditions
-cheque-print-template
\ No newline at end of file
+cheque-print-template
+multi-lingual-print-format
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md b/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
similarity index 56%
rename from erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
rename to erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
index bb48278126..a15834c812 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/multilingual_print_format.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
@@ -1,28 +1,26 @@
-####What is Multlingual Print Format?
+#Multi-lngual Print Formats
User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
-####How does it work?
-Set print language for customer, supplier on their respective form.
+####Set Language
-`Selling -> Customer -> Customer List -> Click on New`
+In the Customer master, select default Language. Say default language for the Customer is deutsch.
-Here user has set default language for customer Adalbert as deutsch.
+
-
+Same way, you can also set default language in the Supplier master.
-`Buying -> Supplier -> Supplier List -> Click on New`
+
-Here user has set default language for supplier Piero as Italiano.
-
+####Print Preview in the Party's Language
-When user click on print icon on the document, system will load the print preview in their default language.
+In the Print Preview of a transaction, values will be translated into party's language.
-Customer quotation standard print preview in customer's default language.
+Customer Quotation print preview in customer's default language.
-Supplier quotation standard print preview in supplier's default language.
+Supplier Quotation print preview in supplier's default language.
@@ -32,16 +30,15 @@ User can have option to select alternate language on print view.
-
####Custom Translation
User can set their custom translations using translation form. For example user want to set description of the product in customer's language(Italiano). For that create new translation with language as Italiano, enter source data and Translated information.
-`Setup -> Settings -> Translation List -> Click on New`
+`Setup > Settings > Translation List > New`
-The translation is applied when user select language as Italiano on supplier quotation's print prieview.
+The translation is applied when user select language as Italiano on supplier quotation's print preview.
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index ffc5f40e43..38ae8974da 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -1,8 +1,8 @@
-Existing Users, need to follow some steps to activate the new Perpetual
-Inventory system. As Perpetual Inventory always maintains a sync between stock
-and account balance, it is not possible to enable it with existing Warehouse
-setup. You have to create a whole new set of Warehouses, each linked to
-relevant account.
+Perpetual Inventory Valuation is activated by default in the system.
+
+For the users who are currently following periodic inventory valuation system, and wish to migrate to perpetual inventory valuation system, please follow the steps explained below.
+
+As Perpetual Inventory always maintains a sync between stock and account balance, it is not possible to enable it with existing Warehouse setup. You have to create a whole new set of Warehouses, each linked to relevant account.
Steps:
@@ -18,21 +18,14 @@ Steps:
* Cost Center
* Activate Perpetual Inventory
-> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
-
-
+ `Explore > Accounts > Accounts Settings`
+
+ 
* Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
-System will not post any accounting entries for existing stock transactions
-submitted prior to the activation of Perpetual Inventory as those old
-warehouses will not be linked to any account. If you create any new
-transaction or modify/amend existing transactions, with old warehouse, there
-will be no corresponding accounting entries. You have to manually sync stock
-and account balance through Journal Entry.
+System will not post any accounting entries for existing stock transactions submitted prior to the activation of Perpetual Inventory as those old warehouses will not be linked to any account. If you create any new transaction or modify/amend existing transactions, with old warehouse, there will be no corresponding accounting entries. You have to manually sync stock and account balance through Journal Entry.
-> Note: If you are already using old Perpetual Inventory system, it will be
-deactivated automatically. You need to follow the above steps to reactivate
-it.
+> Note: If you are already using old Perpetual Inventory system, it will be deactivated automatically. You need to follow the above steps to reactivate it.
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 80970bf1f9..c31d1ac78f 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -19,7 +19,7 @@ asset account will be reduced, based on the valuation amount of those items.
* Stock Adjustment Account
* Expenses Included In Valuation
* Cost Center
- 2. In perpetual inventory, the system will maintain seperate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
+ 2. In perpetual inventory, the system will maintain separate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
3. Activate Perpetual Inventory
@@ -370,4 +370,4 @@ Goods Sold" accounts are also affected based on the valuation amount.
-{ next }
\ No newline at end of file
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
index 6ecd377ae5..72b03b7277 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -2,7 +2,7 @@ Assign To feature in ERPNext allows you to allocate particular document to speci
For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note.
-
#### Step 2: Assign to User
In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
-
+
-With assignment, you can also leave a comment for the review of asignee.
+With assignment, you can also leave a comment for the review of assignee.
####ToDo List of Assignee
This transaction will appear in the To-do list of the ser in “Todo” section.
-
+
####Removing Assignment
User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
-
+
Once assignment is set as completed, Status of its ToDo record will be set as Closed.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/chat.md b/erpnext/docs/user/manual/en/using-erpnext/chat.md
new file mode 100644
index 0000000000..ed155d8c06
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/chat.md
@@ -0,0 +1,14 @@
+You can send and receive messages from the system by using the Messages tool.
+
+`Explore > Tools > Chat`
+
+If you send a message to a user, and the user is logged in, it will appear as a popup message and the unread messages counter in the top toolbar will be
+updated.
+
+
+
+You can choose to send message to all the users, or to specific user.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
index 7418d739df..7ffec7677f 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -1,19 +1,24 @@
+Following are the tools in each document using which you can collaborate with other Users in your ERPNext account.
+
### Assigned to
-You can email any transaction from the system by clicking on the “Assigned to”
-button in the right sidebar. A log of all your sent emails will be maintained
-in Communication.
-
-
+If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.]({{docs_base_url}}/user/manual/en/using-erpnext/assignment.html)
### Comments
Comments are a great way to add information about a transaction that is not a
-part of the transactions. Like some background information etc. Comments can
-be added in the right sidebar.
+part of the transactions. Like some background information etc.
+
+
+
+###Share
+
+You can share document with the specific User. If Document is shared with the specific User, he/she will be able to access it, even if that User doesn't have permission to access that document or Document Type.
+
+
### Tags
-[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)
+[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
index 63f4a64733..c3a6aa45ee 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -1,10 +1,9 @@
to-do
collaborating-around-forms
-messages
+chat
notes
calendar
assignment
tags
articles
-pos-view
-multilingual_print_format
+pos-view
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/messages.md b/erpnext/docs/user/manual/en/using-erpnext/messages.md
deleted file mode 100644
index dfa052625a..0000000000
--- a/erpnext/docs/user/manual/en/using-erpnext/messages.md
+++ /dev/null
@@ -1,12 +0,0 @@
-You can send and receive messages from the system by using the Messages tool.
-If you send a message to a user, and the user is logged in, it will appear as
-a popup message and the unread messages counter in the top toolbar will be
-updated.
-
-
-
-You can choose to send message to all the users, or to specific user.
-
-
-
-{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
index cc88aec765..64e7acbe4f 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/notes.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md
@@ -1,21 +1,17 @@
You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note.
-####Go to Note
-
-`Home > Note > New`
+`Explore > Note > New`
####Notes Details
Enter Title and Context.
-
+
####Set Permissions to select Users
-To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table.
+To make Note accessible for all, check "Public" under links section. Else you can share it with the specific User by using Share feature.
-
-
-
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
index 6f6c9834ac..0446a32229 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/tags.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md
@@ -1,5 +1,9 @@
-Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list.
+Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it.
-
+
+
+ERPNext will also show you all the important tags in the document list.
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
index 03f84d5822..295e79ac84 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/to-do.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
@@ -1,10 +1,9 @@
-To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned
-by you are listed. You can also add your own to-do items in the list.
+To Do is a simple tool where all the activities [assigned]({{docs_base_url}}/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list.
-
+
-When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo record itself.
+When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo master itself.
-
+
{next}
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 1b3b05d506..bb9e1fdfec 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -22,6 +22,12 @@ frappe.ui.form.on("Project", {
}
frm.set_query('customer', 'erpnext.controllers.queries.customer_query');
+
+ frm.set_query("user", "users", function() {
+ return {
+ query:"erpnext.projects.doctype.project.project.get_users_for_project"
+ }
+ });
// sales order
frm.set_query('sales_order', function() {
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 7405f2c879..f5ff2de3f9 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -187,6 +187,13 @@ def get_list_context(context=None):
"row_template": "templates/includes/projects/project_row.html"
}
+def get_users_for_project(doctype, txt, searchfield, start, page_len, filters):
+ return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)
+ from `tabUser`
+ where enabled=1
+ and name not in ("Guest", "Administrator")
+ order by
+ name asc""")
@frappe.whitelist()
def get_cost_center_name(project):
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index ab3f601836..b86378d1c6 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1993,7 +1993,7 @@
"collapsible": 0,
"depends_on": "show_in_website",
"fieldname": "route",
- "fieldtype": "Data",
+ "fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -2011,7 +2011,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
- "unique": 1
+ "unique": 0
},
{
"allow_on_submit": 0,
@@ -2335,7 +2335,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
- "modified": "2016-07-28 19:12:27.253074",
+ "modified": "2016-08-03 17:30:51.323382",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
diff --git a/erpnext/templates/pages/demo.html b/erpnext/templates/pages/demo.html
index e1d98a1158..8db6ad2dd2 100644
--- a/erpnext/templates/pages/demo.html
+++ b/erpnext/templates/pages/demo.html
@@ -51,7 +51,7 @@ $(document).ready(function() {
+