Commit graph

28487 commits

Author SHA1 Message Date
Shivam Mishra
dfd06f3a6b
Merge branch 'develop' into hrwX-patch-1 2020-12-15 13:24:03 +05:30
mergify[bot]
364caf24e5
Merge pull request #11900 from gwhitney/new_doc_callback
fix(quick entry): make sure init_callback is always called
2020-12-15 07:20:39 +00:00
Faris Ansari
06fcb82205
fix: call init_callback after set_route 2020-12-15 12:35:30 +05:30
mergify[bot]
c1665ac76a
Merge pull request #11880 from stephenBDT/fix-redis-dependency-during-setup-1
fix: No redis dependency during tests and install
2020-12-15 07:02:51 +00:00
Gavin D'souza
49b9540f4e Merge branch 'develop' of github.com:frappe/frappe into fix-redis-dependency-during-setup-1 2020-12-15 11:52:53 +05:30
mergify[bot]
71f4274012
Merge pull request #12081 from nextchamp-saqib/abs-value-in-pf-correction
fix: typo in Print Format Settings
2020-12-15 06:08:33 +00:00
mergify[bot]
52a8bcaf24
Merge pull request #12082 from frappe/dependabot/npm_and_yarn/ini-1.3.8
chore(deps): bump ini from 1.3.5 to 1.3.8
2020-12-14 13:22:06 +00:00
dependabot[bot]
8c539743cf
chore(deps): bump ini from 1.3.5 to 1.3.8
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-14 08:18:58 +00:00
mergify[bot]
718b8ae594
Merge pull request #12044 from deepeshgarg007/query_report_filter
fix: Query report filter
2020-12-14 07:24:13 +00:00
Saqib Ansari
9e4e36041a fix: toggling of show absolute values checkbox 2020-12-14 11:48:10 +05:30
Saqib Ansari
881c426296 fix: typo 2020-12-14 11:39:21 +05:30
Shivam Mishra
b348195643
Merge pull request #12013 from scmmishra/print-layout-fix
fix: check if print settings has landscape
2020-12-14 11:09:02 +05:30
Saurabh
d9e5e97bc1
Merge pull request #12053 from frappe/s3_backup
feat: remove useless functionality
2020-12-11 14:26:48 +05:30
mergify[bot]
ff13e303d0
Merge pull request #12077 from saurabh6790/cache_bench_apps_from_app_txt
fix: cache bench apps
2020-12-11 08:10:49 +00:00
Saurabh
5f708fa160 feat: cache bench apps 2020-12-11 12:47:16 +05:30
Nabin Hait
5630298603
fix: Reload server script via patch (#12076) 2020-12-11 12:34:09 +05:30
mergify[bot]
10626eede4
Merge pull request #12019 from nextchamp-saqib/abs-value-in-pf
feat: show absolute value in print format
2020-12-10 14:58:33 +00:00
Saqib Ansari
0651341bf8 feat: show absolute value checkbox if doctype has appropriate fields 2020-12-10 20:01:06 +05:30
mergify[bot]
ff3148dbd2
Merge pull request #11979 from everyx/develop
fix: `PRIMARY KEY must be NOT NULL` error when install with MySQL 5.7+
2020-12-10 12:55:27 +00:00
mergify[bot]
0217146485
Merge pull request #12069 from ruchamahabal/auto-repeat-submit-on-creation
feat(Auto Repeat): Submit on Creation configuration
2020-12-10 12:26:05 +00:00
Rucha Mahabal
ec0d1dd63f fix: added server side validation for submit on creation 2020-12-10 17:18:13 +05:30
Faris Ansari
2b9d176630
Merge pull request #12033 from netchampfaris/fix-base-path-restore 2020-12-10 14:07:21 +05:30
Faris Ansari
9e954a7372 style: quotes 2020-12-10 13:52:21 +05:30
Faris Ansari
5a60048a0a test: for get_bench_relative_path 2020-12-10 12:31:01 +05:30
Rucha Mahabal
30fbf37f25 test: submit on creation 2020-12-10 11:48:12 +05:30
Faris Ansari
6289d7dd59
Merge pull request #12056 from anupamvs/date-format
feat: added data format support DD-Mon-YY
2020-12-10 11:17:38 +05:30
mergify[bot]
8919645f32
Merge pull request #12067 from scmmishra/fix-seconds-cint
fix: cint seconds before operations
2020-12-10 05:26:04 +00:00
Rucha Mahabal
c805851ebe feat(Auto Repeat): Submit on Creation configuration 2020-12-10 10:52:50 +05:30
Shivam Mishra
86bf61ccf9
Merge pull request #12002 from scmmishra/fix-localstorage-quota-exceed 2020-12-10 10:42:06 +05:30
Shivam Mishra
c5d0830553 fix: cint seconds before operations 2020-12-10 10:37:29 +05:30
Faris Ansari
b08d834363
Merge pull request #12034 from netchampfaris/permission-query-server-script 2020-12-09 20:37:00 +05:30
Faris Ansari
3f8b4a70f4
Merge branch 'develop' into permission-query-server-script 2020-12-09 19:51:37 +05:30
mergify[bot]
a3bad373ca
Merge pull request #12018 from scmmishra/feat-allow-html-in-email-temlate
feat: allow html in email templates
2020-12-09 12:58:06 +00:00
Shivam Mishra
b2b36c852d
Merge pull request #12050 from prssanna/shorten-number
refactor: shorten_number function
2020-12-09 16:58:28 +05:30
Shivam Mishra
948f4171e3
Merge pull request #12057 from prssanna/dashboard-filter-modules 2020-12-09 16:55:05 +05:30
Shivam Mishra
309f483bb3
refactor: update return statement 2020-12-09 16:54:40 +05:30
Anupam
e197a6fd7f feat: added data format support DD-Mon-YY 2020-12-08 17:07:32 +05:30
prssanna
3a11ef3365 fix: filter dashboards, dashboard charts, number cards by modules 2020-12-08 12:46:16 +05:30
barredterra
fc97e080c6 feat: remove useless functionality 2020-12-07 16:32:19 +01:00
mergify[bot]
0712d01d43
Merge pull request #12030 from anupamvs/customize-from
feat: provision to open child table in customize form
2020-12-07 10:21:23 +00:00
prssanna
c5677b52d0 refactor: shorten_number function
- pass min_length and max_no_of_decimals
2020-12-07 15:49:22 +05:30
Faris Ansari
60a55cbcf8
Merge pull request #12035 from netchampfaris/newsletter-render-template
fix(newsletter): Render template for HTML content type
2020-12-07 14:17:42 +05:30
Shivam Mishra
055a97898d
Merge pull request #12038 from prssanna/assign-to-label
fix: label for _assign field
2020-12-07 11:54:04 +05:30
Deepesh Garg
b1cab9a9c1 fix: Query report filter 2020-12-05 19:26:52 +05:30
Prssanna Desai
b267084f21
Merge pull request #12039 from prssanna/number-card-diff-fix
fix: use frappe.utils.shorten_number
2020-12-04 19:35:04 +05:30
prssanna
beec0b48fb fix: use frappe.utils.shorten_number 2020-12-04 18:31:16 +05:30
Gavin D'souza
3ce680a5f9 Merge branch 'develop' of github.com:frappe/frappe into fix-base-path-restore 2020-12-04 18:17:59 +05:30
Gavin D'souza
1b609af8e5 fix: Handle paths relative to bench root and sites folder 2020-12-04 18:15:17 +05:30
Abhishek Balam
3676f8dc6f
Merge pull request #11720 from saurabh6790/format-email-fix
fix: validate email id before passing to formataddr
2020-12-04 17:42:53 +05:30
Abhishek Balam
d229e363b3 fix: revert cstr import added 2020-12-04 17:10:42 +05:30