mirror of
https://github.com/frappe/books.git
synced 2026-08-24 10:04:45 -05:00
Merge pull request #1437 from frappe/fix-uom-calculation
fix: uom quantity calculation
This commit is contained in:
@@ -317,7 +317,7 @@ export abstract class InvoiceItem extends Doc {
|
||||
|
||||
return safeParseFloat(conversionItems[0]?.conversionFactor ?? 0);
|
||||
},
|
||||
dependsOn: ['transferUnit'],
|
||||
dependsOn: ['transferUnit', 'qty'],
|
||||
},
|
||||
account: {
|
||||
formula: () => {
|
||||
|
||||
@@ -23,16 +23,19 @@
|
||||
<div
|
||||
v-for="df in tableFields"
|
||||
:key="df.fieldname"
|
||||
class="items-center px-2 h-row-mid"
|
||||
:class="{
|
||||
'ms-auto': isNumeric(df),
|
||||
}"
|
||||
:style="{
|
||||
height: ``,
|
||||
}"
|
||||
class="flex px-2 h-row-mid"
|
||||
:class="[
|
||||
df.sub_label
|
||||
? 'flex-col items-center text-center'
|
||||
: isNumeric(df)
|
||||
? 'ms-auto items-center'
|
||||
: 'items-center',
|
||||
]"
|
||||
>
|
||||
{{ df.label }}
|
||||
<p class="text-xs">{{ df.sub_label }}</p>
|
||||
<span>{{ df.label }}</span>
|
||||
<p v-if="df.sub_label" class="text-xs">
|
||||
{{ df.sub_label }}
|
||||
</p>
|
||||
</div>
|
||||
</Row>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user