Commit graph

46716 commits

Author SHA1 Message Date
barredterra
ff70fece72 fix: layout of printed report filters 2024-06-28 18:48:59 +02:00
barredterra
c1d1a3bab1 fix: don't add empty multiselect to filters object
The convention is that if a filter is not set, then it does not exist in the dictionary. However, empty multiselects used to appear as an empty list, breaking this convention. Now we filter out empty lists just like other falsy values.
2024-06-28 18:45:22 +02:00
Raffael Meyer
ae0b6510fe
Merge pull request #26875 from barredterra/invalid-characters-unhandled 2024-06-28 15:16:53 +02:00
barredterra
722807ee14 test: email with invalid encoding 2024-06-28 14:39:06 +02:00
Raffael Meyer
8cd0ec12cf
Merge pull request #26879 from barredterra/stage-only-pot-file 2024-06-28 13:02:58 +02:00
Sagar Vora
39c7c3d097
Merge pull request #26823 from ljain112/fix-dashboard 2024-06-28 12:01:04 +05:30
ljain112
e9bf5022a9 fix: update filters from dynamic link for dashboard open count 2024-06-28 11:45:56 +05:30
barredterra
ea5aec20d0 ci: explicitly stage pot file
Avoid accidentally adding any other changed files, like yarn.lock, to the commit.
2024-06-27 19:44:28 +02:00
Raffael Meyer
f3816fa2ea
Merge pull request #26425 from cogk/feat-add-translation-context-to-select-options 2024-06-27 19:34:32 +02:00
Raffael Meyer
fab5dcf938
Merge pull request #26167 from earona/feat-translation-customizations 2024-06-27 18:58:17 +02:00
barredterra
5f1b33e1fb fix: docstring 2024-06-27 18:39:54 +02:00
barredterra
47d79b168d refactor: extract common methods for parsing df and links 2024-06-27 18:38:05 +02:00
barredterra
aa43edf1d6 refactor: move EXCLUDE_SELECT_OPTIONS to utils 2024-06-27 18:07:07 +02:00
barredterra
fb6f8658a6 feat: extractor for customizations
Added extraction for property setters and links
2024-06-27 18:02:45 +02:00
barredterra
65ab855571 refactor: extractor for custom fields 2024-06-27 17:36:55 +02:00
barredterra
4c924a5a16 Merge remote-tracking branch 'upstream/develop' into feat-translation-customizations 2024-06-27 17:22:50 +02:00
gavin
e19634fba2
fix: bulk_insert child tables malformed (#26876)
Generator within generator caused something funky to happen which meant wrong values being stitched together as one document, sometimes(?)

Via https://github.com/frappe/frappe/pull/22114
2024-06-27 15:58:29 +02:00
barredterra
0a571e5ee4 fix(Unhandled Email): avoid crashing on invalid characters 2024-06-27 14:55:47 +02:00
gavin
9d73477e60
Merge pull request #26771 from barredterra/contact-vcard
feat: download Contact as vCard
2024-06-27 11:03:22 +02:00
Akhil Narang
c5ea81d8a6
Merge pull request #26855 from akhilnarang/ignore-mariadb-sandbox-mode
fix: remove mariadb sandbox mode comment before restoring backups
2024-06-27 12:08:12 +05:30
barredterra
be29009e4a refactor: only one access log for bulk contact export 2024-06-26 20:03:25 +02:00
Raffael Meyer
72e72bcb65
Merge pull request #26865 from barredterra/remove-doctype-context 2024-06-26 19:48:03 +02:00
barredterra
7d20ab10e5 fix: remove DocType as translation context 2024-06-26 19:22:53 +02:00
Raffael Meyer
3fcc430726
Merge pull request #26863 from barredterra/ci-typo 2024-06-26 18:20:41 +02:00
barredterra
2e4a551a05 ci: fix typo in pot file regeneration 2024-06-26 17:54:00 +02:00
Raffael Meyer
c4777519f0
Merge pull request #26833 from frappe/pot_develop_2024-06-23 2024-06-26 17:36:08 +02:00
Akhil Narang
bb945ab96b
fix: remove mariadb sandbox mode comment before restoring backups
Reference: https://mariadb.org/mariadb-dump-file-compatibility-change/

Newer versions of MariaDB include a line in the dumps that break restoring on older versions
This doesn't allow people to restore newer dumps onto Frappe Cloud

For now just remove the line to allow any backups to be restored anywhere

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-06-26 16:40:25 +05:30
Raffael Meyer
445118a728
Merge pull request #26806 from frappe/l10n_develop 2024-06-25 17:43:12 +02:00
Gursheen Kaur Anand
fab4249d30
Merge pull request #26852 from GursheenK/rename-doc-query-for-link-fields
fix: query for rename_doc during pre_model_sync
2024-06-25 20:22:33 +05:30
Frappe PR Bot
424dca8bd9 fix: Swedish translations 2024-06-25 19:34:09 +05:30
Frappe PR Bot
53b68b2d01 fix: German translations 2024-06-25 19:34:03 +05:30
Gursheen Anand
8bfb213481 fix: syntax error for link field query 2024-06-25 18:46:41 +05:30
Md Hussain Nagaria
a4d396ae50
Merge pull request #26847 from frappe/fix-ci-boilerplate-2
fix: CI boilerplate
2024-06-25 14:18:41 +05:30
Hussain Nagaria
69b2560cb7 fix: indentation 2024-06-25 14:05:44 +05:30
Hussain Nagaria
458fce7b1e fix: update apt before mariadb client install in ci boilerplate 2024-06-25 14:02:45 +05:30
Hussain Nagaria
0fb1a7264b fix: dynamic branch name in ci boilerplate 2024-06-25 14:01:43 +05:30
David Arnold
1ffc6fad84
feat: add new payment processing hooks (#25952)
* feat: add new payment processing hooks

* fix: don't mark as legacy just yet

* fix: polish help message
2024-06-24 21:11:46 +05:30
Akhil Narang
d19e2de1dc
Merge pull request #26842 from akhilnarang/fix-grid-sentry-error
fix(grid): prevent crash
2024-06-24 17:15:00 +05:30
Akhil Narang
876cd2351f
fix(grid): prevent crash
TypeError: Cannot read properties of undefined (reading 'docfields')
  at Grid.update_docfield_property(../../../../../apps/frappe/frappe/public/js/frappe/form/grid.js:1225:23)
  at Grid.toggle_enable(../../../../../apps/frappe/frappe/public/js/frappe/form/grid.js:749:8)
  at erpnext.TransactionController.toggle_conversion_factor(../../../../../apps/erpnext/erpnext/public/js/controllers/transaction.js:1243:36)
  at erpnext.TransactionController.conversion_factor(../../../../../apps/erpnext/erpnext/public/js/controllers/transaction.js:1198:9)
  at erpnext.selling.SellingController.conversion_factor(../../../../../apps/erpnext/erpnext/public/js/utils/sales_common.js:343:11)
  at <anonymous>(../../../../../apps/erpnext/erpnext/public/js/controllers/transaction.js:1254:16)

Resolves FRAPPE-7GB

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-06-24 17:01:10 +05:30
Suraj Shetty
a60d5828f1
Merge pull request #26839 from blaggacao/fix/back-compat 2024-06-24 16:47:22 +05:30
Sumit Bhanushali
e138604c7a
Merge pull request #26840 from frappe/fix-edit-workspace
fix: show edit button only to workspace managers for public workspaces
2024-06-24 15:33:37 +05:30
Sumit Bhanushali
1dbebb48e3 fix: show edit button only to workspace managers for public workspaces 2024-06-24 15:13:14 +05:30
David
0aa652a565
fix: back compat 2024-06-24 10:16:51 +02:00
frappe-pr-bot
746c3262c5 chore: update POT file 2024-06-23 09:33:11 +00:00
Suraj Shetty
9f82febc63
Merge pull request #26817 from blaggacao/feat/error-log-refdoc-button 2024-06-22 08:34:09 +05:30
Suraj Shetty
8e6439b57e
Merge pull request #26822 from frappe/dependabot/npm_and_yarn/pug-3.0.3 2024-06-21 20:14:06 +05:30
Akhil Narang
875c98ba76
Merge pull request #26766 from nikkothari22/fix-socketio-for-mobile
fix(socketio): pass auth token if available instead of cookie
2024-06-21 18:52:08 +05:30
Frappe PR Bot
8059a099de fix: Esperanto translations 2024-06-21 17:30:05 +05:30
Frappe PR Bot
7881329c19 fix: Bosnian translations 2024-06-21 17:30:01 +05:30
Frappe PR Bot
920c8cf269 fix: German translations 2024-06-21 17:29:58 +05:30