fix: solve conflicts from test to dev #780

Merged
alexm merged 34 commits from fixConflicts_testToDev into dev 2024-10-01 09:47:05 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 53d5d123c2 - Show all commits

View File

@ -1184,7 +1184,7 @@ item:
producer: Producer
landed: Landed
fixedPrice:
itemId: Item ID
itemFk: Item ID
groupingPrice: Grouping price
packingPrice: Packing price
hasMinPrice: Has min price

View File

@ -1168,7 +1168,7 @@ item:
producer: Productor
landed: F. entrega
fixedPrice:
itemId: ID Artículo
itemFk: ID Artículo
groupingPrice: Precio grouping
packingPrice: Precio packing
hasMinPrice: Tiene precio mínimo