diff --git a/erpnext/docs/assets/img/accounts/perpetual-2.png b/erpnext/docs/assets/img/accounts/perpetual-2.png new file mode 100644 index 00000000000..5a2b20b21d0 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-2.png differ diff --git a/erpnext/docs/assets/img/accounts/perpetual-3.png b/erpnext/docs/assets/img/accounts/perpetual-3.png new file mode 100644 index 00000000000..faa77245c5e Binary files /dev/null and b/erpnext/docs/assets/img/accounts/perpetual-3.png differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif b/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif deleted file mode 100644 index e6330adb871..00000000000 Binary files a/erpnext/docs/assets/img/articles/fixed-asset-dep-1.gif and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png deleted file mode 100644 index 0679403e146..00000000000 Binary files a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping b/erpnext/docs/assets/img/articles/fixed-asset-dep-2.textClipping deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/docs/assets/img/articles/freeze-account-1.png b/erpnext/docs/assets/img/articles/freeze-account-1.png new file mode 100644 index 00000000000..c2f4257b866 Binary files /dev/null and b/erpnext/docs/assets/img/articles/freeze-account-1.png differ diff --git a/erpnext/docs/assets/img/articles/freeze-account-2.png b/erpnext/docs/assets/img/articles/freeze-account-2.png new file mode 100644 index 00000000000..4562a26a829 Binary files /dev/null and b/erpnext/docs/assets/img/articles/freeze-account-2.png differ diff --git a/erpnext/docs/assets/img/articles/post-dated-1.gif b/erpnext/docs/assets/img/articles/post-dated-1.gif deleted file mode 100644 index 3bb03b59840..00000000000 Binary files a/erpnext/docs/assets/img/articles/post-dated-1.gif and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/post-dated-1.png b/erpnext/docs/assets/img/articles/post-dated-1.png new file mode 100644 index 00000000000..50696b7fbb8 Binary files /dev/null and b/erpnext/docs/assets/img/articles/post-dated-1.png differ diff --git a/erpnext/docs/assets/img/setup-wizard/step-1.png b/erpnext/docs/assets/img/setup-wizard/step-1.png new file mode 100644 index 00000000000..0a3c230ae82 Binary files /dev/null and b/erpnext/docs/assets/img/setup-wizard/step-1.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-1.png b/erpnext/docs/assets/img/setup/dropbox-1.png new file mode 100644 index 00000000000..f839d25720f Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-1.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-2.png b/erpnext/docs/assets/img/setup/dropbox-2.png new file mode 100644 index 00000000000..d0a65588d15 Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-2.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-3.png b/erpnext/docs/assets/img/setup/dropbox-3.png new file mode 100644 index 00000000000..02755977698 Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-3.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-open-1.png b/erpnext/docs/assets/img/setup/dropbox-open-1.png new file mode 100644 index 00000000000..cc1d57ce8b8 Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-open-1.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-open-2.png b/erpnext/docs/assets/img/setup/dropbox-open-2.png new file mode 100644 index 00000000000..969d7a71665 Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-open-2.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-open-3.png b/erpnext/docs/assets/img/setup/dropbox-open-3.png new file mode 100644 index 00000000000..150a95a4ecc Binary files /dev/null and b/erpnext/docs/assets/img/setup/dropbox-open-3.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/permissions-lead-list.png b/erpnext/docs/assets/img/users-and-permissions/permissions-lead-list.png new file mode 100644 index 00000000000..c2fdc7cd043 Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/permissions-lead-list.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png new file mode 100644 index 00000000000..eb529f17923 Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png new file mode 100644 index 00000000000..ee7a19b51ad Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png deleted file mode 100644 index e23f1229b04..00000000000 Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png and /dev/null differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png deleted file mode 100644 index 6d78e5dc1ee..00000000000 Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png and /dev/null differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png deleted file mode 100644 index e091a61b76e..00000000000 Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png and /dev/null differ diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif b/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif new file mode 100644 index 00000000000..609bf257e2e Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png deleted file mode 100644 index f194360b8f2..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png deleted file mode 100644 index c6e336f8a80..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png b/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png deleted file mode 100644 index e0b237329b9..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png b/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png deleted file mode 100644 index 8a7e9c64aed..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png and /dev/null differ diff --git a/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md b/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md deleted file mode 100644 index 811e948fd56..00000000000 --- a/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md +++ /dev/null @@ -1,36 +0,0 @@ -#Cheque Print - -** Whats is Cheque Print? ** - -You can choose to print Cheques at the time of making payments to Creditors/ parties during Voucher Entry i.e., directly from the Payment Vouchers and Inter-bank payment or transfers through Contra Vouchers. - -###Setup Cheque Print - -To enable cheque printing, - -1. Create cheque settings under `Accounts > Cheque Print Template`. - -![Cheque Print Template]({{docs_base_url}}/assets/img/articles/cueque_print_template.png) - -You can see a preview of cheque print by attaching scanned copy of cheque to avoid miss printing. - -![Cheque scanned copy]({{docs_base_url}}/assets/img/articles/attach_scanned_copy.png) - -![Cheque Print Preview]({{docs_base_url}}/assets/img/articles/cueque_print_preview.png) - -2. After saving cheque print settings, you can Create / Update print format for settings. - -To create print format, click on `Create Print Format`. - -![Create Print Format]({{docs_base_url}}/assets/img/articles/create_print_format.png) - -If you have already created a Print Format, you can update it by clicking on `Update Print Format`. - -3. You will see newly created / updated print format under Journal Entry. - -![Print from Journal Entry]({{docs_base_url}}/assets/img/articles/journal_entry_cheque_print.png) - - -###Cheque Print - -![Print from Journal Entry]({{docs_base_url}}/assets/img/articles/cheque_print.gif) diff --git a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md deleted file mode 100644 index f7d1c5bef5e..00000000000 --- a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md +++ /dev/null @@ -1,41 +0,0 @@ -#Depreciation for Fixed Asset Items - -Depreciation is when you write off certain value of your assets as an expense. For example, office computer will be used for five years. Hence total value of computer should be booked as expense over the period of five years. - -As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. Check below steps to learn more. - -#### Step 1: Depreciation Account - -Depreciation account is auto-created, under Indirect Expenses account. - -Project Default Cost Center - -#### 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. - -Project Default Cost Center - -#### Step 4: Depreciation Account - -Select Depereciation Account in which depereciation amount will be booked. - -Project Default Cost Center - -#### Step 5: Submit - -On submission of Stock Reconciliation, depreciation will booked for items asset items. - -Project Default Cost Center - -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. - -![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_001f1e2ff.png) +####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` -![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_0027e4d09.png) +Freeze Account -#### 3. Set Frozen Status of Ledger. +Click on Account in which Frozen Date is to be updated. -![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_003bf981b.png) +####Step 2: Set Account as Frozen + +In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes' + +Freeze Account + +####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: 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. -JE Posting Date +JE Posting Date -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/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html deleted file mode 100644 index 1b7e4f79778..00000000000 --- a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html +++ /dev/null @@ -1,74 +0,0 @@ -

