diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 40c062b274..e17965d506 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -11,41 +11,31 @@ msgstr ""
 "наличност."
 
 msgctxt "error:stock.inventory.line:"
-msgid "Line quantity must be positive!"
-msgstr "Количеството на реда трябва да е положително число!"
+msgid "Line quantity must be positive."
+msgstr ""
 
 msgctxt "error:stock.inventory.line:"
-msgid "Product must be unique by inventory!"
-msgstr "Продукта трябва да е уникален по инвентаризация!"
+msgid "Product must be unique by inventory."
+msgstr ""
 
 msgctxt "error:stock.inventory:"
-msgid "Inventory \"%s\" must be cancelled before deletion!"
-msgstr "Преди да бъде изтрита инвентаризация \"%s\" трябва да бъде прекратена!"
+msgid "Inventory \"%s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.location:"
+msgid "Location \"%(location)s\" must be a child of warehouse \"%(warehouse)s\"."
+msgstr ""
 
 msgctxt "error:stock.location:"
 msgid ""
-"A location with existing moves cannot be changed to a type that does not "
-"support moves."
+"Location \"%s\" with existing moves cannot be changed to a type that does "
+"not support moves."
 msgstr ""
-"Местонахождение със същетсвуващи движения не може да бъде променено с такова"
-" което не поддържа движения"
-
-msgctxt "error:stock.location:"
-msgid "Location \"%s\" must be a child of warehouse \"%s\"!"
-msgstr "Местонахождение \"%s\" трябва да е подчинен на склад \"%s\" !"
-
-msgctxt "error:stock.location:"
-msgid "You can not create recursive locations!"
-msgstr "Не може да създавате взаимновложени местонахождения!"
 
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Количествата на движение трябва да са положително число"
 
-msgctxt "error:stock.move:"
-msgid "Move can be on only one Shipment"
-msgstr "Движението трябва да само върху едно изпращане"
-
 msgctxt "error:stock.move:"
 msgid "Move quantity must be positive"
 msgstr "Количеството на движение трябва да е положително число"
@@ -55,87 +45,79 @@ msgid "Source and destination location must be different"
 msgstr "Източника и целта на местонахождението трябва да са различни"
 
 msgctxt "error:stock.move:"
-msgid "You can not modify a move in the state: \"Assigned\", \"Done\" or \"Cancel\""
+msgid ""
+"You can not delete stock move \"%s\" because it is not in draft or cancelled"
+" state."
 msgstr ""
-"Не може да променяте движение в състояние: \"Назначен\", \"Приключен\" или "
-"\"Отказ\""
 
 msgctxt "error:stock.move:"
-msgid "You can not modify move in closed period!"
-msgstr "Не може да променяте затворен период!"
+msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
+msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to assigned!"
-msgstr "Не може да промените състоянието в назначен!"
+msgid ""
+"You can not modify stock move \"%s\"because it is in \"Assigned\", \"Done\" "
+"or \"Cancel\" state."
+msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to done!"
-msgstr "Не може да прехвърлите в състояние Готов!"
+msgid "You can not set stock move \"%s\" to assigned state."
+msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to draft!"
-msgstr "Не може да пратите статуса в проект!"
+msgid "You can not set stock move \"%s\" to done state."
+msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can only delete draft or cancelled moves!"
-msgstr "Не може да изтривате движения в статус проект или отказан!"
+msgid "You can not set stock move \"%s\" to draft state."
+msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period in the future or today!"
-msgstr "Не може да затваряте период от днес или в бедещето!"
+msgid "You can not close a period in the future or today."
+msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period when there is still assigned moves!"
-msgstr "Не може да затваряте период когато съдържа назначени движения!"
+msgid "You can not close a period when there still are assigned moves."
+msgstr ""
 
 msgctxt "error:stock.shipment.in.return:"
-msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Преди да бъде изтрита пратка върната от доставчик \"%s\" трябва да бъде "
-"прекратена!"
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Incoming Moves must have the warehouse input location as destination "
-"location!"
+"location."
 msgstr ""
