Commit graph

17975 commits

Author SHA1 Message Date
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
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
deepeshgarg007
a0ac414311 fix: Upgrade frappe datatable 2019-05-23 15:00:43 +05:30
Rushabh Mehta
f75f5de49f
Merge pull request #7354 from fproldan/childtable_for_report_error
fix: childtable error in editable report builder
2019-05-23 14:54:21 +05:30
Rushabh Mehta
e1de942ced
Merge pull request #7499 from surajshetty3416/custom-doctype-patch
fix: Add a patch to apply customization to custom doctype
2019-05-23 14:47:59 +05:30
Mangesh-Khairnar
18015dfcf7 fix: has permission 2019-05-23 13:16:02 +05:30
Mangesh-Khairnar
5e4f3d6e17 fix: print format builder setup (#7526)
* fix: print format builder setup

* style: change formatting
2019-05-23 09:37:04 +05:30
Sahil Khan
a41a9cb8d4 Merge branch 'hotfix' 2019-05-22 15:53:32 +05:30
Sahil Khan
44e6d3338f bumped to version 11.1.30 2019-05-22 16:13:32 +05:50
rohitwaghchaure
4aaea40a72 fix: not able to make print format using Print Format Builder (#7533)
* fix: not able to make print format using Print Format Builder

* fix: Set default based_on as "Standard"
2019-05-22 14:58:48 +05:30
Anurag Mishra
5c8acb3303 fix: Doctype some test and fixes (#7535)
* fix: code refactor

* test: added validation test
2019-05-22 14:57:51 +05:30
Himanshu
e2171bbb03 fix(Addresses and Contacts Report): Frappe throw when doctype has no records (#7503) 2019-05-21 14:51:09 +05:30
Nabin Hait
f4778027d6 fix: Allow eligible fields to be updated from notifications (#7517) 2019-05-21 14:49:55 +05:30
Sahil Khan
1a06bc2c15 Merge branch 'hotfix' 2019-05-21 14:07:05 +05:30
Sahil Khan
e4aedc3e66 bumped to version 11.1.29 2019-05-21 14:27:05 +05:50
Deepesh Garg
90bc741c98 fix: Create new button for dynamic link fields (#7510)
* fix: Create new button for dynamic links

* fix: Use get_options for fetching options
2019-05-20 12:19:22 +05:30
Suraj Shetty
4e501f931e
Merge pull request #7515 from deepeshgarg007/moduleview_hotfix
fix: Module view fix for custom query reports
2019-05-20 10:24:44 +05:30
Suraj Shetty
bcf645ad9b fix: Typo 2019-05-20 10:18:05 +05:30
deepeshgarg007
183564f3af fix: Module view fix for custom reports 2019-05-19 17:44:46 +05:30
Suraj Shetty
a5a494f498 Merge branch 'custom-doctype-patch' of github.com:surajshetty3416/frappe into custom-doctype-patch 2019-05-18 16:18:24 +05:30
Suraj Shetty
6cfdbb1e4a Merge branch 'hotfix' of https://github.com/frappe/frappe into custom-doctype-patch 2019-05-18 16:16:57 +05:30
Anurag Mishra
2d62cd60ee fix: Report Print format for indented rows (#7506) 2019-05-16 17:37:06 +05:30
Rushabh Mehta
946fbc6865
Merge pull request #7487 from netchampfaris/surinamese-dollar
fix: Add currency code for Surinamese dollar
2019-05-16 15:03:36 +05:30
Rushabh Mehta
068e6279f6
Merge pull request #7439 from saurabh6790/read_from_secondary_hotfix
fix: naming and provision to use same db credentails for secondary
2019-05-16 14:40:17 +05:30
Suraj Shetty
62eb5e68f4
style: Use prop instead of property as it's a keyword 2019-05-16 12:44:29 +05:30
Suraj Shetty
07340d7852 fix: Add a patch to apply customization to custom doctype
This patch aims to apply & delete all the customization
on custom doctypes done through customize form

This is required because customize form in now blocked
for custom doctypes and user may not be able to
see previous customization
2019-05-16 09:31:05 +05:30
Rushabh Mehta
54cbf64f72
Merge pull request #7491 from saurabh6790/permissions_fixes_prepared_report
fix: permission fixes for prepared report
2019-05-16 09:09:55 +05:30
Deepesh Garg
f59c4eb554 fix: Don't show no value type fields in options for custom columns (#7496)
* fix: Don't show no value type fields in options for custom columns

* fix: Use filter instead of pushing in list
2019-05-15 15:41:46 +05:30
Saurabh
73964e7a61 fix: permission fixes for prepared report 2019-05-15 13:42:42 +05:30
rohitwaghchaure
c947f0432b
Merge pull request #7471 from rohitwaghchaure/auto_repeat_not_showing_correctly_schedule_date
fix: auto repeat showing next schedule date wrong for backdated entries
2019-05-15 13:02:28 +05:30
Saurabh
df6a41045e
Merge pull request #7378 from cjpit/ldap3upgrade
feat: Ldap rewrite/upgrade
2019-05-15 13:02:06 +05:30
Suraj Shetty
605b9e2065
Merge pull request #7484 from rohitwaghchaure/pagination_in_the_multi_select_modal
feat: added more button in the multi select modal
2019-05-15 12:50:06 +05:30
Rohit Waghchaure
c7c1d88adc fixed test cases 2019-05-15 12:33:34 +05:30
Rohit Waghchaure
e51025cc58 feat: added more button in the multi select modal 2019-05-15 12:16:05 +05:30
Faris Ansari
65fca28d87 fix: Add currency code for Surinamese dollar 2019-05-15 11:39:31 +05:30
Suraj Shetty
135c8f14ed
Merge pull request #7416 from scmmishra/link-fix
fix: link_title not getting set in address and contact
2019-05-14 20:16:15 +05:30
Shivam Mishra
959d0c260d
Merge pull request #7482 from sahil28297/fix_contact_patch
fix(patch): reload dynamic link doctype
2019-05-14 19:38:40 +05:30
Sahil Khan
84b9268019 fix(patch): reload dynamic link doctype 2019-05-14 18:50:51 +05:30
rohitwaghchaure
fa3b03c227
Merge pull request #7480 from rohitwaghchaure/incorrect_data_showing_in_the_modal
fix: if more than 20 records are available then system removing last row in the multi select modal
2019-05-14 17:45:58 +05:30
Rohit Waghchaure
e2a945efaf fix: if more than 20 records are available the system removing last row 2019-05-14 17:32:57 +05:30
Sahil Khan
7975118ee1 Merge branch 'hotfix' 2019-05-14 16:46:03 +05:30
Sahil Khan
b7161378d5 bumped to version 11.1.28 2019-05-14 17:06:03 +05:50
Shivam Mishra
7aa258e6b8 style: moved set_link_title to address_and_contact 2019-05-14 16:13:22 +05:30
Deepesh Garg
65b04ea494 fix: Added dynamic links in dashboard (#7475) 2019-05-14 15:06:43 +05:30
Nabin Hait
b2f897746a fix: get month diff between 2 dates (#7474) 2019-05-14 15:04:48 +05:30
Rohit Waghchaure
de3560f1b2 fix: auto repeat showing next schedule date wrong for backdated entries 2019-05-14 14:01:49 +05:30