Merge branch 'dev' into beta

This commit is contained in:
2025-04-19 17:48:52 +02:00

View File

@@ -900,6 +900,7 @@ const getDocumentData = () => {
const generateContext = (itemInfo, contactData) => { const generateContext = (itemInfo, contactData) => {
return { return {
lohnkosten: documentReport.value.totalHoursSellingPrice ? useCurrency(documentReport.value.totalHoursSellingPrice) : null,
vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname), vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname),
nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname), nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
kundenname: customerData && customerData.name, kundenname: customerData && customerData.name,
@@ -1191,6 +1192,7 @@ const saveDocument = async (state,resetup = false) => {
letterhead: itemInfo.value.letterhead, letterhead: itemInfo.value.letterhead,
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices, usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices,
customSurchargePercentage: itemInfo.value.customSurchargePercentage, customSurchargePercentage: itemInfo.value.customSurchargePercentage,
report: documentReport.value
} }
if(route.params.id) { if(route.params.id) {