diff --git a/src/components/PriceEditDialog.vue b/src/components/PriceEditDialog.vue
index fc90b478ca8..71fbc9f3107 100644
--- a/src/components/PriceEditDialog.vue
+++ b/src/components/PriceEditDialog.vue
@@ -10,7 +10,7 @@
       <v-card-text>
         <v-row>
           <v-col cols="12">
-            <PriceCard v-if="price" :price="price" :product="price.product" :hidePriceFooterRow="true" :readonly="true" />
+            <PriceCard v-if="price" :price="price" :product="price.product" :hidePriceFooterRow="false" :hideActionMenuButton="true" :readonly="true" />
           </v-col>
         </v-row>
       </v-card-text>
@@ -18,24 +18,8 @@
       <v-divider />
 
       <v-card-text>
-        <h3 class="mb-1">
-          {{ $t('PriceForm.Label') }}
-        </h3>
+        <ProductInputRow v-if="productIsTypeCategory" :productForm="updatePriceForm" :hideBarcodeMode="true" />
         <PriceInputRow :priceForm="updatePriceForm" :product="price.product" :hideCurrencyChoice="true" />
-
-        <h3 class="mt-4 mb-1">
-          {{ $t('Common.Date') }}
-        </h3>
-        <v-row>
-          <v-col cols="12">
-            <v-text-field
-              v-model="updatePriceForm.date"
-              :label="$t('Common.Date')"
-              type="date"
-              disabled
-            />
-          </v-col>
-        </v-row>
       </v-card-text>
 
       <v-divider />
@@ -59,10 +43,12 @@
 <script>
 import { defineAsyncComponent } from 'vue'
 import api from '../services/api'