-"Входящите движения трябва да имат местонахождение-вход на склад като "
-"местонахождение-цел!"
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
-"Inventory Moves must have the warehouse input location as source location!"
+"Inventory Moves must have the warehouse input location as source location."
 msgstr ""
-"Движение на инвентаризация трябва да имат местонахождение-вход на склад като"
-" местонахождение-източник!"
 
 msgctxt "error:stock.shipment.in:"
-msgid "Supplier Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Преди да бъде изтрита пратка на доставчик \"%s\" трябва да бъде прекратена!"
 
 msgctxt "error:stock.shipment.internal:"
-msgid "Internal Shipment \"%s\" must be cancelled before deletion!"
-msgstr "Преди да бъде изтрита вътрешна доставка \"%s\" трябва да бъде прекратена!"
+msgid "Internal Shipment \"%s\" must be cancelled before deletion."
+msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
-msgid "The shipment with code %s is not yet sent."
-msgstr "Пратката с код %s още не е изпратена"
+msgid "The shipment with code \"%s\" is not yet sent."
+msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
 msgid "You can not create return shipment"
 msgstr "Не може да създадете връщане на пратка"
 
 msgctxt "error:stock.shipment.out.return:"
-msgid "Customer Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Преди да бъде изтрита пратка върната от клиент \"%s\" трябва да бъде "
-"прекратена!"
 
 msgctxt "error:stock.shipment.out:"
-msgid "Customer Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Преди да бъде изтрита доставка за клиент \"%s\" трябва да бъде прекратена!"
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
@@ -445,6 +427,11 @@ msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
 msgstr "Вътрешно количество"
 
+#, fuzzy
+msgctxt "field:stock.move,origin:"
+msgid "Origin"
+msgstr "Източник"
+
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
 msgstr "Планирана дата"
@@ -465,25 +452,9 @@ msgctxt "field:stock.move,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:stock.move,shipment_in:"
-msgid "Supplier Shipment"
-msgstr "Пратка на доставчик"
-
-msgctxt "field:stock.move,shipment_in_return:"
-msgid "Supplier Return Shipment"
-msgstr "Пратка върната от доставчик"
-
-msgctxt "field:stock.move,shipment_internal:"
-msgid "Internal Shipment"
-msgstr "Вътрешно изпращане"
-
-msgctxt "field:stock.move,shipment_out:"
-msgid "Customer Shipment"
-msgstr "Пратка за клиент"
-
-msgctxt "field:stock.move,shipment_out_return:"
-msgid "Customer Return Shipment"
-msgstr "Пратка върната от клиент"
+msgctxt "field:stock.move,shipment:"
+msgid "Shipment"
+msgstr ""
 
 msgctxt "field:stock.move,state:"
 msgid "State"
@@ -1087,10 +1058,6 @@ msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
 msgstr "Инвентаризации"
 
-msgctxt "model:ir.action,name:act_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr "Проект на инвентаризация"
-
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
 msgstr "Местонахождения"
@@ -1108,18 +1075,6 @@ msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
 msgstr "Движения"
 
-msgctxt "model:ir.action,name:act_move_form_cust"
-msgid "Moves to Customers"
-msgstr "Движения към клиенти"
-
-msgctxt "model:ir.action,name:act_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr "Движения от доставчик"
-
-msgctxt "model:ir.action,name:act_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr "Движения от доставчик очакващи пристигане"
-
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
 msgstr "Периоди"
@@ -1133,38 +1088,18 @@ msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
 msgstr "Продукти по местонахождения"
 
-msgctxt "model:ir.action,name:act_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr "Чернова на пратка на доставчик"
-
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr "Пратки на доставчик"
 
-msgctxt "model:ir.action,name:act_shipment_in_form_received"
-msgid "Received Supplier shipments"
-msgstr "Пратки получени от доставчик"
-
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr "Пратка върната на доставчик"
 
