diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 7e887b00224..9f717fd201e 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -14292,7 +14292,7 @@ msgstr ""
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Sales Application Configuration"
 
-#~ msgid "Weigths"
+#~ msgid "Weights"
 #~ msgstr "Ağırlık Bilgisi"
 
 #~ msgid ""
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index fa4bcafc842..0b9773650e1 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "الأوزان"
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 851aba310e0..8cb73c30237 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 307cd6a98fa..fc91f6699eb 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -1994,7 +1994,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 90a638bdfe7..f667ff14c8b 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -1997,7 +1997,7 @@ msgstr "PC complert amb perifèrics"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 8cefdd0b285..affc497d898 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index a692bca6614..b76b368ee7d 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -2127,7 +2127,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Gewichte"
 
 #. module: product
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index a6cd1f13b25..c1be9c0fecf 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -2022,7 +2022,7 @@ msgstr "Ολοκληρωμένος Η/Υ με Περιφερειακά"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Βάρη"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 5cf7fc740bf..6c57dddca3c 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -2110,7 +2110,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index c112b20f1c8..c2f0307c7f9 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -2000,7 +2000,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index cdc36be8bf2..569303bf317 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -2002,7 +2002,7 @@ msgstr "PC completo con periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index aa0ce0d4f1c..77203acb95b 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -1991,7 +1991,7 @@ msgstr "Täielik PC koos välisseadmetega"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Kaalud"
 
 #. module: product
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index d6661b8f15f..9bc0dc31e35 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -1968,7 +1968,7 @@ msgstr "PC Osoa Periferikoekin"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pisuak"
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 26966644b46..1b020a1fbef 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -1994,7 +1994,7 @@ msgstr "Kokonainen PC lisälaitteineen"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Painot"
 
 #. module: product
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 06396918d8a..974ccb5796e 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -2137,7 +2137,7 @@ msgstr "PC complet avec périphériques"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Poids"
 
 #. module: product
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index 58b24a16c84..e4bc8c92c7e 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index e4ef11d4916..93548a11257 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -1994,7 +1994,7 @@ msgstr "Računalo s periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Težine"
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 4faa3025e45..8fdcbb4aa02 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -1978,7 +1978,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Súlyok"
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 0bdfd9875ba..1237ab5f569 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index d8da0530fed..4d9499b25f4 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -2115,7 +2115,7 @@ msgstr "PC Completo con Periferiche"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesi"
 
 #. module: product
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index e5dd7adcc1b..280de9fdb62 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -1970,7 +1970,7 @@ msgstr "주변기기를 갖춘 완전한 PC 세트"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "중량"
 
 #. module: product
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 3824ea0fa72..35bd7e16ca3 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -1991,7 +1991,7 @@ msgstr "Pilnas PK su papildoma įranga"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Gabenimo matai"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index f19d933e2c6..453b59eaba8 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -1966,7 +1966,7 @@ msgstr "Complete PC With Peripherals"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Svari"
 
 #. module: product
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 646e29a92c5..472cbaf64c6 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -2024,7 +2024,7 @@ msgstr "Иж бүрэн PC"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Жин"
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 95f072956e3..e18d7fb092f 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -1968,7 +1968,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po
index 74e08e40d52..1622d88f5af 100644
--- a/addons/product/i18n/nb_NB.po
+++ b/addons/product/i18n/nb_NB.po
@@ -235,7 +235,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Vekt"
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index a852a92464a..1943000b7ee 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -1998,7 +1998,7 @@ msgstr "Complete PC met randapparatuur"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Gewichten"
 
 #. module: product
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index 65823c49f04..4d47852cf7b 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index ba9f04069a3..36d7426d103 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -2010,7 +2010,7 @@ msgstr "Kompletny PC z urządzeniami zewnętrznymi"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Wagi"
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index cf5395ea460..06621b2cc9a 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -1996,7 +1996,7 @@ msgstr "PC Completo Com Periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 028c9788ca1..4353f869c91 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -2115,7 +2115,7 @@ msgstr "PC Complet com periféricos"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Pesos"
 
 #. module: product
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 5656e6c8395..78b6ba37a73 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -1967,7 +1967,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index e3c9f452ff8..12c7f25fdc2 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -2026,7 +2026,7 @@ msgstr "Комплектовать ПК периферией"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Вес"
 
 #. module: product
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 5470bcdea6d..ac280c6757a 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -1999,7 +1999,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Miery"
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index f5ca43ab94b..80df5ef764f 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -1977,7 +1977,7 @@ msgstr "Kompleten PC s perifernimi enotami"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Teže"
 
 #. module: product
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 936f30a13b3..9403edd8594 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -1966,7 +1966,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index afd817dc0a9..15978e226bf 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 8a599fa7a33..65c76fa6aa7 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Težina"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 771b163d24c..dea3f6fea1a 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -2016,7 +2016,7 @@ msgstr "Komplett dator med periferiutrustning"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Mått"
 
 #. module: product
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index d2b07d66b6a..356ba8d3854 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 64e7e16605d..30677eb03f1 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -1985,7 +1985,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Ağırlık Bilgisi"
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index c170491f374..1de1af31f22 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -1970,7 +1970,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 902f2efcb60..6250a5cccc4 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -1996,7 +1996,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "Khối lượng"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 5ec3ff9115e..a7ecb1347d0 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -1974,7 +1974,7 @@ msgstr "完整的电脑外设"
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr "重量"
 
 #. module: product
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 446e21a58a8..a9cb86c1d1c 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -1965,7 +1965,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
+msgid "Weights"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 59623a5204e..83240716715 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -101,7 +101,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="Weigths" colspan="2"/>
+                                <separator string="Weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
@@ -567,7 +567,7 @@
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="Weigths" colspan="2"/>
+                                <separator string="Weights" colspan="2"/>
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 897d5cd0e98..d2b9a2a5eb8 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -28,10 +28,23 @@ class stock_change_product_qty(osv.osv_memory):
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
         'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', required=True,domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        result = super(stock_change_product_qty, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        product_id = context and context.get('active_id', False) or False
+
+        if (context.get('active_model') == 'product.product') and product_id:
+            prod_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            fields = result.get('fields', {})
+            if fields and (prod_obj.track_production == True) and (fields.get('prodlot_id')):
+                result['fields']['prodlot_id']['required'] =  True
+            else:
+                result['fields']['prodlot_id']['required'] = False
+        return result
+
     def default_get(self, cr, uid, fields, context):
         """ To get default values for the object.
          @param self: The object pointer.