Merge branch 'develop' into onboarding

This commit is contained in:
Shariq Ansari 2025-03-12 21:55:34 +05:30 committed by GitHub
commit 1a08480f6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 72 additions and 48 deletions

View File

@ -211,7 +211,6 @@ class CRMLead(Document):
"HTML",
"Button",
"Attach",
"Table",
]
restricted_map_fields = [
"name",
@ -233,6 +232,7 @@ class CRMLead(Document):
"first_responded_on",
"communication_status",
"sla_creation",
"status_change_log",
]
for field in self.meta.fields:

View File

@ -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-07 11:57\n"
"PO-Revision-Date: 2025-03-10 11:20\n"
"Last-Translator: shariq@frappe.io\n"
"Language-Team: Bosnian\n"
"MIME-Version: 1.0\n"
@ -777,7 +777,7 @@ msgstr "Status Konverzacije"
#. Label of a shortcut in the Frappe CRM Workspace
#: crm/fcrm/workspace/frappe_crm/frappe_crm.json
msgid "Communication Statuses"
msgstr "Statusi Konverzacije"
msgstr "Status Konverzacije"
#. Label of the erpnext_company (Data) field in DocType 'ERPNext CRM Settings'
#: crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json
@ -872,7 +872,7 @@ msgstr "Pretvori"
#: frontend/src/pages/Lead.vue:38 frontend/src/pages/Lead.vue:203
#: frontend/src/pages/MobileLead.vue:92
msgid "Convert to Deal"
msgstr "Pretvorite u Dogovor"
msgstr "Pretvori u Dogovor"
#. Label of the converted (Check) field in DocType 'CRM Lead'
#: crm/fcrm/doctype/crm_lead/crm_lead.json
@ -997,7 +997,7 @@ msgstr "Status Dogovora"
#. Label of a shortcut in the Frappe CRM Workspace
#: crm/fcrm/workspace/frappe_crm/frappe_crm.json
msgid "Deal Statuses"
msgstr "Statusi Dogovora"
msgstr "Status Dogovora"
#: frontend/src/pages/Contact.vue:626 frontend/src/pages/MobileContact.vue:622
#: frontend/src/pages/MobileOrganization.vue:508
@ -1056,7 +1056,7 @@ msgstr "Standard Medij"
#: crm/fcrm/doctype/fcrm_settings/fcrm_settings.js:18
#: crm/fcrm/doctype/fcrm_settings/fcrm_settings.js:30
msgid "Default statuses, custom fields and layouts restored successfully."
msgstr "Standard statusi, prilagođena polja i izgledi uspješno su vraćeni."
msgstr "Standard status, prilagođena polja i izgledi uspješno su vraćeni."
#. Label of the defaults_tab (Tab Break) field in DocType 'FCRM Settings'
#: crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
@ -1308,7 +1308,7 @@ msgstr "Uredi bilješku"
#: frontend/src/components/Settings/ProfileSettings.vue:19
#: frontend/src/components/Settings/ProfileSettings.vue:23
msgid "Edit profile photo"
msgstr "Uredite profilnu sliku"
msgstr "Uredi profilnu sliku"
#: frontend/src/components/Modals/CallLogDetailModal.vue:24
msgid "Edit task"
@ -2057,12 +2057,12 @@ msgstr "Odgovorni za Potencijalnog Klijenta ne može biti isti kao i adresa e-po
#. Label of a shortcut in the Frappe CRM Workspace
#: crm/fcrm/workspace/frappe_crm/frappe_crm.json
msgid "Lead Sources"
msgstr "Izvori Potencijalnog Klijenta"
msgstr "Izvor Potencijalnog Klijenta"
#. Label of a shortcut in the Frappe CRM Workspace
#: crm/fcrm/workspace/frappe_crm/frappe_crm.json
msgid "Lead Statuses"
msgstr "Statusi Potencijalnog Klijenta"
msgstr "Status Potencijalnog Klijenta"
#: frontend/src/pages/Lead.vue:429 frontend/src/pages/MobileLead.vue:265
msgid "Lead updated"
@ -2450,7 +2450,7 @@ msgstr "Broj mobilnog nije postavljen"
#: frontend/src/components/Notifications.vue:83
#: frontend/src/pages/MobileNotification.vue:67
msgid "No new notifications"
msgstr "Nema novih obavijesti"
msgstr "Nema novih obaviještenja"
#: frontend/src/pages/Lead.vue:126
msgid "No phone number set"
@ -2481,7 +2481,7 @@ msgstr "Nema {0} Dostupnog"
#: frontend/src/pages/Notes.vue:92 frontend/src/pages/Organization.vue:157
#: frontend/src/pages/Organizations.vue:56 frontend/src/pages/Tasks.vue:181
msgid "No {0} Found"
msgstr "Nije pronađeno {0}"
msgstr "{0}"
#. Label of the no_of_employees (Select) field in DocType 'CRM Deal'
#. Label of the no_of_employees (Select) field in DocType 'CRM Lead'
@ -2633,7 +2633,7 @@ msgstr "Otvori u novom prozoru"
#: frontend/src/pages/Organization.vue:92
msgid "Open website"
msgstr "Otvorite web stranicu"
msgstr "Otvori web stranicu"
#: frontend/src/components/Kanban/KanbanView.vue:221
#: frontend/src/components/Modals/CallLogDetailModal.vue:15
@ -2786,7 +2786,7 @@ msgstr "Brzina izvođenja"
#: crm/integrations/twilio/twilio_handler.py:119
msgid "Please enable twilio settings before making a call."
msgstr "Omogućite Twilio Postavke prije pozivanja."
msgstr "Omogući Twilio Postavke prije pozivanja."
#: frontend/src/components/FilesUploader/FilesUploader.vue:170
msgid "Please enter a valid URL"
@ -2798,7 +2798,7 @@ msgstr "Odaberi postojeći kontakt"
#: frontend/src/pages/Lead.vue:611 frontend/src/pages/MobileLead.vue:445
msgid "Please select an existing organization"
msgstr "Odaberite postojeću organizaciju"
msgstr "Odaberi postojeću organizaciju"
#: crm/integrations/exotel/handler.py:73
msgid "Please setup Exotel intergration"
@ -3286,7 +3286,7 @@ msgstr "Prikaži"
#: frontend/src/components/FieldLayoutEditor.vue:360
msgid "Show border"
msgstr "Prikaži granicu"
msgstr "Prikaži okvir"
#: frontend/src/components/FieldLayoutEditor.vue:355
msgid "Show label"
@ -3600,7 +3600,7 @@ msgstr "Ukupno Praznika"
#: frontend/src/components/SignupBanner.vue:12
msgid "Try Frappe CRM for free with a 14-day trial."
msgstr "Isprobajte Frappe CRM besplatno uz 14-dnevnu probnu verziju."
msgstr "Isprobaj Frappe CRM besplatno uz 14-dnevnu probnu verziju."
#. Option for the 'Weekly Off' (Select) field in DocType 'CRM Holiday List'
#. Option for the 'Workday' (Select) field in DocType 'CRM Service Day'
@ -3886,7 +3886,7 @@ msgstr "dodao"
#: crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
#: crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
msgid "amber"
msgstr "amber"
msgstr "jantar"
#. Option for the 'Color' (Select) field in DocType 'CRM Deal Status'
#. Option for the 'Color' (Select) field in DocType 'CRM Lead Status'
@ -4012,7 +4012,7 @@ msgstr "crveno"
#: crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
#: crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
msgid "teal"
msgstr "teal"
msgstr "plavozelena"
#: frontend/src/components/Activities/Activities.vue:274
#: frontend/src/components/Activities/Activities.vue:337

