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

32302 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nabin Hait
ac5c2c1bf9 fix: merge conflict 2021-05-11 16:10:07 +05:30
Suraj Shetty
6f359bedbc
Merge pull request #13188 from frappe/mergify/bp/version-13-hotfix/pr-13106 
fix: Use docfields from options if no docfields are returned from meta (backport #13106)
 2021-05-11 09:46:23 +05:30
Suraj Shetty
4ce21b6379
Merge pull request #13182 from frappe/mergify/bp/version-13-hotfix/pr-13177 
fix: Do not skip data in save while using shortcut (backport #13177)
 2021-05-11 09:17:19 +05:30
David Angulo
df05f3ae82 fix: Use docfields from options if no docfields are returned from meta 
(cherry picked from commit b7b92845f0)
 2021-05-10 18:32:25 +00:00
gavin
e31ecafb64
Merge pull request #13186 from frappe/mergify/bp/version-13-hotfix/pr-12242 
fix: Don't evaluate dynamic properties to check if conflicts exist (backport #12242)
 2021-05-10 19:12:56 +05:30
gavin
86d2989c52 fix: Avoid possible whitespace bug 
* Handles semgrep warning
* Changed "" to None as a precaution against future whitespace bugs via human error

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit c84feb16e9)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
1eb84ad5e5 fix: Skip field-method conflicts validation on new docs 
(cherry picked from commit 926d13e69e)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
34372e278e fix: Use older logic to set module_name and custom vars 
(cherry picked from commit 87ed7796de)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
b343db84a0 fix: Use fallback values if doctype values unset 
(cherry picked from commit 877f9d08df)
 2021-05-10 13:04:46 +00:00
Gavin D'souza
56606ebc44 refactor: Rename function and add docstring 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 843c544117)
 2021-05-10 13:04:46 +00:00
Gavin D'souza
8d8a6cbd5d fix: Check for db value if cache doesn't exist 
in get_controller, if cached value doesn't exist for a DocType in the
frappe.db.value_cache, then query the db as fallback before the final
fallback of assuming module as Core and non custom

(cherry picked from commit 05712abc60)
 2021-05-10 13:04:45 +00:00
Gavin D'souza
804e4e212d fix: Use Document in case get_controller raises import errors 
(cherry picked from commit a3b79081d6)
 2021-05-10 13:04:45 +00:00
Gavin D'souza
1e55ab34c3 fix: Ignore 'special' DocTypes to avoid breaking changes 
eg:

Fieldname 'Delete' conflicting with a controller method of the name delete in Custom DocPerm
Fieldname 'Delete' conflicting with a controller method of the name delete in DocPerm
Fieldname 'Precision' conflicting with a controller method of the name precision in Custom Field
Fieldname 'Precision' conflicting with a controller method of the name precision in Customize Form Field
Fieldname 'Precision' conflicting with a controller method of the name precision in DocField

(cherry picked from commit ce4253c631)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
b200b6dbb6 chore: Drop dead file 
(cherry picked from commit 78e1297392)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
0b06a67aee feat: Validate field name conflicts in DocType.validate 
# Conflicts:
#	frappe/core/doctype/doctype/doctype.py

(cherry picked from commit c652c7b7f5)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
f7f400985b chore: Rename function to validate conflicting methods and properties 
(cherry picked from commit 255a959a3e)
 2021-05-10 13:04:43 +00:00
Gavin D'souza
1154753a6f fix: Don't execute dynamic properties to check if conflicts exist 
(cherry picked from commit 9aa2f366dd)
 2021-05-10 13:04:43 +00:00
Suraj Shetty
3b4382bf8b fix: Do not skip text in save while using shortcut 
(cherry picked from commit 36d6d224df)
 2021-05-10 10:53:18 +00:00
rohitwaghchaure
4f408730bb
Merge pull request #13149 from rohitwaghchaure/cherk-delete-permission 
fix: show delete button on portal if user has permission to delete document
 2021-05-10 12:49:21 +05:30
