diff --git a/locale/bg.po b/locale/bg.po
index 24ec895aa2..e46362556c 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -2,15 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-"Максималното количество трябва да е по-голямо от Минималното количество"
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -18,11 +9,25 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
-"Не може да зададете две пренареждания на един и същи продукт с "
-"противоположни местонахождения"
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -32,10 +37,44 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Местонахождение на провизии"
@@ -68,6 +107,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Минимално количество"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Продукт"
@@ -84,6 +127,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Местонахождение на съхранение"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Вид"
@@ -109,14 +156,13 @@ msgid "Write User"
 msgstr "Променено от"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "В брой дни"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -136,14 +182,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Пренареждания"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Създаване на заявки за покупка"
-
-#, fuzzy
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Генериране на вътрешна пратка"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -162,6 +203,56 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Управление на покупки"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Пренареждания"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Пренареждане"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Вътрешно"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Покупка"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Вид пренареждане"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Информация за продукт"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Създаване"
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Отказ"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Генериране на заявки за покупка"
@@ -170,10 +261,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Генериране на вътрешна пратка"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Пренареждания"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Създаване на заявки за покупка"
@@ -187,48 +274,16 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Създаване на заявка за покупка"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Пренареждане"
-
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
-msgstr ""
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Вътрешно"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Покупка"
-
 #, fuzzy
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Създаване на заявки за покупка"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Вид пренареждане"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Информация за продукт"
-
 #, fuzzy
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Генериране на вътрешна пратка"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Създаване"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Отказ"
-
 #, fuzzy
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
diff --git a/locale/ca.po b/locale/ca.po
index 6bc888fadf..eeb102f749 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Hi ha alguns moviments de proveïdor endarrerits."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "La quantitat màxima ha de ser major que la mínima."
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -18,11 +10,30 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"No podeu definir dues regles de proveïment del mateix producte amb "
-"ubicacions oposades."
+"No es pot definir dos regles de proveïment amb ubicacions oposades (de la "
+"\"ubicació d'emmagatzemament\" a la \"ubicació de excessos\" i viceversa."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"No es pot definir dos regles de proveïment amb ubicacions oposades (de la "
+"\"ubicació d'emmagatzemament\" a la \"ubicació d'aprovisionament\" i "
+"viceversa)."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Hi ha alguns moviments de client endarrerits."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Hi ha alguns moviments de proveïdor endarrerits."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -32,10 +43,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Període de subministre"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Període de subministre"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Ubicació de excessos"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Ubicació de l'aprovisionament"
@@ -68,6 +107,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Quantitat mínima"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Ubicació de excessos"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Producte"
@@ -84,6 +127,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Ubicació interna"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Quantitat destí"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Tipus"
@@ -108,13 +155,13 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Usuari de modificació"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "En nombre de dies."
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Deixeu-lo buit per no tenir una ubicació d'excessos per defecte."
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -132,13 +179,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Regles de proveïment"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Crea sol·licituds de compra"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Crea albarans interns"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Aprovisionament d'existències"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -155,6 +198,54 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Compra"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Regles de proveïment"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Aprovisionament d'existències"
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Configuració del període d'aprovisionament en compres"
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Regla de proveïment"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Aprovisionament d'existències"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Intern"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Tipus de regla de proveïment"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Informació del producte"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Aprovisionar existències?"
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Crea"
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Generació sol·licituds de compra"
@@ -163,10 +254,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Generar albarans interns"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Regles de proveïment"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Crea sol·licituds de compra"
@@ -179,46 +266,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Crear sol·licitud de compra"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Regla de proveïment"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Crea albarans interns"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Intern"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Compra"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Voleu crear les comandes de compra?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Tipus de regla de proveïment"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Informació del producte"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Voleu crear els albarans interns?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Crea"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Cancel·la"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Crea"
diff --git a/locale/cs.po b/locale/cs.po
index a8ecd49142..70283afb1a 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -28,10 +36,39 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -64,6 +101,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -81,6 +122,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr ""
@@ -105,12 +150,12 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -129,12 +174,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt ""
@@ -152,36 +193,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr ""
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -192,10 +221,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr ""
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -204,22 +229,14 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr ""
 
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 398aae57c9..946da2459d 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Es existieren einige spätere Warenbewegungen von Lieferanten."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "Die maximale Anzahl muss größer als die minimale Anzahl sein"
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -17,11 +9,31 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"Für eine Variante können keine verschiedenen Bestellpunkte mit "
-"unterschiedlichen Lagerstandorten erstellt werden."
+"Zwei Bestellpunkte eines gleichen Artikels mit entgegengesetzten Lagerorten "
+"können nicht erstellt werden (von \"Lagerzone\" zu \"Lagerort Überschüsse\" "
+"und umgekehrt)."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"Zwei Bestellpunkte eines gleichen Artikels mit entgegengesetzten Lagerorten "
+"können nicht erstellt werden (von \"Lagerzone\" zu \"Bereitstellungsort\" "
+"und umgekehrt)."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Es existieren einige spätere Warenbewegungen von Lieferanten."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Es existieren einige spätere Warenbewegungen von Lieferanten."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -31,10 +43,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Beschaffungszeitraum"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Beschaffungszeitraum"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Lager für Überschüsse"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Bereitstellungsort"
@@ -67,6 +107,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Minimale Anzahl"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Lager für Überschüsse"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Variante"
@@ -83,6 +127,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Lagerort"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Zielmenge"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Typ"
@@ -107,13 +155,14 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Letzte Änderung durch"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "In Anzahl von Tagen"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr ""
+"Leer lassen, wenn kein Standardbereitstellungsort verwendet werden soll"
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -132,13 +181,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Bestellpunkte"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Bestellvorschläge erstellen"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Interne Lieferposten erstellen"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Lager beliefern"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -155,6 +200,54 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Einkauf"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Bestellpunkte"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Lager beliefern"
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Einstellungen Einkauf Beschaffungszeitraum"
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Bestellpunkt"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Lager beliefern"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Intern"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Einkauf"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Typ Bestellpunkt"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Info"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Lager beliefern?"
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Erstellen"
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Abbrechen"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Erstellung von Bestellvorschlägen"
@@ -163,10 +256,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Erstellung von Internen Lieferposten"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Bestellpunkte"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Bestellvorschläge erstellen"
@@ -179,46 +268,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Bestellvorschlag erstellen"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Bestellpunkt"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Interne Lieferbewegung erstellen"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Intern"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Einkauf"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Bestellvorschläge erstellen?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Typ Bestellpunkt"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Info"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Interne Lieferposten erstellen?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Erstellen"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Erstellen"
diff --git a/locale/es.po b/locale/es.po
index 881a39ed63..49804938b7 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Hay algunos movimientos de proveedor retrasados."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "La cantidad máxima debe ser mayor que la mínima."
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -18,11 +10,31 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"No puede definir dos reglas de abastecimiento del producto con ubicaciones "
-"opuestas."
+"No se puede definir dos reglas de aprovisionamiento con ubicaciones opuestas"
+" (de la \"ubicación de almacenamiento\" a la \"ubicación de excesos\" y "
+"viceversa)."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"No se puede definir dos reglas de aprovisionamiento con ubicaciones opuestas"
+" (de la \"ubicación de almacenamiento\" a la \"ubicación del "
+"abastecimiento\" y viceversa)."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Hay algunos movimientos de cliente retrasados."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Hay algunos movimientos de proveedor retrasados."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -32,10 +44,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Período de suministro"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Período de suministro"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Ubicación de excesos"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Ubicación del abastecimiento"
@@ -68,6 +108,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Cantidad mínima"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Ubicación de excesos"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Producto"
@@ -84,6 +128,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Ubicación interna"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Cantidad destino"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Tipo"
@@ -108,13 +156,13 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Usuario de modificación"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "En número de días."
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Dejarlo vacío para no tener una ubicación de excesos por defecto."
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -133,13 +181,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Reglas de abastecimiento"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Crear solicitudes de compra"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Crear albaranes internos"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Aprovisionamiento de existencias."
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -156,6 +200,54 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Compra"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Reglas de abastecimiento"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Aprovisionamiento de existencias."
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Configuración del periodo de aprovisionamiento en compras."
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Regla de abastecimiento"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Aprovisionamiento de existencias."
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Interno"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Tipo de regla de abastecimiento"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Información del producto"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Aprovisionar existencias?"
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Crear"
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Generar solicitudes de compra"
@@ -164,10 +256,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Generar albaranes internos"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Reglas de abastecimiento"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Crear solicitudes de compra"
@@ -180,46 +268,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Crear solicitud de compra"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Regla de abastecimiento"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Crear albaranes internos"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Interno"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Compra"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "¿Quiere crear las solicitudes de compra?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Tipo de regla de abastecimiento"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Información del producto"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "¿Crear albaranes internos?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Crear"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Crear"
diff --git a/locale/es_419.po b/locale/es_419.po
index 836f100fba..7cab63edf4 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -2,37 +2,74 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
-#, fuzzy
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
-msgstr "Order Points"
+msgstr ""
 
 msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -47,7 +84,7 @@ msgstr ""
 
 msgctxt "field:stock.order_point,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creado por usuario"
 
 msgctxt "field:stock.order_point,id:"
 msgid "ID"
