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

23423 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Shivam Mishra
9367c76a32 Merge branch 'develop' of github.com:frappe/frappe into no-format-markdown 2020-02-06 11:49:50 +05:30
Shivam Mishra
ed33422511 refactor: log error if theme creation breaks 2020-02-06 11:35:44 +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