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

28552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rucha Mahabal
bf97382002 fix: row removed in child table not syncing when it has a dependency field 2020-12-23 13:09:53 +05:30
mergify[bot]
ee3c4943bf
Merge pull request #12088 from hrwX/patch-1 
fix: strip html before checking for null values
 2020-12-21 10:49:59 +00:00
Rushabh Mehta
4efe5a12e0
Merge pull request #12105 from rohitwaghchaure/fixed-module-removed-issue 
fix: do not remove the modules from txt file if developer mode is off
 2020-12-21 12:52:49 +05:30
Rohit Waghchaure
5a77383aa8 fix: donot remove the modules from txt file if developer mode is off 2020-12-19 13:21:28 +05:30
mergify[bot]
a6705135dc
fix: Link attachment in webform for new file (bp #12097) (#12102) 
(cherry picked from commit 85d6a640358fa0337aaac405e71b7d14395fb298)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-12-19 08:49:14 +05:30
Prssanna Desai
c47f03c48f
Merge pull request #12090 from prssanna/number-card-diff 
fix: rendering of percentage stat
 2020-12-18 14:42:04 +05:30
prssanna
afa8a74497 fix: rendering of percentage stat 2020-12-18 13:06:35 +05:30
sahil28297
018e45fdcc
chore: add space after if keyword 2020-12-18 00:13:49 +05:30
Suraj Shetty
41a3b8c284
fix(workflow): Update modified timestamp (#12093) 
To sync changes in https://github.com/frappe/frappe/pull/11787 after migrate
 2020-12-17 20:44:23 +05:30
Rushabh Mehta
c873c36971 feat(minor): add before_commit methods 2020-12-17 18:46:06 +05:30
Marica
d5a1faebcb
Merge pull request #11795 from gavindsouza/fix-broken-folders 
fix: Rename Doc (and others)
 2020-12-17 11:37:33 +05:30
Gavin D'souza
2b4299a105 test: Set frappe.conf.developer_mode for test_rename_doc 2020-12-17 11:18:13 +05:30
mergify[bot]
f94d5fc092
Merge pull request #12047 from frappe/snyk-fix-e205bf085ec74cf13bd3f75b89038f28 
chore(deps): Security upgrade highlight.js from 9.18.5 to 10.4.1
 2020-12-16 14:32:24 +00:00
Gavin D'souza
bd7ff5277c fix(hljs): Import core instead of highlight 
ref: https://unpkg.com/browse/highlight.js@10.4.1/lib/highlight.js
 2020-12-16 19:27:02 +05:30
Gavin D'souza
c876cdc63e fix: Update controllers via delete_doc and rename_doc only in 
developer_mode
 2020-12-16 19:04:59 +05:30
Himanshu
00255a4c9e
fix: strip html before checking for null values 
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
 2020-12-16 17:40:18 +05:30
Gavin D'souza
aea6123348 chore: Drop unused? highlight.pack.js 2020-12-16 17:39:29 +05:30
mergify[bot]
530a51f9ed
Merge pull request #11899 from conncampbell/11745-workflow-condition-date 
feat: Workflow transition condition allows datetime functions
 2020-12-16 10:22:21 +00:00
Gavin D'souza
5db02513e5 Merge branch 'develop' of github.com:frappe/frappe into snyk-fix-e205bf085ec74cf13bd3f75b89038f28 2020-12-16 15:50:19 +05:30
Gavin D'souza
ed01c67f54 style: Black over updated diffs 2020-12-16 15:19:41 +05:30
mergify[bot]
c68e2adb7a
Merge pull request #11961 from ruchamahabal/auto_repeat_weekdays 
feat: Ability to set weekdays for Auto Repeat with weekly frequency
 2020-12-16 09:19:29 +00:00
Rucha Mahabal
7d70e552aa chore: added a docstring for the get_next_schedule_date method 2020-12-16 12:09:10 +05:30
Rucha Mahabal
4c1756b3d6 fix: code clean-up and fallbacks for get method 2020-12-16 11:29:05 +05:30
Snyk bot
f4f7e8e798
chore(Snyk): Security upgrade frappe-charts from 1.5.4 to 1.5.5 (#12086) 2020-12-16 10:34:07 +05:30
Gavin D'souza
9d75094ba9 chore: Move reset flags to setup method 
Reason for unsetting flags in setUp:
1. frappe.flags.whatever is reset in each request...since it's a werzeug local (ref: https://werkzeug.palletsprojects.com/en/1.0.x/local/)
2. so until it is in the context of current request, it has the same value
3. when you call rename_doc via a request, it's flags are forgotten post that
4. but in a test suite, the whole module's tests run in a single process and the flags aren't (un|re)set
5. which is why frappe.flags.whatever has the same value throughout this module's tests
 2020-12-15 21:54:55 +05:30
marination
2d8550619d fix: Reset frappe.flag.link_fields in test 
- Reset frappe.flag.link_fields in rename doctype tests
- Teardown doctypes appropriately after test
 2020-12-15 16:04:16 +05:30
mergify[bot]
920f187f2a
Merge pull request #12010 from pateljannat/change-precision-for-percent-field 
fix: changing percent field precision to global default
 2020-12-15 09:07:47 +00:00
Gavin D'souza
8ef2f7ed18 style: Re-format and use const instead of var 2020-12-15 13:54:27 +05:30
Shivam Mishra
1051b694d2
Merge pull request #11897 from frappe/hrwX-patch-1 2020-12-15 13:29:49 +05:30
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
conncampbell
7a773d2461 feat: Workflow transition condition allows datetime functions 2020-12-14 20:07:39 -07: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
Rucha Mahabal
6398ca7db7 refactor: move common functions as methods to the Auto Repeat class 2020-12-11 12:11:07 +05:30
Rucha Mahabal
6350291dc2
Merge branch 'develop' into auto_repeat_weekdays 2020-12-11 11:39:42 +05:30
pateljannat
e7417ebe48 fix: fallback for percent field precision to 2 2020-12-11 11:31:56 +05:30
pateljannat
f0ae807df8 fix: fallback for global default precision 2020-12-11 10:31:36 +05:30