Merge branch 'dev' into beta
This commit is contained in:
@@ -56,6 +56,8 @@ const setRowData = (row) => {
|
|||||||
|
|
||||||
row.unit = product.unit
|
row.unit = product.unit
|
||||||
row.price = product.sellingPrice
|
row.price = product.sellingPrice
|
||||||
|
|
||||||
|
calculateTotalMaterialPrice()
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -57,6 +57,8 @@ const setRowData = (row) => {
|
|||||||
|
|
||||||
row.purchasePrice = hourrate.purchasePrice
|
row.purchasePrice = hourrate.purchasePrice
|
||||||
row.price = hourrate.sellingPrice
|
row.price = hourrate.sellingPrice
|
||||||
|
|
||||||
|
calculateTotalPersonalPrice()
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ const isPaid = (item) => {
|
|||||||
let amountPaid = 0
|
let amountPaid = 0
|
||||||
item.statementallocations.forEach(allocation => amountPaid += allocation.amount)
|
item.statementallocations.forEach(allocation => amountPaid += allocation.amount)
|
||||||
|
|
||||||
return Number(amountPaid.toFixed(2)) === Number(calculateDocSum(item))
|
return Number(amountPaid.toFixed(2)) === useSum().getCreatedDocumentSum(item, items.value)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user