Merge branch 'master' into saturdayNEWAC

GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml

@@ -9,7 +9,9 @@
         android:id="@+id/card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginTop="5dp"
         card_view:cardCornerRadius="10dp">
 
         <LinearLayout

GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml

@@ -77,12 +77,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
-                        android:hint="@string/stock_facing_stock"
                         android:inputType="number"
                         android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#222"
                         android:textColorHint="#666" />
+                    <!--android:hint="@string/stock_facing_stock"-->
                 </LinearLayout>
 
                 <LinearLayout
@@ -106,12 +106,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
-                        android:hint="@string/stock_facing_faceup"
                         android:inputType="number"
                         android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#222"
                         android:textColorHint="#666" />
+                    <!--android:hint="@string/stock_facing_faceup"-->
                 </LinearLayout>
             </LinearLayout>
 

GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml

@@ -46,7 +46,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight=".6"
                     android:paddingRight="5dp"
-                    android:text="@string/stock_facing_sos"
+                    android:text="-"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -190,12 +190,28 @@
     <!--Gagan end new code 2-->
 
     <string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
+    <string name="error_incorrect_username">Bu kullanıcı adı yanlış</string>
+
     <string name="error">Hata! paylaşılıyor</string>
     <string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
+
     <string name="data_downloaded_successfully">Veri başarıyla indirildi</string>
     <string name="DELETE_ALERT_MESSAGE">Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?</string>
     <string name="NodataAvailable">Veri yok</string>
     <string name="Pleasedownaloaddata">Lütfen verileri indirin</string>
+
+    <!--Gagan start code 3-->
+    <string name="cancel">İptal etmek</string>
+    <string name="empty">Boş</string>
+
+    <string name="check_faceup">Raf Payı, stoktan daha az veya eşit olmalıdır</string>
+    <string name="fill_stock_value">Önce stok değerini doldurun</string>
+    <string name="want_add">Verileri eklemek istiyor musunuz?</string>
+    <string name="promo_add">Promosyon  eklendi</string>
+    <string name="select_promo_value">Promosyon değerini seçin</string>
+    <string name="select_promo">Seçiniz</string>
+    <!--Gagan end code 3-->
+
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -228,9 +228,25 @@
     <string name="uploadeddata">Uploaded Data</string>
 
     <string name="previous_data_upload">Please Upload Previous Data First</string>
+
+    <string name="error_incorrect_username">This username is incorrect</string>
+
     <string name="error">Error Uploading</string>
+
     <string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
     <string name="NodataAvailable">No data available</string>
     <string name="Pleasedownaloaddata">Please download data</string>
 
+    <!--Gagan start code 3-->
+    <string name="empty">Empty</string>
+    <string name="check_faceup">Faceup can not be greater than stock value</string>
+    <string name="fill_stock_value">First fill the stock value</string>
+    <string name="want_add">Are you sure you want to add</string>
+    <string name="promo_add">promo is added</string>
+    <string name="select_promo_value">Select the promo value</string>
+    <string name="select_promo">Select</string>
+
+    <!--Gagan end code 3-->
+
+
 </resources>