@@ -65,6 +102,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -79,6 +120,10 @@ msgstr ""
 
 msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
+msgstr "Ubicación del almacenamiento"
+
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
 msgstr ""
 
 msgctxt "field:stock.order_point,type:"
@@ -95,7 +140,7 @@ msgstr ""
 
 msgctxt "field:stock.order_point,warehouse_location:"
 msgid "Warehouse Location"
-msgstr ""
+msgstr "Ubicación de la bodega"
 
 msgctxt "field:stock.order_point,write_date:"
 msgid "Write Date"
@@ -103,14 +148,14 @@ msgstr ""
 
 msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por usuario"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -119,87 +164,62 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_order_point_form"
 msgid "Order Points"
-msgstr "Order Points"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_order_point_form_relate"
 msgid "Order Points"
-msgstr "Order Points"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
-msgstr "Order Points"
+msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Create Purchase Requests"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
 msgid "All"
-msgstr "All"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
 msgid "Internal"
-msgstr "Internal"
+msgstr "Interna"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
 msgid "Purchase"
-msgstr "Purchase"
-
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr "Generate Purchase Requests"
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr "Generate Internal Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
-msgstr "Order Points"
-
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Create Purchase Requests"
-
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Create Internal Shipments"
-
-#, fuzzy
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
-msgstr "Create Purchase Requests"
-
-#, fuzzy
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Order Points"
-
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
 msgstr ""
 
