From 7e7a5c97946eec7f1ec7cd2e0419ca6bd9a2f73e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 11 Dec 2019 09:47:51 +0100
Subject: [PATCH 1/2] Aggiunto menu di Movimentazione Interna per FRUDIS.
 Aggiunta qta_col nel fragment articoli in collo.

---
 ...li_in_collo_bottom_sheet__mtbcolr_item.xml | 42 ++++++++++++++-----
 .../extensions/MenuConfigurationFRUDIS.java   | 22 ++++++++++
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
index 2c500812..79095543 100644
--- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
+++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml
@@ -23,20 +23,42 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/qta_box"
-            app:layout_constraintStart_toStartOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{mtbColr.codMart}"
-                android:textColor="@color/colorPrimary"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                style="@style/AppTheme.NewMaterial.Text.Small"
-                tools:text="COD MART" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{mtbColr.codMart}"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    tools:text="COD MART" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
+                    android:visibility="@{mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:layout_alignParentEnd="true"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:background="@drawable/badge2_round_corner"
+                    android:textColor="@android:color/white"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    tools:text="PESO KG" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
index 318aa237..ea9f12ca 100644
--- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
@@ -6,8 +6,10 @@ import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrd
 import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
 import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
 
@@ -74,6 +76,26 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
                                 .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale)
                                 .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
                                 .setFragmentClass(ProdRecuperoMaterialeFragment.newInstance()))
+        ).addGroup(
+                new MenuGroup()
+                        .setGroupText(it.integry.integrywmsnative.R.string.internal_handling)
+                        .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna)
+
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce)
+                                .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                .setFragmentClass(VersamentoMerceFragment.newInstance()))
+
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze)
+                                .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box)
+                                .setFragmentClass(RettificaGiacenzeFragment.newInstance()))
+
+
         );
 
 

From d140ae414a79d8f53bc36138b25ac0c6cfbe756a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 11 Dec 2019 09:48:35 +0100
Subject: [PATCH 2/2] -> v1.10.4 (107)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fc1d5d64..332310b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 106
-    def appVersionName = '1.10.3'
+    def appVersionCode = 107
+    def appVersionName = '1.10.4'
 
     signingConfigs {
         release {