View File

@ -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-07 11:57\n"
"PO-Revision-Date: 2025-03-09 11:10\n"
"Last-Translator: shariq@frappe.io\n"
"Language-Team: Croatian\n"
"MIME-Version: 1.0\n"
@ -20,12 +20,12 @@ msgstr ""
#: frontend/src/components/ViewControls.vue:1201
msgid " (New)"
msgstr ""
msgstr " (Novi)"
#: frontend/src/components/Modals/TaskModal.vue:95
#: frontend/src/components/Telephony/TaskPanel.vue:67
msgid "01/04/2024 11:30 PM"
msgstr ""
msgstr "01.04.2024 23:30"
#. Option for the 'No. of Employees' (Select) field in DocType 'CRM Deal'
#. Option for the 'No. of Employees' (Select) field in DocType 'CRM Lead'
@ -35,7 +35,7 @@ msgstr ""
#: crm/fcrm/doctype/crm_lead/crm_lead.json
#: crm/fcrm/doctype/crm_organization/crm_organization.json
msgid "1-10"
msgstr ""
msgstr "1-10"
#. Option for the 'No. of Employees' (Select) field in DocType 'CRM Deal'
#. Option for the 'No. of Employees' (Select) field in DocType 'CRM Lead'
@ -1165,7 +1165,7 @@ msgstr ""
#: frontend/src/components/Modals/EmailTemplateModal.vue:32
msgid "Doctype"
msgstr ""
msgstr "DocType"
#. Label of the dt (Link) field in DocType 'CRM Fields Layout'
#: crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.json