-msgctxt "model:ir.action,name:act_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr "Назначаване на вътрешна пратка"
-
-msgctxt "model:ir.action,name:act_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr "Проект на вътрешна пратка"
-
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr "Вътрешни изпращания"
 
-msgctxt "model:ir.action,name:act_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr "Вътрешни пратки очакващи назначаване"
-
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
 msgstr "Пратки за клиенти"
@@ -1177,18 +1112,6 @@ msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
 msgstr "Пратки на доставчик"
 
-msgctxt "model:ir.action,name:act_shipment_out_form_assigned"
-msgid "Assigned Customer Shipments"
-msgstr "Назначени пратки за клиенти"
-
-msgctxt "model:ir.action,name:act_shipment_out_form_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr "Пратки за клиенти готови за изпращане"
-
-msgctxt "model:ir.action,name:act_shipment_out_form_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr "Пратки за клиенти чакащи назначаване"
-
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr "Пратки върнати от клиент"
@@ -1246,6 +1169,144 @@ msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
 msgstr "Назначаване на пратка за навън"
 
+msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier"
+msgid "From Suppliers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
+msgid "From Suppliers Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
+msgid "To Customers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
+msgid "Received"
+msgstr "Получен"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
+msgid "Assigned"
+msgstr "Назначен"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
+msgid "Waiting"
+msgstr "Очакване"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
+msgid "Assigned"
+msgstr "Назначен"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
+msgid "Waiting"
+msgstr "Очакване"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
+msgid "Assigned"
+msgstr "Назначен"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
+msgid "Packed"
+msgstr "Опакован"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
+msgid "Waiting"
+msgstr "Очакване"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
+msgid "Received"
+msgstr "Получен"
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr "Изпращане на доставчик"
@@ -1294,10 +1355,6 @@ msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
 msgstr "Инвентаризации"
 
-msgctxt "model:ir.ui.menu,name:menu_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr "Проект на инвентаризация"
-
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
 msgstr "Местонахождения"
@@ -1310,18 +1367,6 @@ msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
 msgstr "Движения"
 
-msgctxt "model:ir.ui.menu,name:menu_move_form_cust"
-msgid "Moves to Customers"
-msgstr "Движения към клиенти"
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr "Движения от доставчик"
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr "Движения от доставчик очакващи пристигане"
-
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
 msgstr "Периоди"
@@ -1330,58 +1375,26 @@ msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Справки"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr "Чернова на пратка на доставчик"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr "Пратки на доставчик"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_received"
-msgid "Received Supplier shipments"
-msgstr "Пратки получени от доставчик"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr "Пратка върната на доставчик"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr "Назначени вътрешни пратки"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr "Проект на вътрешна пратка"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr "Вътрешни изпращания"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr "Вътрешни пратки очакващи назначаване"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_assigned"
-msgid "Assigned Customer Shipments"
-msgstr "Назначени пратки за клиенти"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
 msgstr "Пратки за клиенти"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr "Пратки за клиенти готови за изпращане"
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr "Пратки върнати от клиент"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr "Пратки за клиенти чакащи назначаване"
-
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
 msgstr "Инвентаризация & наличност"
@@ -1994,10 +2007,6 @@ msgctxt "view:stock.location:"
 msgid "Locations"
 msgstr "Местонахождения"
 
-msgctxt "view:stock.location:"
-msgid "Product Stock"
-msgstr "Наличност на продукт"
-
 msgctxt "view:stock.move:"
 msgid "Move"
 msgstr "Движение"
@@ -2066,10 +2075,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
 msgstr "Проект"
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Reset to Draft"
-msgstr "Изпращане в проект"
-
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
 msgstr "Пратка върната на доставчик"
@@ -2082,10 +2087,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr "Очакване"
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Waiting"
-msgstr "Изчакващ"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
 msgstr "Отказ"
@@ -2102,18 +2103,10 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr "Движения на инвентаризация"
 
-msgctxt "view:stock.shipment.in:"
-msgid "Moves"
-msgstr "Движения"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr "Получаване"
 
