Merge branch 'devCorrected' into 'beta'
Dev corrected See merge request fedeo/software!44
This commit is contained in:
@@ -60,7 +60,7 @@ const mappings = ref({
|
||||
})
|
||||
|
||||
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()
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1809,7 +1809,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
|
||||
>
|
||||
<template #description>
|
||||
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>
|
||||
</template>
|
||||
|
||||
@@ -1818,7 +1818,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
|
||||
</UFormGroup>
|
||||
<UFormGroup
|
||||
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>
|
||||
<USelectMenu
|
||||
|
||||
Reference in New Issue
Block a user