Note: In future, if you want to make an accounting transaction against this Account, then you can unfreeze this account by setting values in the Frozen field as 'No'.
-Set Frozen field status of ledger as 'Yes' and save the ledger form. On save this ledger will be frozen and you will became unable to search this ledger in accounting transactions.
-
Note: If you want to make accounting transaction against this ledger in the future, then that time again set frozen field status as 'No'.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index d54f0cda8ec..c2fbf70726d 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -1,7 +1,5 @@
tracking-project-profitability-using-cost-center
-c-form
changing-parent-account
-depreciation-for-fixed-asset-items
difference-entry-button
fiscal-year-error
freeze-accounting-entries
@@ -13,4 +11,4 @@ post-dated-cheque-entry
update-stock-option-in-sales-invoice
what-is-the-differences-of-total-and-valuation-in-tax-and-charges
withdrawing-salary-from-owners-equity-account
-cheque-print
\ No newline at end of file
+c-form
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
index 66da24e8e0a..0b610006861 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -1,32 +1,32 @@
#Post Dated Cheque Entry
-Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only after cheque date has arrived.
+Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only when cheque date arrives.
-In ERPNext, create Journal Entries for post dated cheque.
+In ERPNext, create Payment Entry for post dated cheque.
-####New Journal Entry
+####New Payment Entry
To open new journal voucher go to
-`Accounts > Documents > Journal Entry > New`
+`Explore > Accounts > Payment Entry > New`
#### Set Posting Date
Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
-
+
-Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+Note: Payment Entry Reference Date should equal to or less than Posting Date.
####Step 3: Save and Submit
-After entering required details, Save and Submit the Journal Entry.
+After entering required details, Save and Submit the Payment Entry.
####Adjusting Post Dated Cheque Entry
-If Post Dated Journal Entry needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
+You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
-You might find value of this Journal Entry already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in a account.
+In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in the bank's statement.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index c1cefc60370..e5142ce1b46 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -1,72 +1,60 @@
# User Permissions
-Limit access for a User to a set of documents using User Permissions Manager
-
Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
To start with, go to:
+
> Setup > Permissions > User Permissions Manager
-
-
- User Permissions Manager displaying how users can access only a specific Company.
-
+User Permissions Manager displaying how users can access only a specific Company.
#### Example
-User 'aromn@example.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Wind Power LLC'.
+User 'tom.hagen@riosolutions.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Rio Solutions'.
1. We add a User Permissions row for Company.
-
-
- Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.
-
+
+
+
+ Add User Permissions row for a combination of User 'tom.hagen@riosolutions.com' and Company 'Rio Solutions'.
1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
-
-
- Read Permission with Apply User Permissions checked for DocType Company.
-
+
+
- 1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
-
-
- Access is limited to Company 'Wind Power LLC'.
-
+ Read Permission with Apply User Permissions checked for DocType Company.
+
+ 1. The combined effect of the above two rules lead to User 'tom.hagen@riosolutions.com' having only Read access to Company 'Rio Solutions'.
+
+
+
+ Access is limited to Company 'Rio Solutions'.
1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
-These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
-
-
- Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
-
-
-
- Quotation List is limited to results for Company 'Wind Power LLC' for User 'aromn@example.com'.
-
+
+ These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'tom.hagen@riosolutions' to acces these documents having Company 'Rio Solutions'.
+
+
+
+ Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
+
+
+
+ Quotation List is limited to results for Company 'Rio Solutions' for User 'tom.hagen@riosolutions.com'.
1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
-
-
- Sales User can Read, Write and Create Leads limited by User Permissions.
-
-
-
- Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
-
-
-
- Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.
-
+
+
+
+Sales User can Read, Write and Create Leads limited by User Permissions.
+
+
+
+Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
+
+
+
+Due to the effect of the above combination, User 'tom.hagen@riosolutions.com' can only access Leads with Territory 'United States'.
{next}
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 c31d1ac78f6..84fe5451745 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
@@ -1,42 +1,38 @@
-In perpetual inventory, system creates accounting entries for each stock
-transactions, so that stock and account balance will always remain same. The
-account balance will be posted against their respective account heads for each
-Warehouse. On saving of a Warehouse, the system will automatically create an
-account head with the same name as warehouse. As account balance is maintained
-for each Warehouse, you should create Warehouses, based on the type of items
-(Current / Fixed Assets) it stores.
+As per the perpetual inventory system, accounts posting is done for every stock transaction.
-At the time of items received in a particular warehouse, the balance of asset
-account (linked to that warehouse) will be increased. Similarly when you
-deliver some items from that warehouse, an expense will be booked and the
-asset account will be reduced, based on the valuation amount of those items.
+On creating new Warehouse, the system will automatically create an Account in the Chart of Accout, with the same name as Warehouse Name.
-## **Activation**
+On receipt of items in a particular warehouse, the balance in the Warehouse Account will increase. Similarly when items are delivered from the Warehouse, an expense will be booked, and balance in the Warehouse Account will reduce.
- 1. Setup the following default accounts for each Company
+##Activation
+
+ 1. Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
* Stock Received But Not Billed
* Stock Adjustment Account
* Expenses Included In Valuation
* Cost Center
- 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.
+
+ 2. Ensure each Warehouse is an Account in the Chart of Accounts master. As per the default configuration, Accounts for Warehouse are created under `Assets > Current Asset > Stock Assets > (Warehouse)`
3. Activate Perpetual Inventory
-> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+ > Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement"
+
+
* * *
-## **Example**
+##Example
Consider following Chart of Accounts and Warehouse setup for your company:
-#### Chart of Accounts
+####Chart of Accounts
* Assets (Dr)
* Current Assets
* Accounts Receivable
- * Jane Doe
+ * Debtor
* Stock Assets
* Stores
* Finished Goods
@@ -44,11 +40,11 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Tax Assets
* VAT
* Fixed Assets
- * Fixed Asset Warehouse
+ * Fixed Asset Warehouse
* Liabilities (Cr)
* Current Liabilities
* Accounts Payable
- * East Wind Inc.
+ * Creditors
* Stock Liabilities
* Stock Received But Not Billed
* Tax Liabilities
@@ -65,18 +61,15 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Shipping Charges
* Customs Duty
-#### Warehouse - Account Configuration
+####Warehouse - Account Configuration
* Stores
* Work In Progress
* Finished Goods
- * Fixed Asset Warehouse
-### **Purchase Receipt**
+###Purchase Receipt
-Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of
-item "Desktop" at **$100** from supplier "East Wind Inc". Following are the
-details of Purchase Receipt:
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "East Wind Inc". Following are the details of Purchase Receipt:
**Supplier:** East Wind Inc.
@@ -100,15 +93,7 @@ details of Purchase Receipt:
10
200
2000
-
2200
-
-
-
Desktop
-
Fixed Asset Warehouse
-
5
-
100
-
500
-
550
+
2250
@@ -129,8 +114,8 @@ details of Purchase Receipt:
Total and Valuation
-
VAT
-
120
+
VAT (10%)
+
200
Total
@@ -140,25 +125,22 @@ details of Purchase Receipt:
-
Stock Ledger
-
-
+**Stock Ledger**
+
+
**General Ledger**
-
+
-As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
-Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
-Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
+As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
* * *
-### **Purchase Invoice**
+###Purchase Invoice
-On receiving Bill from supplier, for the above Purchase Receipt, you will make
-Purchase Invoice for the same. The general ledger entries are as follows:
+On receiving Bill from supplier, for the above Purchase Receipt, you will make Purchase Invoice for the same. The general ledger entries are as follows:
**General Ledger**
@@ -169,7 +151,7 @@ effect of Purchase Receipt.
* * *
-### **Delivery Note**
+###Delivery Note
Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
at $300. Following are the details of Delivery Note:
@@ -246,7 +228,7 @@ valuation method (FIFO / Moving Average) or actual cost of serialized items.
* * *
-### **Sales Invoice with Update Stock**
+###Sales Invoice with Update Stock
Lets say, you did not make Delivery Note against the above order and instead
you have made Sales Invoice directly, with "Update Stock" options. The details
@@ -265,7 +247,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Receipt)**
+###Stock Entry (Material Receipt)
**Items:**
@@ -300,7 +282,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Issue)**
+###Stock Entry (Material Issue)
**Items:**
@@ -335,7 +317,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Transfer)**
+###Stock Entry (Material Transfer)
**Items:**
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 773e1628df5..16820842c6a 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -14,14 +14,10 @@ To set up a shopping cart, go to the selling module.
-
-
#### Step 2: Enter Price List, Tax Master and Shipping Rule.
-
-
#### Shopping Cart Display
On the Website, the shopping cart image will be seen below the Item price.
@@ -31,8 +27,6 @@ to the flower sign.
-
-
Click on the flower sign on the right hand side to see the cart details. Click
on the cart to get the final amount details.
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 53bd725f609..bdd12c599d7 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -2118,7 +2118,7 @@
"permissions": [
{
"amend": 1,
- "apply_user_permissions": 0,
+ "apply_user_permissions": 1,
"cancel": 1,
"create": 1,
"delete": 1,
@@ -2134,6 +2134,7 @@
"set_user_permissions": 0,
"share": 1,
"submit": 1,
+ "user_permission_doctypes": "[\"Company\"]",
"write": 1
},
{
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 25e0cfb2ab4..b156e251060 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -10,6 +10,7 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 1,
"fields": [
{
"allow_on_submit": 0,
@@ -1385,8 +1386,8 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-06-26 09:08:50.476200",
- "modified_by": "Administrator",
+ "modified": "2016-08-10 17:04:38.452301",
+ "modified_by": "umair@frappe.io",
"module": "Setup",
"name": "Company",
"owner": "Administrator",
@@ -1453,7 +1454,7 @@
},
{
"amend": 0,
- "apply_user_permissions": 0,
+ "apply_user_permissions": 1,
"cancel": 0,
"create": 0,
"delete": 0,
@@ -1469,6 +1470,7 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
+ "user_permission_doctypes": "[\"Company\"]",
"write": 0
},
{
- 
-
-#### Step 2: Stock Reconciliation
-
-To create new Stock Reconciliation, go to:
-
-`Stock > Setup > Stock Reconciliation > New`
-
-Set Posting Date and Time of Stock Reconciliation will when you wish depreciation entry to be posted in your accounts.
-
-#### Step 3: Item
-
-Select Fixed Asset Items in the item table. Update Warehouse of an item. For item valuation, update post-depreciation value. For example, item value was 100. Depreciation amount is 20. As per this post-depreciation valuation of an item will be 80. Hence 80 should be posted as valuation in the Stock Reconciliation.
-
-
-
-#### Step 4: Depreciation Account
-
-Select Depereciation Account in which depereciation amount will be booked.
-
-
-
-#### Step 5: Submit
-
-On submission of Stock Reconciliation, depreciation will booked for items asset items.
-
-
-
-Click [here]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) for steps to be followed when making Stock Reconciliation entry.
-
-
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index f21bf2d99e1..80aed6d40e9 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -1,28 +1,36 @@
#How To Freeze Accounting Ledger?
-You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
+If you want to discontinue using specific Account, you can freeze it.
-#### 1. Set Frozen Accounts Modifier
+>Account can be Frozen by the User having specific Role. This Role for set in the Account Settings, in the field "Role Allowed to Set Frozen Accounts & Edit Frozen Entries".
-To set frozen accounts modifier go to `Accounts > Setup > Accounts Setting`
+Please check following steps to freeze an Account from the Chart of Accounts master.
-Search and select Role under Frozen Accounts Modifier field and save the Account Settings form.
-
-
+####Step 1: Chart of Accounts
-#### 2. Edit Accounting Ledger.
+To edit an Account, go to Chart of Accounts:
-To edit accounting ledger go to `Accounts > Setup > Chart of Accounts`
+`Explore > Accounts > Chart of Accounts`
-
+
-#### 3. Set Frozen Status of Ledger.
+Click on Account in which Frozen Date is to be updated.
-
+####Step 2: Set Account as Frozen
+
+In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes'
+
+
+
+####Step 3: Save
+
+After update Save an Account.
+
+On saving, this Account will be frozen and will not be selectable in any accounting transaction.
+
+
+
-Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+Note: Payment Entry Reference Date should equal to or less than Posting Date.
####Step 3: Save and Submit
-After entering required details, Save and Submit the Journal Entry.
+After entering required details, Save and Submit the Payment Entry.
####Adjusting Post Dated Cheque Entry
-If Post Dated Journal Entry needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
+You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
-You might find value of this Journal Entry already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in a account.
+In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in the bank's statement.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index c1cefc60370..e5142ce1b46 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -1,72 +1,60 @@
# User Permissions
-Limit access for a User to a set of documents using User Permissions Manager
-
Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
To start with, go to:
+
> Setup > Permissions > User Permissions Manager
-
- 
+
+ Add User Permissions row for a combination of User 'tom.hagen@riosolutions.com' and Company 'Rio Solutions'.
1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
- 
- 
- 
+
+ Access is limited to Company 'Rio Solutions'.
1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
-These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
- 
- 
- 
+
+ Quotation List is limited to results for Company 'Rio Solutions' for User 'tom.hagen@riosolutions.com'.
1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
- 
- 
- 
- 
+
+Due to the effect of the above combination, User 'tom.hagen@riosolutions.com' can only access Leads with Territory 'United States'.
{next}
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 c31d1ac78f6..84fe5451745 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
@@ -1,42 +1,38 @@
-In perpetual inventory, system creates accounting entries for each stock
-transactions, so that stock and account balance will always remain same. The
-account balance will be posted against their respective account heads for each
-Warehouse. On saving of a Warehouse, the system will automatically create an
-account head with the same name as warehouse. As account balance is maintained
-for each Warehouse, you should create Warehouses, based on the type of items
-(Current / Fixed Assets) it stores.
+As per the perpetual inventory system, accounts posting is done for every stock transaction.
-At the time of items received in a particular warehouse, the balance of asset
-account (linked to that warehouse) will be increased. Similarly when you
-deliver some items from that warehouse, an expense will be booked and the
-asset account will be reduced, based on the valuation amount of those items.
+On creating new Warehouse, the system will automatically create an Account in the Chart of Accout, with the same name as Warehouse Name.
-## **Activation**
+On receipt of items in a particular warehouse, the balance in the Warehouse Account will increase. Similarly when items are delivered from the Warehouse, an expense will be booked, and balance in the Warehouse Account will reduce.
- 1. Setup the following default accounts for each Company
+##Activation
+
+ 1. Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
* Stock Received But Not Billed
* Stock Adjustment Account
* Expenses Included In Valuation
* Cost Center
- 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.
+
+ 2. Ensure each Warehouse is an Account in the Chart of Accounts master. As per the default configuration, Accounts for Warehouse are created under `Assets > Current Asset > Stock Assets > (Warehouse)`
3. Activate Perpetual Inventory
-> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+ > Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement"
+
+
* * *
-## **Example**
+##Example
Consider following Chart of Accounts and Warehouse setup for your company:
-#### Chart of Accounts
+####Chart of Accounts
* Assets (Dr)
* Current Assets
* Accounts Receivable
- * Jane Doe
+ * Debtor
* Stock Assets
* Stores
* Finished Goods
@@ -44,11 +40,11 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Tax Assets
* VAT
* Fixed Assets
- * Fixed Asset Warehouse
+ * Fixed Asset Warehouse
* Liabilities (Cr)
* Current Liabilities
* Accounts Payable
- * East Wind Inc.
+ * Creditors
* Stock Liabilities
* Stock Received But Not Billed
* Tax Liabilities
@@ -65,18 +61,15 @@ Consider following Chart of Accounts and Warehouse setup for your company:
* Shipping Charges
* Customs Duty
-#### Warehouse - Account Configuration
+####Warehouse - Account Configuration
* Stores
* Work In Progress
* Finished Goods
- * Fixed Asset Warehouse
-### **Purchase Receipt**
+###Purchase Receipt
-Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of
-item "Desktop" at **$100** from supplier "East Wind Inc". Following are the
-details of Purchase Receipt:
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "East Wind Inc". Following are the details of Purchase Receipt:
**Supplier:** East Wind Inc.
@@ -100,15 +93,7 @@ details of Purchase Receipt:
+**Stock Ledger**
+
+
**General Ledger**
-
+
-As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
-Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
-Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
+As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
* * *
-### **Purchase Invoice**
+###Purchase Invoice
-On receiving Bill from supplier, for the above Purchase Receipt, you will make
-Purchase Invoice for the same. The general ledger entries are as follows:
+On receiving Bill from supplier, for the above Purchase Receipt, you will make Purchase Invoice for the same. The general ledger entries are as follows:
**General Ledger**
@@ -169,7 +151,7 @@ effect of Purchase Receipt.
* * *
-### **Delivery Note**
+###Delivery Note
Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
at $300. Following are the details of Delivery Note:
@@ -246,7 +228,7 @@ valuation method (FIFO / Moving Average) or actual cost of serialized items.
* * *
-### **Sales Invoice with Update Stock**
+###Sales Invoice with Update Stock
Lets say, you did not make Delivery Note against the above order and instead
you have made Sales Invoice directly, with "Update Stock" options. The details
@@ -265,7 +247,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Receipt)**
+###Stock Entry (Material Receipt)
**Items:**
@@ -300,7 +282,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Issue)**
+###Stock Entry (Material Issue)
**Items:**
@@ -335,7 +317,7 @@ Goods Sold" accounts are also affected based on the valuation amount.
* * *
-### **Stock Entry (Material Transfer)**
+###Stock Entry (Material Transfer)
**Items:**
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 773e1628df5..16820842c6a 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -14,14 +14,10 @@ To set up a shopping cart, go to the selling module.
-
-
#### Step 2: Enter Price List, Tax Master and Shipping Rule.
-
-
#### Shopping Cart Display
On the Website, the shopping cart image will be seen below the Item price.
@@ -31,8 +27,6 @@ to the flower sign.
-
-
Click on the flower sign on the right hand side to see the cart details. Click
on the cart to get the final amount details.
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 53bd725f609..bdd12c599d7 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -2118,7 +2118,7 @@
"permissions": [
{
"amend": 1,
- "apply_user_permissions": 0,
+ "apply_user_permissions": 1,
"cancel": 1,
"create": 1,
"delete": 1,
@@ -2134,6 +2134,7 @@
"set_user_permissions": 0,
"share": 1,
"submit": 1,
+ "user_permission_doctypes": "[\"Company\"]",
"write": 1
},
{
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 25e0cfb2ab4..b156e251060 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -10,6 +10,7 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 1,
"fields": [
{
"allow_on_submit": 0,
@@ -1385,8 +1386,8 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-06-26 09:08:50.476200",
- "modified_by": "Administrator",
+ "modified": "2016-08-10 17:04:38.452301",
+ "modified_by": "umair@frappe.io",
"module": "Setup",
"name": "Company",
"owner": "Administrator",
@@ -1453,7 +1454,7 @@
},
{
"amend": 0,
- "apply_user_permissions": 0,
+ "apply_user_permissions": 1,
"cancel": 0,
"create": 0,
"delete": 0,
@@ -1469,6 +1470,7 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
+ "user_permission_doctypes": "[\"Company\"]",
"write": 0
},
{