Commit graph

27657 commits

Author SHA1 Message Date
mergify[bot]
fb5e2fd33f
Merge pull request #11479 from KanchanChauhan/padding-in-about-page
fix(About Us): Padding in About Us page sections
2020-09-23 08:15:10 +00:00
Shivam Mishra
7920ba34db
Merge pull request #11468 from prssanna/report-reorder-columns
fix(Reports): reorder result for custom columns
2020-09-23 13:31:49 +05:30
mergify[bot]
2c3fd72c72
Merge pull request #11552 from netchampfaris/fix-frappe-defaults-import
fix: Remove unused import
2020-09-23 07:45:43 +00:00
Faris Ansari
a28d328f04
Merge pull request #11411 from ruchamahabal/fix-duration-control-import-export 2020-09-23 12:52:07 +05:30
Shivam Mishra
0ddf55aef2
Merge pull request #11544 from rmehta/web-page-dynamic-route
feat(web_page): add dynamic routes to web page like /project/<project>
2020-09-23 12:37:11 +05:30
Faris Ansari
dfa1cc3d42
Merge pull request #11528 from abhishekbalam-xyz/owner_fix
fix(DocType): Reset "owner" and "modified_by" values in DocTypes to Administrator
2020-09-23 12:34:18 +05:30
Rucha Mahabal
bb4e6faad5
fix: exporter.py
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2020-09-23 09:43:57 +05:30
Rucha Mahabal
175c2fdb65
Merge branch 'develop' into fix-duration-control-import-export 2020-09-23 09:39:32 +05:30
Abhishek Balam
76422328b5 fix: override values on save now 2020-09-22 19:12:35 +05:30
Faris Ansari
f010a08796 fix: Remove unused import 2020-09-22 17:37:41 +05:30
mergify[bot]
fdf74f131f
Merge pull request #11551 from ruchamahabal/fix-grid-upload-develop
fix: Validate whether file type is CSV in Grid Upload
2020-09-22 10:03:06 +00:00
Rucha Mahabal
d1083d6b87 fix: Validate whether file type is CSV in Grid Upload 2020-09-22 15:13:59 +05:30
Rucha Mahabal
91714386e7
chore: revert #10917 (#11540) 2020-09-22 12:34:58 +05:30
mergify[bot]
31cb17f416
Merge pull request #11400 from gavindsouza/uninstall-app-for-non-existing-apps
fix: Uninstall App even if it doesn't exist on bench
2020-09-22 03:54:42 +00:00
Abhishek Balam
94e7f23d0a fix: override modified_by to 'Administrator' to non-custom doctypes 2020-09-21 22:33:04 +05:30
Prssanna Desai
bb5ea19255
Merge pull request #11543 from prssanna/auto-email-report-filters 2020-09-21 18:52:46 +05:30
Rushabh Mehta
5006ec8f51 feat(web_page): add dynamic routes to web page like /project/<project> 2020-09-21 16:51:06 +05:30
prssanna
0907474ca9 fix: fetch report filters when report is selected 2020-09-21 15:42:48 +05:30
Wolfram Schmidt
a4c7eb9620
Update salutation.json (#11501)
Abbility to merge salutations after creation. Usefull when Mistakes are made like "Mrs." and "Mrs"

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-09-21 15:04:08 +05:30
Prssanna Desai
94f505396f
Merge pull request #11533 from josephalbaph/patch-1
fix: Fix misaligned columns for Exported Excel reports
2020-09-21 14:19:57 +05:30
Shivam Mishra
df6c52cac1
Merge pull request #11525 from Mangesh-Khairnar/fix-document-follow
fix(document-follow): reduce time taken to check existing records
2020-09-21 13:28:05 +05:30
mergify[bot]
29da83f22a
Merge pull request #11537 from scmmishra/category-patch-fix
fix: reload doc before blog patch
2020-09-21 07:15:06 +00:00
mergify[bot]
176929d8a4
Merge pull request #11535 from gavindsouza/fix-name-validation
fix: Don't allow trailing or leading whitespace in DocType name
2020-09-21 07:09:59 +00:00
Shivam Mishra
20828ecedf
Merge pull request #11536 from ruchamahabal/datatable-fix 2020-09-21 12:38:08 +05:30
Shivam Mishra
208417b930 feat: reload doc before blog patch 2020-09-21 12:27:37 +05:30
Rushabh Mehta
b52dad05e9
Merge pull request #11439 from rmehta/document-naming
feat(document naming): Rule based naming of documents
2020-09-21 12:01:25 +05:30
Rushabh Mehta
282194ef13 fix(document_naming_rule): added priority and removed field based naming 2020-09-21 10:28:11 +05:30
Rushabh Mehta
9fb360ce92 fix(tests): comment out randomly failing recroder.js test 2020-09-21 10:28:11 +05:30
Rushabh Mehta
cf1fd732c4 fix(naming): give first priority to rule, try and fix recorder test 2020-09-21 10:28:11 +05:30
Rushabh Mehta
70baf49c6e fix(data): dont try casting if doctype is missing 2020-09-21 10:28:11 +05:30
Rushabh Mehta
542553b401 fix(naming): ignore table missing + linting 2020-09-21 10:28:11 +05:30
Rushabh Mehta
8696bc3cd1 fix(naming): ignore table missing + linting 2020-09-21 10:28:11 +05:30
Rushabh Mehta
334ae82e52 fix(naming): added multiple rules for naming series 2020-09-21 10:28:11 +05:30
Rushabh Mehta
21419645f8 feat(document naming): [wip] rule based naming of documents 2020-09-21 10:28:11 +05:30
Rucha Mahabal
306e4be69d fix: sider 2020-09-20 23:49:55 +05:30
Gavin D'souza
6bf41f3a69 fix: Don't allow trailing or leading whitespace in DocType name 2020-09-20 17:15:10 +05:30
Joseph Marie Alba
2432f39bd3
Fix misaligned columns for Exported Excel reports
Exported Query Reports have data rows that are not aligned with Column headers because they include the Currency (in Column B) which should be hidden.
This fix makes data rows check if the column is not hidden because adding the data.
2020-09-20 00:12:02 +08:00
Abhishek Balam
6bddca6598 fix: change owner value in doctype jsons to Administrator 2020-09-18 18:05:40 +05:30
Faris Ansari
aadb3e7150
Merge pull request #11285 from netchampfaris/aaaa-website-enhancements-for-redesign 2020-09-18 16:43:43 +05:30
Faris Ansari
958d5f5597 style: sider suggestions 2020-09-18 16:28:11 +05:30
Faris Ansari
bbdbc0d947 Merge remote-tracking branch 'upstream/develop' into aaaa-website-enhancements-for-redesign 2020-09-18 16:17:15 +05:30
Faris Ansari
fd9576a9a7 fix: Brand input styles 2020-09-18 14:31:26 +05:30
Faris Ansari
4a38a3178e fix: Set max width on hero title 2020-09-18 14:31:26 +05:30
Faris Ansari
de8c021eea fix: Scope card styles to section-with-cards 2020-09-18 14:30:58 +05:30
mergify[bot]
b493503290
Merge pull request #11514 from prssanna/notification-recipients
fix: handle None value in recipients while sending system notification
2020-09-18 06:44:53 +00:00
Suraj Shetty
f3132fa301
fix: Always return list from get_list_of_recipients 2020-09-18 11:59:34 +05:30
mergify[bot]
5bf20116f0
Merge pull request #11485 from resilient-tech/fix-grid_df_onload
fix: TypeError occuring due to modification of modified function
2020-09-17 13:09:59 +00:00
Rucha Mahabal
e9783fe7b2 feat: add datatable.js 2020-09-17 15:02:48 +05:30
Mangesh-Khairnar
916c363001 fix(document-follow): reduce time taken to check existing records 2020-09-17 12:56:04 +05:30
Rucha Mahabal
29fc0a8c0c fix: validate duration value while converting to seconds 2020-09-17 11:47:39 +05:30