test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #645 from frappe/develop

Browse Source 
chore: Merge develop to main
This commit is contained in:
Shariq Ansari 2025-03-07 21:54:29 +05:30 committed by GitHub
commit 08a20a467c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 420 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

830
crm/locale/bs.po
View File

File diff suppressed because it is too large Load Diff

4
crm/locale/hr.po
View File

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: frappe\n" "Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: shariq@frappe.io\n" "Report-Msgid-Bugs-To: shariq@frappe.io\n"
"POT-Creation-Date: 2025-03-05 16:31+0553\n" "POT-Creation-Date: 2025-03-05 16:31+0553\n"
"PO-Revision-Date: 2025-03-06 11:24\n" "PO-Revision-Date: 2025-03-07 11:57\n"
"Last-Translator: shariq@frappe.io\n" "Last-Translator: shariq@frappe.io\n"
"Language-Team: Croatian\n" "Language-Team: Croatian\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -20,7 +20,7 @@ msgstr ""
#: frontend/src/components/ViewControls.vue:1201 #: frontend/src/components/ViewControls.vue:1201
msgid " (New)" msgid " (New)"
msgstr " (Novi)" msgstr ""
#: frontend/src/components/Modals/TaskModal.vue:95 #: frontend/src/components/Modals/TaskModal.vue:95
#: frontend/src/components/Telephony/TaskPanel.vue:67 #: frontend/src/components/Telephony/TaskPanel.vue:67

2
frontend/src/components/Filter.vue
View File

@ -71,7 +71,7 @@
<component <component
:is="getValueControl(f)" :is="getValueControl(f)"
v-model="f.value" v-model="f.value"
@change.stop="(v) => updateValue(v, f)" @change="(v) => updateValue(v, f)"
:placeholder="__('John Doe')" :placeholder="__('John Doe')"
/> />
</div> </div>

1
frontend/src/components/ViewControls.vue
View File

@ -1053,6 +1053,7 @@ function updateCustomView() {
} }
function updatePageLength(value, loadMore = false) { function updatePageLength(value, loadMore = false) {
if (list.value.loading) return
if (!defaultParams.value) { if (!defaultParams.value) {
defaultParams.value = getParams() defaultParams.value = getParams()
} }

2
frontend/src/router.js
View File

@ -126,7 +126,7 @@ router.beforeEach(async (to, from, next) => {
route_name = route_name || 'Leads' route_name = route_name || 'Leads'
if (name && !is_standard) { if (name && !is_standard) {
next({ name: route_name, params: { viewType: type }, query: { name } }) next({ name: route_name, params: { viewType: type }, query: { view: name } })
} else { } else {
next({ name: route_name, params: { viewType: type } }) next({ name: route_name, params: { viewType: type } })
} }