-msgctxt "view:stock.shipment.in:"
-msgid "Received"
-msgstr "Получен"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
 msgstr "Изпращане в проект"
@@ -2158,10 +2151,6 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
 msgstr "Вътрешни пратки"
 
-msgctxt "view:stock.shipment.internal:"
-msgid "Reset to Draft"
-msgstr "Изпращане в проект"
-
 msgctxt "view:stock.shipment.internal:"
 msgid "Waiting"
 msgstr "Изчакващ"
@@ -2202,18 +2191,10 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr "Движения на инвентаризация"
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Moves"
-msgstr "Движения"
-
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr "Получен"
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Reset to Draft"
-msgstr "Изпращане в проект"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
 msgstr "Назначаване"
@@ -2250,10 +2231,6 @@ msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr "Изходящи движения"
 
-msgctxt "view:stock.shipment.out:"
-msgid "Reset to Draft"
-msgstr "Изпращане в проект"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Waiting"
 msgstr "Изчакващ"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 0f01ab10fe..fce392e5bb 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -9,39 +9,31 @@ msgid ""
 msgstr ""
 
 msgctxt "error:stock.inventory.line:"
-msgid "Line quantity must be positive!"
+msgid "Line quantity must be positive."
 msgstr ""
 
 msgctxt "error:stock.inventory.line:"
-msgid "Product must be unique by inventory!"
+msgid "Product must be unique by inventory."
 msgstr ""
 
 msgctxt "error:stock.inventory:"
-msgid "Inventory \"%s\" must be cancelled before deletion!"
+msgid "Inventory \"%s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.location:"
+msgid "Location \"%(location)s\" must be a child of warehouse \"%(warehouse)s\"."
 msgstr ""
 
 msgctxt "error:stock.location:"
 msgid ""
-"A location with existing moves cannot be changed to a type that does not "
-"support moves."
-msgstr ""
-
-msgctxt "error:stock.location:"
-msgid "Location \"%s\" must be a child of warehouse \"%s\"!"
-msgstr ""
-
-msgctxt "error:stock.location:"
-msgid "You can not create recursive locations!"
+"Location \"%s\" with existing moves cannot be changed to a type that does "
+"not support moves."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
 
-msgctxt "error:stock.move:"
-msgid "Move can be on only one Shipment"
-msgstr ""
-
 msgctxt "error:stock.move:"
 msgid "Move quantity must be positive"
 msgstr ""
@@ -51,62 +43,66 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not modify a move in the state: \"Assigned\", \"Done\" or \"Cancel\""
+msgid ""
+"You can not delete stock move \"%s\" because it is not in draft or cancelled"
+" state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not modify move in closed period!"
+msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to assigned!"
+msgid ""
+"You can not modify stock move \"%s\"because it is in \"Assigned\", \"Done\" "
+"or \"Cancel\" state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to done!"
+msgid "You can not set stock move \"%s\" to assigned state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to draft!"
+msgid "You can not set stock move \"%s\" to done state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can only delete draft or cancelled moves!"
+msgid "You can not set stock move \"%s\" to draft state."
 msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period in the future or today!"
+msgid "You can not close a period in the future or today."
 msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period when there is still assigned moves!"
+msgid "You can not close a period when there still are assigned moves."
 msgstr ""
 
 msgctxt "error:stock.shipment.in.return:"
-msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Incoming Moves must have the warehouse input location as destination "
-"location!"
+"location."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
-"Inventory Moves must have the warehouse input location as source location!"
+"Inventory Moves must have the warehouse input location as source location."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
-msgid "Supplier Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.internal:"
-msgid "Internal Shipment \"%s\" must be cancelled before deletion!"
+msgid "Internal Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
-msgid "The shipment with code %s is not yet sent."
+msgid "The shipment with code \"%s\" is not yet sent."
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
@@ -114,11 +110,11 @@ msgid "You can not create return shipment"
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return:"
-msgid "Customer Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.out:"
-msgid "Customer Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "field:party.address,delivery:"
@@ -429,6 +425,10 @@ msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
 msgstr ""
 