-#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr ""
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
 msgctxt "selection:stock.order_point,type:"
 msgid "Internal"
-msgstr "Internal"
+msgstr "Interna"
 
-#, fuzzy
 msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
-msgstr "Purchase"
-
-#, fuzzy
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr "Create Purchase Requests"
+msgstr ""
 
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
@@ -209,23 +229,18 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-#, fuzzy
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr ""
+
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
-msgstr "Create Internal Shipments"
-
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
-msgid "Cancel"
-msgstr ""
+msgstr "¿Crear guías de remisión internas?"
diff --git a/locale/fr.po b/locale/fr.po
index 8dcf8d6ba9..cacd1f3f10 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Il y a des mouvements de fournisseur tardifs."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "La Quantité maximale doit être supérieure à la quantité minimale"
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -18,11 +10,31 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"Vous ne pouvez pas définir deux règles d'approvisionnement sur le même "
-"produit avec des emplacement opposés."
+"Vous ne pouvez pas définir deux règles d'approvisionnement pour le même "
+"produit avec des emplacements opposés (d' « Emplacement de stockage » à « "
+"Emplacement de surplus » et vice versa)."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"Vous ne pouvez pas définir deux règles d'approvisionnement pour le même "
+"produit avec des emplacements opposés (d' « Emplacement de stockage » à « "
+"Emplacement d'approvisionnement » et vice versa)."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Il y a des mouvements de client tardifs."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Il y a des mouvements de fournisseur tardifs."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -32,10 +44,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Période d'approvisionnement"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Période d'approvisionnement"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Emplacement de surplus"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Emplacement d’approvisionnement"
@@ -68,6 +108,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Quantité minimale"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Emplacement de surplus"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Produit"
@@ -84,6 +128,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Emplacement de stockage"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Quantité souhaitée"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Type"
@@ -108,13 +156,13 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Mis à jour par"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "En nombre de jours"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Laisser vide pour aucun surplus par défaut"
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -132,13 +180,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Règles d'approvisionnement"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Créer les demandes d'achat"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Créer les expéditions internes"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Approvisionner le stock"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -155,6 +199,54 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Achats"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Règles d'approvisionnement"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Approvisionner le stock"
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Configuration d'achat Période d'approvisionnement"
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Règle d'approvisionnement"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Approvisionner le stock"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Interne"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Achat"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Type de Règle d'approvisionnement"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Info produit"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Approvisionner le stock ?"
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Créer"
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Annuler"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Générer les demandes d'achat"
@@ -163,10 +255,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Générer les expéditions internes"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Règles d'approvisionnement"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Créer les demandes d'achat"
@@ -179,46 +267,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Créer les demandes d'achat"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Règle d'approvisionnement"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Créer l'expédition interne"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Interne"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Achat"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Créer les demandes d'achat ?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Type de Règle d'approvisionnement"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Info produit"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Créer les expéditions internes ?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Créer"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Annuler"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Créer"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index f3940e53da..b984c1c152 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -2,26 +2,33 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Létezik későbbi szállítói anyag mozgatás."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-"A maximális mennyiségnek nagyobb kell lenni, mint a minimális mennyiség."
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr "Csak egy rendelés pont engedélyezett termék-raktárhelyként."
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"Egy termékhez nem lehet különböző rendelés pontot, különböző telephellyel "
-"létrehozni."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+#, fuzzy
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Létezik későbbi szállítói anyag mozgatás."
+
+#, fuzzy
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Létezik későbbi szállítói anyag mozgatás."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -32,10 +39,45 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Beszerzési időszak"
 
