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

35569 commits

This branch
This branch
All branches
Author SHA1 Message Date
hrwx
202cd9ba7d Merge branch 'develop' of github.com:frappe/frappe into multi_timezone_support 2021-11-29 16:48:42 +00:00
mergify[bot]
cb3533556b
Merge pull request #15114 from surajshetty3416/fix-deferred-insert 
fix: Use separate API to insert route history
 2021-11-29 13:38:17 +00:00
Suraj Shetty
aa40abadb1 refactor: Simplify method naming 2021-11-29 17:06:29 +05:30
Suraj Shetty
0e32d52e3a fix: Use separate API to insert route history 2021-11-29 16:38:15 +05:30
mergify[bot]
ed916090b8
Merge pull request #14457 from Aradhya-Tripathi/at/aggregations 
refactor: removed aggregation functions at db level
 2021-11-29 09:25:25 +00:00
Gavin D'souza
43fc713dd7 refactor: Remove Aggregation methods from DB API 
* Make it DRY & make it "better"
* Add to patches.txt so the patch runs :')
* Style fixes - tabs > spaces for consistency, removed unnecessary
  blocks
 2021-11-29 13:53:27 +05:30
Aradhya
e503d81173 perf: reduced no. of db calls 2021-11-29 13:07:31 +05:30
mergify[bot]
4cae147aed
fix: remove duplicate parent when child item option selected (backport #15101) (#15110) 
Co-authored-by: Bhavesh Maheshwari <bhavesh.freelancer95863@gmail.com>
 2021-11-29 09:23:52 +05:30
hrwx
5811a95d67 Merge branch 'develop' of github.com:frappe/frappe into multi_timezone_support 2021-11-28 10:28:40 +00:00
mergify[bot]
ee6624a156
Merge pull request #14073 from leela/refactor-linked-with 
refactor: getting submitted linked reference documents
 2021-11-28 04:31:34 +00:00
Suraj Shetty
491ca2b7c7
chore: Fix CODEOWNERS formatting 2021-11-28 09:57:55 +05:30
Suraj Shetty
615db9b55e style: Fix sider alerts 2021-11-28 09:44:05 +05:30
Suraj Shetty
63f318cbd1
Merge branch 'develop' into refactor-linked-with 2021-11-28 09:37:30 +05:30
mergify[bot]
e2143bd38a
Merge pull request #15103 from ankush/or_filters_rest 
feat(REST): OR filters in REST API
 2021-11-28 04:00:47 +00:00
mergify[bot]
00172a6cb5
Merge pull request #15105 from ankush/return_self 
fix: return self after submit/cancel
 2021-11-28 03:55:24 +00:00
Ankush Menat
88c3d92662 fix: return self after submit/cancel 
`Document.save` returns self but `submit` and `cancel` don't.

change:
For sake of consistency and better support for `run_method` via REST API, return the document.

ref: https://github.com/frappe/frappe/issues/14869
 2021-11-27 19:34:47 +05:30
Aradhya
69108c4c86 Merge branch 'develop' of github.com:Aradhya-Tripathi/frappe into at/aggregations 2021-11-27 17:52:30 +05:30
Ankush Menat
b1d0e574a0 feat(REST): OR filters in REST API 2021-11-27 17:17:05 +05:30
Aradhya
5339008fef feat: Added patch for replacing db level aggregation calls 2021-11-27 14:35:58 +05:30
hrwx
7d36487710 Merge branch 'develop' of github.com:frappe/frappe into multi_timezone_support 2021-11-26 17:26:10 +00:00
mergify[bot]
55103a92e6
Merge pull request #14987 from Aradhya-Tripathi/at/queries 
refactor: moving raw queries to frappe ORM
 2021-11-26 16:20:04 +00:00
Suraj Shetty
86fb8742a0
Merge pull request #15099 from surajshetty3416/fix-dark-mode-2 2021-11-26 21:03:02 +05:30
Suraj Shetty
58ca570f67 fix: Selection color in dark mode 2021-11-26 20:19:47 +05:30
mergify[bot]
ea772c4059
Merge pull request #15072 from pateljannat/customizations-onboarding 
feat: Customizations onboarding and form tour fixes
 2021-11-26 14:08:36 +00:00
mergify[bot]
2cf1766be8
Merge pull request #15091 from frappe/mergify/copy/develop/pr-14942 
fix: Image link render as text in print format (copy #14942)
 2021-11-26 14:06:22 +00:00
Michał Węglowski-Hodur
6b9b288259
fix: Correct the polish translations to correctly show buttons in Frappe framework. (#15093) 
Co-authored-by: Michał Węglowski-Hodur <michal.w.hodur@polkomtel.com.pl>
 2021-11-26 19:20:37 +05:30
Suraj Shetty
171ff3ba4c
fix: Make strings translatable 2021-11-26 19:16:40 +05:30
mergify[bot]
d9fceaa658
Merge pull request #15095 from gavindsouza/data-migration-plan 
refactor: get_mapping_module doesn't need to access to instance
 2021-11-26 12:15:48 +00:00
Gavin D'souza
5a6d7ee191 refactor: get_mapping_module doesn't need to access to instance 2021-11-26 17:29:44 +05:30
mergify[bot]
3a2753a4fa
Merge pull request #15094 from netchampfaris/safe-exec-as_json 
fix: add frappe.as_json for safe_exec scripts
 2021-11-26 11:21:52 +00:00
Faris Ansari
7e35dc4913 fix: add frappe.as_json for safe_exec scripts 2021-11-26 16:30:34 +05:30
Aradhya
b5c73648dc refactor: made DRY-er functions 2021-11-26 15:44:14 +05:30
Jannat Patel
b60452ca18 fix: removed unrelated code 2021-11-26 15:13:24 +05:30
Aradhya
e3bdf11006 refactor: moved aggregation functions to Query Builder 2021-11-26 14:19:59 +05:30
Jannat Patel
9a190c145e fix: translatable strings 2021-11-26 14:19:23 +05:30
Jannat Patel
971a581359 fix: order of reload for doctypes 2021-11-26 14:01:57 +05:30
mergify[bot]
132bcc7f9a
Merge pull request #12608 from LIS-Engineering/multiple_imap_folder 
feat: Optionally sync multiple IMAP folders in `Email Account`
 2021-11-26 08:03:57 +00:00
Aradhya
22434d065c feat: Added aggregation functions to qb functions 
refactor: changed args to aggregation funcs to match db level aggregation funcs
 2021-11-26 13:19:26 +05:30
Manuel
d57fe8f799
Update frappe/email/doctype/email_account/email_account.py 
Co-authored-by: Abhishek Saxena <33656173+saxenabhishek@users.noreply.github.com>
 2021-11-26 08:08:18 +01:00
Sagar Sharma
ba6d96855b fix: Image(link) render as text in print format 
(cherry picked from commit df3692b51e66771c9308a9c7c744c943c1f95752)
 2021-11-26 07:02:46 +00:00
mergify[bot]
6a1a210789
Merge pull request #15081 from sumaiya2908/fix-import-option-in-menu 
fix: import option in doctype menu when allow import is not selected
 2021-11-26 03:39:05 +00:00
mergify[bot]
06470dd1d7
Merge pull request #15060 from gavindsouza/refactor-commands 
refactor: Misc changes in commands
 2021-11-26 03:20:22 +00:00
Suraj Shetty
fdab567fc2
style: Remove unnecessary tabs 2021-11-26 08:47:54 +05:30
Suraj Shetty
48111964ad fix: Remove unnecessary style file for note 2021-11-25 22:06:50 +05:30
Summayya
beb87cecb0 refactor: add meta as separate parameter 2021-11-25 20:30:55 +05:30
Summayya
4d2f9157ae refactor: add meta as separate parameter 2021-11-25 20:25:04 +05:30
Manuel
171e8b06f8
Update frappe/email/doctype/email_account/email_account.py 
Co-authored-by: gavin <gavin18d@gmail.com>
 2021-11-25 13:30:45 +01:00
Jannat Patel
c13e1838d7 fix: module load issue, tour description and save field overlay 2021-11-25 17:57:07 +05:30
Suraj Shetty
83272fd1ec
style: Remove extra tabs 
Co-authored-by: gavin <gavin18d@gmail.com>
 2021-11-25 16:47:58 +05:30
Aradhya
0ea0f7dfa3 fix: fixed default ordering in execute 2021-11-25 16:39:44 +05:30