3.0.0 #220

Merged
flfeders merged 676 commits from dev into main 2026-09-20 16:10:48 +00:00
Showing only changes of commit 5c69388f1c - Show all commits

View File

@@ -883,7 +883,7 @@ const documentReport = computed(() => {
if (row.product) {
let product = products.value.find(i => i.id === row.product)
totalProductsPurchasePrice += product.purchasePrice * row.quantity
totalProductsPurchasePrice += (product?.purchase_price || 0) * row.quantity
} else if (row.service) {
let service = services.value.find(i => i.id === row.service)
@@ -892,7 +892,7 @@ const documentReport = computed(() => {
service.materialComposition.forEach(entry => {
let productData = products.value.find(i => i.id === entry.product)
totalProductsFromServicesPurchasePrice += productData.purchasePrice * entry.quantity * row.quantity
totalProductsFromServicesPurchasePrice += (productData?.purchase_price || 0) * entry.quantity * row.quantity
})
}