+
+1. Create another Custom Field **VAT Number** for *Purchase Order* document, but in this case with *Field Type* as **Read Only** or check **Read Only** checkbox. Set the **Options** as `supplier.vat_number`.
+ 
+
+1. Go to the user menu and click "Reload".
+1. Now, on selection of Supplier in a new Purchase Order, **VAT Number** will be fetched automatically from the selected Supplier.
+ 
diff --git a/frappe/docs/user/fr/guides/app-development/generating-docs.md b/frappe/docs/user/fr/guides/app-development/generating-docs.md
new file mode 100644
index 0000000000..ca3d92a61d
--- /dev/null
+++ b/frappe/docs/user/fr/guides/app-development/generating-docs.md
@@ -0,0 +1,110 @@
+# Generating Documentation Website for your App
+
+Frappe version 6.7 onwards includes a full-blown documentation generator so that you can easily create a website for your app that has both user docs and developers docs (auto-generated). These pages are generated as static HTML pages so that you can add them as GitHub pages.
+
+## Writing Docs
+
+### 1. Setting up docs
+
+#### 1.1. Setup `docs.py`
+
+The first step is to setup the docs folder. For that you must create a new file in your app `config/docs.py` if it is not auto-generated. In your `docs.py` file, add the following module properties.
+
+
+ source_link = "https://github.com/[orgname]/[reponame]"
+ docs_base_url = "https://[orgname].github.io/[reponame]"
+ headline = "This is what my app does"
+ sub_heading = "Slightly more details with key features"
+ long_description = """(long description in markdown)"""
+
+ def get_context(context):
+ # optional settings
+
+ # context.brand_html = 'Brand info on the top left'
+ # context.favicon = 'path to favicon'
+ #
+ # context.top_bar_items = [
+ # {"label": "About", "url": context.docs_base_url + "/about"},
+ # ]
+
+ pass
+
+#### 1.2. Generate `/docs`
+
+To generate the docs for the `current` version, go to the command line and write
+
+ bench --site sitename make-docs app_name current
+
+If you want to maintain versions of your docs, then you can add a version number instead of `current`
+
+This will create a `/docs` folder in your app.
+
+### 2. Add User Documentation
+
+To add user documentation, add folders and pages in your `/docs/user` folder in the same way you would build a website pages in the `www` folder.
+
+Some quick tips:
+
+1. Add your pages as `.md` or `.html` pages
+2. Optionally add `.css` files with the same name that will be automatically served
+3. Add index by adding `{index}`
+
+### 3. Linking
+
+While linking make sure you add `{{ docs_base_url }}` to all your links.
+
+
+ {% raw %}
{% endraw %}
+
+---
+
+## Setting up output docs
+
+1. Create a `/docs` folder in your bench, parallel to your `/sites` folder. e.g. `/frappe-bench/docs`
+2. Copy the repo of your app to the docs folder. e.g. `cp -R apps/myapp docs/myapp` (you can also clone it here using `git clone`).
+3. Go to your docs folder `cd docs/myapp`
+4. Checkout the gh-pages branch `git checkout --orphan gh-pages`
+5. Clean everything `git rm -rf .`
+
+Note > The branch name `gh-pages` is only if you are using GitHub. If you are hosting this on any other static file server, can just skip this and just create your docs folder for your app like `docs/myapp`
+
+Putting it all together:
+
+ mkdir docs
+ cp -R apps/myapp docs/myapp
+ cd docs/myapp
+ git checkout --orphan gh-pages
+ git rm -rf .
+
+---
+
+## Viewing Locally
+
+To test your docs locally, add a `--local` option to the `build-docs` command.
+
+ bench --site [site] build-docs [appname] --local
+
+Then it will build urls so that you can view these files locally. To view them locally in your browser, you can use the Python SimpleHTTPServer
+
+Run this from your `docs/myapp` folder:
+
+ python -m SimpleHTTPServer 8080
+
+---
+
+## Publishing to GitHub Pages
+
+To publish your docs on GitHub pages, you will have to create an empty and orphan branch in your repository called `gh-pages` and write yours there
+
+Now go back to your bench folder and write these docs to this branch. For example if your path to the `gh-pages` repo is `docs/reponame`
+
+ bench --site [site] build-docs [appname]
+
+To check your documentation online go to: https://[orgname].github.io/[reponame]
diff --git a/frappe/docs/user/fr/guides/app-development/how-enable-developer-mode-in-frappe.md b/frappe/docs/user/fr/guides/app-development/how-enable-developer-mode-in-frappe.md
new file mode 100644
index 0000000000..5c47385fbd
--- /dev/null
+++ b/frappe/docs/user/fr/guides/app-development/how-enable-developer-mode-in-frappe.md
@@ -0,0 +1,15 @@
+When you are in application design mode and you want the changes in your DocTypes, Reports etc to affect the app repository, you must be in **Developer Mode**.
+
+To enable developer mode, update the `site_config.json` file of your site in the sites folder for example:
+
+ frappe-bench/sites/site1/site_config.json
+
+Add this to the JSON object
+
+ "developer_mode": 1
+
+After setting developer mode, clear the cache:
+
+ $ bench clear-cache
+
+
diff --git a/frappe/docs/user/fr/guides/app-development/how-to-create-custom-fields-during-app-installation.md b/frappe/docs/user/fr/guides/app-development/how-to-create-custom-fields-during-app-installation.md
new file mode 100644
index 0000000000..20b7fdce30
--- /dev/null
+++ b/frappe/docs/user/fr/guides/app-development/how-to-create-custom-fields-during-app-installation.md
@@ -0,0 +1,20 @@
+Your custom app can automatically add **Custom Fields** to DocTypes outside of your app when it is installed to a new site.
+
+To do this, add the new custom fields that your app requires, using the Frappe web application.
+
+In your `hooks.py` file, add `"Custom Fields"`
+
+ fixtures = ["Custom Field"]
+
+Export fixtures before you commit your app with:
+
+ $ bench --site mysite export-fixtures
+
+This will create a new folder called `fixtures` in your app folder and a `.csv` or `.json` file will be created with the definition of the custom fields you added.
+
+This file will be automatically imported when the app is installed in a new site or updated via `bench update`.
+
+Note: You can also add single DocTypes like "Website Settings" as fixtures
+
+
+
diff --git a/frappe/docs/user/fr/guides/app-development/how-to-improve-a-standard-control.md b/frappe/docs/user/fr/guides/app-development/how-to-improve-a-standard-control.md
new file mode 100644
index 0000000000..bfbf320612
--- /dev/null
+++ b/frappe/docs/user/fr/guides/app-development/how-to-improve-a-standard-control.md
@@ -0,0 +1,102 @@
+Frappé has a couple of elegant and useful widgets, but some times we need to edit them to add small improvements. This small article will describe how to add new resources to the standard widgets.
+
+Let me explain first our goal:
+
+> Add `many` alternative translations in `numerous records` and in a `lot of doctypes`
+
+Look the highlighted sections in the __goal__, we have _many translations_ to add in _many records_ and in _many doctypes_, so, we heave a **many of work**, so we have a lot to do right?
+
+The answer for this question is: _-Of course not! Because we know that if one element exists in many records and in many doctypes, this element is the `Control` or `Widget`_
+
+So, what we need do, is improve your goal based on the `Control`, to reduce our quantity of work.
+
+But, where will we find this magic element, the control? _-For now, we can look it in the JavaScript sources - let's look now at [Github](https://github.com/frappe/frappe/blob/develop/frappe/public/js/frappe/form/control.js#L13)_
+
+> Don't worry if you don't understand the code for now, our goal there is simplify our work.
+
+Let's go ahead with the thought!
+
+We know where we need to make the changes, but how will we dismember which are the controls that are affected by our feature and which aren't ?
+
+We need to keep in mind, that `Control` are instance of `DocFields` and the `DocFields` have a field that is very important for us in this case, the field that will help us to dismember which are affected by our feature and which aren't is the field `options` in the `DocField`.
+
+_-Wait!, we understood that the field `options` can help us, but, how will it help us?_
+
+Good question, we will define a word to put in the `options` of the `DocFields` that we need to include the feature, this world will be **`Translatable`.**
+
+> If you forget how to customize the options of a field look [this article](https://kb.erpnext.com/kb/customize/creating-custom-link-field), it can refresh your knowledge.
+
+Well, with the defined word in `options` of our selected `DocFields`, now is time to code:
+
+_-At last, we think we would never stop talking!_
+
+ frappe.ui.form.ControlData = frappe.ui.form.ControlData.$extend({
+ make_input: function(){
+ var options = this.df.options;
+ if (!options || options!=="Translatable"){
+ this._super();
+ return;
+ }
+ var me = this;
+ $('{%= addr_list[i].address_type %}
+
+
+ {% } %}
+ {% if(!addr_list.length) { %}
+
+ {% if(addr_list[i].is_primary_address) { %}
+ {%= __("Primary") %}{% } %}
+ {% if(addr_list[i].is_shipping_address) { %}
+ {%= __("Shipping") %}{% } %}
+
+ {%= addr_list[i].display %}
+{%= __("No address added yet.") %}
+ {% } %} + + + + + \ No newline at end of file diff --git a/frappe/docs/user/fr/guides/basics/apps.md b/frappe/docs/user/fr/guides/basics/apps.md new file mode 100644 index 0000000000..f79a9f4642 --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/apps.md @@ -0,0 +1,109 @@ +# Frappe Apps + +Frappe Apps are Python packages which use the Frappe platform. They can live +anywhere on the [Python +path](https://docs.python.org/2/tutorial/modules.html#the-module-search-path) +and must have an entry in the `apps.txt` file. + + +### Creating an app + +Frappe ships with a boiler plate for a new app. The command `bench make-app +app-name` helps you start a new app by starting an interactive shell. + + + % bench make-app sample_app + App Name: sample_app + App Title: Sample App + App Description: This is a sample app. + App Publisher: Acme Inc. + App Icon: icon-linux + App Color: #6DAFC9 + App Email: info@example.com + App URL: http://example.com + App License: MIT + +The above command would create an app with the following directory structure. + + sample_app + ├── license.txt + ├── MANIFEST.in + ├── README.md + ├── sample_app + │ ├── __init__.py + │ ├── sample_app + │ │ └── __init__.py + │ ├── config + │ │ ├── desktop.py + │ │ └── __init__.py + │ ├── hooks.py + │ ├── modules.txt + │ ├── patches.txt + │ └── templates + │ ├── generators + │ │ └── __init__.py + │ ├── __init__.py + │ ├── pages + │ │ └── __init__.py + │ └── statics + └── setup.py + +Here, "App Icon" is a font awesome class that you can select from +[http://fortawesome.github.io/Font-Awesome/icons/](http://fortawesome.github.io/Font-Awesome/icons/). + +The boiler plate contains just enough files to show your app icon on the [Desk]. + +### Files in the app + +#### `hooks.py` + +The `hooks.py` file defines the metadata of your app and integration points +with other parts of Frappe or Frappe apps. Examples of such parts include task +scheduling or listening to updates to different documents in the system. For +now, it just contains the details you entered during app creation. + + + app_name = "sample-app" + app_title = "Sample App" + app_publisher = "Acme Inc." + app_description = "This is a sample app." + app_icon = "fa-linux" + app_color = "black" + app_email = "info@example.com" + app_url = "http://example.com" + app_version = 0.0.1 + +#### `modules.txt` + +Modules in Frappe help you organize Documents in Frappe and they are defined in +the `modules.txt` file in your app. It is necessary for every [DocType] to be +attached to a module. By default a module by the name of your app is added. +Also, each module gets an icon on the [Desk]. For example, the [ERPNext] app is +organized in the following modules. + + accounts + buying + home + hr + manufacturing + projects + selling + setup + stock + support + utilities + contacts + +### Adding app to a site + +Once you have an app, whether it's the one you just created or any other you +downloaded, you are required to do the following things. + +Download the app via git + + bench get-app https://github.com/org/app_name + +Install the app to your site + + bench --site app_name install-app app_name + diff --git a/frappe/docs/user/fr/guides/basics/hooks.md b/frappe/docs/user/fr/guides/basics/hooks.md new file mode 100644 index 0000000000..9bfaaeee3c --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/hooks.md @@ -0,0 +1,273 @@ +# Hooks + + +Hooks are the duct tape of the Frappe system. Hooks allow you to "hook" in to +functionality and events of other parts of the Frappe system. Following are the +official hooks from Frappe. + +### Application Name and Details + +1. `app_name` - slugified name with underscores e.g. "shopping\_cart" +2. `app_title` - full title name e.g. "Frappe" +3. `app_publisher` +4. `app_description` +5. `app_version` +6. `app_icon` - font-awesome icon or image url +7. `app_color` - hex colour background of the app icon + +### Install Events + +1. `before_install` +2. `after_install` + +The above hooks are called before and after installation of the app they are in. +For example, [ERPNext](/apps/erpnext)'s hooks contains a line, + + after_install = "erpnext.setup.install.after_install" + +So, the function after\_install is imported and called after ERPNext is installed. + +Note, the `before_install` and `after_install` hooks are called with no arguments. + +### Boot Session + +After a successful login, the Frappe JS Client requests for a resource called +`bootinfo`. The `bootinfo` is available as a global in Javascript via +`frappe.boot`. By default, the `bootinfo` contains + +* System defaults +* Notification status +* Permissions +* List of icons on desktop +* User settings +* Language and timezone info + +If your app wants to modify bootinfo, it can declare a hook `boot_session`. The +value is assumed to be a dotted path to a function and is called with one +argument, bootinfo which it can modify and return. + +Eg, + + boot_session = "erpnext.startup.boot.boot_session" + +### Notification configurations + +The notification configuration hook is expected to return a Python dictionary. + + { + "for_doctype": { + "Issue": {"status":"Open"}, + "Customer Issue": {"status":"Open"}, + }, + "for_module_doctypes": { + "ToDo": "To Do", + "Event": "Calendar", + "Comment": "Messages" + }, + "for_module": { + "To Do": "frappe.core.notifications.get_things_todo", + "Calendar": "frappe.core.notifications.get_todays_events", + "Messages": "frappe.core.notifications.get_unread_messages" + } + } + + +The above configuration has three parts, + +1. `for_doctype` part of the above configuration marks any "Issue" + or "Customer Issue" as unread if its status is Open +2. `for_module_doctypes` maps doctypes to module's unread count. +3. `for_module` maps modules to functions to obtain its unread count. The + functions are called without any argument. + +### Javascript / CSS Assets + +The following hooks allow you to bundle built assets to your app for serving. +There are two types of assets, app and web. The app assets are loaded in the +Desk and web assets are loaded in the website. + +1. `app_include_js` +2. `app_include_css` +3. `web_include_js` +4. `web_include_css` + +Eg, + + app_include_js = "assets/js/erpnext.min.js" + web_include_js = "assets/js/erpnext-web.min.js" + +Note: to create an asset bundle (eg, assets/js/erpnext.min.js) the target file +should be in build.json of your app. + +### Configuring Reports + +In the report view, you can force filters as per doctype using `dump_report_map` +hook. The hook should be a dotted path to a Python function which will be called +without any arguments. Example of output of this function is below. + + + "Warehouse": { + "columns": ["name"], + "conditions": ["docstatus < 2"], + "order_by": "name" + } + +Here, for a report with Warehouse doctype, would include only those records that +are not cancelled (docstatus < 2) and will be ordered by name. + +### Modifying Website Context + +Context used in website pages can be modified by adding +a `update_website_context` hook. This hook should be a dotted path to a function +which will be called with a context (dictionary) argument. + +### Customizing Email footer + +By default, for every email, a footer with content, "Sent via Frappe" is sent. +You can customize this globally by adding a `mail_footer` hook. The hook should +be a dotted path to a variable. + +### Session Creation Hook + +You can attach custom logic to the event of a successful login using +`on_session_creation` hook. The hook should be a dotted path to a Python +function that takes login\_manager as an argument. + +Eg, + + def on_session_creation(login_manager): + """make feed""" + if frappe.session['user'] != 'Guest': + # log to timesheet + pass + +### Website Clear Cache + +If you cache values in your views, the `website_clear_cache` allows you to hook +methods that invalidate your caches when Frappe tries to clear cache for all +website related pages. + +### Document hooks + +#### Permissions + +#### Query Permissions +You can customize how permissions are resolved for a DocType by hooking custom +permission match conditions using the `permission_query_conditions` hook. This +match condition is expected to be fragment for a where clause in an sql query. +Structure for this hook is as follows. + + + permission_query_conditions = { + "{doctype}": "{dotted.path.to.function}", + } + +The output of the function should be a string with a match condition. +Example of such a function, + + + def get_permission_query_conditions(): + return "(tabevent.event_type='public' or tabevent.owner='{user}'".format(user=frappe.session.user) + +The above function returns a fragment that permits an event to listed if it's +public or owned by the current user. + +#### Document permissions +You can hook to `doc.has_permission` for any DocType and add special permission +checking logic using the `has_permission` hook. Structure for this hook is, + + has_permission = { + "{doctype}": "{dotted.path.to.function}", + } + +The function will be passed the concerned document as an argument. It should +True or a falsy value after running the required logic. + +For Example, + + def has_permission(doc): + if doc.event_type=="Public" or doc.owner==frappe.session.user: + return True + +The above function permits an event if it's public or owned by the current user. + +#### CRUD Events + +You can hook to various CRUD events of any doctype, the syntax for such a hook +is as follows, + + doc_events = { + "{doctype}": { + "{event}": "{dotted.path.to.function}", + } + } + +To hook to events of all doctypes, you can use the follwing syntax also, + + doc_events = { + "*": { + "on_update": "{dotted.path.to.function}", + } + } + +The hook function will be passed the doc in concern as the only argument. + +##### List of events + +* `validate` +* `before_save` +* `after_save` +* `before_insert` +* `after_insert` +* `before_submit` +* `before_cancel` +* `before_update_after_submit` +* `on_update` +* `on_submit` +* `on_cancel` +* `on_update_after_submit` + + +Eg, + + doc_events = { + "Cab Request": { + "after_insert": topcab.schedule_cab", + } + } + +### Scheduler Hooks + +Scheduler hooks are methods that are run periodically in background. Structure for such a hook is, + + scheduler_events = { + "{event_name}": [ + "{dotted.path.to.function}" + ], + } + +#### Events + +* `daily` +* `daily_long` +* `weekly` +* `weekly_long` +* `monthly` +* `monthly_long` +* `hourly` +* `all` + +The scheduler events require celery, celerybeat and redis (or a supported and +configured broker) to be running. The events with suffix '\_long' are for long +jobs. The `all` event is triggered everytime (as per the celerybeat interval). + +Example, + + scheduler_events = { + "{daily}": [ + "erpnext.accounts.doctype.sales_invoice.sales_invoice.manage_recurring_invoices" + ], + "{daily_long}": [ + "erpnext.setup.doctype.backup_manager.backup_manager.take_backups_daily" + ], + } diff --git a/frappe/docs/user/fr/guides/basics/index.md b/frappe/docs/user/fr/guides/basics/index.md new file mode 100644 index 0000000000..645bed29a7 --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/index.md @@ -0,0 +1,3 @@ +# Basics + +{index} diff --git a/frappe/docs/user/fr/guides/basics/index.txt b/frappe/docs/user/fr/guides/basics/index.txt new file mode 100644 index 0000000000..910ba191d4 --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/index.txt @@ -0,0 +1,7 @@ +install +apps +sites +site_config +hooks +translations +writing-tests diff --git a/frappe/docs/user/fr/guides/basics/install.md b/frappe/docs/user/fr/guides/basics/install.md new file mode 100644 index 0000000000..3afa43a37c --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/install.md @@ -0,0 +1,10 @@ +# Installing Frappe + +## Frappe bench + +The following steps help you setup an isolated environment (bench) to run and +develop Frappe apps. A virtualenv is installed in the env directory. You can +activate it by running `source ./env/bin/activate` or use execute using +absolute/relative path (eg, `./env/bin/frappe`). + +For more info, see [Frappe Bench](https://github.com/frappe/bench/) diff --git a/frappe/docs/user/fr/guides/basics/site_config.md b/frappe/docs/user/fr/guides/basics/site_config.md new file mode 100644 index 0000000000..322cc1937c --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/site_config.md @@ -0,0 +1,40 @@ +# Site Config + +Settings for `sites/[site]/site_config.json` + +`site_config.json` stores global settings for a particular site and is present in the site directory. Here is a list of properties you can set in `site_config.json`. + +Example: + + { + "db_name": "test_frappe", + "db_password": "test_frappe", + "admin_password": "admin", + } + +### Mandatory Settings + +- `db_name`: Database Name. +- `db_password`: Database password. + +### Optional Settings + +- `db_host`: Database host if not `localhost`. +- `admin_password`: Default Password for "Administrator". +- `mute_emails`: Stops email sending if true. +- `deny_multiple_logins`: Stop users from having more than one active session. +- `root_password`: MariaDB root password. + +### Defaut Outgoing Email Settings + +- `mail_server`: SMTP server hostname. +- `mail_port`: STMP port. +- `use_ssl`: Connect via SSL / TLS. +- `mail_login`: Login id for SMTP server. +- `mail_password`: Password for SMTP server. + +### Developer Settings + +- `developer_mode`: If developer mode is set, DocType changes are automatically updated in files. +- `disable_website_cache`: Don't cache website pages. +- `logging`: writes logs if **1**, writes queries also if set to **2**. diff --git a/frappe/docs/user/fr/guides/basics/sites.md b/frappe/docs/user/fr/guides/basics/sites.md new file mode 100644 index 0000000000..81f51aa599 --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/sites.md @@ -0,0 +1,82 @@ +# Sites + +## Sites Directory + +Frappe is a multitenant platform and each tenant is called a site. Sites exist +in a directory called `sites_dir`, assumed as the current working directory when +running a frappe command or other services like Celery worker or a WSGI server. + +You can set `sites_dir` with an environment variable `SITES_DIR` or pass +`--sites_dir` option to the frappe command. + +Apart from the sites, the `sites_dir` should contain the following. + +#### apps.txt + +`apps.txt` contain a list of Python packages to treat as Frappe apps. Every +frappe app that you intend to use in you site should have an entry in this file. +Also, they should be in the `PYTHONPATH`. For more information, refer +[Frappe Apps](/help/apps). + +#### common\_site\_config.json + +`common_site_config.json` is an optional file. Configuration common to all sites +can be put in this file. + +#### assets + +Assets contain files that are required to be served for the browser client. +These generally include *.js, *.css, *.png files. This directory is auto +generated using the `bench build` command. + +#### languages.txt + +`languages.txt` is an autogenerated file which maps every language to it's code. + +## Site + +A site is a directory in `sites_dir` which represents a tenant in Frappe Platform. + + +### Directory Structure + + site + ├── locks + ├── private + │ └── backups + ├── public + │ └── files + │ └── testfile.txt + └── site_config.json + +* `locks` directory is used by the scheduler to synchronize various jobs using +the [file locking concept](http://en.wikipedia.org/wiki/File_locking). + +* `private` directory contains files that require authentication to access. +Presently, it is limited only to backups. + +* `public` directory contains files that can directly served. In the above + example, `testfile.txt` can be accessed by the URL, + http://site/files/testfile.txt + +* `site_config.json` contains site specific configuration + +### Site Config + +[See configuration options for `site_config.json`](/docs/user-guide/site_config.md) + +### Site Resolution + +While responding to an HTTP request, a site is automatically selected based on, + +* `Host` header in the HTTP request matches a site +* `X-Frappe-Site-Name` header in the HTTP request matches a site + +It is also possible to force the development server to serve a specific site by +starting it with the following command. + `bench --site SITENAME serve` + + +### Adding a new site + +`frappe new-site SITENAME` diff --git a/frappe/docs/user/fr/guides/basics/translations.md b/frappe/docs/user/fr/guides/basics/translations.md new file mode 100644 index 0000000000..e5ff22e9f2 --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/translations.md @@ -0,0 +1,86 @@ + + + +This document shows how to translations are managed in ERPNext and how to add +a new language or update translations of an existing language. + +### 1. Source + +Translatable text exists in 3 main sources: + + 1. Javascript Code Files (both framework and application) + 2. Python Code Files + 3. DocTypes (names, labels and select options) + +#### Strings in Code Files + +Strings in code files are annotated using the `_` (underscore) method + + 1. In Python it is the `frappe._` method. Example: + +`frappe._("String {0} must be translated".format(txt))` + + 2. In Javascript it is the `__` method. Example: + +`__("String {0} must be translated", [txt])` + +**Note:** If you find translatable strings are not properly annotated using the `_` +method, you can add them in the code and rebuild the translations. + +### 2. How Translations Are Picked up During Execution + +Whenever a translation is called via the _ method, the entire translation +dictionaries from all apps are built and stored in memcache. + +Based on the user preferences or request preferences, the appropriate +translations are loaded at the time of request on the server side. Or if +metadata (DocType) is queried, then the appropriate translations are appended +when the DocType data is requested. + +The underscore `_` method will replace the strings based on the available +translations loaded at the time. + +### 3. Adding New Translations + +1. To find untranslated strings, run `bench get-untranslated [lang] [path]` +1. Add the translated strings in another file in the same order +1. run `bench update-translations [lang] [path of untranslated strings] [path of translated strings]` + +### 4. Improving Translations: + +For updating translations, please go to the to [the translation portal](https://frappe.io/translator). + +If you want to do it directly via code: + +To improve an existing translation, just edit the master translation files in +the `translations` of each app + +> Please contribute your translations back to ERPNext by sending us a Pull +Request. + +### 5. Bootstrapping a New Language + +If you want to add a new language it is similar to adding new translations. You need to first export all the translations strings in one file, get them translated via Google Translate Tool or Bing Translate Tool and then import the translations into individual apps. + +**Step 1: Export to a file** + + $ bench get-untranslated [lang] [path] + +**Step 2: Translate** + +Create another file with updated translations (in the same order as the source file). For this you can use the [Google Translator Toolkit](https://translate.google.com/toolkit) or [Bing Translator](http://www.bing.com/translator/). + +**Step 3: Import your translations** + + $ bench update-translations [lang] [source path] [translated path] + +**Step 4: Update `languages.txt`** + +Add your language in `apps/languages.txt` and also `frappe/data/languages.txt` (fore new bench installs) + +**Step 5: Commit each app and push** + +A new file will be added to the `translations` folder in each app. You need to add that file and push to your repo. Then send us a pull-request. + +--- + diff --git a/frappe/docs/user/fr/guides/basics/writing-tests.md b/frappe/docs/user/fr/guides/basics/writing-tests.md new file mode 100644 index 0000000000..f151416ccd --- /dev/null +++ b/frappe/docs/user/fr/guides/basics/writing-tests.md @@ -0,0 +1,109 @@ +# Writing Tests + +### Introduction + +Frappe provides some basic tooling to quickly write automated tests. There are some basic rules: + +1. Test can be anywhere in your repository but must begin with `test_` and should be a `.py` file. +1. Tests must run on a site that starts with `test_`. This is to prevent accidental loss of data. +1. Test stubs are automatically generated for new DocTypes. +1. Frappe test runner will automatically build test records for dependant DocTypes identified by the `Link` type field (Foreign Key) +1. Tests can be executed using `bench run-tests` +1. For non-DocType tests, you can write simple unittests and prefix your file names with `test_`. + +### Tests for a DocType + +#### Writing DocType Tests: + +1. Records that are used for testing are stored in a file `test_records.json` in the doctype folder. [For example see the Event Tests](https://github.com/frappe/frappe/blob/develop/frappe/core/doctype/event/test_records.json). +1. Test cases are in a file named `test_[doctype].py` +1. To provide the test records (and dependencies) call `test_records = frappe.get_test_records('Event')` in your test case file. + +#### Example (for `test_records.json`): + + [ + { + "doctype": "Event", + "subject":"_Test Event 1", + "starts_on": "2014-01-01", + "event_type": "Public" + }, + { + "doctype": "Event", + "starts_on": "2014-01-01", + "subject":"_Test Event 2", + "event_type": "Private" + }, + { + "doctype": "Event", + "starts_on": "2014-01-01", + "subject":"_Test Event 3", + "event_type": "Private", + "event_individuals": [{ + "person": "test1@example.com" + }] + } + ] + + +#### Example (for `test_event.py`): + + # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors + # MIT License. See license.txt + + import frappe + import frappe.defaults + import unittest + + # load test records and dependencies + test_records = frappe.get_test_records('Event') + + class TestEvent(unittest.TestCase): + def tearDown(self): + frappe.set_user("Administrator") + + def test_allowed_public(self): + frappe.set_user("test1@example.com") + doc = frappe.get_doc("Event", frappe.db.get_value("Event", {"subject":"_Test Event 1"})) + self.assertTrue(frappe.has_permission("Event", doc=doc)) + + def test_not_allowed_private(self): + frappe.set_user("test1@example.com") + doc = frappe.get_doc("Event", frappe.db.get_value("Event", {"subject":"_Test Event 2"})) + self.assertFalse(frappe.has_permission("Event", doc=doc)) + + def test_allowed_private_if_in_event_user(self): + frappe.set_user("test1@example.com") + doc = frappe.get_doc("Event", frappe.db.get_value("Event", {"subject":"_Test Event 3"})) + self.assertTrue(frappe.has_permission("Event", doc=doc)) + + def test_event_list(self): + frappe.set_user("test1@example.com") + res = frappe.get_list("Event", filters=[["Event", "subject", "like", "_Test Event%"]], fields=["name", "subject"]) + self.assertEquals(len(res), 2) + subjects = [r.subject for r in res] + self.assertTrue("_Test Event 1" in subjects) + self.assertTrue("_Test Event 3" in subjects) + self.assertFalse("_Test Event 2" in subjects) + +#### Running Tests + +To run a test for a doctype + + bench run-tests --doctype [doctype] + +This function will build all the test dependencies and run your tests. + +### Running All Tests + +To run all tests: + + bench run-tests + +--- + +## Client Side Testing (Using Selenium) + +> This feature is still under development. + +For an example see, [https://github.com/frappe/erpnext/blob/develop/erpnext/tests/sel_tests.py](https://github.com/frappe/erpnext/blob/develop/erpnext/tests/sel_tests.py) diff --git a/frappe/docs/user/fr/guides/data/import-large-csv-file.md b/frappe/docs/user/fr/guides/data/import-large-csv-file.md new file mode 100644 index 0000000000..5194ebd98d --- /dev/null +++ b/frappe/docs/user/fr/guides/data/import-large-csv-file.md @@ -0,0 +1,23 @@ +To import very large CSV files, you can use the bench utility `import-csv`. + +The benefit is that this is not subject to timeouts if you use the web interface. + +Here is an example: + + bench --site test.erpnext.com import-csv ~/Downloads/Activity_Type.csv + +### Help + + $ bench import-csv --help + Usage: bench import-csv [OPTIONS] PATH + + Import CSV using data import tool + + Options: + --only-insert Do not overwrite existing records + --submit-after-import Submit document after importing it + --ignore-encoding-errors Ignore encoding errors while coverting to unicode + --help Show this message and exit. + + + \ No newline at end of file diff --git a/frappe/docs/user/fr/guides/data/index.md b/frappe/docs/user/fr/guides/data/index.md new file mode 100644 index 0000000000..e6f341b236 --- /dev/null +++ b/frappe/docs/user/fr/guides/data/index.md @@ -0,0 +1,3 @@ +# Data Management + +{index} diff --git a/frappe/docs/user/fr/guides/data/index.txt b/frappe/docs/user/fr/guides/data/index.txt new file mode 100644 index 0000000000..4794a002bc --- /dev/null +++ b/frappe/docs/user/fr/guides/data/index.txt @@ -0,0 +1 @@ +import-large-csv-file diff --git a/frappe/docs/user/fr/guides/deployment/checking-problems-in-bench.md b/frappe/docs/user/fr/guides/deployment/checking-problems-in-bench.md new file mode 100644 index 0000000000..05fcd3d879 --- /dev/null +++ b/frappe/docs/user/fr/guides/deployment/checking-problems-in-bench.md @@ -0,0 +1,15 @@ + + +If you're experiencing delays in scheduled jobs or they don't seem to run, you run run the following command to diagnose the issue. + +`bench doctor` + +A desirable output is like below + + + Workers online: True + Pending tasks 0 + Timed out locks: + + +We'll be adding more health checks soon. diff --git a/frappe/docs/user/fr/guides/deployment/configuring-https.md b/frappe/docs/user/fr/guides/deployment/configuring-https.md new file mode 100644 index 0000000000..4fb90be226 --- /dev/null +++ b/frappe/docs/user/fr/guides/deployment/configuring-https.md @@ -0,0 +1,43 @@ + +### Get the required files + +You can buy a SSL certificate from a trusted Certificate Authority or generate your own. For self signed certificates the browser will show a warning that the certificate is not trusted. + +The files required are + +* Certificate (usually with extension .crt) +* Decrypted private key + +If you have multiple certificates (primary and intermediate), you will have to concatenate them. For example, + + cat your_certificate.crt CA.crt >> certificate_bundle.crt + +Also make sure that your private key is not world readable. Generally, it is owned and readable only by root + + chown root private.key + chmod 600 private.key + +### Move the two files to an appropriate location + + mkdir /etc/nginx/conf.d/ssl + mv private.key /etc/nginx/conf.d/ssl/private.key + mv certificate_bundle.crt /etc/nginx/conf.d/ssl/certificate_bundle.crt + +### Setup nginx config + +Set the paths to the certificate and private key for your site + + bench set-ssl-certificate site1.local /etc/nginx/ssl/certificate_bundle.crt + bench set-ssl-key site1.local /etc/nginx/ssl/private.key + +### Generate nginx config + + bench setup nginx + +### Reload nginx + + service nginx reload + +or + + systemctl reload nginx # for CentOS 7 \ No newline at end of file diff --git a/frappe/docs/user/fr/guides/deployment/email-notifications-for-failed-background-jobs.md b/frappe/docs/user/fr/guides/deployment/email-notifications-for-failed-background-jobs.md new file mode 100644 index 0000000000..3c582762ec --- /dev/null +++ b/frappe/docs/user/fr/guides/deployment/email-notifications-for-failed-background-jobs.md @@ -0,0 +1,23 @@ + + +Frappe handles failure of jobs in the following way,
1) If a job fails, (raises exception), it's logged in Scheduler Log and logs/worker.error.log.
2) Keeps a lock file and would not run anymore if lock file is there.
3) Raises LockTimeoutError in case the lock file is more than 10 minutes old.
You can configure email notification for scheduler errors. By writing a file, sites/common_site_config.json with content
{
+ "celery_error_emails": {
+ "ADMINS": [
+ [
+ "Person 1",
+ "person1@example.com"
+ ],
+ [
+ "Person2 ",
+ "person2@example.com"
+ ]
+ ],
+ "SERVER_EMAIL": "exceptions@example.com"
+ }
+}One limitation is that it'll use local mailserver on port 25 to send the emails.
\ No newline at end of file diff --git a/frappe/docs/user/fr/guides/deployment/how-to-change-host-name-from-localhost.md b/frappe/docs/user/fr/guides/deployment/how-to-change-host-name-from-localhost.md new file mode 100644 index 0000000000..39d0008ec8 --- /dev/null +++ b/frappe/docs/user/fr/guides/deployment/how-to-change-host-name-from-localhost.md @@ -0,0 +1,18 @@ +While using a virtual machine, links within emails will be point to your host, e.g. localhost, like **http://localhost/set-password** etc. + +Frappe will automatically extract the host name from the incoming request, or from the `host_name` property from `site_config`. + +### bench set-config + +To fix this, you can use **bench set-config** to set your public IP or domain name as the host name. + +#### Example: + + bench --site mysite.com set-config host_name mysite.com + +--- + +Or edit the `frappe-bench/sites/mysite.com/site_config.json` and add a `host_name` property. + + + \ No newline at end of file diff --git a/frappe/docs/user/fr/guides/deployment/how-to-enable-social-logins.md b/frappe/docs/user/fr/guides/deployment/how-to-enable-social-logins.md new file mode 100644 index 0000000000..847cf78ea3 --- /dev/null +++ b/frappe/docs/user/fr/guides/deployment/how-to-enable-social-logins.md @@ -0,0 +1,67 @@ +Use Facebook, Google or GitHub authentication to login to Frappe, and your users will be spared from remembering another password. + +The system uses the **Email ID** supplied by these services to **match with an existing user** in Frappe. If no such user is found, **a new user is created** of the default type **Website User**, if Signup is not disabled in Website Settings. Any System Manager can later change the user type from **Website User** to **System User**, so that the user can access the Desktop. + +
+ ` block if present will be the page title if not specified in a special tag. If no `` or title is specified, the file name will be the title.
+
+### Adding CSS
+
+You can also add a `.css` file with the same filename (e.g. `index.css` for `index.md`) that will be rendered with the page.
+
+### Special Tags
+
+1. `` will make the page render in Jinja
+2. `` will add a custom title
+3. `` will not add breadcrumbs in the page
+4. `` will enable caching (if you have used Jinja templating)
+
+{next}
diff --git a/frappe/docs/user/fr/guides/portal-development/building.md b/frappe/docs/user/fr/guides/portal-development/building.md
new file mode 100644
index 0000000000..1e7ca23c9a
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/building.md
@@ -0,0 +1,15 @@
+# Building the site
+
+To make the pages to be served on the web, they must first be synced with the database. This is done by running:
+
+ bench --site sitename sync-www
+
+To re-build the site
+
+ bench --site sitename --force sync-www
+
+Clearing the website cache
+
+ bench --site sitename clear-website-cache
+
+{next}
diff --git a/frappe/docs/user/fr/guides/portal-development/contents.md b/frappe/docs/user/fr/guides/portal-development/contents.md
new file mode 100644
index 0000000000..c2ebaf5551
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/contents.md
@@ -0,0 +1,17 @@
+# Table of Contents
+
+You can add a table of contents by adding `{index}` string on a new line.
+
+You can also make Previous and Next buttons by adding `previous` or `next` in `{}`
+
+### Showing contents
+
+ # This is a title
+
+ Hello paragraph
+
+ ### Contents:
+
+ {index}
+
+{next}
diff --git a/frappe/docs/user/fr/guides/portal-development/context.md b/frappe/docs/user/fr/guides/portal-development/context.md
new file mode 100644
index 0000000000..5c72a1835b
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/context.md
@@ -0,0 +1,8 @@
+# Adding to context
+
+You can add more data for the pages by adding a `.py` file with the same filename (e.g. `index.py` for `index.md`) with a `get_context` method.
+
+ def get_context(context):
+ context.data = frappe.db.sql("some query")
+
+{next}
diff --git a/frappe/docs/user/fr/guides/portal-development/index.md b/frappe/docs/user/fr/guides/portal-development/index.md
new file mode 100644
index 0000000000..348e7cf9e5
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/index.md
@@ -0,0 +1,7 @@
+# Making Portals
+
+You can make your website by adding pages to the `/www` folder of your website. The urls of your site will match the path of your pages within the `/www` folder.
+
+Pages must be `.html` or `.md` (Markdown) files. Basic HTML template is provided in frappe in `frappe/templates/base_template.html`
+
+{index}
diff --git a/frappe/docs/user/fr/guides/portal-development/index.txt b/frappe/docs/user/fr/guides/portal-development/index.txt
new file mode 100644
index 0000000000..3eeece6502
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/index.txt
@@ -0,0 +1,5 @@
+adding-pages
+ordering
+contents
+context
+building
diff --git a/frappe/docs/user/fr/guides/portal-development/ordering.md b/frappe/docs/user/fr/guides/portal-development/ordering.md
new file mode 100644
index 0000000000..76db949fbb
--- /dev/null
+++ b/frappe/docs/user/fr/guides/portal-development/ordering.md
@@ -0,0 +1,13 @@
+# Ordering
+
+You can defining the ordering of pages in index by defining the index.txt file in your folder. The index.txt file must have the names (without extensions) of the pages in that folder indicating the order.
+
+For example for this folder the `index.txt` looks like:
+
+ adding-pages
+ ordering
+ contents
+ context
+ building
+
+{next}
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/getting-information-from-another-document-in-print-format.md b/frappe/docs/user/fr/guides/reports-and-printing/getting-information-from-another-document-in-print-format.md
new file mode 100644
index 0000000000..321028d7af
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/getting-information-from-another-document-in-print-format.md
@@ -0,0 +1,7 @@
+In a print format, you can get data from another document. For example in if you have a fields called `sales_order` in Sales Invoice, then you can get the sales order details using `frappe.get_doc`:
+
+{% raw %}
+ {% set sales_order_doc = frappe.get_doc("Sales Order", sales_order) %}
+
+ {{ sales_order_doc.customer }}
+{% endraw %}
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-query-report.md b/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-query-report.md
new file mode 100644
index 0000000000..92ea7d4b2e
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-query-report.md
@@ -0,0 +1,56 @@
+You can create tabulated reports using complex SQL queries by creating a new Report. These reports can be created by a System Manager and are stored in the Database
+
+> Note: You will need System Manager Permissions for this.
+
+To create a new Query Report:
+
+### 1. Create a new Report
+
+
+
+1. Set type as "Query Report"
+1. Set the reference DocType - Users that have access to the reference DocType will have access to the report
+1. Set the module - The report will appear in the "Custom Reports" section of the module.
+1. Add your Query
+
+### 2. Set the Query
+
+You can define complex queries such as:
+
+
+ SELECT
+ `tabProduction Order`.name as "Production Order:Link/Production Order:200",
+ `tabProduction Order`.creation as "Date:Date:120",
+ `tabProduction Order`.production_item as "Item:Link/Item:150",
+ `tabProduction Order`.qty as "To Produce:Int:100",
+ `tabProduction Order`.produced_qty as "Produced:Int:100"
+ FROM
+ `tabProduction Order`
+ WHERE
+ `tabProduction Order`.docstatus=1
+ AND ifnull(`tabProduction Order`.produced_qty,0) < `tabProduction Order`.qty
+ AND EXISTS (SELECT name from `tabStock Entry` where production_order =`tabProduction Order`.name)
+
+1. To format the columns, set labels for each column in the format: [Label]:[Field Type]/[Options]:[Width]
+
+### 3. Check the Report
+
+
+
+### 4. Advanced (adding filters)
+
+If you are making a standard report, you can add filters in your query report just like [script reports](https://frappe.io/kb/reports/how-to-make-script-reports) by adding a `.js` file in your query report folder. To include filters in your query, use `%(filter_key)s` where your filter value will be shown.
+
+For example
+
+ SELECT ... FROM ... WHERE item_code = %(item_code)s ORDER BY ...
+
+---
+
+### Note: Standard Script Report
+
+If you are developing a standard report for an app, make sure to set "Is Standard" as "Yes"
+
+
+
+
\ No newline at end of file
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-script-reports.md b/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-script-reports.md
new file mode 100644
index 0000000000..4f097b34d5
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/how-to-make-script-reports.md
@@ -0,0 +1,51 @@
+# Script Report
+
+You can create tabulated reports using server side scripts by creating a new Report.
+
+> Note: You will need Administrator Permissions for this.
+
+Since these reports give you unrestricted access via Python scripts, they can only be created by Administrators. The script part of the report becomes a part of the repository of the application. If you have not created an app, [read this](/developers/guide).
+
+> Note: You must be in [Developer Mode](/developers/how-to/enable-developer-mode) to do this
+
+### 1. Create a new Report
+
+
+
+1. Set Report Type as "Script Report"
+1. Set "Is Standard" as "Yes"
+1. Select the Module in which you want to add this report
+1. In the module folder (for example if it is Accounts in ERPnext the folder will be `erpnext/accounts/report/[report-name]`) you will see that templates for the report files will be created.
+1. In the `.js` file, you can set filters for the reports
+1. In the `.py` file, you can write the script that will generate the report
+
+### 2. Add Filters
+
+You can add filters in the `.js`. See an example below:
+
+ frappe.query_reports["Accounts Receivable"] = {
+ "filters": [
+ {
+ "fieldname":"company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("company")
+ },
+ ]
+ }
+
+1. These properties are the same as you would set in a DocField in a DocType
+
+### 3. Add the Script
+
+In the `.py` file you can add the script for generating the report.
+
+1. In the `execute` method, two lists `columns` and `data` are returned
+2. Columns must be a list of labels in the same format as query report. **[Label]:[Field Type]/[Options]:[Width]**. For example `Item:Link/Item:150`
+3. You can use all server side modules to build your report.
+4. For example see existing reports. ([Balance Sheet](https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/report/balance_sheet/balance_sheet.py))
+
+### 4. Commit and Push the app
+
+Don't forget to commit and push your app.
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/index.md b/frappe/docs/user/fr/guides/reports-and-printing/index.md
new file mode 100644
index 0000000000..8c464f691c
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/index.md
@@ -0,0 +1 @@
+# Reports and Printing
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/index.txt b/frappe/docs/user/fr/guides/reports-and-printing/index.txt
new file mode 100644
index 0000000000..ec34e2b102
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/index.txt
@@ -0,0 +1,5 @@
+how-to-make-script-reports
+how-to-make-query-report
+getting-information-from-another-document-in-print-format
+where-do-i-find-standard-print-formats
+print-format-for-reports
diff --git a/frappe/docs/user/fr/guides/reports-and-printing/print-format-for-reports.md b/frappe/docs/user/fr/guides/reports-and-printing/print-format-for-reports.md
new file mode 100644
index 0000000000..dd582169c0
--- /dev/null
+++ b/frappe/docs/user/fr/guides/reports-and-printing/print-format-for-reports.md
@@ -0,0 +1,70 @@
+# Report Print Formats
+
+In version 4.1 we introduce Report Print Formats. These are HTML templates that you can use to format Query Report data for printing.
+
+### 1. Creating New Print Formats
+
+To create a new Print Format, just drop in a `.html` file in the folder of the query report. For example, for the [General Ledger](https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/report/general_ledger) report in ERPNext, you can drop in a file called `general_ledger.html` along side the `.js` and `.py` files.
+
+##### Tree Of `erpnext/accounts/general_ledger`
+
+ general_ledger/
+ ├── __init__.py
+ ├── general_ledger.html
+ ├── general_ledger.js
+ ├── general_ledger.json
+ └── general_ledger.py
+
+
+### 2. Templating
+
+For templating, we use an adapted version of [John Resig's microtemplating script](http://ejohn.org/blog/javascript-micro-templating/). If you know Javascript, it is very easy to follow this templating language.
+
+##### Here are some examples (from John Resig's Blog):
+
+Example: Properities:
+
+ ">
+
+ 
+
+
+
+ <%=from_user%>: <%=text%>
+
+
+
+Example: Code structures, Loops
+
+ <% for ( var i = 0; i < users.length; i++ ) { %>
+
">
+
+
+Example: Code structures, Loops
+
+ <% for ( var i = 0; i < users.length; i++ ) { %>
+
+
+
+
+
+
+ <%=from_user%>: <%=text%>
+ +
+ +
1. Customizing Standard Print
+Go to Setup > Customize > Customize Form View and you can: ++
-
+
- Re-arranging fields by dragging and dropping +
- Add static elements by adding HTML type fields and adding your HTML in Options + + +
- Hiding fields by setting the Print Hide property +
+ +
2. Creating new layouts based on Print Formats
+ +As there are not templates that are generated for standard Print Formats, you will have to create new templates from scratch using the Jinja Templating Language via
+Setup > Printing and Branding > Print Format + +
+-
+
- See Print Format help.
+
+
+ - You can use the Bootstrap CSS framework to layout your print formats
+
+
+
+
Tip: You can import Standard Template macros for building your print formats. + +
+Example, adding the standard header:
+
+
{% raw %}{%- from "templates/print_formats/standard_macros.html" import add_header -%}
+{{ add_header() }}{% endraw %}
+Liste des outils, technologies utiles dans le développement d'applications avec Frappe.
+ +Il y a un grand nombres de tutoriels en ligne et nous recommandons [CodeAcademy](http://www.codecademy.com/) ou vous +trouverez beaucoup de ressources de qualité. +--- + +#### 1. Python + +La partie serveur de Frappe est codée en Python et c'est une bonne idée d'[apprendre rapidement Python](http://www.codecademy.com/tracks/python) +avant de commencer à comprendre Frappe. [Le tutoriel sur docs.python.org](https://docs.python.org/2.7/tutorial/index.html) +est aussi une excellente ressource pour apprendre Python. Notez que Frappe utilise Python 2.7. + +Pour produire une application de qualité, vous devez inclure des tests automatiques. Vous pouvez comprendre les bases +du développement par les tests [ici](http://code.tutsplus.com/tutorials/beginning-test-driven-development-in-python--net-30137). + +--- + +#### 2. MariaDB / MySQL + +Vous devez comprendre les notions essentielles des bases de données, comment installer, se connecter, créer de nouvelles bases, +et comment faire des requêtes. Voici [une rapide introduction à MySQL](https://www.digitalocean.com/community/tutorials/a-basic-mysql-tutorial) ou dirigez vous vers [le site MariaDB pour des informations plus détaillées](https://mariadb.com/kb/en/mariadb/documentation/getting-started/) + +--- + +#### 3. HTML / CSS + +Pour construire des interfaces utilisateur, vous devez [apprendre les bases HTML / CSS](http://www.codecademy.com/tracks/web) et [connaître le framework CSS Boostrap](http://getbootstrap.com) + +--- + +#### 4. Construire des interfaces avec Javascript et JQuery + +Pour customiser les formulaires et créer des interfaces riches, le mieux est [d'apprendre Javascript](http://www.codecademy.com/tracks/javascript) et la [fameuse librairie JQuery](http://www.codecademy.com/tracks/jquery). + +--- + +#### 5. Modifier les affichages et les pages web avec le sysème de template Jinja + +Si vous voulez modifier les affichages, vous devez apprendre le [language de template Jinja](http://jinja.pocoo.org/). C'est un moyen rapide de construire des pages web dynamiques. + +--- + +#### 6. Git et GitHub + +[Apprenz à contrinuer à un projet open source en utilisant Git et GitHub](https://guides.github.com/activities/contributing-to-open-source/), deux outils fantastiques pour vous aider à gérer et partager votre code. + +--- + +Quand vous êtes prêts, [essayez de développer une simple applicationa avec Frappe]({{ docs_base_url }}/user/fr/tutorial/app) + diff --git a/frappe/docs/user/fr/tutorial/bench.md b/frappe/docs/user/fr/tutorial/bench.md new file mode 100644 index 0000000000..65a82f29a2 --- /dev/null +++ b/frappe/docs/user/fr/tutorial/bench.md @@ -0,0 +1,13 @@ +# Installer le bench de Frappe + +La facon la plus rapide d'installer Frappe sur un système Unix est d'utiliser frappe-bench. Lisez les instructions détaillées sur +comment installer et utiliser Frappe Bench. + +> [https://github.com/frappe/bench](https://github.com/frappe/bench) + +Avec Frappe Bench vous pourrez configurer et héberger de multiples applications et sites. Frappe Bench configure aussi un Virtualenv +Python donc vos applications seront isolées les unes des autres (et vous n'aurez pas de conflits avce d'autres environnements de developpement). + +La commande `bench` sera installé et vous aidera aidera dans le développement et la gestion des vos applications. + +{suite} diff --git a/frappe/docs/user/fr/tutorial/conclusion.md b/frappe/docs/user/fr/tutorial/conclusion.md new file mode 100644 index 0000000000..44590555f1 --- /dev/null +++ b/frappe/docs/user/fr/tutorial/conclusion.md @@ -0,0 +1,10 @@ +# Conclusion + + +Nous espérons vous avoir donné un apercu de comment les applications sont développées avec Frappe. L'ojectif était de vous +montrer brievement, les différents aspects du développement d'une application en vous donnant un apércu général. Pour aller plus +loin dans les explications, consultez l'API. + +Pour obtenir de l'aider, rejoingnez la communauté sur le[chat sur Gitter](https://gitter.im/frappe/erpnext) ou sur le +[forum des développeurs](https://discuss.erpnext.com) + diff --git a/frappe/docs/user/fr/tutorial/controllers.md b/frappe/docs/user/fr/tutorial/controllers.md new file mode 100644 index 0000000000..963feec9e9 --- /dev/null +++ b/frappe/docs/user/fr/tutorial/controllers.md @@ -0,0 +1,61 @@ +# Les controleurs + +La prochaine étape est d'ajouter quelques méthodes et évéements à nos modèles. Dans l'application, nous devons nous +assurer que si une opération est faite, l'article concerné doit être disponible en stock et que le membre qui souhaite +faire le prêt à un abonnement valide. + +Pour cela, nous pouvons écrire une règle de validation au moment de la sauvegarde du prêt. Ouvrez le template `library_management/doctype/library_transaction/library_transaction.py`. + +Ce fichier est le controleur qui gère les opérations de la librairie, vous pouvez y écrire des méthodes pour: + +1. `before_insert` +1. `validate` (avant l'insertion ou la mise à jour) +1. `on_update` (après la sauvegarde) +1. `on_submit` (quand le document est soumis) +1. `on_cancel` +1. `on_trash` (avant qu'il ne soit sur le point d'être supprimé) + +Vous pouvez écrire des méthodes pour ces événement et elles seront appelées par le framework au bon moment. + +Voici pour finir le controleur: + + from __future__ import unicode_literals + import frappe + from frappe import _ + from frappe.model.document import Document + + class LibraryTransaction(Document): + def validate(self): + last_transaction = frappe.get_list("Library Transaction", + fields=["transaction_type", "transaction_date"], + filters = { + "article": self.article, + "transaction_date": ("<=", self.transaction_date), + "name": ("!=", self.name) + }) + if self.transaction_type=="Issue": + msg = _("Article {0} {1} has not been recorded as returned since {2}") + if last_transaction and last_transaction[0].transaction_type=="Issue": + frappe.throw(msg.format(self.article, self.article_name, + last_transaction[0].transaction_date)) + else: + if not last_transaction or last_transaction[0].transaction_type!="Issue": + frappe.throw(_("Cannot return article not issued")) + +Dans ce scrit: + +1. Nous récuperons la dernière opération, avant la date de l'opération en cours en utilisant la méthode `frappe.get_list` +1. Si la dernière opération est quelque chose qui n'est pas attendu, alors nous levons une exception en utilisant `frappe.throw` +1. Nous utilisons la méthode `_("text")` pour identifier une chaine traduisible. + +Verifiez vos validations en créant de nouveux enregistrements. + +
+
+#### Debogage
+
+Pour debugger, gardez toujours votre console JS ouverte, vérifier les erreurs à la fois de Javascript mais aussi du serveur.
+
+Regardez aussi votre fenêtre de terminal pour les esceptions. Chaque **erreur 500 pour des problèmes internes** seront affichées dans le terminal du serveur en cours d'utilisation.
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/doctype-directory-structure.md b/frappe/docs/user/fr/tutorial/doctype-directory-structure.md
new file mode 100644
index 0000000000..2fbfcb4c30
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/doctype-directory-structure.md
@@ -0,0 +1,32 @@
+# Structure du repertoire d'un DocType
+
+Après avoir sauvegardé vos DocTypes, vérifiez que les modèles dans les fichiers `.json` et `.py` soient créés dans le module
+`apps/library_management/library_management`. La structure du repertoire devrait ressembler à:
+
+ .
+ ├── MANIFEST.in
+ ├── README.md
+ ├── library_management
+ ..
+ │ ├── library_management
+ │ │ ├── __init__.py
+ │ │ └── doctype
+ │ │ ├── __init__.py
+ │ │ ├── article
+ │ │ │ ├── __init__.py
+ │ │ │ ├── article.json
+ │ │ │ └── article.py
+ │ │ ├── library_member
+ │ │ │ ├── __init__.py
+ │ │ │ ├── library_member.json
+ │ │ │ └── library_member.py
+ │ │ ├── library_membership
+ │ │ │ ├── __init__.py
+ │ │ │ ├── library_membership.json
+ │ │ │ └── library_membership.py
+ │ │ └── library_transaction
+ │ │ ├── __init__.py
+ │ │ ├── library_transaction.json
+ │ │ └── library_transaction.py
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/doctypes.md b/frappe/docs/user/fr/tutorial/doctypes.md
new file mode 100644
index 0000000000..199fa92f7c
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/doctypes.md
@@ -0,0 +1,105 @@
+# DocType
+
+Après avoir créé les ^oles, créons des **DocTypes**
+
+Pour créer un nouveau **DocType**, rendez-vous sur:
+
+> Developer > Documents > Doctype > New
+
+
+
+Dans un premier temps, saisissez le module, dans notre cas, **Library Managment**
+
+#### Ajouter des champs
+
+Dans le tableau des champs, vous pouvez ajouter des champs (propriétés) du **DocType** (Article).
+
+Les champs sont bien plus que des colonnes d'une base de données, ils peuvent être:
+
+1. Des colonnes d'une base de données
+1. Des aides pour la mise en page (section / saut de lignes)
+1. Des tableaux enfants (Champs de type tableau)
+1. HTML
+1. Des actions (button)
+1. Des pièces jointes ou des images
+
+Ajoutons des champs pour l'article.
+
+
+
+Quand vous ajoutez des champs, vous devez entrer le **Type**. Le **Label** est optionnel pour les retours de sections et de colonnes.
+Le **Name** (`fieldname`) ets le nom de la colonne dans la base de données et aussi la propriété du controleur. Les définitions
+doivent être *code friendly*, (par exemple insérer des underscores (_) à la place de espaces. Si vous laissez le champs `fieldname`
+vide, il sera automatiquement complété à la sauvegarde.
+
+Vous pouvez aussi définir d'autres propriétés comme par exemple prciser que le champs est requis ou en lecture seule etc.
+
+Nous pouvons ajouter les champs suivants:
+
+1. Article Name (Data)
+2. Author (Data)
+3. Description
+4. ISBN
+5. Status (Select): Pour les champs de type select, vous devez compléter les options. entrer **Issued** et **Available**
+sur chacune des lignes comme ci-dessous
+6. Publisher (Data)
+7. Language (Data)
+8. Image (Attach Image)
+
+
+#### Ajouter des permissins
+
+Après avoir ajouté les champs, validez et ajoutez un nouveau rôle dans la section des règles de permissions. Pour le moment
+ajoutons les droits le lecture, ecriture, création et suppression au modèle **Librarian**. Frappe à une gestion fine des
+permissions sur les modèles. Vous pouvez aussi changer les permissions plus tard en utilisant le gestionnaire de permissions
+dans la configuration.
+
+
+
+#### Sauvegarde
+
+Cliquez sur le bouton **Save**. Quand le bouton est cliqué, une popup vous demandera le nom. Donnez le nom **Article** et
+sauvegardez le **DocType**.
+
+Maintenant, connectez vous à MySQL et vérifiez la base de données créée:
+
+ $ bench mysql
+ Welcome to the MariaDB monitor. Commands end with ; or \g.
+ Your MariaDB connection id is 3931
+ Server version: 5.5.36-MariaDB-log Homebrew
+
+ Copyright (c) 2000, 2014, Oracle, Monty Program Ab and others.
+
+ Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+
+ MariaDB [library]> DESC tabArticle;
+ +--------------+--------------+------+-----+---------+-------+
+ | Field | Type | Null | Key | Default | Extra |
+ +--------------+--------------+------+-----+---------+-------+
+ | name | varchar(255) | NO | PRI | NULL | |
+ | creation | datetime(6) | YES | | NULL | |
+ | modified | datetime(6) | YES | | NULL | |
+ | modified_by | varchar(40) | YES | | NULL | |
+ | owner | varchar(60) | YES | | NULL | |
+ | docstatus | int(1) | YES | | 0 | |
+ | parent | varchar(255) | YES | MUL | NULL | |
+ | parentfield | varchar(255) | YES | | NULL | |
+ | parenttype | varchar(255) | YES | | NULL | |
+ | idx | int(8) | YES | | NULL | |
+ | article_name | varchar(255) | YES | | NULL | |
+ | status | varchar(255) | YES | | NULL | |
+ | description | text | YES | | NULL | |
+ | image | varchar(255) | YES | | NULL | |
+ | publisher | varchar(255) | YES | | NULL | |
+ | isbn | varchar(255) | YES | | NULL | |
+ | language | varchar(255) | YES | | NULL | |
+ | author | varchar(255) | YES | | NULL | |
+ +--------------+--------------+------+-----+---------+-------+
+ 18 rows in set (0.00 sec)
+
+
+Comme vous pouvez le voir, en plus de nos **DocFields**, d'autres colonnes ont été ajoutées dans notre table. Notez les
+changement, la clé primaire sur, `name`, `owner`(l'utilisateur quia créer l'enregistrement), `creation` et `modified` (des timestamps pour enregistrer les dates de creation et de modification).
+
+{suite}
+
diff --git a/frappe/docs/user/fr/tutorial/form-client-scripting.md b/frappe/docs/user/fr/tutorial/form-client-scripting.md
new file mode 100644
index 0000000000..28786d1e39
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/form-client-scripting.md
@@ -0,0 +1,46 @@
+## Codes des formulaires
+
+Jusqu'a maintenant, nous avons développé un système basique qui fonctionne parfaitement sans avoir eu besoin d'écrire une
+ seule ligne de code. Ajoutons donc quelques scripts pour rendre l'applications plus professionnelle et ajoutons des validations
+ pour éviter que les utilisateurs n'enregistrent des données invalides.
+
+
+### Les scripts coté client
+
+Dans le **DocType** **Library Transaction**, nous n'avons qu'un seul champ `Member Name`. Nous n'avons pas fait 2 champs.
+Ca pourrait être bien d'avoir deux champs, mais juste pour l'exemple, considérons que nous avons à implémenter cela. Pour ce
+faire, nous allons devoir écrire un gestionnaire d'évenements pour lorsque l'utilisateur sélectionne le champs `library_member` et accède aux données de l'utilisateur depuis le serveur en utilisant une API REST, remplisse les données dans le formaulaire.
+
+Pour commencer ce script, dans le repertoire `library_management/doctype/library_transaction`, créez un nouveau fichier
+`library_transaction.js`. Ce fichier sera automatiquement executé lorsque le modèle `Library Transaction` est appelé par l'utilisateur.
+Donc, dans ce fichier nous pouvons lier des actions à des événemenents mais aussi écrire d'autres fonctiones.
+
+#### library_transaction.js
+
+ frappe.ui.form.on("Library Transaction", "library_member",
+ function(frm) {
+ frappe.call({
+ "method": "frappe.client.get",
+ args: {
+ doctype: "Library Member",
+ name: frm.doc.library_member
+ },
+ callback: function (data) {
+ frappe.model.set_value(frm.doctype,
+ frm.docname, "member_name",
+ data.message.first_name
+ + (data.message.last_name ?
+ (" " + data.message.last_name) : ""))
+ }
+ })
+ });
+
+1. **frappe.ui.form.on(*doctype*, *fieldname*, *handler*)** est utilisé pour lier un évenement au gestionnaire d'évenements
+ quand la propriété `library_member` est complétée.
+1. Dans le gestionnaire, nous déclenchons un appel AJAX vers `frappe.client.get`. En réponse, nous avons l'ojet demandé sous forme d'une JSON. [En savoir plus sur l'API](/frappe/user/fr/guides/integration/rest_api).
+1. En utilisant **frappe.model.set_value(*doctype*, *name*, *fieldname*, *value*)** nous définissons la valeur dans le formulaire.
+
+**Note:** Pour vérifier que votre script fonctionne, n'oubliez pas de recharger votre page avant de tester.
+Les changements dans les scripts côté client ne sont pas automatiquement pris en compte quand vous êtes en mode développeur.
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/index.md b/frappe/docs/user/fr/tutorial/index.md
new file mode 100644
index 0000000000..a0bd012fb0
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/index.md
@@ -0,0 +1,41 @@
+# Tutoriel Frappe
+
+Dans ce guide nous allons vous montrer comment créer une application de A à Z en utilisant **Frappe**. Avec un
+exemple de gestion d'une librairie, nous allons aborder les sujets suivants:
+
+1. Installation
+1. Créer une nouvelle application
+1. Créer des modèles
+1. Créer des utilisateurs et des enregristrements
+1. Créer des contrôleurs
+1. Créer des vues web
+1. Configurer des Hooks et des tâches
+
+## A qui s'adresse ce tutoriel ?
+
+Ce guide est à destination des développeurs familiers avec la création d'applications web. Le framework Frappe est développé
+avec Python, utilise le système de base de données MariaDB et database and HTML/CSS/Javascript pour le rendu des pages.
+Il est donc necessaire d'être familier avec ces technologies. Si vous n'avez jamais utilisé Python auparavant, vous devriez
+suivre un tutoriel rapide avant de suivre ce guide.
+
+Frappe utilise le système de gestion de version git sur Github. Il est donc imporant que vous connaissiez les basiques de
+l'utilisation de git et que vous ayez un compte sur Github pour gérer vos applications.
+
+## Exemple
+
+Dans ce guide, nous allons développer une simple application de **gestion de librairie**. Dans cette applications nous aurons
+les modèles suivants:
+
+1. Article (un livre ou tout autre produit qui peut être emprunté)
+1. Library Member (membre de la librairie)
+1. Library Transaction (prêt ou retour d'un article)
+1. Library Membership (Periode pendant laquelle un membre peut emprunter)
+1. Library Management Setting (configuration générale)
+
+L'interace utilisateur (UI) pour le libraire sera **Frappe Desk**, un système de rendu d'interface où les formulaires sont
+automatiquement générés depuis les modèles en appliquant rôles et permissions.
+
+Nous allons aussi créer des vues pour la lirairie afin que les utilisateurs puissent parcourir les articles depuis un site
+internet.
+
+{index}
diff --git a/frappe/docs/user/fr/tutorial/index.txt b/frappe/docs/user/fr/tutorial/index.txt
new file mode 100644
index 0000000000..1fed6aed93
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/index.txt
@@ -0,0 +1,19 @@
+before
+app
+bench
+new-app
+setting-up-the-site
+start
+models
+roles
+doctypes
+naming-and-linking
+doctype-directory-structure
+users-and-records
+form-client-scripting
+controllers
+reports
+web-views
+single-doctypes
+task-runner
+conclusion
diff --git a/frappe/docs/user/fr/tutorial/models.md b/frappe/docs/user/fr/tutorial/models.md
new file mode 100644
index 0000000000..7f49a254a1
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/models.md
@@ -0,0 +1,26 @@
+# Définir des modèles
+
+La prochaine étape est de définir les modèles que nous avons présenté en introduction. Dans Frappe, les modèles sont appelés
+des **DocTypes**. Vous pouvez définir de nouveaux **DocTypes** depuis l'interface. Les **DocTypes** sont faits de **DocField**
+et de permissions appelées **DocPerms**.
+
+Quand un DocType est sauvegardé, une nouvelle table est créee dans la base de données. Cette table est nommée `tab[doctype]`.
+
+Quand vous créez un **DocType**, un nouveau repertoire est créé dans le **Module**, un fichier JSON définissant le modèles
+ainsin qu'un template de controleur sont automatiquement créés.
+Qaund vous mettez à jour un **DocType**, le modèle JSON est mis à jour et lorsque la commande `bench migrate` est exécutée,
+c'est synchronisé avec la base de données. Cela facilite a mise à jour et la migrations des schemas.
+
+### Le mode développeur
+
+Pour créer des modèles, vous devez définir la valeur de `developer_mode` à 1 dans le fichier `site_config.json` situé dans
+le repertoire /sites/library et executer la commande `bench clear-cache` ou utiliser l'interface et cliquer sur "Recharger"
+pour appliquer les changements. Vous devriez maintenant voir l'application "Developer" sur le bureau.
+
+ {
+ "db_name": "bcad64afbf",
+ "db_password": "v3qHDeVKvWVi7s97",
+ "developer_mode": 1
+ }
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/naming-and-linking.md b/frappe/docs/user/fr/tutorial/naming-and-linking.md
new file mode 100644
index 0000000000..cf4be0af57
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/naming-and-linking.md
@@ -0,0 +1,79 @@
+# Nommage et relation entre DocType
+
+Définissons un nouveau **DocType**:
+
+1. Library Member (First Name, Last Name, Email ID, Phone, Address)
+
+
+
+
+#### Le nommage des DocTypes
+
+Les **DocTypes** peuvent être nommés de différentes facons:
+
+1. Sur la base d'un champ
+1. Sur la base d'une série
+1. Par le controlleur (code)
+1. Par la console
+
+Cela peut être configuré par le champs **Autoname**. Pour le controlerur, laissez vide.
+
+> **Search Fields**: Un **DocType** peut être nommé sur la base d'une serie mais nous devons toujours pouvoir le chercher par un nom.
+Dans notre cas, l'arcicle peut etre cherché par un titre ou par l'auteur. Remplissons donc le champs **Search Fields**.
+
+
+
+#### Relation et champs select
+
+Les clés étrangères sont, dans Frappe, traduits par un champs de type **Link**. Le **DocType** ciblé doit être mentionné
+ dans le champs **Options**.
+
+Dans notre exemple, pour le **doctype** `Library Transaction`, nous avons un lien vers `Library Member` et vers `Article`.
+
+**Note:** Souvenez vous que les champs **Link** ne sont pas automatiquement enregistré comme clé étrangère afin d'éviter
+d'indexer la colonne. Cela pourrait ne pas être optimum, c'est pour cela que la validation de la clé étrangère est faite
+par le framework.
+
+
+
+Pour les champs **select**, comme mentionné plus tôt, ajoutez chacune des options dans le champs **Options**, chaque
+option sur une nouvelle ligne.
+
+
+
+faites de même pour les autres modèles.
+
+#### Valeurs liées
+
+Un modèle standard c'est lorsque vous selectionnez un ID, admettons **Library Member** dans **Library Membership**, alors,
+les noms et prénoms du membre doivent être copiés dans le champs adequat lors d'enregistrements dans `Library Membership Transaction`.
+
+Pour cela, nous pouvons utiliser des champs en lecture seules et, dans les options, nous pouvons définir le nom du lien
+et le nom du champs de la propriété que nous voulons parcourir. Dans cet exemple, dans **Member First Name** nous pouvons
+définir `library_member.first_name`
+
+
+
+### Completeter les Modeles
+
+De la même facon, vous pouvez compléter les autres modèles pour qu'au final le résultat soit:
+
+#### Article
+
+
+
+#### Library Member
+
+
+
+#### Library Membership
+
+
+
+#### Library Transaction
+
+
+
+> Vérifiez que le modèles **Librarian** ait les permissions sur chaque **DocType**.
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/new-app.md b/frappe/docs/user/fr/tutorial/new-app.md
new file mode 100644
index 0000000000..d3ae222f46
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/new-app.md
@@ -0,0 +1,56 @@
+# Créer une nouvelle application
+
+Une fois que Bench est installé, vous apercevrez deux répertoires, `apps` and `sites`. Toutes les applications seront
+installées dans `apps`.
+
+Pour créer une nouvelle application, allez dans votre répertoire et lancer la commande, `bench new-app {app_name}` et
+remplissez les informations à propos de votre application. Cela va créer un template d'application pour vous.
+
+ $ bench new-app library_management
+ App Title (defaut: Lib Mgt): Library Management
+ App Description: App for managing Articles, Members, Memberships and Transactions for Libraries
+ App Publisher: Frappe
+ App Email: info@frappe.io
+ App Icon (default 'octicon octicon-file-directory'): octicon octicon-book
+ App Color (default 'grey'): #589494
+ App License (default 'MIT'): GNU General Public License
+
+### Structure d'une application
+
+L'application sera créée dans un répertoire appelé `library_management` et aura la structure suivante:
+
+ .
+ ├── MANIFEST.in
+ ├── README.md
+ ├── library_management
+ │ ├── __init__.py
+ │ ├── config
+ │ │ ├── __init__.py
+ │ │ └── desktop.py
+ │ ├── hooks.py
+ │ ├── library_management
+ │ │ └── __init__.py
+ │ ├── modules.txt
+ │ ├── patches.txt
+ │ └── templates
+ │ ├── __init__.py
+ │ ├── generators
+ │ │ └── __init__.py
+ │ ├── pages
+ │ │ └── __init__.py
+ │ └── statics
+ ├── license.txt
+ ├── requirements.txt
+ └── setup.py
+
+1. `config` configuration de l'applicationfolder contains application configuration info
+1. `desktop.py` est l'endroit ou les icones peuvent être ajoutées au bureau
+1. `hooks.py` contient les définitions de la facon dont l'intégration avec l'environnement et les autres applications est faite.
+1. `library_management` (interne) est un **module** bootstrappé. Dans Frappe, un **module** est l'endroit ou sont les controlleurs et les modeles.
+1. `modules.txt` contient la liste des **modules** dans l'application. Quand vous créez un nouveau module, c'est obligatoire de l'ajouter dans ce fichier.
+1. `patches.txt` contient les patchs de migration. Ce sont des références Python utilisant la notation par point.
+1. `templates` est le repertoire qui contient les templates des vues. Les templates pour **Login** et autres pages par défaut sont déjà contenus dans Frappe.
+1. `generators` est l'endroit ou sont stockés les templates des modèles. Chaque instance du modèle a une route web comme par exemple les **articles de blog** ou chaque article a une adresse unique. Dans Frappe, Jinj2 est utilisé pour les templates.
+1. `pages` contient les routes uniques pour les templates. Par exemple "/blog" ou "/article"
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/reports.md b/frappe/docs/user/fr/tutorial/reports.md
new file mode 100644
index 0000000000..ee93a0eb14
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/reports.md
@@ -0,0 +1,7 @@
+# Rapports
+
+Vous pouvez aussi cliquer sur le texte "Rapports" dans la barre latérale de gauche pour voir vos données dans un tableau.
+
+
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/roles.md b/frappe/docs/user/fr/tutorial/roles.md
new file mode 100644
index 0000000000..8ea3498166
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/roles.md
@@ -0,0 +1,15 @@
+# Créer des rôles
+
+Avant de créer des modèles, nous devons auparavant créer des rôles qui auront des permissions sur le modèles. Nous allons
+créer deux rôles:
+
+1. Librarian pour définir le libraire
+1. Library Member pour définir un membre
+
+Pour créer un nouveau rôle, se rendre sur:
+
+> Setup > Users > Role > New
+
+
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/setting-up-the-site.md b/frappe/docs/user/fr/tutorial/setting-up-the-site.md
new file mode 100644
index 0000000000..9c595e2974
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/setting-up-the-site.md
@@ -0,0 +1,56 @@
+# Configurer le site
+
+Créons un site et appelons le `library`.
+
+Vous pouvez installer un nouveau site avec la commande `bench new-site library`
+
+Cette commande va créer une nouvelle base de données, un repertoire et installer `frappe` (qui est aussi une application!)
+dans le nouveau site. L'application `frappe` a deux modules par défaut, **Core** et **Website**. Le module **Core**
+contient les modèles basiques pour l'application. En effet, Frappe contient des modèles par défaut qui sont appelés **DocTypes**
+mais nous en reparlerons plus tard.
+
+ $ bench new-site library
+ MySQL root password:
+ Installing frappe...
+ Updating frappe : [========================================]
+ Updating country info : [========================================]
+ Set Administrator password:
+ Re-enter Administrator password:
+ Installing fixtures...
+ *** Scheduler is disabled ***
+
+### Structure du site
+
+Un nouveau repertoires appelé `library` sera créé dans le repertoire `sites`. Voici la structure standard pour un site.
+
+ .
+ ├── locks
+ ├── private
+ │ └── backups
+ ├── public
+ │ └── files
+ └── site_config.json
+
+1. `public/files` contient les fichiers uploadés.
+1. `private/backups` contient les backups.
+1. `site_config.json` contient la configuration du site.
+
+### COnfiguration par défaut
+
+Dans le cas ou vous avez plusieurs sites, utilisez la commande `bench use [site_name]` pour définir le site par défaut.
+
+Exemple:
+
+ $ bench use library
+
+### Installer une application
+
+Maintenant installons notre application `library_management` dans notre site `library`
+
+1. Installer library_management avec la commande: `bench --site [site_name] install-app [app_name]`
+
+Exemple:
+
+ $ bench --site library install-app library_management
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/single-doctypes.md b/frappe/docs/user/fr/tutorial/single-doctypes.md
new file mode 100644
index 0000000000..e3b10a0523
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/single-doctypes.md
@@ -0,0 +1,12 @@
+# Les DocTypes de type Single
+
+Une application aura en générale une seule page de configuration. Dans notre application nous pouvons donc définir une page
+ou nous définierons la période prêt. Nous avons aussi besoin de sauvegarder cette propriété. Dans Frappe, ceci est possible
+en utilisant un un Doctype de type **Single**. Un DocType **Single** est comme le pattern Singleton, une instance unique
+d'une classe. Appelons le **Library Managment Settings**.
+
+Pour créer un DocType de type **Single** cochez la case **Is Single**.
+
+
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/start.md b/frappe/docs/user/fr/tutorial/start.md
new file mode 100644
index 0000000000..bc71edd27e
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/start.md
@@ -0,0 +1,32 @@
+# Demarrer avec Bench
+
+Maintenant, nous pouvons nous connecter et vérifier que tout fonctionne normalement.
+
+Pour démarrer le serveur de développement, lancez la commande `bench start`
+
+ $ bench start
+ 13:58:51 web.1 | started with pid 22135
+ 13:58:51 worker.1 | started with pid 22136
+ 13:58:51 workerbeat.1 | started with pid 22137
+ 13:58:52 web.1 | * Running on http://0.0.0.0:8000/
+ 13:58:52 web.1 | * Restarting with reloader
+ 13:58:52 workerbeat.1 | [2014-09-17 13:58:52,343: INFO/MainProcess] beat: Starting...
+
+Vous pouvez maintenant ouvrir votre navigateur et vous rendre sur `http://localhost:8000`. Si tout se passe bien vous devriez voir:
+
+
+
+Maintenant, connectez vous avec les identifiants suivants:
+
+Login ID: **Administrator**
+
+Mot de passe: **Le mot de passe que vous avez définis pendant l'installation**
+
+Une fois connecté, vous devriez voir le `Desk`, c'est à dire la page d'accueil
+
+
+
+Comme vous pouvez le voir, Frappe fournit quelques applications comme un To Do, un gestionnaire de fichiers etc. Ces applications
+peuvent être intégrées par la suite.
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/task-runner.md b/frappe/docs/user/fr/tutorial/task-runner.md
new file mode 100644
index 0000000000..9bc2d4aa42
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/task-runner.md
@@ -0,0 +1,82 @@
+# Les tâches planifiées
+
+Finalement, une application a aussi à envoyer des emails de notifications ou d'autres taches planifiées. Dans Frappe, si
+ vous avez configuré le **bench**, la tâche / planificateur est configuré via Celery en utilisant les queues Redis.
+
+Pour ajouter un nouveau gestionnaire de tâches, ouvrez le fichier `hooks.py` et ajoutez un nouveau gestionnaire. Les gestionnaire
+ par defaut sont `all`, `daily`, `weekly`, `monthly`. Le gestionanire `all` est appelé toutes les 3 minutes par defaut.
+
+ # Scheduled Tasks
+ # ---------------
+
+ scheduler_events = {
+ "daily": [
+ "library_management.tasks.daily"
+ ],
+ }
+
+Ici, nous pointons sur une fonction en Python et cette fonction sera appelée tous les jours. Voyons à quoi cette fonction
+ressemble:
+
+ # Copyright (c) 2013, Frappe
+ # For license information, please see license.txt
+
+ from __future__ import unicode_literals
+ import frappe
+ from frappe.utils import datediff, nowdate, format_date, add_days
+
+ def daily():
+ loan_period = frappe.db.get_value("Library Management Settings",
+ None, "loan_period")
+
+ overdue = get_overdue(loan_period)
+
+ for member, items in overdue.iteritems():
+ content = """Following Items are Overdue
+Please return them as soon as possible
- """
+
+ for i in items:
+ content += "
- {0} ({1}) due on {2} ".format(i.article_name, + i.article, + format_date(add_days(i.transaction_date, loan_period))) + + content += "
+
+Maintenant deconnectez-vous puis connectez vous avec l'utilisateur que vous venez de créer.
+
+### 4.2 Créer des enregistrements
+
+Vous allez désormais voirs une icones pour notre module de gestion de librairie. Cliquez sur cette icone et vous apercevrez
+la page du module:
+
+
+
+Vous pouvez donc voir les **DocTypes** que nous avons créés pour l'application. Créons quelques enregistrements.
+
+Définissons un nouvel Article:
+
+
+
+Le **DocType** que vous avons déinis est transformé en formulaire. Les règles de valdiation seront appliquées selons nos
+définitions. Remplissons le formulaire pour créer notre premier article.
+
+
+
+Vous pouvez aussi ajouter une image.
+
+
+
+Maintenant créons un nouveau membre.
+
+
+
+Après cela, définissons un nouvel abonnement pour ce membre.
+
+Ici, si vous vous souvenez, nous avons définis que les noms et prénoms doivent automatiquement être renseignés dès que nous
+avons selectionné l'ID du membre.
+
+
+
+Comme vous pouvez le voir, la date est formattée en années-mois-jour qui est le format du système. Pour configurer / changer
+le format de la date et de l'heure, rendez-vous sur:
+
+> Setup > Settings > System Settings
+
+
+
+{suite}
diff --git a/frappe/docs/user/fr/tutorial/web-views.md b/frappe/docs/user/fr/tutorial/web-views.md
new file mode 100644
index 0000000000..ed5409d800
--- /dev/null
+++ b/frappe/docs/user/fr/tutorial/web-views.md
@@ -0,0 +1,72 @@
+# es vues web
+
+Frappe a deux principaux environnements, le **bureau** et **le web**. Le **bureau** est un environnement riche AJAX alors
+que **le web** est une collection plus traditionnelle de fichers HTML pour la consultation publique. Les vues web peuvent
+aussi être générées pour créer des vues plus controllées pour les utilisateurs qui peuvent se connecter mais qui n'ont pas
+accès au desk.
+
+Dans Frappe, les vues sont gérées par des templates et sont tout naturellement placés dans le repertoire `templates`. Il
+y a 2 principaux types de templates.
+
+1. Pages: Ce sont des templates Jinja ou une vue unique existe pour une route (exemple:`/blog`).
+2. Générateurs: Ce sont des templates ou chaque instance représente un **DocType** réprésenté par une url unique. (exemple:`/blog/a-blog`, `blog/b-blog` etc.)
+3. Les listes et les vues: Ce sont des listes standards et des vues avec l'url `[doctype]/[name]` et sont affichées en fonction des permissions.
+
+### Les vues web standards
+
+> Cette fonctionnalité est encore en développement.
+
+Jettons un oeuil aux vues standards:
+
+Si vous êtes connecté avec votre utilisateur de test, rendez-vous sur`/article` et vous devriez voir la liste des articles:
+
+
+
+Cliquez sur un article et vous devriez voir une vue par défaut.
+
+
+
+Maintenant, si vous voulez une meilleur liste pour vos articles, créez un fichier appelé `list_item.html` dans le
+repertoire `library_management/doctype/article`. Voici un exemple du contenu de ce fichier:
+
+
+
+
+
+Ici, vous aurez toutes les propriétés d'un article dans l'object `doc`.
+
+La mise à jour de la liste ressemble à ca !
+
+
+
+#### La page d'accueil
+
+Frappe permet l'inscription et inclut les inscriptions via Google, Facebook et Github. Quand un utilisateur s'inscrit via
+le web, il n'a pas accès à l'interface du desk par defaut.
+
+> Pour autoriser les utilisateurs à accéder au Desk, ouvrez la configuration de l'utilisateur (Setup > User) et définissez
+ le type d'utilisatuer à "System User".
+
+Pour les utilisateurs qui n'ont pas accès au desk, nous pouvons définir une page d'accueil ou ils peuvent se connecter via
+`hooks.py` le tout en respectant les rôles.
+
+Quand un membre de la librairie se connecte, il doit être redirigé vers la page `article` donc ouvrez le fichier `library_management/hooks.py` et ajoutez:
+
+ role_home_page = {
+ "Library Member": "article"
+ }
+
+{suite}
diff --git a/frappe/docs/user/fr/videos/index.md b/frappe/docs/user/fr/videos/index.md
new file mode 100644
index 0000000000..edcdf8ac54
--- /dev/null
+++ b/frappe/docs/user/fr/videos/index.md
@@ -0,0 +1,9 @@
+# Video Tutorials for Frappe Framework
+
+This 10-part video tutorial will teach you how to build complex apps in Frappe
+
+Pre-requisites: You must have some understanding of Python, Javascript and MySQL before you start this tutorial.
+
+---
+
+
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index 4218598484..3867f5470c 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -6,19 +6,21 @@ import frappe
from frappe.email.email_body import get_email
from frappe.email.smtp import send
+from frappe.utils import markdown
def sendmail_md(recipients, sender=None, msg=None, subject=None, attachments=None, content=None,
- reply_to=None, cc=(), message_id=None):
+ reply_to=None, cc=(), message_id=None, in_reply_to=None):
"""send markdown email"""
- import markdown2
- sendmail(recipients, sender, markdown2.markdown(content or msg), subject, attachments, reply_to=reply_to, cc=cc)
+ sendmail(recipients, sender, markdown(content or msg), subject, attachments, reply_to=reply_to, cc=cc)
def sendmail(recipients, sender='', msg='', subject='[No Subject]', attachments=None, content=None,
- reply_to=None, cc=(), message_id=None):
+ reply_to=None, cc=(), message_id=None, in_reply_to=None):
"""send an html email as multipart with attachments and all"""
mail = get_email(recipients, sender, content or msg, subject, attachments=attachments, reply_to=reply_to, cc=cc)
if message_id:
mail.set_message_id(message_id)
+ if in_reply_to:
+ mail.set_in_reply_to(in_reply_to)
send(mail)
diff --git a/frappe/email/bulk.py b/frappe/email/bulk.py
index f89ed6ddd7..327184fc95 100644
--- a/frappe/email/bulk.py
+++ b/frappe/email/bulk.py
@@ -10,13 +10,13 @@ from frappe.email.smtp import SMTPServer, get_outgoing_email_account
from frappe.email.email_body import get_email, get_formatted_html
from frappe.utils.verified_command import get_signed_params, verify_request
from html2text import html2text
-from frappe.utils import get_url, nowdate, encode, now_datetime, add_days, split_emails
+from frappe.utils import get_url, nowdate, encode, now_datetime, add_days, split_emails, cstr
class BulkLimitCrossedError(frappe.ValidationError): pass
def send(recipients=None, sender=None, subject=None, message=None, reference_doctype=None,
reference_name=None, unsubscribe_method=None, unsubscribe_params=None, unsubscribe_message=None,
- attachments=None, reply_to=None, cc=(), show_as_cc=(), message_id=None, send_after=None,
+ attachments=None, reply_to=None, cc=(), show_as_cc=(), message_id=None, in_reply_to=None, send_after=None,
expose_recipients=False, bulk_priority=1):
"""Add email to sending queue (Bulk Email)
@@ -32,6 +32,7 @@ def send(recipients=None, sender=None, subject=None, message=None, reference_doc
:param attachments: Attachments to be sent.
:param reply_to: Reply to be captured here (default inbox)
:param message_id: Used for threading. If a reply is received to this email, Message-Id is sent back as In-Reply-To in received email.
+ :param in_reply_to: Used to send the Message-Id of a received email back as In-Reply-To.
:param send_after: Send this email after the given datetime. If value is in integer, then `send_after` will be the automatically set to no of days from current date.
"""
if not unsubscribe_method:
@@ -100,11 +101,11 @@ def send(recipients=None, sender=None, subject=None, message=None, reference_doc
# add to queue
add(email, sender, subject, email_content, email_text_context, reference_doctype,
- reference_name, attachments, reply_to, cc, message_id, send_after, bulk_priority)
+ reference_name, attachments, reply_to, cc, message_id, in_reply_to, send_after, bulk_priority)
def add(email, sender, subject, formatted, text_content=None,
reference_doctype=None, reference_name=None, attachments=None, reply_to=None,
- cc=(), message_id=None, send_after=None, bulk_priority=1, email_account=None):
+ cc=(), message_id=None, in_reply_to=None, send_after=None, bulk_priority=1, email_account=None):
"""add to bulk mail queue"""
e = frappe.new_doc('Bulk Email')
e.sender = sender
@@ -118,7 +119,10 @@ def add(email, sender, subject, formatted, text_content=None,
if message_id:
mail.set_message_id(message_id)
- e.message = mail.as_string()
+ if in_reply_to:
+ mail.set_in_reply_to(in_reply_to)
+
+ e.message = cstr(mail.as_string())
except frappe.InvalidEmailAddressError:
# bad email id - don't add to queue
diff --git a/frappe/email/doctype/bulk_email/bulk_email.json b/frappe/email/doctype/bulk_email/bulk_email.json
index b84f496968..7ca9ebb6f6 100644
--- a/frappe/email/doctype/bulk_email/bulk_email.json
+++ b/frappe/email/doctype/bulk_email/bulk_email.json
@@ -1,257 +1,278 @@
{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "creation": "2012-08-02 15:17:28",
- "custom": 0,
- "description": "Bulk Email records.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "System",
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "creation": "2012-08-02 15:17:28",
+ "custom": 0,
+ "description": "Bulk Email records.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "System",
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "sender",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Sender",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "sender",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Sender",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Email",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "recipient",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Recipient",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "recipient",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Recipient",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Email",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "message",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Message",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "message",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Message",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "Not Sent",
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Status",
- "length": 0,
- "no_copy": 0,
- "options": "\nNot Sent\nSending\nSent\nError\nExpired",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "Not Sent",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Status",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nNot Sent\nSending\nSent\nError\nExpired",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "error",
- "fieldtype": "Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Error",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "error",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Error",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "reference_doctype",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Reference DocType",
- "length": 0,
- "no_copy": 0,
- "options": "DocType",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "reference_doctype",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Reference DocType",
+ "length": 0,
+ "no_copy": 0,
+ "options": "DocType",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "reference_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Reference DocName",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "reference_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Reference DocName",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "send_after",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Send After",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "send_after",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Send After",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "1",
- "fieldname": "priority",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Priority",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "1",
+ "fieldname": "priority",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Priority",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-envelope",
- "idx": 1,
- "in_create": 1,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2015-12-24 06:29:43.089602",
- "modified_by": "Administrator",
- "module": "Email",
- "name": "Bulk Email",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-envelope",
+ "idx": 1,
+ "in_create": 1,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-02-26 06:44:01.199764",
+ "modified_by": "anand@erpnext.com",
+ "module": "Email",
+ "name": "Bulk Email",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "read_only": 0,
- "read_only_onload": 0
-}
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 39f1d43082..47f1fd892b 100644
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -345,6 +345,7 @@ class EmailAccount(Document):
reference_doctype = communication.reference_doctype,
reference_name = communication.reference_name,
message_id = communication.name,
+ in_reply_to = email.mail.get("Message-Id"), # send back the Message-Id as In-Reply-To
unsubscribe_message = _("Leave this conversation"),
bulk=True)
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index 23d4cfe409..92fa8633cd 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -106,6 +106,7 @@ class TestEmailAccount(unittest.TestCase):
send_email=True)["name"]
sent_mail = email.message_from_string(frappe.get_last_doc("Bulk Email").message)
+
with open(os.path.join(os.path.dirname(__file__), "test_mails", "reply-1.raw"), "r") as f:
raw = f.read()
raw = raw.replace("<-- in-reply-to -->", sent_mail.get("Message-Id"))
diff --git a/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json
index c28dc54e22..a2c82fdfe5 100644
--- a/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json
+++ b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json
@@ -17,6 +17,7 @@
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Email By Document Field",
@@ -24,6 +25,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -37,16 +39,19 @@
"collapsible": 0,
"description": "Optional: Always send to these ids. Each email id on a new row",
"fieldname": "cc",
- "fieldtype": "Text",
+ "fieldtype": "Code",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "CC",
"length": 0,
"no_copy": 0,
+ "options": "Email",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -63,6 +68,7 @@
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Condition",
@@ -70,6 +76,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -80,13 +87,14 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
+ "idx": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:46.092268",
+ "modified": "2016-02-22 09:19:41.689603",
"modified_by": "Administrator",
"module": "Email",
"name": "Email Alert Recipient",
diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 93345b03f3..55f3baf757 100644
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -5,9 +5,8 @@ from __future__ import unicode_literals
import frappe
from frappe.utils.pdf import get_pdf
from frappe.email.smtp import get_outgoing_email_account
-from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails, to_markdown
+from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails, to_markdown, markdown
import email.utils
-from markdown2 import markdown
def get_email(recipients, sender='', msg='', subject='[No Subject]',
text_content = None, footer=None, print_html=None, formatted=None, attachments=None,
@@ -179,6 +178,10 @@ class EMail:
def set_message_id(self, message_id):
self.msg_root["Message-Id"] = "<{0}@{1}>".format(message_id, frappe.local.site)
+ def set_in_reply_to(self, in_reply_to):
+ """Used to send the Message-Id of a received email back as In-Reply-To"""
+ self.msg_root["In-Reply-To"] = in_reply_to
+
def make(self):
"""build into msg_root"""
headers = {
diff --git a/frappe/handler.py b/frappe/handler.py
index 5325530d7b..c3f51adf8e 100755
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -10,7 +10,6 @@ import frappe.sessions
import frappe.utils.file_manager
import frappe.desk.form.run_method
from frappe.utils.response import build_response
-import bleach
def handle():
"""handle request"""
@@ -50,10 +49,9 @@ def is_whitelisted(method):
if method not in frappe.xss_safe_methods:
# strictly sanitize form_dict
# escapes html characters like <> except for predefined tags like a, b, ul etc.
- # if required, we can add more whitelisted tags like div, p, etc. (see its documentation)
for key, value in frappe.form_dict.items():
if isinstance(value, basestring):
- frappe.form_dict[key] = bleach.clean(value)
+ frappe.form_dict[key] = frappe.utils.sanitize_html(value)
else:
if not method in frappe.whitelisted:
@@ -109,6 +107,7 @@ def uploadfile():
return ret
+
def get_attr(cmd):
"""get method object from cmd"""
if '.' in cmd:
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 5203f1a5bb..cbc85d27bf 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -1,11 +1,11 @@
from __future__ import unicode_literals
app_name = "frappe"
app_title = "Frappe Framework"
-app_publisher = "Frappe Technologies Pvt. Ltd."
+app_publisher = "Frappe Technologies"
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
app_icon = "octicon octicon-circuit-board"
-app_version = "6.23.3"
+app_version = "6.24.10"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
diff --git a/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py b/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py
index 9e0723e0b9..bf9198c73c 100644
--- a/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py
+++ b/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py
@@ -15,6 +15,9 @@ from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
from frappe.utils import cint, split_emails, get_request_site_address, cstr
+from frappe.utils.backups import new_backup
+from frappe.utils import get_files_path, get_backups_path
+
import os
from frappe import _
@@ -38,7 +41,6 @@ def take_backups_if(freq):
def take_backups_dropbox():
did_not_upload, error_log = [], []
try:
- from frappe.integrations.doctype.dropbox_backup.dropbox_backup import backup_to_dropbox
did_not_upload, error_log = backup_to_dropbox()
if did_not_upload: raise Exception
@@ -60,7 +62,9 @@ def send_email(success, service_name, error_status=None):
subject = "[Warning] Backup Upload Failed"
message ="""
+
+ 
+
+
+
+
+ {{ doc.article_name }}
+{{ doc.author }}
+{{ (doc.description[:200] + "...") + if doc.description|length > 200 else doc.description }}
+Publisher: {{ doc.publisher }}
+Backup Upload Failed
Oops, your automated backup to %s failed.
-Error message: %s
+Error message:
+
%sPlease contact your system manager for more information.
""" % (service_name, error_status) @@ -87,7 +91,6 @@ def get_dropbox_authorize_url(): @frappe.whitelist(allow_guest=True) def dropbox_callback(oauth_token=None, not_approved=False): - from dropbox import client if not not_approved: if frappe.db.get_value("Dropbox Backup", None, "dropbox_access_key")==oauth_token: allowed = 1 @@ -127,23 +130,15 @@ def dropbox_callback(oauth_token=None, not_approved=False): frappe.response['page_name'] = 'message.html' def backup_to_dropbox(): - from dropbox import client, session - from frappe.utils.backups import new_backup - from frappe.utils import get_files_path, get_backups_path if not frappe.db: frappe.connect() - sess = session.DropboxSession(frappe.conf.dropbox_access_key, frappe.conf.dropbox_secret_key, "app_folder") - - sess.set_token(frappe.db.get_value("Dropbox Backup", None, "dropbox_access_key"), - frappe.db.get_value("Dropbox Backup", None, "dropbox_access_secret")) - - dropbox_client = client.DropboxClient(sess) + dropbox_client = get_dropbox_client() # upload database backup = new_backup(ignore_files=True) filename = os.path.join(get_backups_path(), os.path.basename(backup.backup_path_db)) - upload_file_to_dropbox(filename, "/database", dropbox_client) + dropbox_client = upload_file_to_dropbox(filename, "/database", dropbox_client) frappe.db.close() @@ -151,12 +146,33 @@ def backup_to_dropbox(): did_not_upload = [] error_log = [] - upload_from_folder(get_files_path(), "/files", dropbox_client, did_not_upload, error_log) - upload_from_folder(get_files_path(is_private=1), "/private/files", dropbox_client, did_not_upload, error_log) + dropbox_client = upload_from_folder(get_files_path(), "/files", dropbox_client, did_not_upload, error_log) + dropbox_client = upload_from_folder(get_files_path(is_private=1), "/private/files", dropbox_client, did_not_upload, error_log) frappe.connect() return did_not_upload, list(set(error_log)) +def get_dropbox_client(previous_dropbox_client=None): + from dropbox import client + + sess = get_dropbox_session() + + sess.set_token(frappe.db.get_value("Dropbox Backup", None, "dropbox_access_key"), + frappe.db.get_value("Dropbox Backup", None, "dropbox_access_secret")) + + dropbox_client = client.DropboxClient(sess) + + # upgrade to oauth2 + token = dropbox_client.create_oauth2_access_token() + dropbox_client = client.DropboxClient(token) + + if previous_dropbox_client: + dropbox_client.connection_reset_count = previous_dropbox_client.connection_reset_count + 1 + else: + dropbox_client.connection_reset_count = 0 + + return dropbox_client + def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, error_log): import dropbox.rest @@ -187,11 +203,13 @@ def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, err if not found: try: - upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client) + dropbox_client = upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client) except Exception: did_not_upload.append(filename) error_log.append(frappe.get_traceback()) + return dropbox_client + def get_dropbox_session(): try: from dropbox import session @@ -218,10 +236,26 @@ def upload_file_to_dropbox(filename, folder, dropbox_client): try: uploader.upload_chunked() uploader.finish(folder + "/" + os.path.basename(filename), overwrite=True) - except rest.ErrorResponse: - pass + + except rest.ErrorResponse, e: + # if "[401] u'Access token not found.'", + # it means that the user needs to again allow dropbox backup from the UI + # so re-raise + + if (e.startswith("[401]") + and dropbox_client.connection_reset_count < 10 + and e != "[401] u'Access token not found.'"): + + # session expired, so get a new connection! + # [401] u"The given OAuth 2 access token doesn't exist or has expired." + dropbox_client = get_dropbox_client(dropbox_client) + + else: + raise else: dropbox_client.put_file(folder + "/" + os.path.basename(filename), f, overwrite=True) + return dropbox_client + if __name__=="__main__": backup_to_dropbox() diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index a94030cd64..f98b7e997c 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -4,7 +4,8 @@ from __future__ import unicode_literals import frappe, sys from frappe import _ -from frappe.utils import cint, flt, now, cstr, strip_html, getdate, get_datetime, to_timedelta +from frappe.utils import (cint, flt, now, cstr, strip_html, getdate, get_datetime, to_timedelta, + sanitize_html, sanitize_email) from frappe.model import default_fields from frappe.model.naming import set_new_name from frappe.modules import load_doctype_module @@ -177,7 +178,7 @@ class BaseDocument(object): d = frappe._dict() for fieldname in self.meta.get_valid_columns(): d[fieldname] = self.get(fieldname) - + # if no need for sanitization and value is None, continue if not sanitize and d[fieldname] is None: continue @@ -188,7 +189,7 @@ class BaseDocument(object): d[fieldname] = cint(d[fieldname]) elif df.fieldtype in ("Currency", "Float", "Percent") and not isinstance(d[fieldname], float): - + d[fieldname] = flt(d[fieldname]) elif df.fieldtype in ("Datetime", "Date") and d[fieldname]=="": @@ -505,6 +506,42 @@ class BaseDocument(object): frappe.throw(_("Not allowed to change {0} after submission").format(df.label), frappe.UpdateAfterSubmitError) + def _sanitize_content(self): + """Sanitize HTML and Email in field values. Used to prevent XSS. + + - Ignore if 'Ignore XSS Filter' is checked or fieldtype is 'Code' + """ + if frappe.flags.in_install: + return + + for fieldname, value in self.get_valid_dict().items(): + if not value or not isinstance(value, basestring): + continue + + elif ("<" not in value and ">" not in value): + # doesn't look like html so no need + continue + + elif "" in value and not ("Test
'
+ escaped_xss = 'Test
'
+ d.subject += xss
+ d.save()
+ d.load_from_db()
+
+ self.assertTrue(xss not in d.subject)
+ self.assertTrue(escaped_xss in d.subject)
+
+ # css attributes
+ xss = 'Test
'
+ escaped_xss = 'Test
'
+ d.subject += xss
+ d.save()
+ d.load_from_db()
+
+ self.assertTrue(xss not in d.subject)
+ self.assertTrue(escaped_xss in d.subject)
+
diff --git a/frappe/translations/fr.csv b/frappe/translations/fr.csv
index fa8bc2b2eb..c935473c52 100644
--- a/frappe/translations/fr.csv
+++ b/frappe/translations/fr.csv
@@ -26,7 +26,7 @@ apps/frappe/frappe/config/core.py +42,Logs,Logs
DocType: DocPerm,This role update User Permissions for a user,Ce rôle Permission mise à jour de l'utilisateur pour un utilisateur
apps/frappe/frappe/public/js/frappe/model/model.js +510,Rename {0},Renommer {0}
DocType: Workflow State,zoom-out,Réduire
-apps/frappe/frappe/public/js/legacy/form.js +66,Cannot open {0} when its instance is open,pas trouvé
+apps/frappe/frappe/public/js/legacy/form.js +66,Cannot open {0} when its instance is open,Ne peut ouvrir {0} quand son instance est ouverte
apps/frappe/frappe/model/document.py +756,Table {0} cannot be empty,La Table {0} ne peut pas être vide
apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +893,With Ledgers,Permanence Annuler {0} ?
DocType: Communication,Reference Owner,référence propriétaire
@@ -63,7 +63,7 @@ apps/frappe/frappe/public/js/frappe/ui/upload.html +12,Web Link,Lien Web
apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +41,1 minute ago,il y a 1 minute
apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +33,"Recommended bulk editing records via import, or understanding the import format.","Modification d'enregistrements en vrac Recommandé par l'importation, ou de comprendre le format d'importation."
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +36,"Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.","En dehors de System Manager, les rôles avec Définir les autorisations de droit d'utilisateur peut définir des autorisations pour d'autres utilisateurs pour ce type de document."
-DocType: Company History,Company History,Historique de l'entreprise
+DocType: Company History,Company History,Historique de la société
DocType: Workflow State,volume-up,Augmenter le volume
apps/frappe/frappe/core/page/data_import_tool/importer.py +45,Only allowed {0} rows in one import,Seulement autorisés {0} lignes d'une importation
apps/frappe/frappe/public/js/frappe/list/list_sidebar.js +61,Refresh Stats,Actualiser Statistiques
@@ -224,7 +224,7 @@ apps/frappe/frappe/core/doctype/file/file_list.js +176,New,Nouveau
DocType: System Settings,Loading...,Chargement en cours ...
DocType: DocField,Password,Mot de passe
DocType: Blogger,Will be used in url (usually first name).,Sera utilisé dans url (généralement prénom).
-apps/frappe/frappe/client.py +63,Can not edit Read Only fields,Ne peut Editer les champs en Lecture Seule
+apps/frappe/frappe/client.py +63,Can not edit Read Only fields,Ne peut éditer les champs en lecture seule
apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +463,Edit Heading,Modifier rubrique
DocType: File,File URL,URL du fichier
apps/frappe/frappe/desk/doctype/event/event.py +68,Upcoming Events for Today,Prochains événements pour Aujourd'hui
@@ -347,13 +347,13 @@ DocType: Workflow Transition,Defines actions on states and the next step and all
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +11,"As a best practice, do not assign the same set of permission rule to different Roles. Instead, set multiple Roles to the same User.","Comme une meilleure pratique , ne pas attribuer le même ensemble de règle d'autorisation pour différents rôles . Au lieu de cela , définir plusieurs rôles à un même utilisateur ."
DocType: Web Form,Message to be displayed on successful completion,Message qui sera affiché sur la réussite
DocType: Contact Us Settings,Address Title,Titre de l'adresse
-DocType: Website Settings,Footer Items,Articles de bas de page
+DocType: Website Settings,Footer Items,Éléments du pied de page
apps/frappe/frappe/public/js/frappe/ui/page.html +21,Menu,Menu
DocType: DefaultValue,DefaultValue,Valeur par défaut
DocType: Dropbox Backup,Daily,Quotidien
apps/frappe/frappe/config/setup.py +19,User Roles,Définition des rôles
DocType: Property Setter,Property Setter overrides a standard DocType or Field property,Propriété Setter remplace un DOCTYPE standard ou bien le terrain
-apps/frappe/frappe/core/doctype/user/user.py +380,Cannot Update: Incorrect / Expired Link.,Vous ne pouvez pas mettre à jour : Lien Mauvais ou périmée .
+apps/frappe/frappe/core/doctype/user/user.py +380,Cannot Update: Incorrect / Expired Link.,La mise à jour ne peut être effectuée : Lien incorrect ou périmé .
DocType: DocField,Set Only Once,Défini qu'une seule fois
apps/frappe/frappe/core/doctype/user/user.py +315,Username {0} already exists,Nom d'utilisateur {0} existe déjà
apps/frappe/frappe/core/doctype/doctype/doctype.py +528,{0}: Cannot set import as {1} is not importable,{0} : Impossible de définir l'importation car {1} n'est pas importable
@@ -463,7 +463,7 @@ apps/frappe/frappe/config/setup.py +176,"States for workflow (e.g. Draft, Approv
apps/frappe/frappe/public/js/frappe/form/link_selector.js +136,Set Quantity,Ensemble Quantité
DocType: User,Unsubscribed,Désabonné
,Data Import Tool,Outil d'importation de données
-apps/frappe/frappe/core/doctype/user/user.py +425,Registration Details Emailed.,Modalités d'inscription envoyé par courriel.
+apps/frappe/frappe/core/doctype/user/user.py +425,Registration Details Emailed.,Modalités d'inscription envoyé par E-mail.
DocType: Workflow State,Stop,arrêtez
DocType: Top Bar Item,Link to the page you want to open. Leave blank if you want to make it a group parent.,Lien vers la page que vous souhaitez ouvrir. Laissez ce champ vide si vous voulez faire un parent du groupe.
DocType: DocType,Is Single,Est célibataire
@@ -471,7 +471,7 @@ apps/frappe/frappe/email/bulk.py +231,{0} has left the conversation in {1} {2},{
DocType: Blogger,User ID of a Blogger,ID de l'utilisateur d'un Blogger
apps/frappe/frappe/core/doctype/user/user.py +201,There should remain at least one System Manager,Il devrait y rester au moins un administrateur système
DocType: Workflow State,circle-arrow-right,cercle flèche à droite
-apps/frappe/frappe/public/js/legacy/form.js +72,Cannot open instance when its {0} is open,Création / modification par
+apps/frappe/frappe/public/js/legacy/form.js +72,Cannot open instance when its {0} is open,Ne peut ouvrir un instance quand son {0} est ouverte
DocType: Scheduler Log,Method,Méthode
DocType: Report,Script Report,Rapport de Script
DocType: About Us Settings,Company Introduction,Présentation de l'entreprise
@@ -639,7 +639,7 @@ DocType: DocPerm,Set User Permissions,Définir les autorisations des utilisateur
DocType: Email Account,Email Account Name,Nom du compte E-mail
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +249,Select Document Types,Sélectionnez Types de documents
DocType: File,old_parent,old_parent
-DocType: Email Account,"e.g. ""Support"", ""Sales"", ""Jerry Yang""","par exemple ""Support "","" vente "","" Jerry Yang """
+DocType: Email Account,"e.g. ""Support"", ""Sales"", ""Jerry Yang""","Ex. ""Support "","" vente "",""Jerry Yang"""
apps/frappe/frappe/public/js/frappe/form/workflow.js +115,Document Status transition from,Statut du document de transition
DocType: DocField,Description,Description
DocType: Print Settings,Repeat Header and Footer in PDF,Répétez-tête et pied de page en PDF
@@ -739,7 +739,7 @@ apps/frappe/frappe/core/page/data_import_tool/exporter.py +60,Notes:,Remarques:
apps/frappe/frappe/public/js/frappe/form/control.js +1391,Markdown,Markdown
DocType: DocShare,Document Name,Nom du document
DocType: ToDo,Medium,Moyen
-apps/frappe/frappe/public/js/frappe/form/linked_with.js +86,Not enough permission to see links.,Pas l'autorisation suffisante pour voir les liens.
+apps/frappe/frappe/public/js/frappe/form/linked_with.js +86,Not enough permission to see links.,Autorisation insuffisante pour voir les liens.
DocType: Customize Form,Customize Form,Personnaliser le formulaire
DocType: Currency,A symbol for this currency. For e.g. $,Un symbole pour cette monnaie. Par exemple $
apps/frappe/frappe/public/js/frappe/ui/toolbar/about.js +4,Frappe Framework,Framework Frappe
@@ -831,7 +831,7 @@ apps/frappe/frappe/public/js/frappe/form/control.js +765,Please save the documen
apps/frappe/frappe/public/js/frappe/ui/messages.js +163,Enter your password,Entrez votre mot de passe
DocType: Dropbox Backup,Dropbox Access Secret,Dropbox accès secrète
apps/frappe/frappe/core/doctype/doctype/doctype.py +351,Fold must come before a Section Break,Pliez doit venir avant un saut de section
-apps/frappe/frappe/core/doctype/user/user.py +430,Not allowed to reset the password of {0},Non autorisé pour réinitialiser le mot de passe de {0}
+apps/frappe/frappe/core/doctype/user/user.py +430,Not allowed to reset the password of {0},Non autorisé a réinitialiser le mot de passe de {0}
DocType: Workflow State,hand-down,la main vers le bas
apps/frappe/frappe/core/doctype/doctype/doctype.py +494,{0}: Cannot set Cancel without Submit,{0} : Impossible de définir Annuler sans Soumettre
DocType: Website Theme,Theme,Thème
@@ -931,7 +931,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +446,Enter at least one permi
apps/frappe/frappe/public/js/frappe/model/model.js +20,Created On,Créé le
DocType: Workflow State,align-center,Centrer
apps/frappe/frappe/public/js/frappe/form/set_sharing.html +6,Can Write,Peut Ecrire
-apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +16,"Certain documents, like an Invoice, should not be changed once final. The final state for such documents is called Submitted. You can restrict which roles can Submit.","Certains documents , comme une facture , ne devraient pas être modifiés une fois finale . L'état final de ces documents est appelée Soumis . Vous pouvez limiter les rôles pouvant Soumettre."
+apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +16,"Certain documents, like an Invoice, should not be changed once final. The final state for such documents is called Submitted. You can restrict which roles can Submit.","Certains documents , comme une facture , ne devraient pas être modifiés une fois finalisés . L'état final de ces documents est appelée soumis . Vous pouvez limiter les rôles pouvant soumettre."
apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +619,You are not allowed to export this report,Vous n'êtes pas autorisé à exporter ce rapport.
DocType: ToDo,Sender,Expéditeur
DocType: Web Page,Description for search engine optimization.,Description pour l'optimisation des moteurs de recherche.
@@ -1005,7 +1005,7 @@ apps/frappe/frappe/public/js/legacy/print_format.js +125,You are not allowed to
apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +286,Loading Report,Chargement rapport
DocType: Page,Standard,Standard
apps/frappe/frappe/public/js/frappe/form/form_sidebar.html +26,Attach File,Joindre un fichier
-apps/frappe/frappe/templates/emails/password_update.html +1,Password Update Notification,Mot de passe Mise à jour de notification
+apps/frappe/frappe/templates/emails/password_update.html +1,Password Update Notification,Notification de mise à jour du mot de passe
apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taille
apps/frappe/frappe/public/js/frappe/form/footer/assign_to.js +62,Assignment Complete,Cession complète
DocType: DocPerm,User Permission DocTypes,DocTypes d'autorisation de l'utilisateur
@@ -1279,7 +1279,7 @@ apps/frappe/frappe/core/doctype/user/user.js +317,Role Permissions,Permissions d
apps/frappe/frappe/public/js/frappe/form/set_sharing.html +5,Can Read,Peut Lire
DocType: Standard Reply,Response,Réponse
apps/frappe/frappe/public/js/frappe/form/workflow.js +41,Workflow will start after saving.,Workflow démarre après la sauvegarde.
-apps/frappe/frappe/public/js/frappe/form/set_sharing.html +7,Can Share,Peuvent partager
+apps/frappe/frappe/public/js/frappe/form/set_sharing.html +7,Can Share,Peut partager
apps/frappe/frappe/email/smtp.py +33,Invalid recipient address,Adresse de destinataire invalide
DocType: Workflow State,step-forward,l'étape de l'avant-
apps/frappe/frappe/core/doctype/user/user.js +41,Refreshing...,Actualisation ...
@@ -1300,7 +1300,7 @@ DocType: Website Theme,Apply Style,Appliquer le style
apps/frappe/frappe/public/js/frappe/form/form_sidebar.html +39,Shared With,Partagé avec
,Modules Setup,modules installation
apps/frappe/frappe/core/page/data_import_tool/exporter.py +230,Type:,Type:
-DocType: Communication,Unshared,non partagée
+DocType: Communication,Unshared,Non partagée
apps/frappe/frappe/desk/moduleview.py +57,Module Not Found,Module introuvable
DocType: User,Location,Lieu
,Permitted Documents For User,Documents autorisés pour l'utilisateur
@@ -1364,7 +1364,7 @@ DocType: DocType,Allow Import via Data Import Tool,Autoriser l'importation v
apps/frappe/frappe/model/base_document.py +505,Not allowed to change {0} after submission,Non autorisé à changer {0} après la présentation
DocType: Communication,Comment Type,Type de commentaire
apps/frappe/frappe/config/setup.py +8,Users,Utilisateurs
-DocType: Report,Report Type,Rapport Genre
+DocType: Report,Report Type,Rapport type
DocType: Email Account,Signature,Signature
apps/frappe/frappe/public/js/frappe/form/share.js +112,Share With,Partager avec
apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Chargement
@@ -1383,7 +1383,7 @@ DocType: Event,Sunday,Dimanche
apps/frappe/frappe/public/js/frappe/form/save.js +14,Amending,Amendement
apps/frappe/frappe/public/js/frappe/form/link_selector.js +5,Dialog box to select a Link Value,Boîte de dialogue pour sélectionner une valeur de lien
DocType: Contact Us Settings,Send enquiries to this email address,Envoyer une demande à cette adresse courriel
-DocType: Letter Head,Letter Head Name,Nom de A en-tête
+DocType: Letter Head,Letter Head Name,Nom de l'en-tête
apps/frappe/frappe/config/website.py +23,User editable form on Website.,Utilisateur formulaire modifiable sur le Site.
DocType: Workflow State,file,fichier
apps/frappe/frappe/templates/pages/login.html +74,Back to Login,Retour connexion
@@ -1499,7 +1499,7 @@ DocType: Website Theme,This must be checked if the below style settings are appl
apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +111,Name of the new Print Format,Nom du nouveau Format d'Impression
apps/frappe/frappe/core/page/data_import_tool/exporter.py +229,Mandatory:,Obligatoire:
,User Permissions Manager,Gestion autorisations des utilisateurs
-DocType: Property Setter,New value to be set,La nouvelle valeur à régler
+DocType: Property Setter,New value to be set,Nouvelle valeur à régler
DocType: Email Alert,Days Before or After,Jours avant ou après
DocType: Email Alert,Email Alert,Alerte E-mail
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +34,Select Document Types to set which User Permissions are used to limit access.,Sélectionner les types de document pour définir les autorisations utilisateur sont utilisés pour limiter l'accès.
@@ -1760,7 +1760,7 @@ DocType: Role,Role Name,Nom du Rôle
apps/frappe/frappe/config/core.py +27,Script or Query reports,Script ou une requête rapports
DocType: Workflow Document State,Workflow Document State,Etat du document de workflow
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +32,"To give acess to a role for only specific records, check the Apply User Permissions. User Permissions are used to limit users with such role to specific records.","Pour donner acess à un rôle pour que les enregistrements spécifiques, vérifiez les permissions d'utilisation se appliquent. les autorisations des utilisateurs sont utilisés pour limiter les utilisateurs avec ce rôle à des enregistrements spécifiques."
-apps/frappe/frappe/workflow/doctype/workflow/workflow.py +70,Cannot cancel before submitting. See Transition {0},Vous ne pouvez pas annuler avant de soumettre .
+apps/frappe/frappe/workflow/doctype/workflow/workflow.py +70,Cannot cancel before submitting. See Transition {0},Impossible d'annuler avant de soumettre . Voir transition {0}
apps/frappe/frappe/templates/pages/print.py +173,Print Format {0} is disabled,Format d'impression {0} est désactivé
DocType: Email Alert,Send days before or after the reference date,Envoyer jours avant ou après la date de référence
DocType: User,Allow user to login only after this hour (0-24),Permettre à l'utilisateur de se connecter seulement après cette heure (0-24)
@@ -1894,14 +1894,14 @@ apps/frappe/frappe/core/doctype/user/user.py +240,User {0} cannot be renamed,Uti
DocType: Website Settings,An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org],Un fichier d'icône avec .ico. Devrait être 16 x 16 px. Généré en utilisant un générateur de favicon. [favicon-generator.org]
apps/frappe/frappe/website/doctype/website_settings/website_settings.js +17,Exported,exporté
DocType: DocPerm,"JSON list of DocTypes used to apply User Permissions. If empty, all linked DocTypes will be used to apply User Permissions.","JSON liste des DocTypes utilisés pour appliquer les autorisations des utilisateurs. Se il est vide, tous liés DocTypes seront utilisés pour appliquer les autorisations des utilisateurs."
-DocType: Report,Ref DocType,Réf DocType
+DocType: Report,Ref DocType,Réf. DocType
apps/frappe/frappe/core/doctype/doctype/doctype.py +499,{0}: Cannot set Amend without Cancel,{0} : Impossible de définir Modifier sans Annuler
apps/frappe/frappe/public/js/frappe/form/print_layout.html +20,Full Page,Pleine page
DocType: DocType,Is Child Table,Est-table enfant
apps/frappe/frappe/utils/csvutils.py +123,{0} must be one of {1},{0} doit être l'un des {1}
apps/frappe/frappe/public/js/frappe/form/form_viewers.js +26,{0} is currently viewing this document,{0} est en train de regarder ce document
apps/frappe/frappe/config/core.py +52,Background Email Queue,Contexte Email Queue
-apps/frappe/frappe/templates/emails/password_reset.html +1,Password Reset,Password Reset
+apps/frappe/frappe/templates/emails/password_reset.html +1,Password Reset,Initialisation du mot de passe
DocType: Communication,Opened,Ouvert
DocType: Workflow State,chevron-left,chevron gauche
DocType: Bulk Email,Sending,Envoi
@@ -2002,7 +2002,7 @@ apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +158,"Change
apps/frappe/frappe/website/doctype/web_form/web_form.py +27,You need to be in developer mode to edit a Standard Web Form,Vous devez être en mode développeur pour modifier un formulaire Web standard
apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +48,"For comparative filters, start with","Pour les filtres de comparaison, commencez par"
DocType: Website Theme,Link to Bootstrap CSS,Lien vers Bootstrap CSS
-DocType: Workflow State,camera,appareil photo
+DocType: Workflow State,camera,Caméra
DocType: Website Settings,Brand HTML,Marque HTML
apps/frappe/frappe/templates/includes/login/login.js +19,Both login and password required,Un login et un mot de passe sont requis
apps/frappe/frappe/model/document.py +436,Please refresh to get the latest document.,S'il vous plaît Refresh pour obtenir la dernière version du document.
diff --git a/frappe/translations/hr.csv b/frappe/translations/hr.csv
index 595bcfa747..af1ec10ca0 100644
--- a/frappe/translations/hr.csv
+++ b/frappe/translations/hr.csv
@@ -60,7 +60,7 @@ DocType: Print Settings,Classic,Klasik
apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +49,For ranges,Za raspone
DocType: Workflow State,indent-right,alineje-desno
apps/frappe/frappe/public/js/frappe/ui/upload.html +12,Web Link,Web Link
-apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +41,1 minute ago,prije 1 minutu
+apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +41,1 minute ago,Prije 1 minutu
apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +33,"Recommended bulk editing records via import, or understanding the import format.","Preporučena skupno uređivanje zapisa putem uvoza, odnosno razumijevanje uvoz formatu."
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +36,"Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.","Osim System Manager, uloge s postavite korisnički Dozvole pravo može postaviti dozvole za ostale korisnike za tu vrstu dokumenta."
DocType: Company History,Company History,Povijest tvrtke
@@ -108,7 +108,7 @@ apps/frappe/frappe/custom/doctype/custom_field/custom_field.py +108,"Insert Afte
DocType: Workflow State,circle-arrow-up,krug sa strelicom prema gore
apps/frappe/frappe/public/js/frappe/upload.js +156,Uploading...,Prijenos ...
DocType: Workflow State,italic,kurzivan
-apps/frappe/frappe/core/doctype/doctype/doctype.py +501,{0}: Cannot set Import without Create,{0} : Ne može se uvoz bez Stvoriti
+apps/frappe/frappe/core/doctype/doctype/doctype.py +501,{0}: Cannot set Import without Create,{0} : Ne može se uvesti bez stvaranja
apps/frappe/frappe/config/desk.py +21,Event and other calendars.,Događaj i druge kalendare.
apps/frappe/frappe/public/js/frappe/views/reports/reportview.js +614,Drag to sort columns,Povucite kako bi sortirali stupce
apps/frappe/frappe/print/page/print_format_builder/print_format_builder_column_selector.html +2,Widths can be set in px or %.,Širina može biti postavljena u px ili%.
@@ -355,7 +355,7 @@ DocType: Property Setter,Property Setter overrides a standard DocType or Field p
apps/frappe/frappe/core/doctype/user/user.py +380,Cannot Update: Incorrect / Expired Link.,Ne možete ažurirati : Nepravilan / istekla .
DocType: DocField,Set Only Once,Postaviti samo jednom
apps/frappe/frappe/core/doctype/user/user.py +315,Username {0} already exists,Korisničko ime {0} već postoji
-apps/frappe/frappe/core/doctype/doctype/doctype.py +528,{0}: Cannot set import as {1} is not importable,{0} : Ne može se uvesti kao {1} nije za uvoz
+apps/frappe/frappe/core/doctype/doctype/doctype.py +528,{0}: Cannot set import as {1} is not importable,{0} : Ne može se postaviti uvoz kao {1} nije za uvoz
DocType: Top Bar Item,"target = ""_blank""",target = "_blank"
DocType: Workflow State,hdd,HDD
DocType: ToDo,High,Visok
@@ -365,7 +365,7 @@ apps/frappe/frappe/desk/query_report.py +19,You don't have access to Report: {0}
DocType: User,Send Welcome Email,Pošalji e-mail dobrodošlice
apps/frappe/frappe/core/page/user_permissions/user_permissions.js +132,Upload CSV file containing all user permissions in the same format as Download.,Pošalji CSV datoteku koja sadrži sve korisničke dozvole u istom obliku kao preuzimanje.
apps/frappe/frappe/public/js/frappe/ui/filters/filters.js +359,Remove Filter,Uklonite filtar
-apps/frappe/frappe/config/setup.py +108,Bulk Rename,Bulk Rename
+apps/frappe/frappe/config/setup.py +108,Bulk Rename,Skupno preimenuj
DocType: DocField,Heading,Naslov
DocType: Workflow State,resize-vertical,resize-vertikalna
DocType: Contact Us Settings,Introductory information for the Contact Us Page,Uvodni podaci za stranicu Kontaktirajte nas
@@ -386,7 +386,7 @@ DocType: DocType,Sort Order,sortiranje
apps/frappe/frappe/custom/doctype/customize_form/customize_form.py +137,'In List View' not allowed for type {0} in row {1},'U prikazu popisa' nisu dopušteni za tip {0} u redu {1}
DocType: Custom Field,Select the label after which you want to insert new field.,Odaberite oznaku nakon što želite umetnuti novo polje.
DocType: Website Settings,Tweet will be shared via your user account (if specified),Tweet će se dijeliti putem vašeg korisničkog računa (ako je određeno)
-,Document Share Report,Dokument Podijeli Prijavi
+,Document Share Report,Dokument podijele prijava
DocType: User,Last Login,Zadnja prijava
apps/frappe/frappe/core/doctype/doctype/doctype.py +411,Fieldname is required in row {0},"Podataka, Naziv Polja je potrebno u redu {0}"
apps/frappe/frappe/print/page/print_format_builder/print_format_builder_column_selector.html +4,Column,Kolona
@@ -408,7 +408,7 @@ apps/frappe/frappe/public/js/frappe/ui/editor.html +12,Number list,Popis brojeva
apps/frappe/frappe/config/setup.py +84,Log of error during requests.,Prijava pogreške prilikom zahtjeva.
DocType: DocShare,Everyone,Svako
DocType: Workflow State,backward,Natrag
-apps/frappe/frappe/core/doctype/doctype/doctype.py +475,"{0}: Only one rule allowed with the same Role, Level and {1}","{0}: Samo jedno pravilo dopušten uz istu ulogu, razine i {1}"
+apps/frappe/frappe/core/doctype/doctype/doctype.py +475,"{0}: Only one rule allowed with the same Role, Level and {1}","{0}: Samo je jedno pravilo dopušteno za istu ulogu, razinu i {1}"
DocType: Workflow State,share,udio
apps/frappe/frappe/config/setup.py +102,Set numbering series for transactions.,Postavi brojni slijed za transakcije.
apps/frappe/frappe/desk/like.py +38,You cannot like something that you created,Ne možete se sviđa nešto što ste stvorili
@@ -610,7 +610,7 @@ DocType: Custom Field,Field Type,Vrsta polja
apps/frappe/frappe/utils/data.py +429,only.,samo.
apps/frappe/frappe/public/js/frappe/views/reports/reportview.js +455,Descending,Silazni
apps/frappe/frappe/email/receive.py +57,Invalid Mail Server. Please rectify and try again.,Nevažeći mail server. Ispravi i pokušaj ponovno.
-DocType: Dropbox Backup,Dropbox Backup,Dropbox Backup
+DocType: Dropbox Backup,Dropbox Backup,Dropbox backup
DocType: DocField,"For Links, enter the DocType as range.
For Select, enter list of Options, each on a new line.","Za Linkovi unesite DOCTYPE kao raspona. Za Odaberi unesite popisu opcija, svaki na novoj liniji."
DocType: Workflow State,film,film
@@ -704,7 +704,7 @@ DocType: DocPerm,If user is the owner,Ako korisnik je vlasnik
,Activity,Aktivnost
DocType: Note,"Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Pomoć: Za povezivanje na drugi zapis u sustavu, koristite "# Forma / Napomena / [Napomena ime]" kao URL veze. (Ne koristite "http://")"
DocType: Communication,Delayed,Odgođeno
-apps/frappe/frappe/config/setup.py +116,List of backups available for download,Popis kopija dostupna za preuzimanje
+apps/frappe/frappe/config/setup.py +116,List of backups available for download,Popis kopija dostupnih za preuzimanje
apps/frappe/frappe/templates/pages/login.html +61,Sign up,Prijavite se
apps/frappe/frappe/config/setup.py +222,Add fields to forms.,Dodaj polja obrascima.
DocType: File,rgt,RGT
@@ -832,7 +832,7 @@ DocType: Dropbox Backup,Dropbox Access Secret,Dropbox tajni pristup
apps/frappe/frappe/core/doctype/doctype/doctype.py +351,Fold must come before a Section Break,Preklopite moraju doći pred Odjeljak Break
apps/frappe/frappe/core/doctype/user/user.py +430,Not allowed to reset the password of {0},Nije dopušteno za resetiranje lozinke od {0}
DocType: Workflow State,hand-down,rukom prema dolje
-apps/frappe/frappe/core/doctype/doctype/doctype.py +494,{0}: Cannot set Cancel without Submit,{0} : Ne mogu postaviti Odustani bez Podnijeti
+apps/frappe/frappe/core/doctype/doctype/doctype.py +494,{0}: Cannot set Cancel without Submit,{0} : Ne može se postaviti Odustani bez Potvrdi
DocType: Website Theme,Theme,Tema
apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Bilo je grešaka .
DocType: DocType,Is Submittable,Je Submittable
@@ -862,7 +862,7 @@ apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while y
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +7,Roles can be set for users from their User page.,Uloge se mogu postaviti za korisnike iz svoje korisničke stranice .
DocType: DocField,Mandatory,Obavezno
apps/frappe/frappe/core/doctype/doctype/doctype.py +458,{0}: No basic permissions set,{0}: Nisu postavljene osnovne ovlasti
-apps/frappe/frappe/utils/backups.py +158,Download link for your backup will be emailed on the following email address: {0},Preuzmite link za Vašu backup će biti poslana na e-mail adresu: {0}
+apps/frappe/frappe/utils/backups.py +158,Download link for your backup will be emailed on the following email address: {0},Poveznica za Vašu sigurnosnu kopiju će biti poslana na email adresu: {0}
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +14,"Meaning of Submit, Cancel, Amend","Značenje od Podnijeti, Odustati, Izmijeniti"
apps/frappe/frappe/desk/doctype/todo/todo_list.js +7,To Do,Podsjetnik
apps/frappe/frappe/public/js/frappe/ui/editor.html +25,Paragraph,Paragraf
@@ -1069,7 +1069,7 @@ apps/frappe/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html +31,R
apps/frappe/frappe/email/doctype/email_account/email_account_list.js +14,Default Sending,Zadana Slanje
DocType: Workflow State,volume-off,volumen-off
apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +107,Liked by {0},Svidjelo mi se {0}
-,Download Backups,Preuzmite Sigurnosne kopije
+,Download Backups,Preuzmi sigurnosne kopije
apps/frappe/frappe/core/doctype/file/test_file.py +43,Home/Test Folder 1,Početna / Ispitni mapa 1
apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +47,"Do not update, but insert new records.","Nemoj ažurirati, ali ubacite nove rekorde."
apps/frappe/frappe/public/js/frappe/form/footer/assign_to.js +160,Assign to me,Dodijeli mi
@@ -1476,7 +1476,7 @@ DocType: Workflow Transition,Action,Akcija
apps/frappe/frappe/core/page/data_import_tool/exporter.py +231,Info:,Info:
DocType: Custom Field,Permission Level,Razina ovlasti
DocType: User,Send Notifications for Transactions I Follow,Pošalji obavijesti o transakcijama | Prati
-apps/frappe/frappe/core/doctype/doctype/doctype.py +497,"{0}: Cannot set Submit, Cancel, Amend without Write","{0} : Ne mogu postaviti Podnijeti , Odustani , Izmijeniti bez zapisivanja"
+apps/frappe/frappe/core/doctype/doctype/doctype.py +497,"{0}: Cannot set Submit, Cancel, Amend without Write","{0} : Ne može se postaviti Potvrdi, Odustani, Izmijeni bez zapisivanja"
apps/frappe/frappe/public/js/frappe/form/footer/attachments.js +83,Are you sure you want to delete the attachment?,Jeste li sigurni da želite izbrisati privitak?
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +8,Setup > User,Postavke > Korisnik
apps/frappe/frappe/model/base_document.py +483,"{0}: '{1}' will get truncated, as max characters allowed is {2}","{0}: '{1}' bi bio skraćen, kao max likovi dopušteno je {2}"
@@ -1701,7 +1701,7 @@ apps/frappe/frappe/core/doctype/docshare/docshare.py +49,{0} shared this documen
apps/frappe/frappe/desk/page/activity/activity_row.html +20,Commented on {0}: {1},Komentirano {0}: {1}
apps/frappe/frappe/core/page/user_permissions/user_permissions.js +248,These restrictions will apply for Document Types where 'Apply User Permissions' is checked for the permission rule and a field with this value is present.,"Ova ograničenja primjenjivat će se za vrste dokumenata, gdje 'Primijeni korisnik dozvole' se provjerava za vladavinu dozvole i polje s ovim vrijednosti prisutan."
DocType: Email Alert,Send alert if this field's value changes,Pošalji upozorenje ako se vrijednost mijenja ovom području je
-apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +102,Select a DocType to make a new format,Odaberite vrstu dokumenta kako bi novi format
+apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +102,Select a DocType to make a new format,Odaberite Doctype za kreiranje novog formata
apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +40,just now,upravo sad
DocType: Module Def,Module Def,Definicija modula
apps/frappe/frappe/public/js/frappe/form/grid_form.html +7,Done,Pospremljen
@@ -1749,7 +1749,7 @@ DocType: Communication,Info,Info
DocType: Communication,Email,E-mail
apps/frappe/frappe/templates/includes/contact.js +30,Thank you for your message,Hvala vam za vašu poruku
apps/frappe/frappe/templates/pages/login.py +54,Invalid Login Token,Pogrešna Prijava token
-apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +43,1 hour ago,prije 1 sat
+apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +43,1 hour ago,Prije 1 sat
DocType: Website Settings,Home Page,Početna stranica
DocType: Error Snapshot,Parent Error Snapshot,Roditelj Greška Snimak
DocType: Email Alert,Filters,Filteri
@@ -1821,7 +1821,7 @@ DocType: User,Enabled,Omogućeno
DocType: Blog Category,Category Name,Naziv kategorije
DocType: Print Settings,PDF Settings,PDF postavke
apps/frappe/frappe/core/page/data_import_tool/data_import_tool.py +16,Column Name,Naziv Stupac
-apps/frappe/frappe/print/doctype/print_format/print_format.js +18,Make Default,Make Default
+apps/frappe/frappe/print/doctype/print_format/print_format.js +18,Make Default,Napravi zadani
apps/frappe/frappe/core/doctype/doctype/doctype.py +339,Fieldtype {0} for {1} cannot be indexed,Fieldtype {0} od {1} ne može biti indeksirana
DocType: Communication,Email Account,E-mail računa
DocType: Workflow State,Download,Preuzimanje
diff --git a/frappe/translations/ko.csv b/frappe/translations/ko.csv
index c8b144f039..96a6caa40c 100644
--- a/frappe/translations/ko.csv
+++ b/frappe/translations/ko.csv
@@ -36,7 +36,7 @@ apps/frappe/frappe/model/base_document.py +478,"{0}, Row {1}",{0} 행 {1}
apps/frappe/frappe/model/document.py +730,Beginning with,로 시작
apps/frappe/frappe/core/page/data_import_tool/exporter.py +51,Data Import Template,데이터 가져 오기 템플릿
apps/frappe/frappe/public/js/frappe/model/model.js +31,Parent,부모의
-DocType: About Us Settings,"""Team Members"" or ""Management""","""팀 회원""또는 ""관리"""
+DocType: About Us Settings,"""Team Members"" or ""Management""","""Team Members""또는 ""Management"""
apps/frappe/frappe/core/doctype/doctype/doctype.py +302,Default for 'Check' type of field must be either '0' or '1',필드의 '확인'유형의 기본 중 하나를 '0'또는 '1'이어야합니다
apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +45,Yesterday,Yester일
apps/frappe/frappe/public/js/frappe/views/test_runner.js +10,Test Runner,테스트 러너
@@ -1168,7 +1168,7 @@ DocType: Web Form,Success Message,성공 메시지
DocType: DocType,User Cannot Search,사용자는 검색 할 수 없습니다
DocType: DocPerm,Apply this rule if the User is the Owner,사용자가 소유자 인 경우이 규칙 적용
apps/frappe/frappe/desk/page/activity/activity.js +73,Build Report,보고서보기 빌드
-apps/frappe/frappe/model/rename_doc.py +91,"{0} {1} does not exist, select a new target to merge","{0} {1}이 (가) 없습니다, 병합하는 새로운 대상을 선택"
+apps/frappe/frappe/model/rename_doc.py +91,"{0} {1} does not exist, select a new target to merge","{0} {1}이 (가) 없습니다, 새로운 대상을 선택해서 병합하세요."
apps/frappe/frappe/core/page/user_permissions/user_permissions.py +66,Cannot set permission for DocType: {0} and Name: {1},문서 종류에 대한 사용 권한을 설정할 수 없습니다 : {0}과 이름 : {1}
apps/frappe/frappe/public/js/frappe/form/footer/assign_to.js +158,Add to To Do,할일 추가
apps/frappe/frappe/public/js/frappe/list/list_sidebar.html +10,Assigned To Me,나에게 할당
@@ -1185,7 +1185,7 @@ apps/frappe/frappe/email/doctype/email_unsubscribe/email_unsubscribe.py +21,{0}
apps/frappe/frappe/public/js/frappe/views/communication.js +69,Communication Medium,통신 매체
DocType: Website Settings,Banner HTML,배너 HTML
DocType: Error Snapshot,Pyver,Pyver
-apps/frappe/frappe/model/base_document.py +451,"{0} {1} cannot be ""{2}"". It should be one of ""{3}""","{0} {1}이 될 수 없습니다 ""{2}"".그것은 ""{3}""중 하나 여야합니다"
+apps/frappe/frappe/model/base_document.py +451,"{0} {1} cannot be ""{2}"". It should be one of ""{3}""","{0} {1} ""{2}""가 될 수 없습니다. ""{3}""중 하나입니다."
apps/frappe/frappe/utils/data.py +516,{0} or {1},{0} 또는 {1}
apps/frappe/frappe/core/doctype/user/user.py +160,Password Update,암호 업데이트
DocType: Workflow State,trash,쓰레기
@@ -1294,7 +1294,7 @@ DocType: Workflow State,ok-sign,확인 서명
apps/frappe/frappe/public/js/frappe/form/toolbar.js +126,Duplicate,복제
apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,날짜 누계 이전이어야합니다
apps/frappe/frappe/email/doctype/email_alert/email_alert.py +21,Please specify which value field must be checked,값 필드를 선택해야하는 이유를 적어주세요
-apps/frappe/frappe/core/page/data_import_tool/exporter.py +69,"""Parent"" signifies the parent table in which this row must be added","""부모는""이 행을 추가해야하는 부모 테이블을 의미"
+apps/frappe/frappe/core/page/data_import_tool/exporter.py +69,"""Parent"" signifies the parent table in which this row must be added","""상위항목"" 테이블에서 열이 추가되어야 합니다."
DocType: Website Theme,Apply Style,스타일 적용
apps/frappe/frappe/public/js/frappe/form/form_sidebar.html +39,Shared With,함께 공유
,Modules Setup,모듈 설치
@@ -1517,7 +1517,7 @@ apps/frappe/frappe/public/js/frappe/list/listview.js +342,2 days ago,1 일 전
apps/frappe/frappe/config/website.py +64,Categorize blog posts.,블로그 게시물을 분류합니다.
DocType: Workflow State,Time,시간
DocType: DocField,Attach,첨부
-apps/frappe/frappe/core/doctype/doctype/doctype.py +386,{{{0}}} is not a valid fieldname pattern. It should be {{field_name}}.,{{{0}}} 유효한 필드 이름 패턴이 아니다. 그것은해야한다 {{FIELD_NAME}}.
+apps/frappe/frappe/core/doctype/doctype/doctype.py +386,{{{0}}} is not a valid fieldname pattern. It should be {{field_name}}.,{{{0}}} 유효한 필드명 유형이 아닙니다. {{field_name}} 이어야 합니다.
DocType: DocType,Permission Rules,권한 규칙
apps/frappe/frappe/public/js/frappe/form/toolbar.js +119,Links,링크
apps/frappe/frappe/model/base_document.py +369,Value missing for,값을 누락
@@ -1724,7 +1724,7 @@ DocType: DocType,Naming,Naming
DocType: Event,Every Year,매년
apps/frappe/frappe/public/js/frappe/list/list_item_main_head.html +23,Select All,모두 선택
apps/frappe/frappe/public/js/frappe/form/linked_with.js +86,Not Linked to any record.,모든 레코드에 연결되어 있지.
-apps/frappe/frappe/public/js/frappe/form/workflow.js +32, by Role ,역할에 따라
+apps/frappe/frappe/public/js/frappe/form/workflow.js +32, by Role ,역할별
apps/frappe/frappe/core/doctype/user/user.py +406,Registered but disabled.,등록 만 사용할.
apps/frappe/frappe/public/js/frappe/list/doclistview.js +538,Delete permanently?,영구적으로 삭제 하시겠습니까?
apps/frappe/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +95,Search in a document type,문서 유형의 검색
@@ -1745,7 +1745,7 @@ apps/frappe/frappe/public/js/frappe/views/pageview.js +110,Sorry! You are not pe
DocType: Workflow State,bell,벨
apps/frappe/frappe/public/js/frappe/form/set_sharing.html +39,Share this document with,이 문서를 공유하기
apps/frappe/frappe/desk/page/activity/activity.js +203,Jun,6월
-apps/frappe/frappe/utils/nestedset.py +235,{0} {1} cannot be a leaf node as it has children,이 아이를 가지고 {0} {1} 잎 노드가 될 수 없습니다
+apps/frappe/frappe/utils/nestedset.py +235,{0} {1} cannot be a leaf node as it has children,{0} {1} 은 가지 노드가 될 수 없습니다. 하위 항목을 가지고 있습니다.
DocType: Communication,Info,정보
DocType: Communication,Email,이메일
apps/frappe/frappe/templates/includes/contact.js +30,Thank you for your message,메시지를 수신했습니다
diff --git a/frappe/translations/nl.csv b/frappe/translations/nl.csv
index bafc498dcc..4eb2725750 100644
--- a/frappe/translations/nl.csv
+++ b/frappe/translations/nl.csv
@@ -44,7 +44,7 @@ DocType: Email Account,Enable Incoming,Inschakelen Binnenkomend
DocType: Workflow State,Danger,Gevaar
apps/frappe/frappe/templates/pages/login.html +35,Email Address,E-mailadres
DocType: Workflow State,th-large,th-large
-DocType: Communication,Unread Notification Sent,Ongelezen Notification Sent
+DocType: Communication,Unread Notification Sent,Melding 'Ongelezen' verstuurd
apps/frappe/frappe/public/js/frappe/misc/tools.js +8,Export not allowed. You need {0} role to export.,Exporteren niet toegestaan. Je hebt rol {0} nodig om te kunnen exporteren .
apps/frappe/frappe/public/js/frappe/ui/filters/edit_filter.html +11,Not Like,Niet zoals
apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +154,Set the display label for the field,Stel het display label voor het veld
@@ -59,8 +59,8 @@ apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Select {0},Selecte
DocType: Print Settings,Classic,Klassiek
apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +49,For ranges,Voor bereiken
DocType: Workflow State,indent-right,inspringing-rechts
-apps/frappe/frappe/public/js/frappe/ui/upload.html +12,Web Link,Web Link
-apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +41,1 minute ago,1 uur geleden
+apps/frappe/frappe/public/js/frappe/ui/upload.html +12,Web Link,Link
+apps/frappe/frappe/public/js/frappe/misc/pretty_date.js +41,1 minute ago,1 minuut geleden
apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +33,"Recommended bulk editing records via import, or understanding the import format.","Aanbevolen bulk bewerken verslagen via import, of het begrijpen van de import-formaat."
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +36,"Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.","Afgezien van de System Manager, rollen met Set User Permissions recht kunt toestemmingen voor andere gebruikers voor dat type document."
DocType: Company History,Company History,Bedrijf Geschiedenis
@@ -144,7 +144,7 @@ DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
DocType: Workflow State,headphones,hoofdtelefoon
DocType: Bulk Email,Bulk Email records.,Bulk Email records.
DocType: Email Account,e.g. replies@yourcomany.com. All replies will come to this inbox.,bijv. antwoord@uwbedrijf.nl. Alle antwoorden zullen op deze inbox binnenkomen.
-apps/frappe/frappe/templates/includes/login/login.js +33,Valid email and name required,Geldige e-mail en naam vereist
+apps/frappe/frappe/templates/includes/login/login.js +33,Valid email and name required,Geldig e-mailadres en naam vereist
DocType: DocType,Hide Heading,Verberg rubriek
apps/frappe/frappe/config/core.py +17,Groups of DocTypes,Groepen DocTypes
DocType: Workflow State,remove-circle,remove-cirkel
@@ -158,7 +158,7 @@ DocType: DocType,Show this field as title,Toon dit gebied als titel
apps/frappe/frappe/model/db_schema.py +539,Fieldname {0} cannot have special characters like {1},"Veldnaam {0} kan geen speciale tekens, zoals hebben {1}"
apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecteer uw taal
apps/frappe/frappe/model/document.py +434,Error: Document has been modified after you have opened it,Fout: Document is gewijzigd nadat u het hebt geopend
-apps/frappe/frappe/core/doctype/doctype/doctype.py +522,{0}: Cannot set Assign Submit if not Submittable,{0} : Kan geen toewijzen indienen indien niet Submittable
+apps/frappe/frappe/core/doctype/doctype/doctype.py +522,{0}: Cannot set Assign Submit if not Submittable,"{0} : Kan niet op ""In te dienen"" gezet worden indien niet indienbaar"
DocType: Social Login Keys,Facebook,Facebook
apps/frappe/frappe/templates/pages/list.py +46,"Filtered by ""{0}""",Gefilterd op "{0}"
DocType: DocType,Administrator,Beheerder
@@ -226,7 +226,7 @@ DocType: Blogger,Will be used in url (usually first name).,Wordt gebruikt in url
apps/frappe/frappe/client.py +63,Can not edit Read Only fields,Kan Alleen-lezen velden niet bewerken
apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +463,Edit Heading,Bewerken Koptekst
DocType: File,File URL,File-URL
-apps/frappe/frappe/desk/doctype/event/event.py +68,Upcoming Events for Today,Gebeurtenissen voor vandaag
+apps/frappe/frappe/desk/doctype/event/event.py +68,Upcoming Events for Today,Geplande evenementen voor vandaag
DocType: Email Alert Recipient,Email By Document Field,E-mail Door Document Field
apps/frappe/frappe/email/receive.py +61,Cannot connect: {0},Kan geen verbinding maken: {0}
apps/frappe/frappe/utils/nestedset.py +218,Merging is only possible between Group-to-Group or Leaf Node-to-Leaf Node,Samenvoegen is alleen mogelijk tussen de Groepen of tussen Blad Nodes.
@@ -268,7 +268,7 @@ DocType: DocField,Link,Link
apps/frappe/frappe/utils/file_manager.py +93,No file attached,Geen bestand bijgevoegd
DocType: Version,Version,Versie
DocType: User,Fill Screen,Scherm vullen
-apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +462,"Unable to display this tree report, due to missing data. Most likely, it is being filtered out due to permissions.","Niet in staat om deze boom rapport weer te geven, als gevolg van ontbrekende gegevens. Waarschijnlijk wordt ze uitgefilterd vanwege permissies."
+apps/frappe/frappe/public/js/frappe/views/reports/query_report.js +462,"Unable to display this tree report, due to missing data. Most likely, it is being filtered out due to permissions.",Niet in staat om dit boomrapport weer te geven omdat er gegevens ontbreken. Waarschijnlijk wordt ze uitgefilterd vanwege permissies.
apps/frappe/frappe/core/doctype/role/role.js +9,Edit Permissions,Bewerken Machtigingen
apps/frappe/frappe/public/js/frappe/form/grid.js +271,Edit via Upload,Bewerken via uploaden
apps/frappe/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +94,"document type..., e.g. customer","documenttype ..., bijvoorbeeld klant"
@@ -411,7 +411,7 @@ DocType: Workflow State,backward,achterwaarts
apps/frappe/frappe/core/doctype/doctype/doctype.py +475,"{0}: Only one rule allowed with the same Role, Level and {1}","{0}: Slechts één regel toegestaan met dezelfde rol, niveau en {1}"
DocType: Workflow State,share,aandeel
apps/frappe/frappe/config/setup.py +102,Set numbering series for transactions.,Instellen nummerreeksen voor transacties.
-apps/frappe/frappe/desk/like.py +38,You cannot like something that you created,Je kunt niet als iets dat je gemaakt
+apps/frappe/frappe/desk/like.py +38,You cannot like something that you created,U kan niets 'liken' dat u zelf gemaakt hebt.
DocType: User,Last IP,Laatste IP-
DocType: DocPerm,Filter records based on User Permissions defined for a user,Records filteren op basis van Gebruikersmachtigingen gedefinieerd voor een gebruiker
apps/frappe/frappe/public/js/frappe/ui/editor.html +46,Insert picture (or just drag & drop),Plaats foto (of sleep & gewoon drop)
@@ -426,7 +426,7 @@ apps/frappe/frappe/public/js/frappe/form/form_sidebar.html +24,Attachments,Toebe
apps/frappe/frappe/website/doctype/web_form/web_form.py +74,You don't have the permissions to access this document,U hebt niet de rechten om toegang te krijgen tot dit document
DocType: Email Alert,Value Changed,Waarde Veranderd
apps/frappe/frappe/model/base_document.py +287,Duplicate name {0} {1},Dubbele naam {0} {1}
-DocType: Web Form Field,Web Form Field,Web Form Field
+DocType: Web Form Field,Web Form Field,Webformulier invulveld
apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +197,Hide field in Report Builder,Veld verbergen in Report Builder
apps/frappe/frappe/templates/generators/blog_post.html +25,This post is filed under {0},Dit bericht is gearchiveerd onder {0}
apps/frappe/frappe/print/page/print_format_builder/print_format_builder_field.html +14,Edit HTML,Bewerken HTML
@@ -466,7 +466,7 @@ apps/frappe/frappe/core/doctype/user/user.py +425,Registration Details Emailed.,
DocType: Workflow State,Stop,stoppen
DocType: Top Bar Item,Link to the page you want to open. Leave blank if you want to make it a group parent.,Link naar de pagina die u wilt openen. Laat leeg als u wilt dat een groep ouders te maken.
DocType: DocType,Is Single,Is Single
-apps/frappe/frappe/email/bulk.py +231,{0} has left the conversation in {1} {2},{0} is het gesprek linker {1} {2}
+apps/frappe/frappe/email/bulk.py +231,{0} has left the conversation in {1} {2},{0} heeft gesprek verlaten in {1} {2}
DocType: Blogger,User ID of a Blogger,Gebruikers-ID van een Blogger
apps/frappe/frappe/core/doctype/user/user.py +201,There should remain at least one System Manager,Er moet ten minste één System Manager blijven
DocType: Workflow State,circle-arrow-right,cirkel-pijl-rechts
@@ -587,12 +587,12 @@ apps/frappe/frappe/public/js/frappe/list/list_sidebar_stat.html +5,No records ta
DocType: User,Send Password Update Notification,Stuur wachtwoord-update
apps/frappe/frappe/public/js/legacy/form.js +62,"Allowing DocType, DocType. Be careful!","Het toestaan DocType , DocType . Wees voorzichtig !"
apps/frappe/frappe/config/core.py +32,"Customized Formats for Printing, Email","Aangepaste Formaten voor afdrukken, e-mail"
-apps/frappe/frappe/public/js/frappe/desk.js +308,Updated To New Version,Bijgewerkt Aan Nieuwe versie
+apps/frappe/frappe/public/js/frappe/desk.js +308,Updated To New Version,Geupdate naar nieuwe versie
DocType: DocField,Depends On,Hangt af van
DocType: DocPerm,Additional Permissions,Additionele Machtigingen
apps/frappe/frappe/core/page/data_import_tool/data_import_tool.py +13,Start entering data below this line,Beginnen met het invoeren onder deze lijn
DocType: Workflow State,retweet,retweet
-apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +40,Update the template and save in CSV (Comma Separate Values) format before attaching.,Actualiseren van de template en opslaan in CSV (Comma Gescheiden Waarden) formaat voor het vastmaken.
+apps/frappe/frappe/core/page/data_import_tool/data_import_main.html +40,Update the template and save in CSV (Comma Separate Values) format before attaching.,Werk de template bij en sla op CSV (Comma Gescheiden Waarden) formaat om als bijlage bij te voegen.
apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +163,Specify the value of the field,Geef de waarde van het veld
DocType: Report,Disabled,Uitgezet
apps/frappe/frappe/desk/page/activity/activity.js +203,May,Mei
@@ -694,7 +694,7 @@ DocType: Website Settings,Hide Footer Signup,Verberg Footer Inschrijven
apps/frappe/frappe/core/doctype/report/report.js +16,Write a Python file in the same folder where this is saved and return column and result.,Schrijf een Python bestand in dezelfde map waarin deze is opgeslagen en geef kolom en resultaat.
DocType: DocType,Sort Field,Sorteren Veld
apps/frappe/frappe/public/js/frappe/ui/filters/filters.js +355,Edit Filter,Filter bewerken
-apps/frappe/frappe/templates/pages/404.html +12,"We are very sorry for this, but the page you are looking for is missing (this could be because of a typo in the address) or moved.","We zijn erg jammer voor dit, maar de pagina die u zoekt ontbreekt (dit kan worden als gevolg van een typefout in het adres) of verplaatst."
+apps/frappe/frappe/templates/pages/404.html +12,"We are very sorry for this, but the page you are looking for is missing (this could be because of a typo in the address) or moved.","We zijn erg jammer voor dit, maar de pagina die u zoekt ontbreekt (misschien als gevolg van een typefout in het adres) of verplaatst."
apps/frappe/frappe/core/doctype/doctype/doctype.py +265,Field {0} of type {1} cannot be mandatory,Veld {0} van type {1} kan niet verplicht zijn
DocType: System Settings,"eg. If Apply User Permissions is checked for Report DocType but no User Permissions are defined for Report for a User, then all Reports are shown to that User","bijv. Als Breng Gebruikersmachtigingen wordt gecontroleerd rapport DocType maar geen gebruiker machtigingen worden gedefinieerd voor Rapport voor een gebruiker, dan worden alle rapporten worden aangetoond dat de Gebruiker"
DocType: System Settings,Session Expiry Mobile,Session Vervaldatum Mobile
@@ -753,13 +753,13 @@ DocType: Async Task,Async Task,Async Task
DocType: Workflow State,picture,afbeelding
apps/frappe/frappe/templates/pages/complete_signup.html +22,Complete,Compleet
DocType: Print Format,Custom HTML Help,Aangepaste HTML Help
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +306,Add A New Restriction,Voeg een nieuwe beperking
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +306,Add A New Restriction,Voeg een nieuwe beperking toe
DocType: Workflow Transition,Next State,Volgend Stadium
apps/frappe/frappe/public/js/frappe/ui/editor.html +56,Align Left (Ctrl/Cmd+L),Links uitlijnen (Ctrl / Cmd + L)
DocType: User,Block Modules,Block Modules
apps/frappe/frappe/model/db_schema.py +137,Reverting length to {0} for '{1}' in '{2}'; Setting the length as {3} will cause truncation of data.,Terugdraaien lengte {0} voor '{1}' in '{2}'; Het instellen van de lengte als {3} zal afkappen van gegevens veroorzaken.
DocType: Print Format,Custom CSS,Custom CSS
-apps/frappe/frappe/public/js/frappe/form/footer/timeline.html +4,Add a comment,Voeg een reactie
+apps/frappe/frappe/public/js/frappe/form/footer/timeline.html +4,Add a comment,Voeg een reactie toe
apps/frappe/frappe/model/rename_doc.py +350,Ignored: {0} to {1},Genegeerd: {0} tot {1}
apps/frappe/frappe/config/setup.py +79,Log of error on automated events (scheduler).,Log van fout op geautomatiseerde evenementen ( scheduler ) .
apps/frappe/frappe/utils/csvutils.py +74,Not a valid Comma Separated Value (CSV File),Geen geldige waarde ( CSV-file )
@@ -767,7 +767,7 @@ DocType: Email Account,Default Incoming,Standaard Inkomende
DocType: Workflow State,repeat,herhalen
DocType: Website Settings,Banner,Banner
apps/frappe/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +88,Help on Search,Hulp bij zoeken
-DocType: User,Uncheck modules to hide from user's desktop,Haal het vinkje weg modules te verbergen van desktop gebruiker
+DocType: User,Uncheck modules to hide from user's desktop,Vink modules af om ze te verbergen van het bureaublad
DocType: DocType,Hide Copy,Verberg Copy
apps/frappe/frappe/core/doctype/user/user.js +162,Clear all roles,Wis alle rollen
apps/frappe/frappe/model/base_document.py +332,{0} must be unique,{0} moet uniek zijn
@@ -816,7 +816,7 @@ apps/frappe/frappe/core/doctype/doctype/doctype.py +261,Fieldname {0} appears mu
DocType: Bulk Email,Expired,Verlopen
DocType: DocType,System,Systeem
apps/frappe/frappe/templates/pages/login.html +63,Have an account? Login,Een account hebben? Aanmelden
-apps/frappe/frappe/public/js/legacy/print_format.js +144,Unknown Print Format: {0},Onbekend Print Format: {0}
+apps/frappe/frappe/public/js/legacy/print_format.js +144,Unknown Print Format: {0},Onbekend afdrukformaat: {0}
DocType: Workflow State,arrow-down,arrow-down
apps/frappe/frappe/public/js/frappe/ui/tree.js +122,Collapse,ineenstorting
apps/frappe/frappe/model/delete_doc.py +133,User not allowed to delete {0}: {1},Gebruiker niet toegestaan om {0} te verwijderen: {1}
@@ -995,7 +995,7 @@ DocType: Print Settings,With Letterhead,Met briefhoofd
apps/frappe/frappe/email/smtp.py +177,Invalid Outgoing Mail Server or Port,Ongeldige uitgaande Server of Poort
DocType: DocPerm,Write,Schrijven
apps/frappe/frappe/core/doctype/report/report.py +29,Only Administrator allowed to create Query / Script Reports,Alleen Beheerder toegestaan om Query / Script Rapporten maken
-apps/frappe/frappe/public/js/frappe/form/save.js +13,Updating,Updaten
+apps/frappe/frappe/public/js/frappe/form/save.js +13,Updating,Bijwerken
DocType: File,Preview,Voorbeeld
DocType: Customize Form,Use this fieldname to generate title,Gebruik deze veldnaam om de titel te genereren
apps/frappe/frappe/public/js/frappe/views/communication.js +80,Select Attachments,Selecteer Bijlagen
@@ -1023,13 +1023,13 @@ DocType: Workflow Document State,Update Field,Veld bijwerken
apps/frappe/frappe/desk/page/applications/applications.js +50,Regional Extensions,Regionale Extensions
apps/frappe/frappe/email/doctype/email_account/email_account.py +348,Leave this conversation,Laat dit gesprek
apps/frappe/frappe/model/base_document.py +406,Options not set for link field {0},Opties niet ingesteld voor link veld {0}
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.py +151,You cannot unset 'Read Only' for field {0},Je kan niet uitgeschakeld 'Read Only' voor in het veld {0}
+apps/frappe/frappe/custom/doctype/customize_form/customize_form.py +151,You cannot unset 'Read Only' for field {0},Je kan 'Alleen lezen' niet uitschakelen voor het veld {0}
apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Voltooien Setup
DocType: Workflow State,asterisk,sterretje
apps/frappe/frappe/core/page/data_import_tool/exporter.py +61,Please do not change the template headings.,Gelieve niet de sjabloon rubrieken veranderen.
DocType: Communication,Linked,Linked
apps/frappe/frappe/public/js/frappe/form/save.js +84,Enter the name of the new {0},Geef de naam van de nieuwe {0}
-apps/frappe/frappe/config/desk.py +39,Activity log of all users.,Activiteit logboek van alle gebruikers.
+apps/frappe/frappe/config/desk.py +39,Activity log of all users.,Activiteitenlogboek van alle gebruikers.
DocType: Workflow State,shopping-cart,shopping-cart
DocType: Social Login Keys,Google,Google
DocType: Workflow State,Inverse,Omgekeerde
@@ -1171,7 +1171,7 @@ apps/frappe/frappe/desk/page/activity/activity.js +73,Build Report,Maak Rapport
apps/frappe/frappe/model/rename_doc.py +91,"{0} {1} does not exist, select a new target to merge","{0} {1} bestaat niet, kies een nieuw doel om samen te voegen"
apps/frappe/frappe/core/page/user_permissions/user_permissions.py +66,Cannot set permission for DocType: {0} and Name: {1},Kan geen toestemming voor DocType : {0} en Naam : {1}
apps/frappe/frappe/public/js/frappe/form/footer/assign_to.js +158,Add to To Do,Toevoegen aan To Do
-apps/frappe/frappe/public/js/frappe/list/list_sidebar.html +10,Assigned To Me,Assigned To Me
+apps/frappe/frappe/public/js/frappe/list/list_sidebar.html +10,Assigned To Me,Aan mij toegewezen
apps/frappe/frappe/public/js/frappe/ui/messages.js +178,Verify Password,Bevestig wachtwoord
apps/frappe/frappe/core/page/modules_setup/modules_setup.js +55,There were errors,Er zijn fouten opgetreden.
apps/frappe/frappe/core/doctype/communication/communication.js +19,Close,Sluiten
@@ -1368,7 +1368,7 @@ DocType: Email Account,Signature,Handtekening
apps/frappe/frappe/public/js/frappe/form/share.js +112,Share With,Delen met
apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laden
apps/frappe/frappe/config/setup.py +199,"Enter keys to enable login via Facebook, Google, GitHub.","Voer sleutels in om toegang in te schakelen via Facebook, Google, GitHub."
-apps/frappe/frappe/public/js/frappe/ui/tags.js +21,Add a tag,Voeg een tag
+apps/frappe/frappe/public/js/frappe/ui/tags.js +21,Add a tag,Voeg een tag toe
apps/frappe/frappe/public/js/frappe/form/control.js +1000,Please attach a file first.,Eerst een bestand toevoegen.
apps/frappe/frappe/model/naming.py +156,"There were some errors setting the name, please contact the administrator","Er zijn fouten opgetreden bij het instellen van de naam, neemt u aub contact op met de beheerder"
DocType: Website Slideshow Item,Website Slideshow Item,Website Diashow Item
@@ -1421,7 +1421,7 @@ DocType: Workflow,"Different ""States"" this document can exist in. Like ""Open"
apps/frappe/frappe/utils/verified_command.py +40,This link is invalid or expired. Please make sure you have pasted correctly.,Deze koppeling is ongeldig of verlopen. Zorg ervoor dat u correct hebt geplakt.
DocType: Web Page,Slideshow,Diashow
DocType: Workflow State,Search,Zoek
-DocType: Web Form,Web Form Fields,Web Form Fields
+DocType: Web Form,Web Form Fields,Webformulier invulvelden
DocType: Website Theme,Top Bar Text Color,Top Bar Tekst Kleur
apps/frappe/frappe/core/doctype/file/file.py +327,File '{0}' not found,Bestand '{0}' niet gevonden
apps/frappe/frappe/print/page/print_format_builder/print_format_builder.js +370,Remove Section,Verwijder Sectie
@@ -1480,7 +1480,7 @@ DocType: User,Send Notifications for Transactions I Follow,Stuur Meldingen voor
apps/frappe/frappe/core/doctype/doctype/doctype.py +497,"{0}: Cannot set Submit, Cancel, Amend without Write","{0} : Kan niet Indienen, Annuleren, Wijzigen zonder te Schrijven"
apps/frappe/frappe/public/js/frappe/form/footer/attachments.js +83,Are you sure you want to delete the attachment?,Weet u zeker dat u de bijlage wilt verwijderen?
apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html +8,Setup > User,Instellingen > Gebruiker
-apps/frappe/frappe/model/base_document.py +483,"{0}: '{1}' will get truncated, as max characters allowed is {2}","{0}: {1} 'zal afgekapt krijgen, als maximum toegestane tekens is {2}"
+apps/frappe/frappe/model/base_document.py +483,"{0}: '{1}' will get truncated, as max characters allowed is {2}","{0}: {1} 'zal afgekort worden, het maximum toegestaan aantal tekens is {2}"
apps/frappe/frappe/templates/emails/password_reset.html +6,Thank you,Dankjewel
apps/frappe/frappe/public/js/frappe/form/save.js +11,Saving,Opslaan
DocType: Print Settings,Print Style Preview,Print Stijl Voorbeeld
@@ -1540,7 +1540,7 @@ DocType: DocType,Child Tables are shown as a Grid in other DocTypes.,Onderliggen
DocType: Website Settings,"If checked, the Home page will be the default Item Group for the website.","Indien aangevinkt, zal de Home pagina zijn de standaard Item Groep voor de website."
DocType: Blog Post,"Description for listing page, in plain text, only a couple of lines. (max 140 characters)","Beschrijving van lijst pagina, in platte tekst, slechts een paar regels. (Max 140 tekens)"
apps/frappe/frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html +29,Forums,Forums
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +302,Add A User Restriction,Een gebruiker toevoegen Restriction
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +302,Add A User Restriction,Een gebruikersrestrictie toevoegen
DocType: DocType,Name Case,Naam Case
apps/frappe/frappe/public/js/frappe/form/share.js +26,Shared with everyone,Gedeeld met iedereen
apps/frappe/frappe/model/base_document.py +365,Data missing in table,Data ontbreekt in tabel
@@ -1574,9 +1574,9 @@ DocType: DocField,Allow on Submit,Laat op Submit
apps/frappe/frappe/core/page/desktop/desktop.js +60,All Applications,Alle Toepassingen
DocType: Error Snapshot,Exception Type,Uitzondering Type
apps/frappe/frappe/public/js/frappe/views/reports/reportview.js +425,Pick Columns,Kies Kolommen
-DocType: Web Page,Add code as <script>,Voeg code toe als