Nabin Hait
0f64358f0b Merge branch 'version-13-pre-release' into version-13 2021-05-08 17:18:38 +05:30
Nabin Hait
0bbf7c89bf bumped to version 13.2.2 2021-05-08 17:38:38 +05:50
Suraj Shetty
579b712924
Merge pull request #13166 from frappe/mergify/bp/version-13-pre-release/pr-13098 
fix(setup): do not show messsage when exception is handled (backport #13098)
 2021-05-08 17:11:02 +05:30
Sagar Vora
bf33a80042 fix(setup): do not show messsage when exception is handled 
(cherry picked from commit ac9fe71733)
 2021-05-08 11:40:16 +00:00
gavin
36fe9020a8
Merge pull request #13128 from frappe/mergify/bp/version-13-hotfix/pr-13102 
refactor(CLI): Show config (backport #13102)
 2021-05-07 13:01:07 +05:30
Gavin D'souza
3b5c54df54 Merge branch 'version-13-hotfix' of github.com:frappe/frappe into mergify/bp/version-13-hotfix/pr-13102 2021-05-07 12:34:45 +05:30
gavin
477e5e78e9
Merge pull request #13125 from frappe/mergify/bp/version-13-hotfix/pr-12966 
feat(cli): Format Option for list-apps (backport #12966)
 2021-05-07 12:32:48 +05:30
Gavin D'souza
983e29d666 chore(cli): Add pending deprecation warning 
* Add PDW for --as-dict in command set-config
* Move all top level imports inside each util to optimize imports for
  CLI
* Set always show filter for DeprecationWarning, PendingDeprecationWarning via frappe module

(cherry picked from commit bf9fcb3)

---

Conflicts Resolved. 1 Pending

Depends on https://github.com/frappe/frappe/pull/13125
 2021-05-07 12:30:15 +05:30
Suraj Shetty
bd8ce96a00
Merge pull request #13151 from frappe/mergify/bp/version-13-hotfix/pr-13121 
feat(DX): Add simple __repr__ for DocTypes (backport #13121)
 2021-05-07 11:50:26 +05:30
Suraj Shetty
c10ae1d291
Merge pull request #13156 from frappe/mergify/bp/version-13-hotfix/pr-13155 
fix: Typo (backport #13155)
 2021-05-07 11:44:46 +05:30
Suraj Shetty
e869f8fc04 fix: Typo 
(cherry picked from commit a2bb92f6a4)
 2021-05-07 06:14:16 +00:00
Suraj Shetty
ff04aee051
Merge pull request #13154 from frappe/mergify/bp/version-13-hotfix/pr-13153 2021-05-07 11:26:40 +05:30
Suraj Shetty
bb276f08f5 fix: Quill Table border color 
(cherry picked from commit 4fb545fb8c)
 2021-05-07 05:37:06 +00:00
Suraj Shetty
c5da8436c2 fix: Summary Item width 
(cherry picked from commit 5fabd51a03)
 2021-05-07 05:37:06 +00:00
Ankush Menat
c9fd0031dc feat(DX): Add __repr__ and __str__ for DocTypes 
- Show doctype and name
- if docstatus != 0, show docstatus
- if child doctype, show parent

(cherry picked from commit adbf267212)
 2021-05-07 04:44:36 +00:00
Rohit Waghchaure
a302393bc2 fix: show delete button on portal if user has permission to delete document 2021-05-06 23:23:21 +05:30
Nabin Hait
10c8e3430c Merge branch 'version-13-pre-release' into version-13 2021-05-06 19:15:43 +05:30
Nabin Hait
abc49ef960 bumped to version 13.2.1 2021-05-06 19:35:43 +05:50
Nabin Hait
a280547c22
perf: Performance enhancement on creation of custom fields from setup wizard (#13139) 2021-05-06 17:05:55 +05:30
Nabin Hait
a5ea898204
perf: Performance enhancement on creation of custom fields from setup wizard (#13137) 2021-05-06 17:05:33 +05:30
Suraj Shetty
4010dfbcd7
Merge pull request #13119 from frappe/mergify/bp/version-13-hotfix/pr-12965 2021-05-05 18:02:09 +05:30
Gavin D'souza
769d1f4ec4 refactor(minor): Bench set-config 
* Replace --as-dict with a more apt --parse
* Fixed styling
* Renamed variables

(cherry picked from commit 8cd6b520ed)
 2021-05-05 12:31:59 +00:00
Gavin D'souza
8f0ae65b9b chore: Drop redundant command auto-deploy 
(cherry picked from commit 73ff84da8e)
 2021-05-05 12:31:59 +00:00
Gavin D'souza
0ea3c3f2a5 fix(bench-console): Show only apps in namespace 
(cherry picked from commit 3c1b6c66d9)
 2021-05-05 12:31:59 +00:00
Gavin D'souza
affeb672a6 fix: Show complete frappe.conf including common conf 
(cherry picked from commit bcbc0d0a7c)
 2021-05-05 12:31:59 +00:00
Gavin D'souza
b30980ebf5 test: Add tests for bench show-config 
(cherry picked from commit 3b34474f8d)

# Conflicts:
#	frappe/tests/test_commands.py
 2021-05-05 12:31:59 +00:00
Gavin D'souza
e9fab5da38 fix: Format JSON outputs better 
(cherry picked from commit 991965fe6b)

# Conflicts:
#	frappe/commands/site.py
 2021-05-05 12:31:59 +00:00
Gavin D'souza
fa5dabca1a feat(cli): Format option in bench show-config 
(cherry picked from commit 95db79a1d0)
 2021-05-05 12:31:59 +00:00
Gavin D'souza
229e472820 refactor: bench show-config 
* Handle no site being specified. Fixes https://github.com/frappe/frappe/issues/13100
* Remove tabbed output in favour of table
* Add multi site support

(cherry picked from commit bb25caa97f)
 2021-05-05 12:31:58 +00:00
Suraj Shetty
0014cf3b09
Merge pull request #13126 from frappe/mergify/bp/version-13-hotfix/pr-13120 
perf(PDDR): Replace filter_by like with full text filter (backport #13120)
 2021-05-05 18:00:55 +05:30
Suraj Shetty
765ef10434
Merge pull request #13124 from frappe/mergify/bp/version-13-hotfix/pr-12996 2021-05-05 18:00:45 +05:30