-msgctxt "field:purchase.request.create.start,id:"
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás dátuma"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Beszerzési időszak"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Előkészítés helye"
@@ -68,6 +110,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Min. mennyiség"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Termék"
@@ -84,6 +130,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Raktár helye"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Típus"
@@ -108,14 +158,15 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+#, fuzzy
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
 #, fuzzy
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "Napok száma"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Üresen hagyni, ha nincs előkészítési hely "
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -133,13 +184,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Rendelés pont"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Rendelés javaslat készítése"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Belső szállítások "
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -156,6 +203,57 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Vásárlás"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Rendelés pont"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Rendelés pont"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Belső"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Vásárlás"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Rendelés pont típus"
+
+#, fuzzy
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Termék infó"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Létrehozás"
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Mégse"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Rendelés javaslat létrehozása"
@@ -164,10 +262,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Belső szállítások létrehozása"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Rendelés pont"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Rendelés javaslat létrehozása"
@@ -180,47 +274,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Rendelés javaslat létrehozása"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Rendelés pont"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Belső szállítások létrehozása"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Belső"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Vásárlás"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Rendelés javaslat létrehozása?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Rendelés pont típus"
-
-#, fuzzy
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Termék infó"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Belső szállítások létrehozása?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Létrehozás"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Mégse"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Létrehozás"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index ff44b22673..8cbdfd5d1d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -29,10 +37,43 @@ msgid "Supply Period"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Data di creazione"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Utente creazione"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Utente scrittura"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "modificato da"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -70,6 +111,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
@@ -88,6 +133,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
@@ -118,12 +167,12 @@ msgid "Write User"
 msgstr "modificato da"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -142,12 +191,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 #, fuzzy
@@ -167,36 +212,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Acquisto"
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -208,10 +241,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr "Acquisto"
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -220,17 +249,17 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr "Creazione"
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr "Cancella"
 
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 836f100fba..2a929cb23d 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 #, fuzzy
@@ -29,10 +37,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -65,6 +101,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -81,6 +121,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr ""
@@ -105,12 +149,12 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -129,13 +173,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Order Points"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Create Purchase Requests"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -152,6 +192,57 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Purchase"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Order Points"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Order Points"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Internal"
+
+#, fuzzy
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Purchase"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr ""
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr ""
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr ""
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Generate Purchase Requests"
@@ -160,10 +251,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Generate Internal Shipments"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Order Points"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Create Purchase Requests"
@@ -177,55 +264,12 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Create Purchase Requests"
 
-#, fuzzy
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Order Points"
-
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
-msgstr ""
-
-#, fuzzy
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Internal"
-
-#, fuzzy
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Purchase"
-
 #, fuzzy
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Create Purchase Requests"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr ""
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr ""
-
 #, fuzzy
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Create Internal Shipments"
-
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
-msgid "Cancel"
-msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 9d9dd68659..53c2b1c7e5 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -29,10 +37,43 @@ msgid "Supply Period"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "ສ້າງວັນທີ"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ເລດລຳດັບ"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "ສ້າງຜູ້ໃຊ້"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -70,6 +111,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
@@ -88,6 +133,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
@@ -118,12 +167,12 @@ msgid "Write User"
 msgstr "ສ້າງຜູ້ໃຊ້"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ເລດລຳດັບ"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -142,12 +191,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 #, fuzzy
@@ -167,36 +212,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr "ສັ່ງຊື້"
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -208,10 +241,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr "ສັ່ງຊື້"
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -220,17 +249,17 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr "ສ້າງ"
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr "ຍົກເລີກ"
 