+msgctxt "field:stock.move,origin:"
+msgid "Origin"
+msgstr ""
+
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -449,24 +449,8 @@ msgctxt "field:stock.move,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:stock.move,shipment_in:"
-msgid "Supplier Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_in_return:"
-msgid "Supplier Return Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_internal:"
-msgid "Internal Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_out:"
-msgid "Customer Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_out_return:"
-msgid "Customer Return Shipment"
+msgctxt "field:stock.move,shipment:"
+msgid "Shipment"
 msgstr ""
 
 msgctxt "field:stock.move,state:"
@@ -1051,10 +1035,6 @@ msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
 msgstr ""
@@ -1071,18 +1051,6 @@ msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_move_form_cust"
-msgid "Moves to Customers"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
 msgstr ""
@@ -1095,38 +1063,18 @@ msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_in_form_received"
-msgid "Received Supplier shipments"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
 msgstr ""
@@ -1139,18 +1087,6 @@ msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_out_form_assigned"
-msgid "Assigned Customer Shipments"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_out_form_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_out_form_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr ""
@@ -1207,6 +1143,129 @@ msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
 msgstr ""
 
+msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier"
+msgid "From Suppliers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
+msgid "From Suppliers Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
+msgid "To Customers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
+msgid "Received"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
+msgid "Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
+msgid "Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
+msgid "Packed"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
+msgid "Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
+msgid "Received"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1255,10 +1314,6 @@ msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
 msgstr ""
@@ -1271,18 +1326,6 @@ msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_move_form_cust"
-msgid "Moves to Customers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
 msgstr ""
@@ -1291,58 +1334,26 @@ msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_received"
-msgid "Received Supplier shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_assigned"
-msgid "Assigned Customer Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
 msgstr ""
@@ -1955,10 +1966,6 @@ msgctxt "view:stock.location:"
 msgid "Locations"
 msgstr ""
 
-msgctxt "view:stock.location:"
-msgid "Product Stock"
-msgstr ""
-
 msgctxt "view:stock.move:"
 msgid "Move"
 msgstr ""
@@ -2027,10 +2034,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
 msgstr ""
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Reset to Draft"
-msgstr ""
-
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
 msgstr ""
@@ -2043,10 +2046,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
-msgctxt "view:stock.shipment.in.return:"
-msgid "Waiting"
-msgstr ""
-
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
 msgstr ""
@@ -2063,18 +2062,10 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "view:stock.shipment.in:"
-msgid "Moves"
-msgstr ""
-
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
-msgctxt "view:stock.shipment.in:"
-msgid "Received"
-msgstr ""
-
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
 msgstr ""
@@ -2119,10 +2110,6 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal:"
-msgid "Reset to Draft"
-msgstr ""
-
 msgctxt "view:stock.shipment.internal:"
 msgid "Waiting"
 msgstr ""
@@ -2163,18 +2150,10 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr ""
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Moves"
-msgstr ""
-
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
-msgctxt "view:stock.shipment.out.return:"
-msgid "Reset to Draft"
-msgstr ""
-
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
 msgstr ""
@@ -2211,10 +2190,6 @@ msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr ""
 
-msgctxt "view:stock.shipment.out:"
-msgid "Reset to Draft"
-msgstr ""
-
 msgctxt "view:stock.shipment.out:"
 msgid "Waiting"
 msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 39c443fc24..79691de039 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -9,39 +9,31 @@ msgid ""
 msgstr ""
 
 msgctxt "error:stock.inventory.line:"
-msgid "Line quantity must be positive!"
+msgid "Line quantity must be positive."
 msgstr ""
 
 msgctxt "error:stock.inventory.line:"
-msgid "Product must be unique by inventory!"
+msgid "Product must be unique by inventory."
 msgstr ""
 
 msgctxt "error:stock.inventory:"
-msgid "Inventory \"%s\" must be cancelled before deletion!"
+msgid "Inventory \"%s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.location:"
+msgid "Location \"%(location)s\" must be a child of warehouse \"%(warehouse)s\"."
 msgstr ""
 
 msgctxt "error:stock.location:"
 msgid ""
