Merge remote-tracking branch 'origin/modular' into modular
# Conflicts: # src/utils/productAssets.ts # src/views/base/products/components/ProductItem.vue # src/views/base/transactions/DefaultTransactionsPage.vue
This commit is contained in:
@@ -26,6 +26,7 @@ export interface Product {
|
||||
direct_price: number | undefined
|
||||
price_offset_percent?: number | null
|
||||
use_last_price_if_zero?: boolean
|
||||
reference_provider_active?: boolean
|
||||
trade_by_quantity?: boolean
|
||||
reading_method: any
|
||||
created_at: any
|
||||
|
||||
Reference in New Issue
Block a user