diff --git a/locale/lt.po b/locale/lt.po
index a8ecd49142..70283afb1a 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -28,10 +36,39 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr ""
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -64,6 +101,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -81,6 +122,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr ""
@@ -105,12 +150,12 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -129,12 +174,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt ""
@@ -152,36 +193,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr ""
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -192,10 +221,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr ""
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -204,22 +229,14 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr ""
 
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 8a19027fdf..85431dc513 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -29,10 +37,43 @@ msgid "Supply Period"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -69,6 +110,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
@@ -87,6 +132,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
@@ -117,12 +166,12 @@ msgid "Write User"
 msgstr "Gebruiker"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -141,12 +190,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt ""
@@ -165,36 +210,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Inkoop"
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -206,10 +239,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr "Inkoop"
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -218,17 +247,17 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr "Maken"
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr "Annuleren"
 
diff --git a/locale/pl.po b/locale/pl.po
index 836f100fba..2a929cb23d 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 #, fuzzy
@@ -29,10 +37,38 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr ""
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -65,6 +101,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -81,6 +121,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr ""
@@ -105,12 +149,12 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr ""
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -129,13 +173,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Order Points"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Create Purchase Requests"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -152,6 +192,57 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Purchase"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Order Points"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Order Points"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Internal"
+
+#, fuzzy
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Purchase"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr ""
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr ""
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr ""
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr ""
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Generate Purchase Requests"
@@ -160,10 +251,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Generate Internal Shipments"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Order Points"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Create Purchase Requests"
@@ -177,55 +264,12 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Create Purchase Requests"
 
-#, fuzzy
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Order Points"
-
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
-msgstr ""
-
-#, fuzzy
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Internal"
-
-#, fuzzy
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Purchase"
-
 #, fuzzy
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Create Purchase Requests"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr ""
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr ""
-
 #, fuzzy
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Create Internal Shipments"
-
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
-msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
-msgid "Cancel"
-msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 1c494b3ba2..9d9f4291ce 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2,39 +2,80 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Existem algumas movimentações de fornecedor atrasadas."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "A quantidade máxima deve ser maior do que a quantidade mínima"
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
-msgstr "Apenas uma ordem é permitida para cada par produto-localização."
+msgstr ""
+"Apenas uma regras de abastecimento é permitida para cada par produto-"
+"localização."
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"Você não pode definir duas ordens para o mesmo produto com localizações "
-"opostas."
+"Você não pode definir duas regras de abastecimento no mesmo produto com "
+"localizações opostas (de \"Local de Armazenamento\" para \"Local de "
+"Transbordo\" e vice versa)."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"Você não pode definir duas regras de abastecimento no mesmo produto com "
+"localizações opostas (de \"Local de Armazenamento\" para \"Local de "
+"Transbordo\" e vice versa)."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Algumas movimentações de clientes estão atrasadas."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Algumas movimentações de fornecedores estão atrasadas."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
 msgstr "Regras de Abastecimento"
 
-#, fuzzy
 msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
-msgstr "Período de suprimento"
+msgstr "Período de Abastecimento"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Período de Abastecimento"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Localização de Transbordo"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Localização do Abastecimento"
@@ -67,6 +108,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Quantidade mínima"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Localização de Transbordo"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Produto"
@@ -83,6 +128,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Local de armazenamento"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Quantidade Alvo"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Tipo"
@@ -97,7 +146,7 @@ msgstr "Dígitos da unidade"
 
 msgctxt "field:stock.order_point,warehouse_location:"
 msgid "Warehouse Location"
-msgstr "Localização do estoque/almoxarifado"
+msgstr "Localização do Almoxarifado"
 
 msgctxt "field:stock.order_point,write_date:"
 msgid "Write Date"
@@ -107,14 +156,13 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Gravado pelo usuário"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "Em número de dias"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Deixe vazio para nenhum transbordo padrão"
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -132,13 +180,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Regras de Abastecimento"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Criar ordens de compra"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Gerar Remessas Internas"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Abastecer Estoque"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -155,37 +199,25 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Compra"
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr "Gere ordens de compra"
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr "Gere expedições internas"
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr "Regras de Abastecimento"
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Criar ordens de compra"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Abastecer Estoque"
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Gerar Remessas Internas"
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
-msgstr "Criar ordem de compra"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Configurações de Compra Período de Abastecimento"
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr "Regra de Abastecimento"
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
-msgstr "Criar Remessa Interna"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Abastecer Estoque"
 
 msgctxt "selection:stock.order_point,type:"
 msgid "Internal"
@@ -195,10 +227,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr "Compra"
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr "Criar Ordens de Compra?"
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr "Tipo de Regra de Abastecimento"
@@ -207,18 +235,50 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr "Informação do Produto"
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
-msgstr "Criar Remessas Internas?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Abastecer Estoque?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr "Criar"
 
