diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java index 75439e1a..1c126a18 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java @@ -259,7 +259,7 @@ public class ArticoloOrdine { } public float getCnfDaRic() { - return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0; + return qtaCnf > 0.f ? merceDaRic / qtaCnf : 0; } public int checkQtaProposta() { diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml index a0cdec6c..cce298cc 100644 --- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml +++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml @@ -254,7 +254,7 @@ style="@style/AppTheme.NewMaterial.Text.Medium" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@{UtilityNumber.decimalToString(view.articolo.merceDaRic)}" + android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}" android:textColor="@android:color/black" android:textStyle="bold" tools:text="1" /> @@ -285,7 +285,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="0dp" - android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}" + android:text="@{UtilityNumber.decimalToString(view.articolo.merceDaRic)}" android:textColor="@android:color/black" android:textStyle="bold" />