From 7d1d01f00696ccdffb0a50c49f3a1a30bea76f63 Mon Sep 17 00:00:00 2001
From: Gius95 <giuseppescorrano95@gmail.com>
Date: Tue, 4 Dec 2018 09:31:00 +0100
Subject: [PATCH] Creata key per la build e modifiche al Dialog Filtro Avanzato

---
 .idea/assetWizardSettings.xml                 |  51 ------------------
 .idea/caches/build_file_checksums.ser         | Bin 729 -> 728 bytes
 .idea/modules.xml                             |   2 +-
 Integry.jks                                   | Bin 0 -> 2228 bytes
 app/.gitignore                                |   1 +
 .../integrywmsnative/MainActivity.java        |   8 +--
 .../core/di/BindableInteger.java              |  34 ++++++++++++
 .../gest/main/MainFragment.java               |   6 +++
 .../gest/vendita/MainVenditaFragment.java     |   3 +-
 .../dialogs/DialogVenditaFiltroAvanzato.java  |  28 +++++++++-
 .../DialogVenditaFiltroAvanzatoViewModel.java |  13 +++++
 .../input_quantity/DialogInputQuantity.java   |  15 +++---
 .../layout/dialog_vendita_filtro_avanzato.xml |  48 +++++++++++++++--
 app/src/main/res/layout/fragment_main.xml     |  33 ++++++++++++
 app/src/main/res/layout/nav_header_main.xml   |   4 +-
 app/src/main/res/values-it/strings.xml        |   3 ++
 app/src/main/res/values/strings.xml           |   4 ++
 17 files changed, 184 insertions(+), 69 deletions(-)
 delete mode 100644 .idea/assetWizardSettings.xml
 create mode 100644 Integry.jks
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 7cc9fb08..00000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState />
-          </value>
-        </entry>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="clipartAsset">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/av/ic_playlist_add_check_black_24dp.xml" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputName" value="ic_playlist_add_check_24dp" />
-                            <entry key="sourceFile" value="C:\Users\GiuseppeS" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9c8b9aa46270e4e88edbc39616f964d23c3b391e..fe61d7ed35dd8d289e6c08164d617a5f95cbe3ac 100644
GIT binary patch
delta 111
zcmV-#0FeLL1=t0Um;`fBMih~pPXrKQaBz|VBoH9KIC+xpyQP;v;;eg&VtSG3C6i79
z36mrN5|d*AEE_9BI$TwAWpZ;|M`?9)WpHq1TrOvFVPtG&T$8N=8<WNXRuF}uug?~e
R^=9|?piLi2*h!Nt0<C4-EQkOA

delta 101
zcmV-r0Gj{U1=$6Vm;_|~Q8SU8Pm?79Ba!_U7A;^aMX)@R1x><giq^zj%5(q_VQ_Gh
zKLQt%69E#FV*xA^EJHe6RdZ!>b6iJhb#rBKaAi}Ip#gdjZ#!~yzWj{NqXa`UnPi{^
HlPdzPrJ5#L

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 246b1bce..e0a9141b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/IntegryWMSNative.iml" filepath="$PROJECT_DIR$/IntegryWMSNative.iml" />
+      <module fileurl="file://$PROJECT_DIR$/WMS.iml" filepath="$PROJECT_DIR$/WMS.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" filepath="$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" />
       <module fileurl="file://$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" filepath="$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" />
diff --git a/Integry.jks b/Integry.jks
new file mode 100644
index 0000000000000000000000000000000000000000..1b30e196208d541dd83fa87fab1606ea45a86fae
GIT binary patch
literal 2228
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
Xk{L81S<T@R%U#ew%h08GM1}WX-tzKB

literal 0
HcmV?d00001

diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1..956c004d 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
 /build
+/release
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 6cff7d29..0eff41f4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -15,6 +15,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.TextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -55,7 +56,6 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        ExceptionsHandler.toCatch(this);
 
         if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
             startLoginActivity();
@@ -64,9 +64,6 @@ public class MainActivity extends AppCompatActivity
 
             ButterKnife.bind(this);
 
-//            WaterfallToolbar waterfallToolbar = findViewById(R.id.waterfall_toolbar);
-//            waterfallToolbar.set
-
             Toolbar toolbar = findViewById(R.id.toolbar);
             setSupportActionBar(toolbar);
 
@@ -76,6 +73,7 @@ public class MainActivity extends AppCompatActivity
             drawer.setDrawerListener(toggle);
             toggle.syncState();
 
+
             mNavigationView = findViewById(R.id.nav_view);
             mNavigationView.setNavigationItemSelectedListener(this);
 
@@ -261,6 +259,8 @@ public class MainActivity extends AppCompatActivity
             }
         });
 