-msgctxt "wizard_button:purchase.request.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"
 
+msgctxt "model:ir.cron,name:cron_generate_request"
+msgid "Generate Purchase Requests"
+msgstr "Gerar Pedidos de Compra"
+
+msgctxt "model:ir.cron,name:cron_shipment_iternal"
+msgid "Generate Internal Shipments"
+msgstr "Gere expedições internas"
+
+msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
+msgid "Create Purchase Requests"
+msgstr "Criar Pedidos de Compra"
+
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Gerar Remessas Internas"
+
+msgctxt "model:purchase.request.create.start,name:"
+msgid "Create Purchase Request"
+msgstr "Criar Pedidos de Compra"
+
+msgctxt "model:stock.shipment.internal.create.start,name:"
+msgid "Create Shipment Internal"
+msgstr "Criar Remessa Interna"
+
+msgctxt "view:purchase.request.create.start:"
+msgid "Create Purchase Requests?"
+msgstr "Criar Pedidos de Compra?"
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr "Criar Remessas Internas?"
+
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Criar"
diff --git a/locale/ru.po b/locale/ru.po
index c2e6dba753..68b65889c5 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -2,14 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "Максимальное кол-во должно быть больше чем минимальное."
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
@@ -17,11 +9,25 @@ msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
-"Вы не можете определить две точки заказа для одного продукта с "
-"противоположными местоположениями."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
@@ -31,10 +37,44 @@ msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr ""
 
-msgctxt "field:purchase.request.create.start,id:"
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr "Местоположение резервирования"
@@ -67,6 +107,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Минимальное кол-во"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Продукт"
@@ -83,6 +127,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Хранение Местоположение"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Тип"
@@ -108,14 +156,13 @@ msgid "Write User"
 msgstr "Изменено пользователем"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "После указанного количества дней"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -135,14 +182,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Точки заказа"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Создать запросы на покупку"
-
-#, fuzzy
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Создать внутренние доставки."
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr ""
 
 #, fuzzy
 msgctxt ""
@@ -162,6 +204,56 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Покупки"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Точки заказа"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr ""
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Точка заказа"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr ""
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Внутренний"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Покупки"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Типы точек заказа"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Информация о продукте"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Создать"
+
+#, fuzzy
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Отменить"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Создать запросы на покупки."
@@ -170,10 +262,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Создать внутренние доставки."
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Точки заказа"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Создать запросы на покупку"
@@ -187,48 +275,16 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Создать запрос на покупку"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Точка заказа"
-
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
-msgstr ""
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Внутренний"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Покупки"
-
 #, fuzzy
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Создать запросы на покупку"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Типы точек заказа"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Информация о продукте"
-
 #, fuzzy
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Создать внутренние доставки."
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Создать"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Отменить"
-
 #, fuzzy
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
diff --git a/locale/sl.po b/locale/sl.po
index bbae823470..c5fdf62ecc 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -2,42 +2,79 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr "Obstaja nekaj poznih knjižb dobaviteljev."
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "Največja količina mora biti večja od najmanjše količine."
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr "Dovoljena je samo ena točka naročanja za vsak par izdelek - lokacija."
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
 msgstr ""
-"Dveh točk naročanja ni možno določiti na istem izdelku z nasprotujočima "
-"lokacijama."
+"Dveh točk naročanja z nasprotnima lokacijama (iz \"Shrambe\" na \"Prelivno "
+"lokacijo\" in obratno) ni možno določiti na istem izdelku."
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+"Dveh točk naročanja z nasprotnima lokacijama (iz \"Shrambe\" na "
+"\"Preskrbovalno lokacijo\" in obratno) ni možno določiti na istem izdelku."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr "Obstaja nekaj zakasnelih dobav kupcem."
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
+msgstr "Obstaja nekaj zakasnelih dobav dobaviteljev."
 
 msgctxt "field:product.product,order_points:"
 msgid "Order Points"
 msgstr "Točke naročanja"
 
-#, fuzzy
 msgctxt "field:purchase.configuration,supply_period:"
 msgid "Supply Period"
 msgstr "Obdobje dobave"
 
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr "Obdobje dobave"
+
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Prelivna lokacija"
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
-msgstr "Preskrba"
+msgstr "Preskrbovalna lokacija"
 
 msgctxt "field:stock.order_point,company:"
 msgid "Company"
@@ -67,13 +104,17 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr "Najmanjša količina"
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr "Prelivna lokacija"
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr "Izdelek"
 
 msgctxt "field:stock.order_point,provisioning_location:"
 msgid "Provisioning Location"
