From a161306359a31aaf63f66c03eb5ed95d55a3370f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 9 Dec 2025 11:05:56 +0100
Subject: [PATCH] BETA for new DB

---
 pages/createDocument/edit/[[id]].vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 047fa9c..4e761ac 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1506,7 +1506,20 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
   }
 
   if (row.service) {
-    row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit
+    console.log(service)
+    if(service.unit) {
+      row.unit = service.unit
+    } else {
+      let selectedService = services.value.find(i => i.id === row.service)
+      console.log(selectedService)
+      if(selectedService.unit?.id) {
+        row.unit = selectedService.unit.id
+      } else {
+        row.unit = selectedService.unit
+      }
+    }
+
+    //row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit
     row.inputPrice = ((service.sellingPriceComposed.total || service.sellingPrice) ? (service.sellingPriceComposed.total || service.sellingPrice) : (services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice))
     row.description = service.description ? service.description : (services.value.find(i => i.id === row.service) ? services.value.find(i => i.id === row.service).description : "")
 
@@ -1520,14 +1533,14 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
   if (row.product) {
     console.log("Product Detected")
     row.unit = product.unit ? product.unit : products.value.find(i => i.id === row.product).unit
-    row.inputPrice = (product.sellingPrice ? product.sellingPrice : products.value.find(i => i.id === row.product).sellingPrice)
+    row.inputPrice = (product.selling_price ? product.selling_price : products.value.find(i => i.id === row.product).selling_price)
     //row.price = Number((row.originalPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2))
     row.description = product.description ? product.description : (products.value.find(i => i.id === row.product) ? products.value.find(i => i.id === row.product).description : "")
 
     if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) {
       row.taxPercent = 0
     } else {
-      row.taxPercent = product.taxPercentage ? product.taxPercentage : products.value.find(i => i.id === row.product).taxPercentage
+      row.taxPercent = product.tax_percentage ? product.tax_percentage : products.value.find(i => i.id === row.product).tax_percentage
     }
   }