+
+
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
new file mode 100644
index 00000000..4a509d0a
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
@@ -0,0 +1,34 @@
+package it.integry.integrywmsnative.core.di;
+
+import android.databinding.BaseObservable;
+
+import org.parceler.Parcel;
+
+@Parcel
+public class BindableInteger  extends BaseObservable {
+    Integer value;
+
+    public Integer get() {
+        return get(true);
+    }
+
+    public Integer get(boolean defaultIfNull) {
+
+        if(value == null){
+            if(defaultIfNull) return 0;
+            else return null;
+        } else return value;
+    }
+
+    public void set(Integer value) {
+        if (!Objects.equals(this.value, value)) {
+            this.value = value;
+            notifyChange();
+        }
+    }
+
+    public boolean isEmpty() {
+        return value == null;
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index f6e6d3f5..16c13898 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import net.cachapa.expandablelayout.ExpandableLayout;
 
@@ -29,6 +30,7 @@ public class MainFragment extends Fragment implements ITitledFragment {
 
 
     @BindView(R.id.no_connection_top_layout) ExpandableLayout mNoConnectionLayout;
+    @BindView(R.id.current_user_name) TextView currentUsername;
 
     private View mView;
 
@@ -76,6 +78,10 @@ public class MainFragment extends Fragment implements ITitledFragment {
 
         WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power);
         wiFiCheckerViewHolder.startMonitoring();
+
+
+        currentUsername.setText(SettingsManager.i().user.fullname);
+
     }
 
     private void collapseNoConnectionLayout(){
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
index 335c1a23..360a6ad9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
 import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
+import it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzato;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
@@ -320,7 +321,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR
     @Override
     public void onFilterClick() {
 
-
+        DialogVenditaFiltroAvanzato.makeBase(getActivity()).show();
 
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
index 2933c430..b3c7b445 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
@@ -2,16 +2,42 @@ package it.integry.integrywmsnative.gest.vendita.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.view.LayoutInflater;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
 
 
 public class DialogVenditaFiltroAvanzato {
 
+
+    private static AlertDialog currentAlert;
     private static Context currentContext;
 
+    private static DialogVenditaFiltroAvanzatoViewModel currentViewModel;
 
     public static AlertDialog makeBase(final Context context) {
         currentContext = context;
+        currentViewModel = new DialogVenditaFiltroAvanzatoViewModel();
 
-        return null;
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+
+        DialogVenditaFiltroAvanzatoBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false);
+
+        final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
+                .setView(contentView.getRoot())
+                .setPositiveButton(context.getText(R.string.confirm), null)
+                .setNegativeButton(context.getText(R.string.abort), null);
+
+        contentView.setViewmodel(currentViewModel);
+
+
+
+        currentAlert = alertDialog.create();
+        currentAlert.setCanceledOnTouchOutside(false);
+
+        return currentAlert;
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
new file mode 100644
index 00000000..37755d79
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.gest.vendita.dialogs;
+
+import it.integry.integrywmsnative.core.di.BindableFloat;
+import it.integry.integrywmsnative.core.di.BindableInteger;
+import it.integry.integrywmsnative.core.di.BindableString;
+
+public class DialogVenditaFiltroAvanzatoViewModel {
+
+    public BindableString numOrds = new BindableString();
+    public BindableString cliente = new BindableString();
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index e854da5f..f513d1e4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
 import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
 import it.integry.plugins.barcode_base_library.model.BarcodeType;
@@ -207,13 +208,13 @@ public class DialogInputQuantity {
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
 
-        ViewDataBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
+        DialogInputQuantityArticoloBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
 
-        final TextInputLayout txlInputBatchLot = contentView.getRoot().findViewById(R.id.input_partita_mag);
+        final TextInputLayout txlInputBatchLot = contentView.inputPartitaMag;
 
-        final TextInputLayout txlInputNumDiCnf = contentView.getRoot().findViewById(R.id.input_num_cnf);
-        final TextInputLayout txlInputQtaPerCnf = contentView.getRoot().findViewById(R.id.input_qta_cnf);
-        final TextInputLayout txlInputQtaTot = contentView.getRoot().findViewById(R.id.input_qta_tot);
+        final TextInputLayout txlInputNumDiCnf = contentView.inputNumCnf;
+        final TextInputLayout txlInputQtaPerCnf = contentView.inputQtaCnf;
+        final TextInputLayout txlInputQtaTot = contentView.inputQtaTot;
 
         txlInputNumDiCnf.getEditText().setSelectAllOnFocus(true);
         txlInputQtaPerCnf.getEditText().setSelectAllOnFocus(true);
@@ -229,8 +230,8 @@ public class DialogInputQuantity {
 
         setupQuantityListener(currentQuantityDto, txlInputNumDiCnf, txlInputQtaPerCnf, txlInputQtaTot);
 
-        contentView.setVariable(BR.viewmodel, dto);
-        contentView.setVariable(BR.quantityViewModel, currentQuantityDto);
+        contentView.setViewmodel(dto);
+        contentView.setQuantityViewModel(currentQuantityDto);
 
         final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
                 .setView(contentView.getRoot())
diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
index 5f663861..b773e8ba 100644
--- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
@@ -4,14 +4,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
+        <variable
+            name="viewmodel"
+            type="it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzatoViewModel" />
+
+    </data>
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:layout_margin="16dp">
 
             <android.support.v7.widget.AppCompatTextView
@@ -20,10 +27,45 @@
                 android:textSize="22sp"
                 android:text="@string/dialog_vendita_filtro_avanzato"
                 android:textStyle="bold"
-                android:textColor="@android:color/black" />
+                android:textColor="@android:color/black"
+                android:layout_marginBottom="12dp"/>
 
 
-        </RelativeLayout>
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/input_num_ords"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hintTextAppearance="@style/hint_text">
+
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textNoSuggestions"
+                    android:hint="@string/num_ords"
+                    app:binding="@{viewmodel.numOrds}"/>
+
+
+            </android.support.design.widget.TextInputLayout>
+
+
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/input_cliente"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hintTextAppearance="@style/hint_text">
+
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textNoSuggestions"
+                    android:hint="@string/customer"
+                    app:binding="@{viewmodel.cliente}"/>
+
+
+            </android.support.design.widget.TextInputLayout>
+
+
+        </LinearLayout>
 
     </android.support.v7.widget.CardView>
 
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 66d0d803..5fea7e3c 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -71,6 +71,39 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
+                    <android.support.constraint.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <android.support.constraint.Guideline
+                            android:id="@+id/guideline_username"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.40"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:text="Utente corrente"
+                            android:textColor="@android:color/black"
+                            app:layout_constraintEnd_toStartOf="@+id/guideline"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/current_user_name"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="0dp"
+                            android:layout_marginStart="0dp"
+                            android:text="N/A"
+                            android:textSize="16sp"
+                            app:layout_constraintStart_toStartOf="@+id/guideline_username"
+                            app:layout_constraintEnd_toEndOf="parent" />
+
+                    </android.support.constraint.ConstraintLayout>
+
                     <android.support.constraint.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 5eea9a6f..d2572035 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/side_nav_bar"
     android:gravity="bottom"
     android:orientation="vertical"
@@ -20,10 +21,11 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/drawer_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="Android Studio"
+        tools:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 833295b4..848b2699 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -136,4 +136,7 @@
     <string name="cod_art_or_description">Cod art / Descrizione</string>
     <string name="no_supplier_selected">Seleziona un fornitore prima</string>
 
+    <string name="num_ords">Numero ordine</string>
+    <string name="customer">Cliente</string>
+
 </resources>
\ 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 da8af156..e7d7ed3e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,4 +144,8 @@
     <string name="cod_art_or_description">Item code / Description</string>
     <string name="no_supplier_selected">Please select a supplier first</string>
 
+
+    <string name="num_ords">Orders number</string>
+    <string name="customer">Customer</string>
+
 </resources>