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

22720 commits

This branch
This branch
All branches
Author SHA1 Message Date
prssanna
1026800ee0 feat: add mandatory_depends_on and read_only_depends_on to docfield 2019-12-04 21:34:49 +05:30
mergify[bot]
af67d81b7b
Merge pull request #8786 from prssanna/child-table-pagination 
feat: Child table pagination
 2019-12-04 08:09:37 +00:00
prssanna
146c4d46cb fix: change function name to go_to_last_page_to_add_row 2019-12-04 11:59:35 +05:30
mergify[bot]
ac7c5837c5
Merge pull request #8861 from alias/frappe_org_dev 
fix: Allow to delete custom doctype with custom module
 2019-12-03 16:17:45 +00:00
mergify[bot]
e193746a91
Merge pull request #8873 from Mangesh-Khairnar/add-yearly-in-dashboard 
feat: Add all time in dashboard charts
 2019-12-03 15:59:32 +00:00
DeeMysterio
c06be49f6c feat(tags): accept click to enter tags (#8826) 
* feat(tags): accept click to enter tags

* fix: refactor code

* fix: refactor code

* style: Fix Codacy
 2019-12-03 16:58:33 +05:30
mergify[bot]
4893ef5c78
Merge pull request #8933 from ruchamahabal/filter_doctypes_for_bulk_update 
fix: Restrict DocTypes in Bulk Update Tool
 2019-12-03 11:06:16 +00:00
Rucha Mahabal
bc577d5a9f fix: don't set filter for restrict_to_domain in Bulk Update Tool 2019-12-03 16:09:30 +05:30
mergify[bot]
27fcb322d9
Merge pull request #8939 from revant/fix-social-login-develop 
fix(integration): Social Login Key
 2019-12-03 10:10:53 +00:00
Revant Nandgaonkar
de6ec7985a fix(integration): Social Login Key 
add missing field
 2019-12-03 12:41:35 +05:30
Shivam Mishra
1898b2fb0e fix: use hasattr to verify links (#8938) 
* fix: use hasattr to verify links

* fix: verify length explicitly

* style: remove unnecessary call to len
 2019-12-03 07:11:04 +00:00
Ben Knowles
a8914a2cbd fix: REST API utf-8 decoding on creates/updates (#8875) 
* fix: REST API utf-8 decoding on creates/updates

Creating or updating a document via the REST API would generate an error of:

`TypeError: the JSON object must be str, not 'bytes'`

Because get_data() returns bytes which must be explicitly converted to a string before parsing as JSON.

Defect introduced by efe94886a and a71a92341e

* fix: switch to safe_decode
 2019-12-03 06:44:11 +00:00
mergify[bot]
07f3a87f0b
Merge pull request #8863 from scmmishra/null-state 
feat: added a null state to list view
 2019-12-02 11:49:19 +00:00
Shivam Mishra
3c3c0b2252 Merge branch 'develop' of https://github.com/frappe/frappe into null-state 2019-12-02 16:46:05 +05:30
Anurag Mishra
5aad587a4a
fix: Showing quotes in string (#8904) 2019-12-02 16:33:58 +05:30
Rucha Mahabal
398d5bad6f fix: do not allow bulk update for core, single doctypes and doctypes from inactive domains 2019-12-02 14:58:09 +05:30
Suraj Shetty
7e1834548c fix: Codacy 2019-12-02 14:22:17 +05:30
Suraj Shetty
bd69e8cff3 Merge branch 'develop' of https://github.com/frappe/frappe into child-table-pagination 2019-12-02 14:05:46 +05:30
mergify[bot]
56caf0707a
Merge pull request #8486 from rmehta/refactor-scheduler 
refactor(scheduler): created "Scheduler Job Type" and cleaned up scheduler
 2019-12-02 08:03:41 +00:00
Suraj Shetty
14fc9dc860
Merge pull request #8910 from netchampfaris/print-format-fixes 
fix: Print Format Fixes
 2019-12-02 13:29:17 +05:30
Faris Ansari
488c68df96
Merge branch 'develop' into refactor-scheduler 2019-12-02 13:16:45 +05:30
Saqib
1aa7824af5 fix(IntControl): Check for arithmetic expression before eval (#8813) 
* fix: int eval_expression only checks for comma

* fix: get_number_format called for int fields
* int control doesn't have get_number_format

* fix(Numeric fields): Only match valid arithmetic expressions
 2019-12-02 13:05:46 +05:30
mergify[bot]
d847233f02
Merge pull request #8921 from netchampfaris/website-route-meta-fixes 
fix: Website Route Meta fixes
 2019-12-01 16:49:19 +00:00
Suraj Shetty
0a3638d1f1
test: Fix list_view test by removing clear-cache code (#8929) 
test: Fix list_view test by removing clear-cache code
 2019-12-01 18:56:35 +05:30
Suraj Shetty
7629f07dbf test: Try removing clear-cache 2019-12-01 13:32:28 +05:30
Suraj Shetty
d41ca958ab test: Move wait to list_view.js 2019-12-01 12:36:21 +05:30
Suraj Shetty
9f3b0b59fc test: Fix listview test by waiting for clear-cache 2019-12-01 11:41:11 +05:30
mergify[bot]
2a12331da4
Merge pull request #8923 from gavindsouza/legacy-tests-cleanup 
chore: cleanup redundant function definitions, sort imports
 2019-11-30 11:52:10 +00:00
Suraj Shetty
5a2c2b8ec0
fix: Change modified user 2019-11-30 17:19:00 +05:30
Gavin D'souza
e9a6927039 chore: fixed imports after module restructure 2019-11-29 21:08:30 +05:30
Gavin D'souza
450f5c3785 chore: moved 'get_html_for_route' to frappe.utils 2019-11-29 20:42:25 +05:30
mergify[bot]
4ec6061513
Merge pull request #8918 from Thunderbottom/csv-export-fix 
fix(reportview): convert to unicode conditionally
 2019-11-29 13:58:01 +00:00
mergify[bot]
250e293bec
Merge pull request #8925 from ruchamahabal/fix_auto_repeat_dates 
fix: auto repeat next schedule date should be on or after the current date
 2019-11-29 13:43:58 +00:00
Rucha Mahabal
f4b68b4c25 test: next schedule date 2019-11-29 18:27:42 +05:30
Rucha Mahabal
ace5ddad87 fix: next schedule date should be on or after current date 2019-11-29 18:27:18 +05:30
Gavin D'souza
aa1e698acf chore: cleanup redundant function definitions, sort imports 2019-11-29 18:00:40 +05:30
Faris Ansari
1e1903db40
Merge pull request #8805 from gavindsouza/drop-selenium 
chore: drop legacy tests
 2019-11-29 17:42:10 +05:30
Faris Ansari
598deb7c4a fix: Add Visit Web Page button in form 2019-11-29 17:01:02 +05:30
Faris Ansari
1a17c25ca4 fix: Allow Rename in Website Route Meta 2019-11-29 17:00:53 +05:30
Chinmay D. Pai
56b0385841
chore: remove useless encode 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-11-29 16:25:31 +05:30
Chinmay D. Pai
29fcd291b1
fix(reportview): convert to unicode conditionally 
fixes TypeError: decoding str is not supported

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 57, in application
    response = frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 22, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 61, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1038, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 511, in wrapper_fn
    retval = fn(*args, **get_newargs(fn, kwargs))
  File "/home/frappe/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 177, in export_query
    frappe.response['result'] = text_type(f.read(), 'utf-8')
TypeError: decoding str is not supported

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-11-29 13:18:48 +05:30
gavin
695e212575
Merge branch 'develop' into drop-selenium 2019-11-29 13:13:33 +05:30
mergify[bot]
fba8317a78
Merge pull request #8908 from surajshetty3416/fix-prepared-report 
fix: Pass prepared_report_name as filter if exists
 2019-11-29 06:56:36 +00:00
mergify[bot]
cc6ba94068
Merge pull request #8909 from zerodhatech/case_insensitive_search 
fix(postgres): Case insensitive search
 2019-11-29 06:20:18 +00:00
Shridhar
44c7f08ccf convert operator to lowercase while checking 2019-11-28 18:07:14 +05:30
Faris Ansari
ae0bf912c7 fix: Add label to standard print format sections 
data-label is now added to each section so they can be targeted via CSS
 2019-11-28 16:34:41 +05:30
Faris Ansari
6a0d8f306d feat: Add Refresh button to Print Format selector 2019-11-28 16:33:34 +05:30
Faris Ansari
45138df076 fix: Add syntax highlighting to Edit HTML dialog 2019-11-28 16:32:37 +05:30
Faris Ansari
bbd99139ad fix: Add CSS highlighting to Custom CSS field 2019-11-28 16:32:20 +05:30
Shridhar
acae06a36a case insensitive search for postgres 2019-11-28 16:13:20 +05:30