diff --git a/frappe/config/tools.py b/frappe/config/tools.py new file mode 100644 index 0000000000..3ab2a59222 --- /dev/null +++ b/frappe/config/tools.py @@ -0,0 +1,2 @@ +from __future__ import unicode_literals +from frappe import _ \ No newline at end of file diff --git a/frappe/docs/assets/img/desk.png b/frappe/docs/assets/img/desk.png index 311ff5a7cb..a0115d79de 100644 Binary files a/frappe/docs/assets/img/desk.png and b/frappe/docs/assets/img/desk.png differ diff --git a/frappe/docs/user/tutorial/doctypes.md b/frappe/docs/user/tutorial/doctypes.md index c089cbbbc9..bde64947a8 100644 --- a/frappe/docs/user/tutorial/doctypes.md +++ b/frappe/docs/user/tutorial/doctypes.md @@ -17,7 +17,7 @@ In the Fields Table, you can add the fields (properties) of the DocType (Article Fields are much more than database columns, they can be: 1. Columns in the database -1. For Layout (section / column breaks) +1. Layout helpers (section / column breaks) 1. Child tables (Table type field) 1. HTML 1. Actions (button) diff --git a/frappe/docs/user/tutorial/form-client-scripting.md b/frappe/docs/user/tutorial/form-client-scripting.md index a2afd1033c..70e2edb520 100644 --- a/frappe/docs/user/tutorial/form-client-scripting.md +++ b/frappe/docs/user/tutorial/form-client-scripting.md @@ -29,7 +29,7 @@ To start the script, in the `library_management/doctype/library_transaction` fol }); 1. **frappe.ui.form.on(*doctype*, *fieldname*, *handler*)** is used to bind a handler to the event when the property library_member is set. -1. In the handler, we trigger an AJAX call to `frappe.client.get`. In response we get the requested object as JSON. [Learn more about the API](/help/rest_api). +1. In the handler, we trigger an AJAX call to `frappe.client.get`. In response we get the requested object as JSON. [Learn more about the API](/frappe/user/guides/integration/rest_api). 1. Using **frappe.model.set_value(*doctype*, *name*, *fieldname*, *value*)** we set the value in the form. **Note:** To check if your script works, remember to 'reload' the page before testing your script. Client script changes are not automatically picked up when you are in developer mode. diff --git a/frappe/docs/user/tutorial/models.md b/frappe/docs/user/tutorial/models.md index 636c013b08..04114e1369 100644 --- a/frappe/docs/user/tutorial/models.md +++ b/frappe/docs/user/tutorial/models.md @@ -1,6 +1,6 @@ # Making Models -The next step is to create the models as we discussed in the introduction. In Frappe, models are called **DocType**. You can create new DocTypes from the Desk UI. **DocTypes** are made of fields called **DocField** and role based permissions are integrated into the models, these are called **DocPerms**. +The next step is to create the models as we discussed in the introduction. In Frappe, models are called **DocTypes**. You can create new DocTypes from the Desk UI. **DocTypes** are made of fields called **DocField** and role based permissions are integrated into the models, these are called **DocPerms**. When a DocType is saved, a new table is created in the database. This table is named as `tab[doctype]`. @@ -11,7 +11,7 @@ When you create a **DocType** a new folder is created in the **Module** and a mo To create models, you must set `developer_mode` as 1 in the `site_config.json` file located in /sites/library and execute command `bench clear-cache` or use the user menu in UI and click on "Reload" for the changes to take effect. You should now see the "Developer" app on your desk { - "db_name": "library", + "db_name": "bcad64afbf", "db_password": "v3qHDeVKvWVi7s97", "developer_mode": 1 } diff --git a/frappe/docs/user/tutorial/naming-and-linking.md b/frappe/docs/user/tutorial/naming-and-linking.md index f32c1d12be..d47d352663 100644 --- a/frappe/docs/user/tutorial/naming-and-linking.md +++ b/frappe/docs/user/tutorial/naming-and-linking.md @@ -24,7 +24,7 @@ This can be set by entering the **Autoname** field. For controller, leave blank. #### Link and Select Fields -Foreign keys are specified in Frappe as **Link** type fields. The target DocType must be mentioned in the Options table. +Foreign keys are specified in Frappe as **Link** type fields. The target DocType must be mentioned in the Options text area. In our example, in the Library Transaction DocType, we have to link both the Library Member and the Article. diff --git a/frappe/docs/user/tutorial/new-app.md b/frappe/docs/user/tutorial/new-app.md index 63f4b63a08..d90eced873 100644 --- a/frappe/docs/user/tutorial/new-app.md +++ b/frappe/docs/user/tutorial/new-app.md @@ -1,8 +1,8 @@ # Make a New App -After the bench is installed, there are two main folders, `apps` and `sites`. All the applications will be installed in apps. +Once the bench is installed, you will see two main folders, `apps` and `sites`. All the applications will be installed in apps. -To make a new application, go to your bench folder and run, `bench new-app {app_name}` and fill in details about the application. This will create a boilerplate application for your. +To make a new application, go to your bench folder and run, `bench new-app {app_name}` and fill in details about the application. This will create a boilerplate application for you. $ bench new-app library_management App Title (defaut: Lib Mgt): Liblary Management diff --git a/frappe/docs/user/tutorial/reports.md b/frappe/docs/user/tutorial/reports.md index 1b2d23262f..03b61822f2 100644 --- a/frappe/docs/user/tutorial/reports.md +++ b/frappe/docs/user/tutorial/reports.md @@ -1,6 +1,6 @@ # Reports -You can also click on the Reports Icon on the toolbar (right) to see tabulated records +You can also click on the Reports text on the sidebar (left) to see tabulated records Report diff --git a/frappe/docs/user/tutorial/setting-up-the-site.md b/frappe/docs/user/tutorial/setting-up-the-site.md index 7a122a639a..a74d98361a 100644 --- a/frappe/docs/user/tutorial/setting-up-the-site.md +++ b/frappe/docs/user/tutorial/setting-up-the-site.md @@ -48,6 +48,6 @@ Now let us install our app `library_management` in our site `library` Example: - $ bench install-app library_management + $ bench --site library install-app library_management {next} diff --git a/frappe/docs/user/tutorial/start.md b/frappe/docs/user/tutorial/start.md index 2a2000850e..0182654494 100644 --- a/frappe/docs/user/tutorial/start.md +++ b/frappe/docs/user/tutorial/start.md @@ -20,12 +20,12 @@ Now login with : Login ID: **Administrator** -Password : **Use the password that was generated during installation** +Password : **Use the password that was created during installation** When you login, you should see the "Desk" home page Desk -As you can see, the Frappe basic system comes with a bunch of pre-loaded applications and screens like To Do, Calendar etc. These apps can integrated in your app workflow as we progress. +As you can see, the Frappe basic system comes with several pre-loaded applications like To Do, File Manager etc. These apps can integrated in your app workflow as we progress. {next}