View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Frappe CRM VERSION\n"
"Report-Msgid-Bugs-To: shariq@frappe.io\n"
"POT-Creation-Date: 2025-03-05 16:31+0553\n"
"PO-Revision-Date: 2025-03-05 16:31+0553\n"
"POT-Creation-Date: 2025-03-09 09:34+0000\n"
"PO-Revision-Date: 2025-03-09 09:34+0000\n"
"Last-Translator: shariq@frappe.io\n"
"Language-Team: shariq@frappe.io\n"
"MIME-Version: 1.0\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.13.1\n"
#: frontend/src/components/ViewControls.vue:1201
#: frontend/src/components/ViewControls.vue:1202
msgid " (New)"
msgstr ""
@ -160,7 +160,7 @@ msgstr ""
#: frontend/src/components/CustomActions.vue:73
#: frontend/src/components/ViewControls.vue:666
#: frontend/src/components/ViewControls.vue:1093
#: frontend/src/components/ViewControls.vue:1094
msgid "Actions"
msgstr ""
@ -1070,8 +1070,8 @@ msgstr ""
#: frontend/src/components/ListBulkActions.vue:96
#: frontend/src/components/ListBulkActions.vue:104
#: frontend/src/components/ListBulkActions.vue:186
#: frontend/src/components/ViewControls.vue:1145
#: frontend/src/components/ViewControls.vue:1156
#: frontend/src/components/ViewControls.vue:1146
#: frontend/src/components/ViewControls.vue:1157
#: frontend/src/pages/Contact.vue:105 frontend/src/pages/Contact.vue:296
#: frontend/src/pages/MobileContact.vue:81
#: frontend/src/pages/MobileContact.vue:289
@ -1091,8 +1091,8 @@ msgstr ""
msgid "Delete Task"
msgstr ""
#: frontend/src/components/ViewControls.vue:1141
#: frontend/src/components/ViewControls.vue:1149
#: frontend/src/components/ViewControls.vue:1142
#: frontend/src/components/ViewControls.vue:1150
msgid "Delete View"
msgstr ""
@ -1203,7 +1203,7 @@ msgid "Due Date"
msgstr ""
#: frontend/src/components/Modals/ViewModal.vue:15
#: frontend/src/components/ViewControls.vue:1097
#: frontend/src/components/ViewControls.vue:1098
msgid "Duplicate"
msgstr ""
@ -1259,7 +1259,7 @@ msgstr ""
#: frontend/src/components/FieldLayoutEditor.vue:319
#: frontend/src/components/FieldLayoutEditor.vue:345
#: frontend/src/components/ListBulkActions.vue:179
#: frontend/src/components/ViewControls.vue:1115
#: frontend/src/components/ViewControls.vue:1116
msgid "Edit"
msgstr ""
@ -2157,11 +2157,11 @@ msgstr ""
msgid "Make Call"
msgstr ""
#: frontend/src/components/ViewControls.vue:1130
#: frontend/src/components/ViewControls.vue:1131
msgid "Make Private"
msgstr ""
#: frontend/src/components/ViewControls.vue:1130
#: frontend/src/components/ViewControls.vue:1131
msgid "Make Public"
msgstr ""
@ -2765,7 +2765,7 @@ msgstr ""
msgid "Phone Numbers"
msgstr ""
#: frontend/src/components/ViewControls.vue:1122
#: frontend/src/components/ViewControls.vue:1123
msgid "Pin View"
msgstr ""
@ -3265,7 +3265,7 @@ msgstr ""
msgid "Set as Primary Contact"
msgstr ""
#: frontend/src/components/ViewControls.vue:1107
#: frontend/src/components/ViewControls.vue:1108
msgid "Set as default"
msgstr ""
@ -3673,7 +3673,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
#: frontend/src/components/ViewControls.vue:1122
#: frontend/src/components/ViewControls.vue:1123
msgid "Unpin View"
msgstr ""
@ -3845,7 +3845,7 @@ msgstr ""
msgid "Yesterday"
msgstr ""
#: crm/api/whatsapp.py:216 crm/api/whatsapp.py:230
#: crm/api/whatsapp.py:36 crm/api/whatsapp.py:216 crm/api/whatsapp.py:230
#: frontend/src/components/Activities/WhatsAppArea.vue:34
#: frontend/src/components/Activities/WhatsAppBox.vue:14
msgid "You"
@ -3871,7 +3871,11 @@ msgstr ""
msgid "You need to be in developer mode to edit a Standard Form Script"
msgstr ""
#: crm/api/todo.py:46
#: crm/api/todo.py:111
msgid "Your assignment on task {0} has been removed by {1}"
msgstr ""
#: crm/api/todo.py:46 crm/api/todo.py:89
msgid "Your assignment on {0} {1} has been removed by {2}"
msgstr ""
@ -3886,6 +3890,14 @@ msgstr ""
msgid "amber"
msgstr ""
#: crm/api/todo.py:120
msgid "assigned a new task {0} to you"
msgstr ""
#: crm/api/todo.py:100
msgid "assigned a {0} {1} to you"
msgstr ""
#. Option for the 'Color' (Select) field in DocType 'CRM Deal Status'
#. Option for the 'Color' (Select) field in DocType 'CRM Lead Status'
#: crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
@ -3956,7 +3968,7 @@ msgstr ""
msgid "list"
msgstr ""
#: frontend/src/components/Notifications.vue:65
#: crm/api/comment.py:36 frontend/src/components/Notifications.vue:65
#: frontend/src/pages/MobileNotification.vue:52
msgid "mentioned you in {0}"
msgstr ""
@ -3998,6 +4010,10 @@ msgstr ""
msgid "purple"
msgstr ""
#: crm/api/whatsapp.py:37
msgid "received a whatsapp message in {0}"
msgstr ""
#. Option for the 'Color' (Select) field in DocType 'CRM Deal Status'
#. Option for the 'Color' (Select) field in DocType 'CRM Lead Status'
#: crm/fcrm/doctype/crm_deal_status/crm_deal_status.json

