Merge branch 'devCorrected' into 'beta'

Dev corrected

See merge request fedeo/software!18

components/EntityShowSubPhases.vue

@@ -58,7 +58,7 @@ const renderedPhases = computed(() => {
 })
 
 const changeActivePhase = async (key) => {
-  let item = await useSupabaseSelectSingle("projects",props.item.id,'*')
+  let item = await useEntities("projects").selectSingle(props.item.id,'*')
 
   let phaseLabel = ""
 
@@ -75,16 +75,18 @@ const changeActivePhase = async (key) => {
     return p
   })
 
-  const {error:updateError} = await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
+  const res = await useEntities("projects").update(item.id, {phases:item.phases})
+
+  //const {error:updateError} = await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
 
 
 
-  const {error} = await supabase.from("historyitems").insert({
+  /*const {error} = await supabase.from("historyitems").insert({
     createdBy: profileStore.activeProfile.id,
     tenant: profileStore.currentTenant,
     text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
     project: item.id
-  })
+  })*/
 
   emit("updateNeeded")
 

components/materialComposing.vue

@@ -2,8 +2,6 @@
 
 import { v4 as uuidv4 } from 'uuid';
 
-const supabase = useSupabaseClient()
-
 const props = defineProps({
   item: {
     type: Object,
@@ -15,8 +13,8 @@ const products = ref([])
 const units = ref([])
 
 const setup = async () => {
-  products.value = await useSupabaseSelect("products")
+  products.value = await useEntities("products").select()
-  units.value = (await supabase.from("units").select()).data
+  units.value = await useEntities("units").selectSpecial()
 }
 
 setup()

components/personalComposing.vue

@@ -15,8 +15,8 @@ const hourrates = ref([])
 const units = ref([])
 
 const setup = async () => {
-  hourrates.value = await useSupabaseSelect("hourrates")
+  hourrates.value = await useEntities("hourrates").select()
-  units.value = (await supabase.from("units").select()).data
+  units.value = await useEntities("units").selectSpecial()
 }
 
 setup()

pages/createDocument/edit/[[id]].vue

@@ -439,6 +439,10 @@ const setTaxType = () => {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0
     })
+  } else if (itemInfo.value.taxType === "13b UStG") {
+    itemInfo.value.rows.forEach(row => {
+      row.taxPercent = 0
+    })
   } else if (itemInfo.value.taxType === "12.3 UStG") {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0