diff --git a/components/materialComposing.vue b/components/materialComposing.vue index b3c802a..201f3ce 100644 --- a/components/materialComposing.vue +++ b/components/materialComposing.vue @@ -53,7 +53,7 @@ const setRowData = (row) => { let product = products.value.find(i => i.id === row.product) row.unit = product.unit - row.price = product.sellingPrice + row.price = product.selling_price calculateTotalMaterialPrice() } diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue index 97943e8..f62350e 100644 --- a/pages/banking/statements/[mode]/[[id]].vue +++ b/pages/banking/statements/[mode]/[[id]].vue @@ -29,7 +29,7 @@ const customers = ref([]) const vendors = ref([]) const createddocuments = ref([]) - +const incominginvoices = ref([]) const accounts = ref([]) const ownaccounts = ref([]) @@ -45,7 +45,7 @@ const setup = async () => { createddocuments.value = (await useEntities("createddocuments").select("*, statementallocations(*), customer(id,name)")) const documents = createddocuments.value.filter(i => i.type === "invoices" ||i.type === "advanceInvoices") - const incominginvoices = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(id,name)")).filter(i => i.state === "Gebucht") + incominginvoices.value = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(id,name)")).filter(i => i.state === "Gebucht") accounts.value = (await useEntities("accounts").selectSpecial("*","number",true)) ownaccounts.value = (await useEntities("ownaccounts").select()) @@ -66,7 +66,7 @@ const setup = async () => { console.log(openDocuments.value) allocatedDocuments.value = documents.filter(i => i.statementallocations.find(x => x.bankstatement === itemInfo.value.id)) - allocatedIncomingInvoices.value = incominginvoices.filter(i => i.statementallocations.find(x => x.bankstatement === itemInfo.value.id)) + allocatedIncomingInvoices.value = incominginvoices.value.filter(i => i.statementallocations.find(x => x.bankstatement === itemInfo.value.id)) console.log(allocatedDocuments.value) console.log(allocatedIncomingInvoices.value) openIncomingInvoices.value = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(*)")).filter(i => !i.archived && i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false)) @@ -513,7 +513,7 @@ const archiveStatement = async () => { > @@ -533,7 +533,7 @@ const archiveStatement = async () => { >