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 5ee30523..cb8364da 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
@@ -242,4 +242,8 @@ public class ArticoloOrdine {
public void setNewNoPromo(boolean newNoPromo) {
this.newNoPromo = newNoPromo;
}
+
+ public float getCnfDaRic() {
+ return qtaCnf > 0.f ? merceDaRic / qtaCnf : 0;
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
index 35cfdf25..0d5c1a58 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java
@@ -175,7 +175,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
}
private void editOrdine(Ordine ordine) {
- requireActivity().startActivity(PVOrdineAcquistoEditActivity.newInstance(requireActivity(),ordine));
+ requireActivity().startActivity(PVOrdineAcquistoEditActivity.newInstance(requireActivity(), ordine));
}
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 32964cca..ed37da18 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -224,6 +224,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
index 572eb7b3..055c1bcd 100644
--- a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
@@ -32,19 +32,9 @@
-
-
+
+
+
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b3c8e888..c801f0ae 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -378,4 +378,5 @@
giorni
Nuovo articolo in griglia
Seleziona la riga da modificare
+ Colli in arrivo
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2088df9c..1a3ecbc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -387,4 +387,5 @@
days
Newly added product
Select document row to edit
+ Incoming packages