-msgstr "Preskrba"
+msgstr "Preskrbovalna lokacija"
 
 msgctxt "field:stock.order_point,rec_name:"
 msgid "Name"
@@ -83,6 +124,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr "Shramba"
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr "Ciljna količina"
+
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
 msgstr "Tip"
@@ -107,14 +152,13 @@ msgctxt "field:stock.order_point,write_uid:"
 msgid "Write User"
 msgstr "Zapisal"
 
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
-msgstr "V dnevih"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
+msgstr "Pusti prazno, če ni privzetega preliva"
 
 msgctxt "help:stock.location,provisioning_location:"
 msgid "Leave empty for no default provisioning"
@@ -132,13 +176,9 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr "Točke naročanja"
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr "Izdelava nabavnih zahtevkov"
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr "Izdelava notranjih odpremnic"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
+msgstr "Oskrba zaloge"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -155,6 +195,54 @@ msgctxt ""
 msgid "Purchase"
 msgstr "Nabavni nalogi"
 
+msgctxt "model:ir.ui.menu,name:menu_order_point_form"
+msgid "Order Points"
+msgstr "Točke naročanja"
+
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
+msgstr "Oskrba zaloge"
+
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
+msgstr "Konfiguracija obdobja nabavne dobave"
+
+msgctxt "model:stock.order_point,name:"
+msgid "Order Point"
+msgstr "Točka naročanja"
+
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
+msgstr "Oskrba zaloge"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Internal"
+msgstr "Interno"
+
+msgctxt "selection:stock.order_point,type:"
+msgid "Purchase"
+msgstr "Nabavni nalog"
+
+msgctxt "view:stock.order_point:"
+msgid "Order Point Type"
+msgstr "Tip točke naročanja"
+
+msgctxt "view:stock.order_point:"
+msgid "Product Info"
+msgstr "Podatek o izdelku"
+
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
+msgstr "Oskrba zaloge?"
+
+msgctxt "wizard_button:stock.supply,start,create_:"
+msgid "Create"
+msgstr "Izdelava"
+
+msgctxt "wizard_button:stock.supply,start,end:"
+msgid "Cancel"
+msgstr "Prekliči"
+
 msgctxt "model:ir.cron,name:cron_generate_request"
 msgid "Generate Purchase Requests"
 msgstr "Izdelava nabavnih zahtevkov"
@@ -163,10 +251,6 @@ msgctxt "model:ir.cron,name:cron_shipment_iternal"
 msgid "Generate Internal Shipments"
 msgstr "Izdelava notranjih odpremnic"
 
-msgctxt "model:ir.ui.menu,name:menu_order_point_form"
-msgid "Order Points"
-msgstr "Točke naročanja"
-
 msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
 msgid "Create Purchase Requests"
 msgstr "Izdelava nabavnih zahtevkov"
@@ -179,46 +263,18 @@ msgctxt "model:purchase.request.create.start,name:"
 msgid "Create Purchase Request"
 msgstr "Izdelava nabavnega zahtevka"
 
-msgctxt "model:stock.order_point,name:"
-msgid "Order Point"
-msgstr "Točka naročanja"
-
 msgctxt "model:stock.shipment.internal.create.start,name:"
 msgid "Create Shipment Internal"
 msgstr "Izdelava notranje odpremnice"
 
-msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Interno"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Nabavni nalog"
-
 msgctxt "view:purchase.request.create.start:"
 msgid "Create Purchase Requests?"
 msgstr "Izdelava nabavnih zahtevkov?"
 
-msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Tip točke naročanja"
-
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Podatek o izdelku"
-
 msgctxt "view:stock.shipment.internal.create.start:"
 msgid "Create Internal Shipments?"
 msgstr "Izdelava notranjih odpremnic?"
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
-msgid "Create"
-msgstr "Izdelaj"
-
-msgctxt "wizard_button:purchase.request.create,start,end:"
-msgid "Cancel"
-msgstr "Prekliči"
-
 msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
 msgid "Create"
 msgstr "Izdelaj"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 89b4f344f8..f0e4195129 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -2,22 +2,30 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves."
-msgstr ""
-
-msgctxt "error:stock.order_point:"
-msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr ""
-
 msgctxt "error:stock.order_point:"
 msgid "Only one order point is allowed for each product-location pair."
 msgstr ""
 
 msgctxt "error:stock.order_point:"
 msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Overflowing Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.order_point:"
