Merge pull request #645 from frappe/develop
chore: Merge develop to main
This commit is contained in:
commit
08a20a467c
830
crm/locale/bs.po
830
crm/locale/bs.po
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,7 @@ msgstr ""
|
||||
"Project-Id-Version: frappe\n"
|
||||
"Report-Msgid-Bugs-To: shariq@frappe.io\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"
|
||||
"Language-Team: Croatian\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -20,7 +20,7 @@ msgstr ""
|
||||
|
||||
#: frontend/src/components/ViewControls.vue:1201
|
||||
msgid " (New)"
|
||||
msgstr " (Novi)"
|
||||
msgstr ""
|
||||
|
||||
#: frontend/src/components/Modals/TaskModal.vue:95
|
||||
#: frontend/src/components/Telephony/TaskPanel.vue:67
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
<component
|
||||
:is="getValueControl(f)"
|
||||
v-model="f.value"
|
||||
@change.stop="(v) => updateValue(v, f)"
|
||||
@change="(v) => updateValue(v, f)"
|
||||
:placeholder="__('John Doe')"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -1053,6 +1053,7 @@ function updateCustomView() {
|
||||
}
|
||||
|
||||
function updatePageLength(value, loadMore = false) {
|
||||
if (list.value.loading) return
|
||||
if (!defaultParams.value) {
|
||||
defaultParams.value = getParams()
|
||||
}
|
||||
|
||||
@ -126,7 +126,7 @@ router.beforeEach(async (to, from, next) => {
|
||||
route_name = route_name || 'Leads'
|
||||
|
||||
if (name && !is_standard) {
|
||||
next({ name: route_name, params: { viewType: type }, query: { name } })
|
||||
next({ name: route_name, params: { viewType: type }, query: { view: name } })
|
||||
} else {
|
||||
next({ name: route_name, params: { viewType: type } })
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user