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

18021 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nabin Hait
df438c1697
Revert "fix: Set default only if the dependent field is set (#7130)" (#7644) 
This reverts commit 73c1f531e8.
 2019-06-05 20:30:13 +05:30
Nabin Hait
4853284d27
Revert "fix: Avoid default of field if its depends_on field is not set (#7004)" (#7643) 
This reverts commit dcf3d2d061.
 2019-06-05 20:29:59 +05:30
Sahil Khan
6196e72df3 Merge branch 'hotfix' 2019-06-05 15:10:59 +05:30
Sahil Khan
d2aec962bd bumped to version 11.1.33 2019-06-05 15:30:59 +05:50
Nabin Hait
a8c92fb02b
fix: updated modified date 2019-06-05 14:46:46 +05:30
Saurabh
65b77c164f
Merge pull request #7630 from surajshetty3416/fix-print-format-hotfix 
fix: Encode print format name passed through url
 2019-06-03 16:58:52 +05:30
Suraj Shetty
8e22789777 fix: encodeURIComponent print format 
- to support & character in print format name
 2019-06-03 14:11:02 +05:30
Saurabh
a44003d492 fix(paypal): Ignore if profile is already cancelled (#7622) 
* fix: ignore if profile already in cancelled state

* Update frappe/integrations/doctype/paypal_settings/paypal_settings.py

grammar fixes

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
 2019-06-03 12:11:17 +05:30
Rushabh Mehta
2f43a76a0a
Merge pull request #7617 from deepeshgarg007/report-print-fix 
fix: Query report print fix
 2019-06-03 12:10:31 +05:30
Saurabh
d65e607b7a
Merge pull request #7527 from saurabh6790/razopary_payent_capture_fix_hotfix 
fix: check payment status before capturing the payment
 2019-06-03 10:50:35 +05:30
deepeshgarg007
d5c908deb0 fix: Reset data after filter reset if data is not present 2019-05-31 16:26:53 +05:30
Deepesh Garg
bcbde4575e
Merge pull request #7613 from adityahase/fix-query-report-custom-columns-hotfix 
fix(query-report): Adding custom column data when result row is a tuple
 2019-05-30 19:11:39 +05:30
Aditya Hase
9b91dacd10 fix(query-report): Adding custom column data when result row is a tuple 
Result row can be a list, dict or a tuple.

Previously handled cases:
Case dict: row can be used as it is
Case list: row is converted to an equivalent dict

Unhandled case (fixed with this commit):
Case tuple: row is converted to a list so that it can be handled with the list case
 2019-05-30 17:58:42 +05:30
Rushabh Mehta
2241330b16
Merge pull request #7591 from deepeshgarg007/dashboard_fix 
fix: Remove dynamic link logic from make_new function
 2019-05-30 17:13:01 +05:30
Suraj Shetty
372575716d
fix: Use get_meta to avoid error 2019-05-30 15:36:36 +05:30
Suraj Shetty
997f3306aa
fix: Use get_meta to avoid error 2019-05-30 15:14:46 +05:30
Karthikeyan S
acd2f589b6 fix(Barcode): excluding Barcode feild from XSS FIlter (#7605) 
(cherry picked from commit e579b8960e1c34e7ad0bf794a10596b40530bc09)
 2019-05-30 13:51:14 +05:30
Sahil Khan
88ce01a28a Merge branch 'hotfix' 2019-05-30 12:08:16 +05:30
Sahil Khan
4584de59b5 bumped to version 11.1.32 2019-05-30 12:28:16 +05:50
Rohan
a03d37c196 fix(timeline): Render links in Comment-type communications (#7547) 2019-05-30 11:30:41 +05:30
Aditya Hase
e9c54ff6a8 fix(list-view): Escape quotes in data-name (#7599) 
Fixes misbehaviour in bulk actions when selected documents have names
with quotes.
 2019-05-30 10:52:36 +05:30
Shivam Mishra
b42ac9ae1f
Merge pull request #7594 from adityahase/fix-email-autosuggest 
fix(email): Search contacts by email_id as well
 2019-05-29 20:03:39 +05:30
Aditya Hase
279ec5e533 fix(email): Search contacts by email_id as well 
Email auto suggest now performs lookup on contact name and email_id fields
 2019-05-29 18:05:07 +05:30
Himanshu Mishra
0fa0d4324a perf: Don't fetch complete global unsubscribe (#7578) 
* Update queue.py

* Update email_unsubscribe.json

* Update email_unsubscribe.json
 2019-05-29 17:49:48 +05:30
sahil28297
74601c33ca
Merge pull request #7587 from surajshetty3416/fix-patch-hotfix 
fix: UniqueFieldnameError while migration
 2019-05-29 17:13:12 +05:30
Aditya Hase
5a3b2d87b6
fix: Update regex for capturing touched tables from query (#7590) 
fix: Update regex for capturing touched tables from query
 2019-05-29 14:55:47 +05:30
deepeshgarg007
abd822b943 fix: Remove dynamic link logic from make_new function 2019-05-29 14:36:10 +05:30
Saurabh
35c0b6b2fc
Merge pull request #7584 from rohitwaghchaure/issue_in_the_latest_version_of_babel_package 
fix: issue in the latest version of babel, set it to 2.6.0
 2019-05-29 13:40:48 +05:30
Aditya Hase
a1f441578c fix: Update regex for capturing touched tables from query 
Previous regex used to yield false positives and false negatives
for queries like

UPDATE tabToDo SET description = "something"

Instead of yielding "tabToDo" it used to yield "tabToDo SET".

Now two separate regexes handle single word and multi-word names
In case of multi-word surrounding quotes are a must
 2019-05-29 13:37:32 +05:30
Rohit Waghchaure
be427b1464 fix: issue in the latest version of babel, set it to 2.6.0 2019-05-29 13:13:10 +05:30
Suraj Shetty
5a194be77b fix: UniqueFieldnameError while migration 2019-05-29 13:06:49 +05:30
Faris Ansari
778bc4349b
fix: Check if value is string (#7583) 
Breaks the check when value is a map. So we reverse the check.
 2019-05-29 11:40:53 +05:30
rohitwaghchaure
4d7faa65c9
Merge pull request #7575 from rohitwaghchaure/same_result_set_showing_multiple_times 
fix: same result set shwoing multiple times in the multi-select popup
 2019-05-29 11:12:44 +05:30
Deepesh Garg
3992d7ab21 fix: Update frappe datatable (#7579) 2019-05-29 10:07:11 +05:30
Rohit Waghchaure
568ae60b7b fix: same result set shwoing multiple times in the multi-select popup 2019-05-28 23:44:10 +05:30
Sahil Khan
42393d8edb Merge branch 'hotfix' 2019-05-28 14:48:39 +05:30
Sahil Khan
ac99dbaf49 bumped to version 11.1.31 2019-05-28 15:08:39 +05:50
Saurabh
ff53e0269b
Merge pull request #7556 from Alchez/hotfix-route-history-issue 
fix: Fix routing issue causing dynamic links to disappear
 2019-05-28 12:14:47 +05:30
Faris Ansari
1f395ea91f
fix: Skip website attr for Custom DocTypes (#7565) 2019-05-28 10:23:08 +05:30
rohitwaghchaure
1c8b142d8c
Merge pull request #7559 from rohitwaghchaure/incorrect_schedule_in_the_auto_repeat 
fix: incorrect schedule showing in the auto repeat when document is in the draft mode
 2019-05-25 14:11:09 +05:30
Faris Ansari
6fdbb6fd79 fix: Error message for invalid Workflow Transition (#7552) 
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
 2019-05-25 11:55:46 +05:30
Rohit Waghchaure
b7712ebbd6 fix: incorrect schedule showing in the draft mode 2019-05-24 18:43:23 +05:30
Felipe Orellana
e6b3e91510 fix: Fixes route rewrite issue causing dynamic links on addresses to disapear 2019-05-24 15:54:20 +05:30
Anurag Mishra
2a4a658c3c fix: Bulk user permission unhandled condition(v11) (#7402) 
* fix: unhandled condition

* test: if changed from apply_to_all to apply_to_all

* fix: test_cases

* Update frappe/core/doctype/user_permission/test_user_permission.py

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>

* fix: tests

* fix: refactor
 2019-05-24 08:37:50 +05:30
Rushabh Mehta
c6b04ee94e
Merge pull request #7544 from deepeshgarg007/datatable-upgrade 
fix: Update frappe datatable
 2019-05-23 17:33:26 +05:30
Don-Leopardo
5fb0f468bd fix: Order and filters in query report custom template (#7359) 
* fix ordered with no template and new property: original_data

* fix no extra method
 2019-05-23 15:20:49 +05:30
Rushabh Mehta
b09b378391
Merge pull request #7450 from ci2014/patch-28 
Fix: Wrong variable used for this.lang_code
 2019-05-23 15:19:41 +05:30
Rushabh Mehta
1a7b7255df
Merge pull request #7448 from rasos/patch-1 
Apply Customer role instead of Blogger
 2019-05-23 15:10:43 +05:30
Suraj Shetty
d94c900244
Merge pull request #7542 from Mangesh-Khairnar/has-perm-fix 
fix: has permission decorator
 2019-05-23 15:10:39 +05:30
deepeshgarg007
e39239a8c1 Merge branch 'hotfix' of https://github.com/frappe/frappe into datatable-upgrade 2019-05-23 15:01:13 +05:30