flfeders/FEDEO
2
1
Fork 0
Code Issues 63 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Merge branch 'devCorrected' into 'beta'

Browse Source 
Dev corrected

See merge request fedeo/software!44
This commit is contained in:
Florian Federspiel
2025-12-10 07:25:44 +00:00
parent b88e840ff5 ac2ed79e10
commit ab2b5135c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/copyCreatedDocumentModal.vue
View File

@@ -60,7 +60,7 @@ const mappings = ref({
}) })
const startImport = () => { const startImport = () => {
router.push(`/createDocument/edit/?linkedDocument=${props.id}&type=${documentTypeToUse.value}&optionsToImport=${encodeURIComponent(JSON.stringify(optionsToImport.value))}`) router.push(`/createDocument/edit/?createddocument=${props.id}&type=${documentTypeToUse.value}&optionsToImport=${encodeURIComponent(JSON.stringify(optionsToImport.value))}`)
modal.close() modal.close()
} }
</script> </script>

4
pages/createDocument/edit/[[id]].vue
View File

@@ -1809,7 +1809,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
> >
<template #description> <template #description>
Kundennr: {{ customers.find(i => i.id === itemInfo.customer).customerNumber }}<br> Kundennr: {{ customers.find(i => i.id === itemInfo.customer).customerNumber }}<br>
Typ: {{ customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat' }}<br> Typ: {{ customers.find(i => i.id === itemInfo.customer).is_company ? 'Firma' : 'Privat' }}<br>
Notizen: <span class="truncate">{{ customers.find(i => i.id === itemInfo.customer).notes }}</span> Notizen: <span class="truncate">{{ customers.find(i => i.id === itemInfo.customer).notes }}</span>
</template> </template>
@@ -1818,7 +1818,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
</UFormGroup> </UFormGroup>
<UFormGroup <UFormGroup
label="Ansprechpartner:" label="Ansprechpartner:"
v-if="itemInfo.customer ? customers.find(i => i.id === itemInfo.customer).isCompany : false " v-if="itemInfo.customer ? customers.find(i => i.id === itemInfo.customer).is_company : false "
> >
<InputGroup> <InputGroup>
<USelectMenu <USelectMenu