+import constants from '../constants'
 
 export default {
   components: {
     PriceCard: defineAsyncComponent(() => import('../components/PriceCard.vue')),
+    ProductInputRow: defineAsyncComponent(() => import('../components/ProductInputRow.vue')),
     PriceInputRow: defineAsyncComponent(() => import('../components/PriceInputRow.vue')),
   },
   props: {
@@ -75,12 +61,19 @@ export default {
   data() {
     return {
       updatePriceForm: {
+        type: null,
+        product: null,
+        product_code: '',
+        category_tag: null,
+        origins_tags: '',
+        labels_tags: [],
         price: null,
         price_per: null,
         price_is_discounted: false,
         price_without_discount: null,
         currency: null,
-        date: null,
+        receipt_quantity: null,
+        // date: null,
       },
       productMode: null,
       loading: false
@@ -93,6 +86,9 @@ export default {
     dialogWidth() {
       return this.$vuetify.display.smAndUp ? '80%' : '100%'
     },
+    productIsTypeCategory() {
+      return this.updatePriceForm && this.updatePriceForm.type === constants.PRICE_TYPE_CATEGORY
+    },
   },
   mounted() {
     this.initUpdatePriceForm()
diff --git a/src/components/ProductInputRow.vue b/src/components/ProductInputRow.vue
index ec02b779213..8d9c5751f6e 100644
--- a/src/components/ProductInputRow.vue
+++ b/src/components/ProductInputRow.vue
@@ -4,7 +4,7 @@
       <v-row>
         <v-col>
           <v-item-group v-model="productForm.type" class="d-inline" mandatory @update:modelValue="setType($event)">
-            <v-item v-for="pt in productTypeList" :key="pt.key" v-slot="{ isSelected, toggle }" :value="pt.key">
+            <v-item v-for="pt in productTypeDisplayList" :key="pt.key" v-slot="{ isSelected, toggle }" :value="pt.key">
               <v-chip class="mr-1" :class="isSelected ? 'border-success' : ''" variant="outlined" density="comfortable" @click="toggle">
                 <v-icon start :icon="pt.icon" />
                 {{ $t('Common.' + pt.value) }}
@@ -14,7 +14,7 @@
           </v-item-group>
         </v-col>
       </v-row>
-      <v-row v-if="productIsTypeProduct" class="mt-0">
+      <v-row v-if="!hideBarcodeMode && productIsTypeProduct" class="mt-0">
         <v-col>
           <v-btn class="mb-2" size="small" prepend-icon="mdi-barcode-scan" :class="productForm.product ? 'border-success' : 'border-error'" @click="showBarcodeScannerDialog">
             {{ $t('Common.ProductFind') }}
@@ -130,6 +130,10 @@ export default {
       type: Boolean,
       default: () => false
     },
+    hideBarcodeMode: {
+      type: Boolean,
+      default: false
+    },
     hideProductBarcode: {
       type: Boolean,
       default: true
@@ -142,7 +146,6 @@ export default {
   emits: ['filled'],
   data() {
     return {
-      productTypeList: constants.PRICE_TYPE_LIST,
       categoryTags: [],  // list of category tags for autocomplete  // see initPriceMultipleForm
       originTags: [],  // list of origins tags for autocomplete  // see initPriceMultipleForm
       labelTags: [],  // list of labels tags for checkboxes  // see initPriceMultipleForm
@@ -157,6 +160,12 @@ export default {
     productIsTypeCategory() {
       return this.productForm && this.productForm.type === constants.PRICE_TYPE_CATEGORY
     },
+    productTypeDisplayList() {
+      if (this.hideBarcodeMode) {
+        return constants.PRICE_TYPE_LIST.filter(pt => pt.key !== constants.PRICE_TYPE_PRODUCT)
+      }
+      return constants.PRICE_TYPE_LIST
+    },
     productBarcodeFormFilled() {
       let keys = ['product_code']
       return Object.keys(this.productForm).filter(k => keys.includes(k)).every(k => !!this.productForm[k])
diff --git a/src/services/api.js b/src/services/api.js
index b2763853196..4c4ecac5ca7 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -2,8 +2,8 @@ import { useAppStore } from '../store'
 import constants from '../constants'
 
 
-const PRICE_UPDATE_FIELDS = ['price', 'price_is_discounted', 'price_without_discount', 'price_per', 'currency', 'receipt_quantity', 'date']
-const PRICE_CREATE_FIELDS = PRICE_UPDATE_FIELDS.concat(['type', 'product_code', 'product_name', 'category_tag', 'labels_tags', 'origins_tags', 'location_id', 'location_osm_id', 'location_osm_type', 'proof_id'])
+const PRICE_UPDATE_FIELDS = ['type', 'category_tag', 'labels_tags', 'origins_tags', 'price', 'price_is_discounted', 'price_without_discount', 'price_per', 'currency', 'receipt_quantity', 'date']
+const PRICE_CREATE_FIELDS = PRICE_UPDATE_FIELDS.concat(['product_code', 'product_name', 'location_id', 'location_osm_id', 'location_osm_type', 'proof_id'])
 const PROOF_UPDATE_FIELDS = ['type', 'date', 'currency', 'receipt_price_count', 'receipt_price_total']
 const PROOF_CREATE_FIELDS = PROOF_UPDATE_FIELDS.concat(['location_id', 'location_osm_id', 'location_osm_type'])  // 'file'
 const LOCATION_ONLINE_CREATE_FIELDS = ['type', 'website_url']
@@ -54,8 +54,13 @@ function extraPriceCreateOrUpdateFiltering(data) {
     } else {
       filteredData.origins_tags = ['en:unknown']
     }
-    if (filteredData.labels_tags.length == 0) {
-      filteredData.labels_tags = null
+    if (filteredData.labels_tags) {
+      if (filteredData.labels_tags.length == 0) {
+        filteredData.labels_tags = null
+      }
+      else if (typeof filteredData.labels_tags === 'string') {
+        filteredData.labels_tags = [filteredData.labels_tags]
+      }
     }
   }
   // generic rules