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

38625 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shariq Ansari
6a3e43789b
Merge branch 'develop' into enable-further-translations 2022-06-28 17:43:06 +05:30
Samuel Danieli
d58f2ed8e7
fix: german translations (#17324) 2022-06-28 17:28:27 +05:30
mergify[bot]
996cd58279
Merge pull request #17290 from resilient-tech/fix-expense-svg 
fix: improve SVG for expenses icon
 2022-06-28 11:48:19 +00:00
Shariq Ansari
4dff0d25a3
feat: add email retry limit in system settings (#17259) 
**MAX_RETRY_COUNT** for email was hard coded as 3. Added **Email Retry Limit** field in **Email** section in **System Settings** 

<img width="754" alt="image" src="https://user-images.githubusercontent.com/30859809/174769592-97c27a5b-9fea-471f-b596-593de4c5f91f.png">

>no-docs
 2022-06-28 10:47:26 +00:00
Shariq Ansari
971b8160a3
fix: extra column in excel after exporting report with group by (#17126) 
Co-authored-by: gavin <gavin18d@gmail.com>
 2022-06-28 12:39:45 +05:30
Ankush Menat
9e1d7742eb
Merge pull request #17329 from ankush/next_execution 
fix(UX): show next execution time on scheduled job
 2022-06-28 12:34:41 +05:30
Ankush Menat
6001864888 fix(UX): show next execution time on scheduled job 2022-06-28 12:27:11 +05:30
Ankush Menat
4bf7cd8210 fix: ignore virtual docfield property conflicts 2022-06-28 12:27:11 +05:30
Ankush Menat
9bd753551b
ci: temp fix for semgrep (#17228) 
* ci: respekt my authoritah

* ci: use pip semgrep
 2022-06-28 12:07:34 +05:30
Shariq Ansari
c6fa8ab090
fix: email not sent if contain file with current site url (#17250) 2022-06-28 11:50:57 +05:30
mergify[bot]
f7761c7d43
Merge pull request #17322 from resilient-tech/pass-shared 
fix(redis): pass shared param when setting value based on generator
 2022-06-28 05:01:58 +00:00
Samuel Danieli
19a1393152 feat: make field label translatable 2022-06-27 23:32:55 +02:00
Samuel Danieli
3263bf8324 style: indent 2022-06-27 22:19:05 +02:00
Samuel Danieli
5604b090c0 feat: enable further translations 2022-06-27 22:15:23 +02:00
Sagar Vora
b7514a05ca fix(redis): pass shared param when setting value based on generator 2022-06-28 00:37:31 +05:30
Ankush Menat
112f113598
fix!: remove dangerous "rollback_on_exception" flag (#17321) 2022-06-27 17:04:34 +05:30
Ankush Menat
fba75c3595
fix: use console.error for logging errors (#17318) 
Currently if uncaught exception occurs on server side, there's no simple
way to find it out. Converting these console.log to console.error
simplifies this for UI tests.

Also converted `console.trace to` `console.error`; Both are practically same
and give stack trace too, `trace` expands tracebacks by default. This is
done to make spying on window.console.error easier.
 2022-06-27 15:55:54 +05:30
gavin
0a198621f7
Merge pull request #17320 from gavindsouza/doc-not-found 
refactor(minor): get_permissions API
 2022-06-27 15:44:28 +05:30
Gavin D'souza
084a1e6c31 refactor: get_permissions 
* Show page even if dangling Custom DocPerm records encountered
* Add typing hints
* Cleanup APIs
 2022-06-27 15:18:06 +05:30
Shariq Ansari
f89dc40b94
fix: Allow permitted number card of type report (#17316) 2022-06-27 14:46:06 +05:30
mergify[bot]
e79bef4115
Merge pull request #17213 from Abhirup-99/develop 
Add data titles to sidebar workspace fields for easier selection through CSS.
 2022-06-27 05:21:53 +00:00
mergify[bot]
d861538c36
Merge pull request #17238 from Altizo/develop 
fix: update ru translate
 2022-06-27 05:18:41 +00:00
mergify[bot]
ffd8db6947
Merge pull request #17303 from resilient-tech/chore-redis 
chore(redis): remove unnecessary exception handling
 2022-06-27 04:58:06 +00:00
Sagar Vora
99388652c9 chore(redis): remove unnecessary exception handling 2022-06-27 01:56:58 +05:30
Abhirup
c99dd7c5ef Add data titles to sidebar workspace fields for easier selection through CSS. 2022-06-27 01:11:21 +05:30
Sagar Vora
217644ac07
fix!: remove unnecessary get_default API (#17295) 2022-06-27 01:01:03 +05:30
mergify[bot]
81d41c8d3a
Merge pull request #17297 from resilient-tech/dont-remove-custom-perms 
fix!: dont delete custom permissions when doctype is deleted
 2022-06-26 14:22:55 +00:00
mergify[bot]
9b2ce4861e
Merge pull request #17298 from resilient-tech/ignore-docs-on-delete 
fix: ignore integration request when deleting doc
 2022-06-26 08:27:49 +00:00
Smit Vora
b6963b1dec fix: ignore integration request when deleting doc 2022-06-26 12:53:38 +05:30
Sagar Vora
3c617e3b06 fix!: dont delete custom permissions when doctype is deleted 2022-06-26 11:51:52 +05:30
mergify[bot]
568702967e
Merge pull request #17287 from scdanieli/patch-3 
fix(Image View): make info field translatable
 2022-06-24 14:02:54 +00:00
Sagar Vora
ac84287266 fix: improve SVG for expenses icon 2022-06-24 18:31:43 +05:30
Danny
47483f833f
feat(translations-cli): Fetch translations for a particular app (#17276) 
* translataions for particular app 

get-untranslated/update-translations string for particular app frappe#17268 (feature request)

* fix: linting, making stuff DRY-er

Co-authored-by: gavin <gavin18d@gmail.com>
 2022-06-24 17:04:49 +05:30
Samuel Danieli
3bc636ce30
fix(Image View): translate info field 2022-06-24 11:27:30 +02:00
gruener
1349a73e14
fix: Virtual DocTypes currently breaking Parent-DocType Update and Deletion (#16977) 
When you create a Virtual DocType as a Child Table (which is possible without any warning), then it will lead to several errors when updating or deleting of the parent document.

This is because the following files just execute a SQL Statement for the doctype (which doesnt have a DB Table, as this is the nature of a virtual doctype ;-)

**apps/frappe/frappe/model/document.py**
```py
frappe.db.sql("""delete from `tab{0}` where parent=%s and parenttype=%s and parentfield=%s""".format(df.options), (self.name, self.doctype, fieldname))
```

**apps/frappe/frappe/model/delete_doc.py**
```py
frappe.db.sql(
	"delete from `tab%s` where parenttype=%s and parent = %s" % (t, "%s", "%s"), (doctype, name)
)
```

So at these points, I added a check to not perform any sql command for virtual doctypes. With these changes, my affected situation is solved. Perhaps there are other situations, I didn't encounter yet.

As an additional feature, those virtual doctype models should also get an information about the parent is deleted, to propagate the deletion to the remote data pools; but for now I hope this bugfix can be approved.
 2022-06-23 11:38:29 +00:00
gavin
6a91c2cf14
Merge pull request #17141 from vishdha/_format_naming 
fix: Use date/time field in document naming
 2022-06-23 16:35:16 +05:30
mergify[bot]
5f94cac111
Merge pull request #17278 from pateljannat/navbar-redirection-issue 
fix: navbar child redirection issue
 2022-06-23 09:39:09 +00:00
Vladislav
efed50811c
Update frappe/translations/ru.csv 
Yes, this translation is more correct

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2022-06-23 11:52:14 +03:00
Jannat Patel
20c94a5d32 fix: navbar child redirection issue 2022-06-23 12:26:31 +05:30
mergify[bot]
35405dec1c
Merge pull request #17262 from ankush/doc_conficts_ux 
fix: show "doc modified after load" message
 2022-06-23 05:38:23 +00:00
Suraj Shetty
bb525de78b
Merge pull request #17271 from frappe/dependabot/npm_and_yarn/shell-quote-1.7.3 2022-06-23 10:04:15 +05:30
Suraj Shetty
94f61fc3ba
Merge branch 'develop' into doc_conficts_ux 2022-06-23 09:59:57 +05:30
Ernesto Ruiz
b076ec1b91
fix: Make OTP link for get QR Code clickleable (#17275) 2022-06-22 21:11:48 +05:30
dependabot[bot]
9737bb39fa
build(deps): bump shell-quote from 1.7.2 to 1.7.3 
Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 10:45:05 +00:00
gavin
1297b25ecf
Merge pull request #17245 from gavindsouza/deps-audit 
ci: Add audit for python dependencies via pip-audit
 2022-06-22 16:14:33 +05:30
Gavin D'souza
71531bd290 chore(deps): Bump PyJWT from 2.0.1 to 2.4.0 
Consists of security & bug fixes, and seemingly no breaking changes

Ref: https://pyjwt.readthedocs.io/en/stable/changelog.html
 2022-06-22 15:02:18 +05:30
Gavin D'souza
593fd0a178 ci: Add audit for python dependencies via pip-audit 2022-06-22 15:02:18 +05:30
Ritwik Puri
09229029da
Merge pull request #17234 from phot0n/fix-parameterized-list-pg 
fix: cast list to tuple when using parameterized query for postgres
 2022-06-22 13:59:26 +05:30
mergify[bot]
c6ada3d186
Merge pull request #17266 from adityahase/fix-oauth-id-token 
fix(oauth): Send id_token of the authorized user instead of Guest
 2022-06-22 08:24:10 +00:00
Jannat Patel
fd4a7031b9
fix: added mailto to email displayed on contact us page (#17269) 2022-06-22 13:23:15 +05:30