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

23447 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
0cca0778cc
Merge branch 'develop' into fix-invalid-dashboard-filter 2020-02-19 09:31:32 +05:30
sahil28297
b1d42e1302
fix: consider Not Sent and Sending status while pulling daily e… (#9496) 
Co-authored-by: Saurabh <saurabh6790@gmail.com>
 2020-02-18 15:43:16 +05:30
Faris Ansari
14fef7d01e
chore: Add github action to automate backporting (#9456) 2020-02-18 14:49:06 +05:30
Shivam Mishra
80f9a5f9fe
fix: don't try to export empty report (#9482) 2020-02-18 12:36:09 +05:30
Fab
59cc62b206
fix(base_list): Verify that filters are not undefined/empty. #9468 (#9487) 
* fix(base_list): Verify that filters are not undefined/empty. #9468

Fixes an issue with empty filters in certain list views as referenced in #9467

* style: Fix formatting issue

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-02-18 12:33:01 +05:30
Faris Ansari
494c8274af
Merge pull request #9476 from scmmishra/better-only-for-message 
Better Only For message
 2020-02-18 12:21:35 +05:30
Faris Ansari
8c7a7942dc
style: missing semicolon 2020-02-18 12:20:52 +05:30
Suraj Shetty
0090142232
style: fix formatting 2020-02-18 11:38:47 +05:30
mergify[bot]
f2744a993b
Merge pull request #9491 from zerodhatech/scruburl 
fix: scrub urls should only replace relative urls
 2020-02-18 06:05:32 +00:00
Priyanka Gangar
09b6010e5a
feat: add button to resend welcome email (#9464) 
* fix: Resend Welcome Email

* fix: Removed Space in Resend Welcome Email

* fix: Removed Space in Resend Welcome Email

* Send welcome mail called from frm

* Passing Parameter to msgprint

* Passing Parameter to msgprint

* Removed Unused Function

* Removed Unused Space

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
 2020-02-18 11:08:05 +05:30
Shridhar
efa740efba regular expression fixed 2020-02-18 10:58:47 +05:30
Shridhar
a68766261a workaround for wkhtmltopdf 2020-02-18 10:58:40 +05:30
Shridhar
690611f6f8 scrub urls should only replace relative urls 2020-02-18 10:58:28 +05:30
mergify[bot]
aa6a4f8c10
Merge pull request #9489 from deepeshgarg007/treeview_cleanup 
fix: Remove unnecessary code from treeview
 2020-02-18 04:41:16 +00:00
mergify[bot]
c27ee8fc2c
Merge pull request #9486 from gmplab/gmplab-patch-3 
fix(list_view): Cannot read property 'disable_auto_refresh'
 2020-02-18 04:39:52 +00:00
Deepesh Garg
86263496d5 fix: Remove unnecessary code from treeview 2020-02-18 09:01:24 +05:30
mergify[bot]
630c85a9cc
Merge pull request #9479 from scmmishra/report-key-error-dev 
fix: skip columns not sent
 2020-02-17 16:22:11 +00:00
gmplab
0a55241389
Fix property 'disable_auto_refresh' 
TypeError: Cannot read property 'disable_auto_refresh' of undefined
 2020-02-17 22:35:08 +08:00
Shivam Mishra
8e5fbb033c Merge branch 'develop' of github.com:frappe/frappe into report-key-error-dev 2020-02-17 15:36:38 +05:30
Shivam Mishra
4ee8b9d872 fix: skip columns not sent 2020-02-17 15:35:03 +05:30
mergify[bot]
97c2ea3f2b
Merge pull request #9329 from scmmishra/no-format-markdown 
fix: don't format markdown in versions
 2020-02-17 09:57:21 +00:00
Shivam Mishra
724564103c
fix: better logging for slack (#9474) 
* fix: better logging for slack

* chore: cleanup code and get from dict

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-17 14:49:45 +05:30
Shivam Mishra
67b9b01087 fix: don't format none 2020-02-17 14:38:16 +05:30
mergify[bot]
c67e00d061
Merge pull request #9473 from shrikant9867/develop 
Stock Balance Report Shows Fatal Error #20602 #9470
 2020-02-17 08:51:12 +00:00
Shivam Mishra
290d077572 feat: add save button only for script manager 
- Save option will only be shown to script manager.
- The report name field is set to mandatory
 2020-02-17 14:07:18 +05:30
Shivam Mishra
84241e5b61 feat: better only_for role message 2020-02-17 14:06:06 +05:30
mergify[bot]
891268459f
Merge pull request #9454 from frappe/fix-cypress-command 
fix: Cypress run command
 2020-02-17 08:04:38 +00:00
Suraj Shetty
db6bf3c197
Merge branch 'develop' into fix-cypress-command 2020-02-17 12:25:13 +05:30
shrikant9867
5be6ae555e
fix: Stock Balance Report Shows Fatal Error #20602 -2 
Old:
skip_total_row = result['skip_total_row'] if 'skip_total_row' in result else ''
result["add_total_row"] = report.add_total_row and not skip_total_row

New:
result["add_total_row"] = report.add_total_row and not result.get('skip_total_row')
 2020-02-17 12:21:48 +05:30
Himanshu
1353ef24b0
fix(Contact): Dont reroute from Contact to unrelated document (#9432) 
* fix:dont reroute to doc if unrelated

* Update frappe/contacts/doctype/address/address.js

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

* Update frappe/contacts/doctype/contact/contact.js

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

* Update address.js

* Update contact.js

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-02-17 06:40:10 +00:00
mergify[bot]
cfc40b4525
Merge pull request #9429 from scmmishra/log-theme-error 
refactor: log error if theme creation breaks
 2020-02-17 06:34:05 +00:00
shrikant dixit
8ff57cf78a fix: Stock Balance Report Shows Fatal Error #20602 2020-02-15 16:02:39 +05:30
mergify[bot]
bdaf522074
Merge pull request #9449 from Thunderbottom/revert-faux-sec-fix 
revert: "fix(security): invalidate reset_password_key on password reset"
 2020-02-11 09:59:49 +00:00
Suraj Shetty
1a6f303e8d
Merge branch 'develop' into revert-faux-sec-fix 2020-02-11 13:22:03 +05:30
Suraj Shetty
c061550a21
Merge branch 'develop' into fix-cypress-command 2020-02-11 13:21:36 +05:30
Suraj Shetty
588c0090c2
Merge branch 'develop' into log-theme-error 2020-02-11 13:20:48 +05:30
Suraj Shetty
22c13f6b77 Merge branch 'develop' of https://github.com/frappe/frappe into fix-invalid-dashboard-filter 2020-02-11 13:13:27 +05:30
mergify[bot]
a0dc9f7952
Merge pull request #9459 from hrwX/ui-test-fixes 
test: fix awesomebar filter test
 2020-02-11 07:41:05 +00:00
Suraj Shetty
823076e614 test: fix awesomebar filter test 2020-02-11 12:38:46 +05:30
Himanshu Warekar
7270c743a5 fix: ui test fixes 2020-02-10 23:56:11 +05:30
Suraj Shetty
6977e6ec2b fix: Throw "Invalid Filter Value" error on getting TypeError 
TypeError with message "'NoneType' object is not iterable" will mostly occur if a link field value does not exist.
 2020-02-10 19:01:34 +05:30
Faris Ansari
d508ef258e
fix: Remove translation method and pass statement 2020-02-10 17:23:42 +05:30
Faris Ansari
4b51508194 fix: Cypress run command 2020-02-10 13:08:26 +05:30
mergify[bot]
08e18c649e
Merge pull request #9408 from ruchamahabal/fix_report_status_column 
fix(Report View): don't render/add status if value not found
 2020-02-09 15:33:38 +00:00
Chinmay D. Pai
36506e010c
Revert "fix(security): invalidate reset_password_key on password reset" 
This reverts commit 35024c18fc.
 2020-02-08 17:50:56 +05:30
Andy Zhu
209393ecbd
Fix (S3-Backup-Setting): ensure recipients and sender are corre… (#9417) 
* fix: sender is not set to current user

I am not sure if I did it right:
1. import frappe
2. check if the sender is None: using frappe.session.user to fetch email address for current user

* fix: update the correct field name for S3-backup-setting

The field variable name should be updated to 'notify_email' instead of 'notification_email'.

* style: remove a trailing whitespace

* fix: Assign notify_email instead of calling frappe.db.get_value twice

* chore: remove default sender and notify_email check

* default sender already gets set in queue.py, so there's no need for a
  check inside __init__.py

* notify_email seems to be a mandatory field, so there's no need to
  check if the field has a value (assuming that it always will).

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-08 14:36:05 +05:30
Himanshu
873dad7047
Merge pull request #9309 from ci2014/patch-32 
fix(list view): Keep the standard filter input fields on reload
 2020-02-07 22:42:57 +05:30
Himanshu
4bacf07164
Merge pull request #9374 from vishdha/fix_comment_develop 
fix(comment): Unexpected token &lt; in JSON at position 0
 2020-02-07 22:39:26 +05:30
mergify[bot]
d212a7d1dd
Merge pull request #9428 from prssanna/customize-form-print-format 
fix: filter default print format in Customize Form by doctype
 2020-02-07 16:55:52 +00:00
mergify[bot]
27ef1f6e10
Merge pull request #9438 from Thunderbottom/pin-werkzeug 
chore: update werkzeug to v0.16.1
 2020-02-07 11:43:56 +00:00