-"A location with existing moves cannot be changed to a type that does not "
-"support moves."
-msgstr ""
-
-msgctxt "error:stock.location:"
-msgid "Location \"%s\" must be a child of warehouse \"%s\"!"
-msgstr ""
-
-msgctxt "error:stock.location:"
-msgid "You can not create recursive locations!"
+"Location \"%s\" with existing moves cannot be changed to a type that does "
+"not support moves."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
 
-msgctxt "error:stock.move:"
-msgid "Move can be on only one Shipment"
-msgstr ""
-
 msgctxt "error:stock.move:"
 msgid "Move quantity must be positive"
 msgstr ""
@@ -51,62 +43,66 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not modify a move in the state: \"Assigned\", \"Done\" or \"Cancel\""
+msgid ""
+"You can not delete stock move \"%s\" because it is not in draft or cancelled"
+" state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not modify move in closed period!"
+msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to assigned!"
+msgid ""
+"You can not modify stock move \"%s\"because it is in \"Assigned\", \"Done\" "
+"or \"Cancel\" state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to done!"
+msgid "You can not set stock move \"%s\" to assigned state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can not set state to draft!"
+msgid "You can not set stock move \"%s\" to done state."
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "You can only delete draft or cancelled moves!"
+msgid "You can not set stock move \"%s\" to draft state."
 msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period in the future or today!"
+msgid "You can not close a period in the future or today."
 msgstr ""
 
 msgctxt "error:stock.period:"
-msgid "You can not close a period when there is still assigned moves!"
+msgid "You can not close a period when there still are assigned moves."
 msgstr ""
 
 msgctxt "error:stock.shipment.in.return:"
-msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
 "Incoming Moves must have the warehouse input location as destination "
-"location!"
+"location."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
 msgid ""
-"Inventory Moves must have the warehouse input location as source location!"
+"Inventory Moves must have the warehouse input location as source location."
 msgstr ""
 
 msgctxt "error:stock.shipment.in:"
-msgid "Supplier Shipment \"%s\" must be cancelled before deletion!"
+msgid "Supplier Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.internal:"
-msgid "Internal Shipment \"%s\" must be cancelled before deletion!"
+msgid "Internal Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
-msgid "The shipment with code %s is not yet sent."
+msgid "The shipment with code \"%s\" is not yet sent."
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return.create:"
@@ -114,11 +110,11 @@ msgid "You can not create return shipment"
 msgstr ""
 
 msgctxt "error:stock.shipment.out.return:"
-msgid "Customer Return Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "error:stock.shipment.out:"
-msgid "Customer Shipment \"%s\" must be cancelled before deletion!"
+msgid "Customer Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "field:party.address,delivery:"
@@ -456,6 +452,10 @@ msgctxt "field:stock.move,internal_quantity:"
 msgid "Internal Quantity"
 msgstr ""
 
+msgctxt "field:stock.move,origin:"
+msgid "Origin"
+msgstr ""
+
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
 msgstr ""
@@ -479,24 +479,8 @@ msgctxt "field:stock.move,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
-msgctxt "field:stock.move,shipment_in:"
-msgid "Supplier Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_in_return:"
-msgid "Supplier Return Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_internal:"
-msgid "Internal Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_out:"
-msgid "Customer Shipment"
-msgstr ""
-
-msgctxt "field:stock.move,shipment_out_return:"
-msgid "Customer Return Shipment"
+msgctxt "field:stock.move,shipment:"
+msgid "Shipment"
 msgstr ""
 
 #, fuzzy
@@ -1138,10 +1122,6 @@ msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
 msgstr ""
@@ -1159,18 +1139,6 @@ msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
 msgstr "Boekingen"
 
-msgctxt "model:ir.action,name:act_move_form_cust"
-msgid "Moves to Customers"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr ""
-
 #, fuzzy
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
@@ -1185,38 +1153,18 @@ msgctxt "model:ir.action,name:act_products_by_locations"
 msgid "Products"
 msgstr "Producten"
 