+msgid ""
+"You can not define on the same product two order points with opposite "
+"locations (from \"Storage Location\" to \"Provisioning Location\" and vice "
+"versa)."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late customer moves."
+msgstr ""
+
+msgctxt "error:stock.supply:"
+msgid "There are some late supplier moves."
 msgstr ""
 
 msgctxt "field:product.product,order_points:"
@@ -29,10 +37,43 @@ msgid "Supply Period"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:purchase.request.create.start,id:"
+msgctxt "field:purchase.configuration.supply_period,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,id:"
 msgid "ID"
 msgstr "编号"
 
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+msgctxt "field:purchase.configuration.supply_period,supply_period:"
+msgid "Supply Period"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:purchase.configuration.supply_period,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
+msgctxt "field:stock.location,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.location,provisioning_location:"
 msgid "Provisioning Location"
 msgstr ""
@@ -68,6 +109,10 @@ msgctxt "field:stock.order_point,min_quantity:"
 msgid "Minimal Quantity"
 msgstr ""
 
+msgctxt "field:stock.order_point,overflowing_location:"
+msgid "Overflowing Location"
+msgstr ""
+
 msgctxt "field:stock.order_point,product:"
 msgid "Product"
 msgstr ""
@@ -85,6 +130,10 @@ msgctxt "field:stock.order_point,storage_location:"
 msgid "Storage Location"
 msgstr ""
 
+msgctxt "field:stock.order_point,target_quantity:"
+msgid "Target Quantity"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.order_point,type:"
 msgid "Type"
@@ -113,12 +162,12 @@ msgid "Write User"
 msgstr "写入帐号"
 
 #, fuzzy
-msgctxt "field:stock.shipment.internal.create.start,id:"
+msgctxt "field:stock.supply.start,id:"
 msgid "ID"
 msgstr "编号"
 
-msgctxt "help:purchase.configuration,supply_period:"
-msgid "In number of days"
+msgctxt "help:stock.location,overflowing_location:"
+msgid "Leave empty for no default overflowing"
 msgstr ""
 
 msgctxt "help:stock.location,provisioning_location:"
@@ -137,12 +186,8 @@ msgctxt "model:ir.action,name:act_order_point_form_relate2"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_purchase_request_create"
-msgid "Create Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_shipment_internal_create"
-msgid "Create Internal Shipments"
+msgctxt "model:ir.action,name:act_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
 #, fuzzy
@@ -161,36 +206,24 @@ msgctxt ""
 msgid "Purchase"
 msgstr ""
 
-msgctxt "model:ir.cron,name:cron_generate_request"
-msgid "Generate Purchase Requests"
-msgstr ""
-
-msgctxt "model:ir.cron,name:cron_shipment_iternal"
-msgid "Generate Internal Shipments"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_order_point_form"
 msgid "Order Points"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
-msgid "Create Purchase Requests"
+msgctxt "model:ir.ui.menu,name:menu_stock_supply"
+msgid "Supply Stock"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
-msgid "Create Internal Shipments"
-msgstr ""
-
-msgctxt "model:purchase.request.create.start,name:"
-msgid "Create Purchase Request"
+msgctxt "model:purchase.configuration.supply_period,name:"
+msgid "Purchase Configuration Supply Period"
 msgstr ""
 
 msgctxt "model:stock.order_point,name:"
 msgid "Order Point"
 msgstr ""
 
-msgctxt "model:stock.shipment.internal.create.start,name:"
-msgid "Create Shipment Internal"
+msgctxt "model:stock.supply.start,name:"
+msgid "Supply Stock"
 msgstr ""
 
 msgctxt "selection:stock.order_point,type:"
@@ -201,10 +234,6 @@ msgctxt "selection:stock.order_point,type:"
 msgid "Purchase"
 msgstr ""
 
-msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Requests?"
-msgstr ""
-
 msgctxt "view:stock.order_point:"
 msgid "Order Point Type"
 msgstr ""
@@ -213,23 +242,19 @@ msgctxt "view:stock.order_point:"
 msgid "Product Info"
 msgstr ""
 
-msgctxt "view:stock.shipment.internal.create.start:"
-msgid "Create Internal Shipments?"
+msgctxt "view:stock.supply.start:"
+msgid "Supply Stock?"
 msgstr ""
 
-msgctxt "wizard_button:purchase.request.create,start,create_:"
+msgctxt "wizard_button:stock.supply,start,create_:"
 msgid "Create"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:purchase.request.create,start,end:"
+msgctxt "wizard_button:stock.supply,start,end:"
 msgid "Cancel"
 msgstr "取消"
 
-msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
-msgid "Create"
-msgstr ""
-
 #, fuzzy
 msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
 msgid "Cancel"