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

23398 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Chinmay D. Pai
585ea4a191
chore: pin to 0.16.1 
lol

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-02-07 12:28:36 +05:30
Chinmay D. Pai
f239684740
chore: update werkzeug to 1.0.0 
* move all werkzeug.wsgi and werkzeug.contrib imports to
  werkzeug.middleware to make things work.
* update pinned requirement to 1.0.0

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-02-07 12:16:42 +05:30
Mangesh-Khairnar
7875ebaf28
fix: open print preview in new tab (#9402) 2020-02-06 18:13:44 +05:30
mergify[bot]
ba5bce093d
Merge pull request #9430 from scmmishra/reports-tnum 
feat (ux): enabled tnum font feature for report
 2020-02-06 07:44:59 +00:00
Shivam Mishra
6614ccc628 feat: enabled tnum font feature for report 2020-02-06 12:40:42 +05:30
Chinmay Pai
45e69c9723
fix: reset reset_password_key on password update using link (#9421) 
extension to #8982

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-02-05 18:45:16 +05:30
mergify[bot]
85ee4f1a67
Merge pull request #9425 from deepeshgarg007/custom_column_addition_fix 
fix: Options for custom columns with datatype as Link
 2020-02-05 13:00:42 +00:00
Deepesh Garg
4dd9afb89f Merge branch 'develop' of https://github.com/frappe/frappe into custom_column_addition_fix 2020-02-05 16:54:50 +05:30
Deepesh Garg
9f5b655824 fix: Options for custom columns with datatype as Link 2020-02-05 16:53:36 +05:30
mergify[bot]
62ea837d07
Merge pull request #9363 from prssanna/workflow-fix 
fix(Workflow): Set workflow state when some action is performed on a …
 2020-02-05 10:04:49 +00:00
mergify[bot]
758d163c8a
Merge pull request #9413 from deepeshgarg007/skip_total_row 
feat: Ability to dynamically skip total row in Script Reports
 2020-02-05 09:53:14 +00:00
prssanna
b0513409ab fix: filter default print format in customize form by doctype 2020-02-05 12:35:20 +05:30
prssanna
44cbdb0ebd fix: iff workflow state of doc is already correct, don't set workflow state 2020-02-05 11:57:23 +05:30
Deepesh Garg
439fac44f4 fix: Undo client side changes 2020-02-05 11:53:36 +05:30
prssanna
70316e8670 fix(test): set workflow state Approved docstatus to 1 in test 2020-02-05 11:47:03 +05:30
Prssanna Desai
1831021a77
Merge pull request #9368 from hrwX/del_button_fix 
fix(Grid): hide Delete and Delete All for Grid
 2020-02-04 14:59:08 +05:30
prssanna
2edfca9fb5 test: add test case to check if workflow state is set 2020-02-04 12:09:18 +05:30
Deepesh Garg
f91ecd8d96 fix: Condition 2020-02-03 23:57:20 +05:30
Prssanna Desai
09760ea108
Merge pull request #9393 from hrwX/allow_cf_in_qe 
fix(Custom Field): add quick entry in custom field
 2020-02-03 23:16:02 +05:30
Himanshu
ee79d16751
fix: reset default letterhead (#9380) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-02-03 19:57:44 +05:30
Prssanna Desai
f1b30d4519
fix: party name filter not getting set (#9394) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-02-03 19:57:21 +05:30
Deepesh Garg
c0cf5fddbd Merge branch 'develop' of https://github.com/frappe/frappe into skip_total_row 2020-02-03 19:19:25 +05:30
Deepesh Garg
8677360cb2 feat: Ability to dynamically skip total row in Script Reports 2020-02-03 19:17:36 +05:30
Rucha Mahabal
c4e3b019ab fix: codacy 2020-02-03 18:38:37 +05:30
mergify[bot]
e0acaaf4d3
Merge pull request #9391 from surajshetty3416/fix-release-notes-popup-ux 
fix(UX): Show release notes/update popup only to System Manager
 2020-02-03 12:55:53 +00:00
Rucha Mahabal
e78f73679b fix (Report View): don't render/add status if value not found 2020-02-03 18:04:45 +05:30
mergify[bot]
58f89a43c7
Merge pull request #9371 from prssanna/dashboard-week-ending 
fix(Dashboards): Dashboard chart week ending
 2020-02-03 11:26:48 +00:00
Suraj Shetty
34f7dc1911
Merge branch 'develop' into allow_cf_in_qe 2020-02-03 16:39:59 +05:30
Suraj Shetty
65b7d6cdb0
Merge branch 'develop' into del_button_fix 2020-02-03 16:39:46 +05:30
Suraj Shetty
4742e88957
Merge branch 'develop' into dashboard-week-ending 2020-02-03 16:38:06 +05:30
mergify[bot]
35583d8164
Merge pull request #9404 from ruchamahabal/fix-auto-repeat 
fix: handle PermissionError for auto repeat email notifications
 2020-02-03 10:45:59 +00:00
Suraj Shetty
8d496c7055
fix: Invalid syntax 2020-02-03 16:03:13 +05:30
Suraj Shetty
7a4ee06acf
fix: Translatable string for error 2020-02-03 15:58:26 +05:30
Rucha Mahabal
70bf6f3bc8 fix: change mutliline error message to single line for translations 2020-02-03 15:39:32 +05:30
Rucha Mahabal
d1942838d1 fix: handle PermissionError for auto repeat email notifications 2020-02-03 14:51:29 +05:30
Rucha Mahabal
dc13938667 fix: auto repeat test 2020-02-03 13:00:28 +05:30
Prssanna Desai
526527a958
fix: increase chat message alert time to 15 seconds (#9398) 2020-02-02 21:45:02 +05:30
Prssanna Desai
20c55bf9d7
Merge branch 'develop' into del_button_fix 2020-02-02 21:34:31 +05:30
Frappe PR Bot
abbc93916a
feat: Updated translation (#9354) 
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
 2020-02-02 16:03:41 +05:30
prssanna
6d95513c11 fix: remove console log 2020-02-01 13:43:12 +05:30
prssanna
7665521adf fix: uncheck heading row checkbox when delete or delete all is clicked 2020-02-01 13:40:53 +05:30
Himanshu Warekar
1980b5f988 fix: add quick entry in custom field 2020-02-01 11:59:44 +05:30
Suraj Shetty
62eb7ec38e fix(UX): Show release notes/update popup only to System Manager 2020-01-31 17:29:41 +05:30
Kyra
9fe65cb809
fix(sms_settings): add support for sending data as json (#9381) 
* Add support for sending JSON to SMS Settings

Many SMS gateways expect data in raw JSON and do not accept plain
form data. This change enables this by detecting a "Content-Type"
header in the parameters with a value of "application/json", and
in this case decoding the message text to unicode as expected by
the `requests` module before passing the data to the `json`
parameter.

* Update frappe/core/doctype/sms_settings/sms_settings.py

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* Update frappe/core/doctype/sms_settings/sms_settings.py

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-01-31 15:46:05 +05:30