-msgctxt "model:ir.action,name:act_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_in_form_received"
-msgid "Received Supplier shipments"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
 msgstr ""
@@ -1229,18 +1177,6 @@ msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_shipment_out_form_assigned"
-msgid "Assigned Customer Shipments"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_out_form_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_out_form_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr ""
@@ -1297,6 +1233,138 @@ msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
 msgstr ""
 
+msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier"
+msgid "From Suppliers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
+msgid "From Suppliers Waiting"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
+msgid "To Customers"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
+msgid "Received"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
+msgid "Waiting"
+msgstr "In afwachting"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
+msgid "Waiting"
+msgstr "In afwachting"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
+msgid "Assigned"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
+msgid "Packed"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
+msgid "Waiting"
+msgstr "In afwachting"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
+msgid "Received"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
 msgstr ""
@@ -1346,10 +1414,6 @@ msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_inventory_form_draft"
-msgid "Draft Inventories"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
 msgstr ""
@@ -1363,18 +1427,6 @@ msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
 msgstr "Boekingen"
 
-msgctxt "model:ir.ui.menu,name:menu_move_form_cust"
-msgid "Moves to Customers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp"
-msgid "Moves from Suppliers"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_move_form_supp_proceed"
-msgid "Moves from Suppliers Waiting Arrival"
-msgstr ""
-
 #, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
@@ -1385,58 +1437,26 @@ msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Rapportage"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_draft"
-msgid "Draft Supplier Shipment"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_in_received"
-msgid "Received Supplier shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_assigned_form"
-msgid "Assigned Internal Shipments"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_draft_form"
-msgid "Draft Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_waiting_form"
-msgid "Internal Shipments Waiting Assignation"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_assigned"
-msgid "Assigned Customer Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_ready"
-msgid "Customer Shipments Ready for Shipping"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_out_waiting"
-msgid "Customer Shipments Waiting Assignation"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
 msgstr ""
@@ -2117,10 +2137,6 @@ msgctxt "view:stock.location:"
 msgid "Locations"
 msgstr ""
 
-msgctxt "view:stock.location:"
-msgid "Product Stock"
-msgstr ""
-
 #, fuzzy
 msgctxt "view:stock.move:"
 msgid "Move"
@@ -2198,11 +2214,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
 msgstr "Concept"
 
-#, fuzzy
-msgctxt "view:stock.shipment.in.return:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
-
 msgctxt "view:stock.shipment.in.return:"
 msgid "Supplier Return Shipment"
 msgstr ""
@@ -2215,11 +2226,6 @@ msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.in.return:"
-msgid "Waiting"
-msgstr "In afwachting"
-
 #, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Cancel"
@@ -2238,19 +2244,10 @@ msgctxt "view:stock.shipment.in:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.in:"
-msgid "Moves"
-msgstr "Boekingen"
-
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
 msgstr ""
 
-msgctxt "view:stock.shipment.in:"
-msgid "Received"
-msgstr ""
-
 #, fuzzy
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
@@ -2299,11 +2296,6 @@ msgctxt "view:stock.shipment.internal:"
 msgid "Internal Shipments"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.internal:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
-
 #, fuzzy
 msgctxt "view:stock.shipment.internal:"
 msgid "Waiting"
@@ -2348,20 +2340,10 @@ msgctxt "view:stock.shipment.out.return:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.out.return:"
-msgid "Moves"
-msgstr "Boekingen"
-
 msgctxt "view:stock.shipment.out.return:"
 msgid "Received"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.out.return:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
-
 msgctxt "view:stock.shipment.out:"
 msgid "Assign"
 msgstr ""
@@ -2401,11 +2383,6 @@ msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
 msgstr ""
 
-#, fuzzy
-msgctxt "view:stock.shipment.out:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
-
 #, fuzzy
 msgctxt "view:stock.shipment.out:"
 msgid "Waiting"