View File

@ -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-10 11:20\n"
"Last-Translator: shariq@frappe.io\n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
@ -2481,7 +2481,7 @@ msgstr "Ingen {0} Tillgänglig"
#: frontend/src/pages/Notes.vue:92 frontend/src/pages/Organization.vue:157
#: frontend/src/pages/Organizations.vue:56 frontend/src/pages/Tasks.vue:181
msgid "No {0} Found"
msgstr "Ingen {0} Hittades"
msgstr "{0}"
#. Label of the no_of_employees (Select) field in DocType 'CRM Deal'
#. Label of the no_of_employees (Select) field in DocType 'CRM Lead'

View File

@ -11,7 +11,7 @@
:label="value"
theme="gray"
variant="subtle"
class="rounded bg-surface-gray-3 group-hover:bg-surface-gray-4 focus-visible:ring-outline-gray-4"
class="rounded bg-surface-white hover:!bg-surface-gray-1 focus-visible:ring-outline-gray-4"
@keydown.delete.capture.stop="removeLastValue"
>
<template #suffix>
@ -35,6 +35,9 @@
</div>
</div>
<ErrorMessage class="mt-2 pl-2" v-if="error" :message="error" />
<p v-if="description" class="text-xs text-ink-gray-5 mt-1.5">
{{ description }}
</p>
</div>
</template>
@ -46,6 +49,10 @@ const props = defineProps({
type: Function,
default: null,
},
description: {
type: String,
default: '',
},
errorMessage: {
type: Function,
default: (value) => `${value} is an Invalid value`,

View File

@ -14,6 +14,7 @@
:error-message="
(value) => __('{0} is an invalid email address', [value])
"
:description="__('Press enter to add email')"
/>
<FormControl
type="select"
@ -26,7 +27,6 @@
]"
:description="description"
/>
<ErrorMessage class="mt-2" v-if="error" :message="error" />
</div>
<template v-if="pendingInvitations.data?.length && !invitees.length">
<div class="flex flex-col gap-4">
@ -67,7 +67,8 @@
</div>
</template>
</div>
<div class="flex flex-row-reverse">
<div class="flex justify-between items-center gap-2">
<div><ErrorMessage v-if="error" :message="error" /></div>
<Button
:label="__('Send Invites')"
variant="solid"
@ -124,8 +125,8 @@ const inviteByEmail = createResource({
pendingInvitations.reload()
updateOnboardingStep('invite_your_team')
},
onError(error) {
error.value = error
onError(err) {
error.value = err?.messages?.[0]
},
})