vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
34887 commits 1 branch 0 tags 587 MiB
Commit graph

34887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
494cc83bde fix: Return parent doc object for further permission check 2021-10-26 14:30:13 +05:30
Suraj Shetty
3728e6dfdb fix: Use get_all instead of get_list for doc creation to avoid permission check 2021-10-26 12:40:37 +05:30
Suraj Shetty
cdde111021 fix: Re-arrange code 
Return true if user is Admin before checking child table condition
 2021-10-21 13:00:52 +05:30
Suraj Shetty
2a2421888f fix: Check parent permission while doing has_permission for child 
- Since, permissions for child table is based on parent doctype
 2021-10-21 12:21:51 +05:30
mergify[bot]
bfdc7b43d5
Merge pull request #14503 from shariquerik/cypress-ui-test 
test: Cypress UI test fixes
 2021-10-19 14:42:41 +00:00
Suraj Shetty
a892925f73
Merge pull request #14504 from surajshetty3416/fix-as-json 2021-10-19 20:01:55 +05:30
Shariq Ansari
06c8cbceb9 test: Commenting relative_time_filters.js 2021-10-19 19:46:33 +05:30
Suraj Shetty
50e9930ca5
ci: Disable patch status 
Can be enabled later
 2021-10-19 18:53:43 +05:30
Suraj Shetty
7f86137b74 fix: List header alignment 2021-10-19 18:44:01 +05:30
Suraj Shetty
d47f23dd3a fix(Print): Select button alignment issue 2021-10-19 18:43:44 +05:30
Shariq Ansari
749e12b544
Merge branch 'develop' into cypress-ui-test 2021-10-19 18:31:28 +05:30
Suraj Shetty
c968712450 fix: Return unsorted json in case of type error 2021-10-19 18:22:09 +05:30
Shariq Ansari
d18852f793 test: timeline.js ui test fix 2021-10-19 18:18:22 +05:30
gavin
429f77be0c
Merge pull request #14434 from deepeshgarg007/report_loader 
fix: Loading state for query reports
 2021-10-19 15:47:54 +05:30
mergify[bot]
8e2cf038c4
Merge pull request #14493 from frappe/fix-negative-duration 
fix: handle negative duration
 2021-10-19 09:34:11 +00:00
