Bläddra i källkod

Merge branch 'hotfix'

version-14
Nabin Hait 8 år sedan
förälder
incheckning
fe98b32e97
4 ändrade filer med 6 tillägg och 6 borttagningar
  1. +1
    -1
      frappe/__init__.py
  2. Binär
      frappe/docs/assets/img/script-report.png
  3. +3
    -3
      frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md
  4. +2
    -2
      frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md

+ 1
- 1
frappe/__init__.py Visa fil

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template

__version__ = "7.0.46"
__version__ = "7.0.47"

local = Local()



Binär
frappe/docs/assets/img/script-report.png Visa fil

Före Efter
Bredd: 1171  |  Höjd: 403  |  Storlek: 61 KiB

+ 3
- 3
frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md Visa fil

@@ -6,7 +6,7 @@ To create a new Query Report:

### 1. Create a new Report

![Query Report](/assets/frappe_io/images/how-to/query-report.png)
![Query Report](/assets/query-report.png)

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
@@ -35,11 +35,11 @@ You can define complex queries such as:

### 3. Check the Report

![Query Report](/assets/frappe_io/images/how-to/query-report-out.png)
![Query Report](/assets/query-report-out.png)

### 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.
If you are making a standard report, you can add filters in your query report just like [script reports](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/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



+ 2
- 2
frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md Visa fil

@@ -6,11 +6,11 @@ You can create tabulated reports using server side scripts by creating a new Rep

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
> Note: You must be in [Developer Mode](https://frappe.github.io/frappe/user/en/guides/app-development/how-enable-developer-mode-in-frappe) to do this

### 1. Create a new Report

![Query Report](/assets/frappe_io/images/how-to/script-report.png)
![Query Report](/assets/img/script-report.png)

1. Set Report Type as "Script Report"
1. Set "Is Standard" as "Yes"


Laddar…
Avbryt
Spara