diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json index 41063734198..ff857f16720 100644 --- a/erpnext/crm/doctype/lead/lead.json +++ b/erpnext/crm/doctype/lead/lead.json @@ -912,7 +912,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-08-10 13:47:37.703600", + "modified": "2016-08-16 14:04:49.753397", "modified_by": "umair@frappe.io", "module": "CRM", "name": "Lead", @@ -940,7 +940,7 @@ }, { "amend": 0, - "apply_user_permissions": 1, + "apply_user_permissions": 0, "cancel": 0, "create": 1, "delete": 0, 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/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/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index bdd12c599d7..81537d30f06 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -2110,15 +2110,15 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, - "modified": "2016-08-11 08:52:09.666306", - "modified_by": "Administrator", + "modified": "2016-08-16 14:05:00.356461", + "modified_by": "umair@frappe.io", "module": "Selling", "name": "Quotation", "owner": "Administrator", "permissions": [ { "amend": 1, - "apply_user_permissions": 1, + "apply_user_permissions": 0, "cancel": 1, "create": 1, "delete": 1, diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index b156e251060..66cdb4e2b59 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -1386,7 +1386,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-10 17:04:38.452301", + "modified": "2016-08-16 14:08:32.439922", "modified_by": "umair@frappe.io", "module": "Setup", "name": "Company", @@ -1454,7 +1454,7 @@ }, { "amend": 0, - "apply_user_permissions": 1, + "apply_user_permissions": 0, "cancel": 0, "create": 0, "delete": 0,