Sagar Vora
5c86dc80c7
fix: if_owner constraint being applied wrongly (#14471) 
* fix: `if_owner` constraint being applied wrongly

* test: check if owner on `frappe.get_list`

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-10-19 15:03:17 +05:30
Suraj Shetty
4f94f19940
ci: Remove Github status for UI coverage 2021-10-19 14:46:01 +05:30
gavin
fbe925b42c
Merge pull request #14238 from resilient-tech/autoreload_on_build 
feat: automatically reload web pages whenever JS/CSS assets are rebuilt
 2021-10-19 14:13:04 +05:30
Sagar Vora
7649cdff4c fix: minor cleanup 2021-10-19 14:00:19 +05:30
mergify[bot]
a473d1c9b1
Merge pull request #14482 from resilient-tech/fix-whitelist 
fix: remove/update older whitelist calls
 2021-10-19 08:25:21 +00:00
gavin
a52decf308
Merge pull request #14481 from saxenabhishek/aks-feat-semgrep-sql 
ci: semgrep rule for db.sql
 2021-10-19 13:50:03 +05:30
Gavin D'souza
4a5bb2873d ci: Ignore sql=>qb rule for test files 2021-10-19 13:25:37 +05:30
Gavin D'souza
a575cff8a7 fix: Retry flaky test_printview_page if errored 2021-10-19 12:35:55 +05:30
mergify[bot]
df9e929482
Merge pull request #14484 from hrwX/add_enabled_field 
feat: Add enabled to Language
 2021-10-19 04:53:01 +00:00
Raffael Meyer
2e4f5e0796
fix: handle negative duration 2021-10-19 01:41:02 +02:00
Sagar Vora
770bda8cc6 fix: use cint, as os.environ only contains string values 2021-10-19 04:04:00 +05:30
hrwx
586ef77cd7 feat: Add enabled to Language 2021-10-18 20:12:09 +01:00
Ankush Menat
ac1bb636cf
ci: flag new instances of sql_ddl and sql_list 2021-10-18 22:13:50 +05:30
Ankush Menat
059e5441c2
ci: use semgrep pattern instead of regex 2021-10-18 21:33:06 +05:30
mergify[bot]
df76d33893
Merge pull request #14100 from saxenabhishek/aks-query 
refactor: convert db.sql calls in core module
 2021-10-18 14:24:54 +00:00
Pruthvi Patel
3cec476cbc fix: add whitespace 2021-10-18 19:07:13 +05:30
mergify[bot]
4e92a71791
Merge pull request #14483 from resilient-tech/role-profile-permlevel 
fix: set missing `permlevel` for Role Profile
 2021-10-18 13:00:44 +00:00
Pruthvi Patel
d99403393a fix: rename auto-reload to live-reload 2021-10-18 17:52:33 +05:30
Sagar Vora
c56ded1c4b fix: set missing permlevel for Role Profile 2021-10-18 16:58:37 +05:30
Sagar Vora
c560d67a57 fix: remove/update older whitelist calls 2021-10-18 16:47:11 +05:30
abhishek
236c84ab8b feat: semgrep rule for db.sql 2021-10-18 16:35:13 +05:30
gavin
51ce9f5832
Merge pull request #14444 from NagariaHussain/chore-try-on-fc-button 
chore: Try on FCloud button in README
 2021-10-18 14:08:56 +05:30
Suraj Shetty
def460715e
Merge pull request #14478 from surajshetty3416/fix-listview-printformat 2021-10-18 13:58:27 +05:30
Suraj Shetty
0bff45add2
Merge branch 'frappe:develop' into fix-listview-printformat 2021-10-18 13:54:18 +05:30
Suraj Shetty
c624b54eca fix: Set limit_page_length to get all letterhead 
`limit` is not a valid argument for `frappe.client.get_list`
 2021-10-18 13:54:00 +05:30
Summayya Hashmani
20d7a9df78
feat: Add confirm password field (#14281) 
* fix: remove commented code

* refactor: add confirm password field

* fix: remove dialog and add inline warning

* fix: capitalize words and text function

* fix: capitalize words

* style: Fix formatting

* refactor:update class name

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* refactor: remove indicator class and add margin

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-10-18 08:02:35 +00:00
Suraj Shetty
202d94715f
Merge pull request #14476 from surajshetty3416/fix-auto-email-report-download 2021-10-18 12:39:11 +05:30
gavin
8980e733c1
Merge pull request #14475 from gavindsouza/misc-fixes-2 
fix: Remove unnecessary missing_ok kwarg from unlink
 2021-10-18 12:36:49 +05:30
Suraj Shetty
5c5c176872 fix: Check if parent exist in col before getting doc 
This fixes following error while downloading auto email report

```
Traceback (most recent call last):
  File "/Users/sps/benches/develop/apps/frappe/frappe/app.py", line 66, in application
    response = frappe.api.handle()
  File "/Users/sps/benches/develop/apps/frappe/frappe/api.py", line 54, in handle
    return frappe.handler.handle()
  File "/Users/sps/benches/develop/apps/frappe/frappe/handler.py", line 31, in handle
    data = execute_cmd(cmd)
  File "/Users/sps/benches/develop/apps/frappe/frappe/handler.py", line 67, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/Users/sps/benches/develop/apps/frappe/frappe/__init__.py", line 1205, in call
    return fn(*args, **newargs)
  File "/Users/sps/benches/develop/apps/frappe/frappe/email/doctype/auto_email_report/auto_email_report.py", line 196, in download
    data = auto_email_report.get_report_content()
  File "/Users/sps/benches/develop/apps/frappe/frappe/email/doctype/auto_email_report/auto_email_report.py", line 98, in get_report_content
    columns, data = make_links(columns, data)
  File "/Users/sps/benches/develop/apps/frappe/frappe/email/doctype/auto_email_report/auto_email_report.py", line 253, in make_links
    doc = frappe.get_doc(col.parent, doc_name) if doc_name else None
  File "/Users/sps/benches/develop/apps/frappe/frappe/__init__.py", line 883, in get_doc
    doc = frappe.model.document.get_doc(*args, **kwargs)
  File "/Users/sps/benches/develop/apps/frappe/frappe/model/document.py", line 62, in get_doc
    raise ValueError('First non keyword argument must be a string or dict')
ValueError: First non keyword argument must be a string or dict
```

The issue was introduced via https://github.com/frappe/frappe/pull/13340
 2021-10-18 12:20:06 +05:30
Gavin D'souza
30c39acabe fix: Don't unlink file blindly 
This made sense with the missing_ok. But now, a try-except seems
unnecessary too. Also, possibly destructive. Best to stray away from
these things.
 2021-10-18 12:07:42 +05:30
Gavin D'souza
f51b1cc739 fix: Remove unnecessary missing_ok kwarg from unlink 
missing_ok added in PY38, this change breaks installs for PY37. ref: https://docs.python.org/3/library/pathlib.html#pathlib.Path.unlink
 2021-10-18 11:51:33 +05:30
mergify[bot]
75b7efe76c
Merge pull request #14473 from frappe/child-table-fix 
fix: child table layout in the web-form
 2021-10-18 06:02:21 +00:00
Summayya Hashmani
4146cd3cca
refactor: child table layout in the web-form 2021-10-18 09:28:44 +05:30
Deepesh Garg
d257adc130 fix: Rename loader functions 2021-10-16 16:48:33 +05:30
abhishek
3cc2202ce9 refactor: convert doctype transaction_log db.sql calls 2021-10-15 17:39:02 +05:30