vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] Query Report data fetch (#5441)

Browse source 
- fallback for user arg
- also commit yarn.lock
This commit is contained in:
Faris Ansari 2018-04-12 17:50:02 +05:30 • committed by GitHub
parent 8b70725951
commit 026f57d4ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/reportview.py
View file

@ -341,7 +341,7 @@ def get_match_cond(doctype):
cond = DatabaseQuery(doctype).build_match_conditions()
return ((' and ' + cond) if cond else "").replace("%", "%%")
def build_match_conditions(doctype, user, as_condition=True):
def build_match_conditions(doctype, user=None, as_condition=True):
match_conditions = DatabaseQuery(doctype, user=user).build_match_conditions(as_condition=as_condition)
if as_condition:
return match_conditions.replace("%", "%%")

8
yarn.lock
View file

@ -862,14 +862,6 @@ forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
frappe-datatable@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.4.tgz#3fdcd698c2cd7bf7d75e920ed9d2f04f69e3afc9"
dependencies:
clusterize.js "^0.18.0"
lodash "^4.17.5"
sortablejs "^1.7.0"
frappe-datatable@frappe/datatable:
version "0.0.4"
resolved "https://codeload.github.com/frappe/datatable/tar.gz/4bb400230087fbf97e8587a34916e14f77fa01cd"