Setting Up Dropbox Backups

- -

Setting Up Dropbox Backups

- -

If you wish to store your backups on a periodic basis,on Dropbox, you can do it directly through ERPNext.

-
-

Setup > Manage 3rd Party Backups

-
-

Step 1: Click on Integrations > Backup Manager -
-

-
-
-

In the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', select whether you wish to upload Daily, Weekly or Never.

-

Step 2 Click on Allow Dropbox Access.

-
-

Tip: In future, if you wish to discontinue uploading backups to dropbox, then select the Never option.

-
- -
-
  -
-
-
- Step 3 -
-
-
-

You need to login to your dropbox account, with your user id and password.

-
-
-   -
-
-
-
-
-
-
-

Open Source Users

- -
-
-
-
-
Step 1: Go to https://www.dropbox.com/developers/apps - -
-
Step 2: Create a new app
-
- -
-
-
Step 3: Fill in details for the app.
-
- -
-
-
-
-
-
Step 4: After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
-
-
-
-
{ 
- "db_name": "demo", 
- "db_password": "DZ1Idd55xJ9qvkHvUH", 
- "dropbox_access_key": "ACCESSKEY", 
- "dropbox_secret_key": "SECRECTKEY" 
-}
-
-
-
Step 5: Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md new file mode 100644 index 00000000000..68e40312819 --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md @@ -0,0 +1,74 @@ +#Setting Up Dropbox Backups + +We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well. + +You can automate database backup download of your ERPNext account into your Dropbox account. + +####Step 1: Go to Setup + +`Explore > Setup > Integrations > Dropbox Backup` + +####Step 2: Activate + +In the Dropbox Backup, check "Send Backups to Dropbox" to active this feature. On checking this field, you will find field to set Frequency and notification Email. + +####Step 3: Set Frequency + +Set Frequency to download backup in your Dropbox account. + +set frequency + +####Step 4: Allow Dropbox Access + +After setting frequency and updating notification email, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account. + +####Step 5: Login to Dropbox + +Login to your Dropbox account by entering login credentials. + +Login + +####Step 6: Allow + +On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account. + +Allow + +With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it. + +##Open Source Users + +####Step 1: Go to + +https://www.dropbox.com/developers/apps + +####Step 2:Create a new app + +Create new + +####Step 3: Fill in details for the app + +Create new + +- +Create new + +####Step 4: Settings in Site Config + +After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows, + +
+ 
+		{ 
+ "db_name": "demo", 
+ "db_password": "DZ1Idd55xJ9qvkHvUH", 
+ "dropbox_access_key": "ACCESSKEY", 
+ "dropbox_secret_key": "SECRECTKEY" 
+} 		
+		
+
+
+ +####Step 5: Complete Backup + +Setup dropbox backups from the backup manager as shown in previous section. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md index d3c24f22473..72b79e1ad90 100644 --- a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md +++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md @@ -1,23 +1,38 @@ -# Letter Heads +#Letter Head -You can manage multiple letter heads in ERPNext. In a letter head you can: +Each company has default Letter Head for their company. This Letter Head values are generally set as Header and Footer in the documents. In ERPNext, you can capture the these details in the Letter Head master. - * Create an image with your logo, brand and other information that you want to put on your letter head. - * Attach the image in your Letter Head record by clicking on image icon to automatically generate the HTML required for this Letter Head. - * If you want to make this the default letter head, click on “Is Default”. +In the Letter Head master, you can track Header and Footer details of the company. These details will appear in the Print Format of the transactions like Sales Order, Sales Invoice, Salary Slip, Purchase Order etc. -Your letter head will now appear in all Prints and Emails of documents. +####Step 1: Go to Setup -You can create / manage Letter Heads from: +`Explore > Setup > Printing > Letter Head > New Letter Head` -> Setup > Printing > Letter Head > New Letter Head +####Step 2: Letter Head Name -### Example +In one ERPNext account, you can enter multiple Letter Head, hence name Letter Head so that you can identify it easily. For example, if your Letter Head also contains office address, then you should create separate Letter Head for each office location. + +####Step 3: Enter Details + +Following is how you can enter details in the Letter Head. + + * Logo Image: You can insert the image in your Letter Head record by clicking on image icon. Once image is inserted, HTML for it will be generated automatically. + * Other information (like Address, tax ID etc.) that you want to put on your letter head. Print Heading + +> If you want to make this the default letter head, click on “Is Default”. -This is how the letter head looks in a document print: +####Step 4: Save + +After enter values in the Header and Footer section, Save Letter Head. + +####Letter Head in the Print Format + +This is how the letter head looks in a document's print. Print Heading -{next} +> Please note that Footer will be visible only when document's print is seen in the PDF. Footer will not be visible in the HTML based print preview. + +{next} \ 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..7fae95cbe77 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 -
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. -
- User Permissions For Company -
Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.
-
+ + User Permissions For Company + + 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. -
- Role Permissions for All on Company -
Read Permission with Apply User Permissions checked for DocType Company.
-
+ + Role Permissions for All on 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'. -
- Effect of Role and User Permissions on Company -
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'. + + Effect of Role and User Permissions on Company + + 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'. -
- Sales User Role Permissions for Quotation -
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 limited to results for Company 'Wind Power LLC' -
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'. - 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. -
- Role Permissions on Lead for Sales User Role -
Sales User can Read, Write and Create Leads limited by User Permissions.
-
-
- Set Ingore User Permissions from Setup > Customize > Customize Form -
Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
-
-
- Lead List is limited to records with Territory 'United States' -
Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.
-
+ Sales User Role Permissions for Quotation + + 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 limited to results for Company 'Rio Solutions' + + 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. + +Role Permissions on Lead for Sales User Role + +Sales User can Read, Write and Create Leads limited by User Permissions. + +Set Ingore User Permissions from Setup > Customize > Customize Form + +Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead. + +Lead List is limited to records with Territory 'United States' + +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" + +Perpetual Inventory * * * -## **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 +**Stock Ledger** + +Perpetual Inventory **General Ledger** -Leger +Perpetual Inventory -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. ![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-1.png) - - #### Step 2: Enter Price List, Tax Master and Shipping Rule. ![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-2.png) - - #### 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. ![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-display-1.png) - - 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.