[tryton-debian-vcs] tryton-modules-stock-supply branch upstream updated. upstream/3.2.1-1-g2cb5804
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:19:02 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=upstream/3.2.1-1-g2cb5804
commit 2cb58042010c8ad7d4fa3b862cbefd41fc34f740
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:23 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index d2add3f..31950b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 3.2.1 - 2014-08-03
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
+* Allow to calculate purchase requests filtered by warehouse
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2be7935..2f51ccf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_stock_supply
====================
diff --git a/__init__.py b/__init__.py
index 89e6e06..2760752 100644
--- a/__init__.py
+++ b/__init__.py
@@ -14,7 +14,6 @@ def register():
Product,
PurchaseRequest,
CreatePurchaseRequestStart,
- CreatePurchaseAskTerm,
CreatePurchaseAskParty,
ShipmentInternal,
CreateShipmentInternalStart,
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index c1b4943..f5169cf 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
+msgid "There are some late supplier moves."
msgstr ""
msgctxt "error:purchase.request.create_purchase:"
@@ -156,22 +156,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Продукт"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Фирма"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Доставчик"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Условие за плащане"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Фирма"
@@ -270,6 +254,23 @@ msgid "Create Purchase"
msgstr "Създаване на покупка"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Вътрешно"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Управление на покупки"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr ""
@@ -316,10 +317,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Създаване на покупка - питане на партньор"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Запитване за създаване на условие за плащане"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Заявка за покупка"
@@ -377,10 +374,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Създаване на покупка; липсва доставчик"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Създаване на покупка: Липсва условие за плащане"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Информация за продукт"
@@ -437,14 +430,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Продължаване"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Отказ"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Продължаване"
-
#, fuzzy
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 4bde04b..583386d 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,9 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Hi ha alguns moviments de proveïdor pendents. Esteu segur d'ignorar-los?"
+msgid "There are some late supplier moves."
+msgstr "Hi ha alguns moviments de proveïdor anteriors."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -157,22 +156,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Producte"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Proveïdor"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Termini de pagament"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Empresa"
@@ -270,6 +253,21 @@ msgid "Create Purchase"
msgstr "Crear una compra"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Tots"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Intern"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Tots"
@@ -315,10 +313,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Crear una compra - Petició de tercer"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Crear una compra - Petició de termini"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Sol·licitud de compra"
@@ -379,10 +373,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Crear una compra: falta el proveïdor"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear una compra: falta el termini de pagament"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Informació del producte"
@@ -439,14 +429,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuar"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Cancel·la"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuar"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Crea"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 5e34aac..b817e37 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
+msgid "There are some late supplier moves."
msgstr ""
msgctxt "error:purchase.request.create_purchase:"
@@ -152,22 +152,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr ""
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr ""
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr ""
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr ""
@@ -265,6 +249,21 @@ msgid "Create Purchase"
msgstr ""
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr ""
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr ""
@@ -310,10 +309,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr ""
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr ""
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr ""
@@ -370,10 +365,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr ""
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr ""
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr ""
@@ -430,14 +421,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr ""
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr ""
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index ad95173..1c1c29c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,10 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Es existieren spätere Lieferbewegungen von Lieferanten.\n"
-"Ignorieren und fortfahren?"
+msgid "There are some late supplier moves."
+msgstr "Es existieren einige spätere Warenbewegungen von Lieferanten."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -111,11 +109,11 @@ msgstr "Status"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Lagerbestand am Lieferdatum"
+msgstr "Lagerbestand am Beschaffungsdatum"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
-msgstr "Voraussichtliches Lieferdatum"
+msgstr "Voraussichtliches Beschaffungsdatum"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
@@ -157,22 +155,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Artikel"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Unternehmen"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Lieferant"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Zahlungsbedingung"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Unternehmen"
@@ -267,7 +249,22 @@ msgstr "Interne Lieferposten erstellen"
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
-msgstr "Verkauf erstellen"
+msgstr "Einkauf erstellen"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Alle"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Intern"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Einkauf"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
@@ -315,10 +312,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Nachfrage Partei Einkauf"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Nachfrage Zahlungsbedingung Einkauf"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Bestellvorschlag"
@@ -379,10 +372,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Auftragerstellung: Fehlender Lieferant"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Auftragerstellung: Fehlende Zahlungsbedingung"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Info Artikel"
@@ -439,14 +428,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Fortfahren"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Fortfahren"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Erstellen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a6a9b6b..5d8d57b 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,9 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Hay algunos movimientos de proveedor pendientes. ¿Está seguro de ignorarlos?"
+msgid "There are some late supplier moves."
+msgstr "Hay pendientes algunos movimientos de proveedor."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -157,22 +156,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Proveedor"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Término de pago"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Empresa"
@@ -270,6 +253,21 @@ msgid "Create Purchase"
msgstr "Crear compra"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interno"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Todo"
@@ -315,10 +313,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Crear compra - Petición de tercero"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Crear compra - Petición de plazo"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Solicitud de compra"
@@ -379,10 +373,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Crear compra: sin proveedor"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear compra: sin término de pago"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Información del producto"
@@ -439,14 +429,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuar"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuar"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Crear"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 29022e5..c7d8f2b 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,10 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Hay algunos movimientos de proveedor retrasados, esta seguro que desea "
-"ignorarlos?"
+msgid "There are some late supplier moves."
+msgstr "Hay pendientes algunos movimientos de proveedor."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -156,22 +154,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Proveedor"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Forma de Pago"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Compañía"
@@ -269,6 +251,21 @@ msgid "Create Purchase"
msgstr "Crear Compra"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interna"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Todo"
@@ -314,10 +311,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Crear Compra Pregunta Tercero"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Crear Compra Pregunta Forma de Pago"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Orden de Compra"
@@ -378,10 +371,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Crear Compra: Sin Proveedor"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear Compra: Sin Forma de Pago"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Información de Producto"
@@ -438,14 +427,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuar"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuar"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Crear"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 80%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 29022e5..79b158f 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -3,10 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Hay algunos movimientos de proveedor retrasados, esta seguro que desea "
-"ignorarlos?"
+msgid "There are some late supplier moves."
+msgstr "Hay algunos movimientos de proveedor atrasados."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -14,11 +12,11 @@ msgstr "Falta el precio de compra del producto \"%s\"."
msgctxt "error:purchase.request.create_purchase:"
msgid "This price is necessary for creating purchases."
-msgstr "Este precio es ncesario para crear compras."
+msgstr "Este precio es necesario para crear compras."
msgctxt "error:purchase.request:"
msgid "Purchase requests are only created by the system."
-msgstr "Los requisitos de compras son creados por el sistema únicamente."
+msgstr "Las solicitudes de compra son creadas únicamente por el sistema."
msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
@@ -26,7 +24,7 @@ msgstr "La cantidad solicitada debe ser mayor que 0"
msgctxt "error:purchase.request:"
msgid "You can not delete purchased request."
-msgstr "No puede borrar ordenes de compra."
+msgstr "No puede eliminar una solicitud comprada."
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
@@ -34,15 +32,15 @@ msgstr "La cantidad máxima debe ser mayor que la cantidad mínima"
msgctxt "error:stock.order_point:"
msgid "Only one order point is allowed for each product-location pair."
-msgstr ""
-"Solamente se permite un punto de orden para cada par producto-locación."
+msgstr "Sólo se permite una requisición para cada par producto-ubicación."
msgctxt "error:stock.order_point:"
msgid ""
"You can not define two order points on the same product with opposite "
"locations."
msgstr ""
-"No puede definir dos requisiciones del mismo producto con lugares opuestos."
+"No puede definir dos requisiciones del mismo producto con ubicaciones "
+"opuestas."
msgctxt "field:product.product,order_points:"
msgid "Order Points"
@@ -50,7 +48,7 @@ msgstr "Requisiciones"
msgctxt "field:purchase.request,company:"
msgid "Company"
-msgstr "Compañía"
+msgstr "Empresa"
msgctxt "field:purchase.request,computed_quantity:"
msgid "Computed Quantity"
@@ -110,7 +108,7 @@ msgstr "Estado"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Almacenar la Fecha de Abastecimiento"
+msgstr "Existencias a la Fecha de Abastecimiento"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
@@ -126,7 +124,7 @@ msgstr "Depósito"
msgctxt "field:purchase.request,warehouse_required:"
msgid "Warehouse Required"
-msgstr "Depósito Requerido"
+msgstr "Almacén Requerido"
msgctxt "field:purchase.request,write_date:"
msgid "Write Date"
@@ -142,7 +140,7 @@ msgstr "ID"
msgctxt "field:purchase.request.create_purchase.ask_party,company:"
msgid "Company"
-msgstr "Compañía"
+msgstr "Empresa"
msgctxt "field:purchase.request.create_purchase.ask_party,id:"
msgid "ID"
@@ -156,25 +154,9 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Proveedor"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Forma de Pago"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
-msgstr "Compañía"
+msgstr "Empresa"
msgctxt "field:stock.order_point,create_date:"
msgid "Create Date"
@@ -254,21 +236,36 @@ msgstr "Requisiciones"
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear Ordenes de Compras"
+msgstr "Crear Solicitudes de Compra"
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Ordenes de Compra"
+msgstr "Solicitudes de Compra"
msgctxt "model:ir.action,name:act_shipment_internal_create"
msgid "Create Internal Shipments"
-msgstr "Crear Envío Interno"
+msgstr "Crear Envíos Internos"
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Crear Compra"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interna"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Compras"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Todo"
@@ -280,7 +277,7 @@ msgstr "Borrador"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Purchase Requests"
-msgstr "Generar Orden de Compra"
+msgstr "Generar Solicitudes de Compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
@@ -292,11 +289,11 @@ msgstr "Requisiciones"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear Ordenes de Compra"
+msgstr "Crear Solicitudes de Compra"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Ordenes de Compra"
+msgstr "Solicitudes de Compra"
msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
msgid "Create Internal Shipments"
@@ -304,31 +301,27 @@ msgstr "Crear Envíos Internos"
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
-msgstr "Orden de Compra"
+msgstr "Solicitud de Compra"
msgctxt "model:purchase.request.create.start,name:"
msgid "Create Purchase Request"
-msgstr "Crear Orden de Compra"
+msgstr "Crear Solicitud de Compra"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Crear Compra Pregunta Tercero"
-
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Crear Compra Pregunta Forma de Pago"
+msgstr "Crear Compra - Petición de Tercero"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
-msgstr "Orden de Compra"
+msgstr "Solicitud de Compra"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Purchase Request"
-msgstr "Cron Orden de Compra"
+msgstr "Programador de Solicitudes de Compra"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Cron Envío Interno"
+msgstr "Programador de Envío Interno"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
@@ -344,11 +337,11 @@ msgstr "Requisición"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Cancelada"
msgctxt "selection:purchase.request,state:"
msgid "Done"
-msgstr "Hecho"
+msgstr "Realizada"
msgctxt "selection:purchase.request,state:"
msgid "Draft"
@@ -368,35 +361,31 @@ msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Requests"
-msgstr "Crear Ordenes de Compras"
+msgstr "Crear Solicitudes de Compras"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Requests?"
-msgstr "Crear Ordenes de Compras?"
+msgstr "¿Crear Solicitudes de Compra?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
-msgstr "Crear Compra: Sin Proveedor"
-
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear Compra: Sin Forma de Pago"
+msgstr "Crear Compra: Falta Proveedor"
msgctxt "view:purchase.request:"
msgid "Product Info"
-msgstr "Información de Producto"
+msgstr "Información del Producto"
msgctxt "view:purchase.request:"
msgid "Purchase Request"
-msgstr "Orden de Compra"
+msgstr "Solicitud de Compra"
msgctxt "view:purchase.request:"
msgid "Purchase Requests"
-msgstr "Ordenes de Compra"
+msgstr "Solicitudes de Compra"
msgctxt "view:purchase.request:"
msgid "Supply Info"
-msgstr "Información de Proveedor"
+msgstr "Información del Suministro"
msgctxt "view:stock.order_point:"
msgid "Order Point"
@@ -412,7 +401,7 @@ msgstr "Requisiciones"
msgctxt "view:stock.order_point:"
msgid "Product Info"
-msgstr "Información de Producto"
+msgstr "Información del Producto"
msgctxt "view:stock.shipment.internal.create.start:"
msgid "Create Internal Shipments"
@@ -420,7 +409,7 @@ msgstr "Crear Envíos Internos"
msgctxt "view:stock.shipment.internal.create.start:"
msgid "Create Internal Shipments?"
-msgstr "Crear Envíos Internos?"
+msgstr "¿Crear Envíos Internos?"
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
@@ -438,14 +427,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuar"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuar"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Crear"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index f6df76d..03936b6 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,9 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Hay algunos movimientos de proveedor pendientes. ¿Está seguro de ignorarlos?"
+msgid "There are some late supplier moves."
+msgstr "Hay algunos movimientos de proveedor anteriores."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -157,22 +156,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Proveedor"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Plazo de pago"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Empresa"
@@ -270,6 +253,21 @@ msgid "Create Purchase"
msgstr "Crear compra"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Todos"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interno"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Todos"
@@ -315,10 +313,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Crear compra - Petición de tercero"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Crear compra - Petición de plazo"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Solicitud de compra"
@@ -379,10 +373,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Crear compra: Falta proveedor"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear compra: Falta plazo de pago"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Información del producto"
@@ -439,14 +429,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuar"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuar"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Crear"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 7546200..5002832 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,13 +3,12 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Il y a des mouvements fournisseurs tardifs, êtes-vous sûr de les ignorer ?"
+msgid "There are some late supplier moves."
+msgstr "Il y a des mouvements de fournisseur tardifs."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
-msgstr "Le prix d'achat du produit \"%s\" est manquant."
+msgstr "Le prix d'achat du produit « %s » est manquant."
msgctxt "error:purchase.request.create_purchase:"
msgid "This price is necessary for creating purchases."
@@ -157,22 +156,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Produit"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Société"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Fournisseur"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Condition de paiement"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Société"
@@ -270,6 +253,21 @@ msgid "Create Purchase"
msgstr "Créer achat"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Toutes"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interne"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Achats"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Toutes"
@@ -315,10 +313,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Créer l'achat - Demande de tiers"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Créer l'achat - Demande de condition de paiement"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Demande d'achat"
@@ -373,16 +367,12 @@ msgstr "Créer les demandes d'achat"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Requests?"
-msgstr "Créer les demandes d'achat ?"
+msgstr "Créer les demandes d'achat ?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Créer la commande: fournisseur absent"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Créer la commande: condition de paiement absente"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Info produit"
@@ -421,7 +411,7 @@ msgstr "Création les expéditions internes"
msgctxt "view:stock.shipment.internal.create.start:"
msgid "Create Internal Shipments?"
-msgstr "Créer les expéditions internes ?"
+msgstr "Créer les expéditions internes ?"
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
@@ -439,14 +429,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Continuer"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Annuler"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Continuer"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr "Créer"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1934643..70795f8 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
+msgid "There are some late supplier moves."
msgstr ""
msgctxt "error:purchase.request.create_purchase:"
@@ -163,25 +163,6 @@ msgid "Product"
msgstr "Producten"
#, fuzzy
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Bedrijf"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Leverancier"
-
-#, fuzzy
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Betalingstermijn"
-
-#, fuzzy
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Bedrijf"
@@ -284,6 +265,21 @@ msgid "Create Purchase"
msgstr ""
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr ""
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr ""
@@ -330,10 +326,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr ""
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr ""
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr ""
@@ -393,10 +385,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr ""
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr ""
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr ""
@@ -455,15 +443,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr ""
-#, fuzzy
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Annuleren"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr ""
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 2e8fd5f..0e0aad1 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
+msgid "There are some late supplier moves."
msgstr ""
msgctxt "error:purchase.request.create_purchase:"
@@ -155,22 +155,6 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Продукт"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Организация"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Поставщик"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Правило оплаты"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Организация"
@@ -268,6 +252,24 @@ msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Создать покупку"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Все"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Внутренний"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Покупки"
+
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
@@ -314,10 +316,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Создать покупку, Запрос контрагента"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Создать покупку, Запрос правила"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Запрос на покупку"
@@ -375,10 +373,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Создать покупку: Отсутствует поставщик"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Создать покупку: Отсутствует правило оплаты"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Информация о продукте"
@@ -435,14 +429,6 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Продолжить"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Отменить"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Продолжить"
-
#, fuzzy
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index ee0feb9..d8c4415 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -3,10 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
-msgid "There are some late supplier moves, are you sure to ignore them?"
-msgstr ""
-"Obstaja nekaj zapoznelega prometa pri dobavitelju. Ali ste prepričani, da ga"
-" želite prezreti?"
+msgid "There are some late supplier moves."
+msgstr "Obstaja nekaj poznih knjižb dobaviteljev."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -62,11 +60,11 @@ msgstr "Izračunana ME"
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:purchase.request,id:"
msgid "ID"
@@ -156,33 +154,17 @@ msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
msgstr "Izdelek"
-msgctxt "field:purchase.request.create_purchase.ask_term,company:"
-msgid "Company"
-msgstr "Družba"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,party:"
-msgid "Supplier"
-msgstr "Dobavitelj"
-
-msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
-msgid "Payment Term"
-msgstr "Plačilni rok"
-
msgctxt "field:stock.order_point,company:"
msgid "Company"
msgstr "Družba"
msgctxt "field:stock.order_point,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:stock.order_point,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:stock.order_point,id:"
msgid "ID"
@@ -269,6 +251,21 @@ msgid "Create Purchase"
msgstr "Izdelava nabavnega naloga"
msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
+msgid "All"
+msgstr "Vse"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
+msgid "Internal"
+msgstr "Interno"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_order_point_form_domain_purchase"
+msgid "Purchase"
+msgstr "Nabavni nalogi"
+
+msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Vse"
@@ -314,10 +311,6 @@ msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
msgstr "Izdelava nabavnega naloga: Partner"
-msgctxt "model:purchase.request.create_purchase.ask_term,name:"
-msgid "Create Purchase Ask Term"
-msgstr "Izdelava nabavnega naloga: Plačilni rok"
-
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
msgstr "Nabava - zahtevki"
@@ -374,10 +367,6 @@ msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
msgstr "Izdelava nabavnega naloga: Dobavitelj manjka"
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Izdelava nabavnega naloga: Plačilni rok manjka"
-
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Podatek o izdelku"
@@ -420,7 +409,7 @@ msgstr "Izdelava notranjih odpremnic?"
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
-msgstr "Ustvari"
+msgstr "Izdelaj"
msgctxt "wizard_button:purchase.request.create,start,end:"
msgid "Cancel"
@@ -434,17 +423,9 @@ msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
msgstr "Naprej"
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Prekliči"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Naprej"
-
msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
msgid "Create"
-msgstr "Ustvari"
+msgstr "Izdelaj"
msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
msgid "Cancel"
diff --git a/order_point.xml b/order_point.xml
index 789b328..bf74dee 100644
--- a/order_point.xml
+++ b/order_point.xml
@@ -28,6 +28,26 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="order_point_view_form"/>
<field name="act_window" ref="act_order_point_form"/>
</record>
+ <record model="ir.action.act_window.domain"
+ id="act_order_point_form_domain_purchase">
+ <field name="name">Purchase</field>
+ <field name="sequence" eval="10"/>
+ <field name="domain">[('type', '=', 'purchase')]</field>
+ <field name="act_window" ref="act_order_point_form"/>
+ </record>
+ <record model="ir.action.act_window.domain"
+ id="act_order_point_form_domain_internal">
+ <field name="name">Internal</field>
+ <field name="sequence" eval="20"/>
+ <field name="domain">[('type', '=', 'internal')]</field>
+ <field name="act_window" ref="act_order_point_form"/>
+ </record>
+ <record model="ir.action.act_window.domain"
+ id="act_order_point_form_domain_all">
+ <field name="name">All</field>
+ <field name="sequence" eval="9999"/>
+ <field name="act_window" ref="act_order_point_form"/>
+ </record>
<menuitem parent="stock.menu_stock" sequence="60"
action="act_order_point_form" id="menu_order_point_form"/>
diff --git a/purchase_request.py b/purchase_request.py
index 40b2b78..2da0fb0 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -11,10 +11,11 @@ from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
from trytond.pyson import If, In, Eval, Get
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.tools import grouped_slice
__all__ = ['PurchaseRequest',
'CreatePurchaseRequestStart', 'CreatePurchaseRequest',
- 'CreatePurchaseAskTerm', 'CreatePurchaseAskParty', 'CreatePurchase']
+ 'CreatePurchaseAskParty', 'CreatePurchase']
STATES = {
'readonly': Eval('state') != 'draft',
@@ -57,7 +58,7 @@ class PurchaseRequest(ModelSQL, ModelView):
('id', If(In('company', Eval('context', {})), '=', '!='),
Eval('context', {}).get('company', -1)),
])
- origin = fields.Reference('Origin', selection='origin_get', readonly=True,
+ origin = fields.Reference('Origin', selection='get_origin', readonly=True,
required=True)
state = fields.Function(fields.Selection([
('purchased', 'Purchased'),
@@ -116,6 +117,10 @@ class PurchaseRequest(ModelSQL, ModelView):
if self.purchase_line:
return self.purchase_line.purchase.id
+ @property
+ def currency(self):
+ return self.company.currency
+
def get_state(self, name):
if self.purchase_line:
if self.purchase_line.purchase.state == 'cancel':
@@ -130,21 +135,30 @@ class PurchaseRequest(ModelSQL, ModelView):
return self.product.type in ('goods', 'assets')
@staticmethod
- def origin_get():
- Model = Pool().get('ir.model')
- res = []
- models = Model.search([
- ('model', '=', 'stock.order_point'),
+ def _get_origin():
+ 'Return the set of Model names for origin Reference'
+ return {'stock.order_point'}
+
+ @classmethod
+ def get_origin(cls):
+ pool = Pool()
+ IrModel = pool.get('ir.model')
+ models = IrModel.search([
+ ('model', 'in', list(cls._get_origin())),
])
- for model in models:
- res.append([model.model, model.name])
- return res
+ return [(m.model, m.name) for m in models]
@classmethod
- def generate_requests(cls, products=None):
+ def generate_requests(cls, products=None, warehouses=None):
"""
For each product compute the purchase request that must be
- create today to meet product outputs.
+ created today to meet product outputs.
+
+ If products is specified it will compute the purchase requests
+ for the selected products.
+
+ If warehouses is specified it will compute the purchase request
+ necessary for the selected warehouses.
"""
pool = Pool()
OrderPoint = pool.get('stock.order_point')
@@ -153,10 +167,11 @@ class PurchaseRequest(ModelSQL, ModelView):
User = pool.get('res.user')
company = User(Transaction().user).company
- # fetch warehouses:
- warehouses = Location.search([
- ('type', '=', 'warehouse'),
- ])
+ if warehouses is None:
+ # fetch warehouses:
+ warehouses = Location.search([
+ ('type', '=', 'warehouse'),
+ ])
warehouse_ids = [w.id for w in warehouses]
# fetch order points
order_points = OrderPoint.search([
@@ -186,11 +201,11 @@ class PurchaseRequest(ModelSQL, ModelView):
# compute requests
new_requests = []
- cursor = Transaction().cursor
- for dates, sub_products in date2products.iteritems():
+ for dates, dates_products in date2products.iteritems():
min_date, max_date = dates
- for i in range(0, len(sub_products), cursor.IN_MAX):
- product_ids = [p.id for p in sub_products[i:i + cursor.IN_MAX]]
+ for sub_products in grouped_slice(dates_products):
+ sub_products = list(sub_products)
+ product_ids = [p.id for p in sub_products]
with Transaction().set_context(forecast=True,
stock_date_end=min_date or datetime.date.max):
pbl = Product.products_by_location(warehouse_ids,
@@ -203,7 +218,7 @@ class PurchaseRequest(ModelSQL, ModelView):
min_date, max_date, min_date_qties=min_date_qties,
order_points=product2ops)
- for product in sub_products[i:i + cursor.IN_MAX]:
+ for product in sub_products:
shortage_date, product_quantity = shortages[product.id]
if shortage_date is None or product_quantity is None:
continue
@@ -432,16 +447,19 @@ class PurchaseRequest(ModelSQL, ModelView):
if (not res_qty) or (current_qty < res_qty):
res_qties[product_id] = current_qty
- with Transaction().set_context(stock_date_start=current_date,
+ if current_date == datetime.date.max:
+ break
+ current_date += datetime.timedelta(1)
+
+ # Update current quantities with next moves
+ with Transaction().set_context(forecast=True,
+ stock_date_start=current_date,
stock_date_end=current_date):
pbl = Product.products_by_location([location_id],
product_ids, with_childs=True)
for key, qty in pbl.iteritems():
_, product_id = key
current_qties[product_id] += qty
- if current_date == datetime.date.max:
- break
- current_date += datetime.timedelta(1)
return dict((x, (res_dates.get(x), res_qties.get(x)))
for x in product_ids)
@@ -480,10 +498,13 @@ class CreatePurchaseRequest(Wizard):
def __setup__(cls):
super(CreatePurchaseRequest, cls).__setup__()
cls._error_messages.update({
- 'late_supplier_moves': ('There are some late supplier moves, '
- 'are you sure to ignore them?'),
+ 'late_supplier_moves': 'There are some late supplier moves.',
})
+ @property
+ def _requests_parameters(self):
+ return {}
+
def do_create_(self, action):
pool = Pool()
PurchaseRequest = pool.get('purchase.request')
@@ -498,22 +519,13 @@ class CreatePurchaseRequest(Wizard):
], order=[]):
self.raise_user_warning('%s@%s' % (self.__name__, today),
'late_supplier_moves')
- PurchaseRequest.generate_requests()
+ PurchaseRequest.generate_requests(**self._requests_parameters)
return action, {}
def transition_create_(self):
return 'end'
-class CreatePurchaseAskTerm(ModelView):
- 'Create Purchase Ask Term'
- __name__ = 'purchase.request.create_purchase.ask_term'
- party = fields.Many2One('party.party', 'Supplier', readonly=True)
- company = fields.Many2One('company.company', 'Company', readonly=True)
- payment_term = fields.Many2One(
- 'account.invoice.payment_term', 'Payment Term', required=True)
-
-
class CreatePurchaseAskParty(ModelView):
'Create Purchase Ask Party'
__name__ = 'purchase.request.create_purchase.ask_party'
@@ -531,11 +543,6 @@ class CreatePurchase(Wizard):
Button('Cancel', 'end', 'tryton-cancel'),
Button('Continue', 'start', 'tryton-go-next', default=True),
])
- ask_term = StateView('purchase.request.create_purchase.ask_term',
- 'stock_supply.purchase_request_create_purchase_ask_term_view_form', [
- Button('Cancel', 'end', 'tryton-cancel'),
- Button('Continue', 'start', 'tryton-go-next', default=True),
- ])
@classmethod
def __setup__(cls):
@@ -562,22 +569,6 @@ class CreatePurchase(Wizard):
'company': request.company.id,
}
- def default_ask_term(self, fields):
- Request = Pool().get('purchase.request')
- requests = Request.browse(Transaction().context['active_ids'])
- for request in requests:
- if (not request.party) or request.purchase_line:
- continue
- if not request.party.supplier_payment_term:
- return {
- 'party': request.party.id,
- 'company': request.company.id,
- }
- return {
- 'party': request.party.id,
- 'company': request.company.id,
- }
-
@staticmethod
def _group_purchase_key(requests, request):
'''
@@ -589,15 +580,13 @@ class CreatePurchase(Wizard):
('party', request.party),
('payment_term', request.party.supplier_payment_term),
('warehouse', request.warehouse),
- # XXX use function field
- ('currency', request.company.currency),
+ ('currency', request.currency),
('invoice_address', request.party.address_get(type='invoice')),
)
def transition_start(self):
pool = Pool()
Request = pool.get('purchase.request')
- Party = pool.get('party.party')
Purchase = pool.get('purchase.purchase')
Date = pool.get('ir.date')
@@ -617,18 +606,6 @@ class CreatePurchase(Wizard):
self.ask_party.product = None
self.ask_party.party = None
self.ask_party.company = None
- elif (getattr(self.ask_term, 'payment_term', None)
- and getattr(self.ask_term, 'party', None)
- and getattr(self.ask_term, 'company', None)):
- with Transaction().set_context(
- company=self.ask_term.company.id):
- Party.write([self.ask_term.party], {
- 'supplier_payment_term': (
- self.ask_term.payment_term.id),
- })
- self.ask_term.payment_term = None
- self.ask_term.party = None
- self.ask_term.company = None
reqs = Request.search([
('id', 'in', request_ids),
@@ -642,34 +619,31 @@ class CreatePurchase(Wizard):
requests = Request.browse(request_ids)
requests = [r for r in requests if not r.purchase_line]
- if any(r for r in requests if not r.party.supplier_payment_term):
- return 'ask_term'
keyfunc = partial(self._group_purchase_key, requests)
requests = sorted(requests, key=keyfunc)
- with Transaction().set_user(0, set_context=True):
- for key, grouped_requests in groupby(requests, key=keyfunc):
- grouped_requests = list(grouped_requests)
- try:
- purchase_date = min(r.purchase_date
- for r in grouped_requests
- if r.purchase_date)
- except ValueError:
- purchase_date = today
- if purchase_date < today:
- purchase_date = today
- purchase = Purchase(purchase_date=purchase_date)
- for f, v in key:
- setattr(purchase, f, v)
- purchase.save()
- for request in grouped_requests:
- line = self.compute_purchase_line(request)
- line.purchase = purchase
- line.save()
- Request.write([request], {
- 'purchase_line': line.id,
- })
+ for key, grouped_requests in groupby(requests, key=keyfunc):
+ grouped_requests = list(grouped_requests)
+ try:
+ purchase_date = min(r.purchase_date
+ for r in grouped_requests
+ if r.purchase_date)
+ except ValueError:
+ purchase_date = today
+ if purchase_date < today:
+ purchase_date = today
+ purchase = Purchase(purchase_date=purchase_date)
+ for f, v in key:
+ setattr(purchase, f, v)
+ purchase.save()
+ for request in grouped_requests:
+ line = self.compute_purchase_line(request, purchase)
+ line.purchase = purchase
+ line.save()
+ Request.write([request], {
+ 'purchase_line': line.id,
+ })
return 'end'
@staticmethod
@@ -680,7 +654,7 @@ class CreatePurchase(Wizard):
return {}
@classmethod
- def compute_purchase_line(cls, request):
+ def compute_purchase_line(cls, request, purchase):
pool = Pool()
Product = pool.get('product.product')
Line = pool.get('purchase.line')
@@ -695,7 +669,7 @@ class CreatePurchase(Wizard):
# XXX purchase with several lines of the same product
with Transaction().set_context(uom=request.uom.id,
supplier=request.party.id,
- currency=request.company.currency.id):
+ currency=request.currency.id):
product_price = Product.get_purchase_price(
[request.product], request.quantity)[request.product.id]
product_price = product_price.quantize(
diff --git a/purchase_request.xml b/purchase_request.xml
index c24ae3a..7b11b64 100644
--- a/purchase_request.xml
+++ b/purchase_request.xml
@@ -76,11 +76,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_purchase_request"/>
</record>
- <record model="ir.ui.view" id="purchase_request_create_purchase_ask_term_view_form">
- <field name="model">purchase.request.create_purchase.ask_term</field>
- <field name="type">form</field>
- <field name="name">purchase_request_create_purchase_ask_term_form</field>
- </record>
<record model="ir.ui.view" id="purchase_request_create_purchase_ask_party">
<field name="model">purchase.request.create_purchase.ask_party</field>
<field name="type">form</field>
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index 70fc771..c246a44 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -6,7 +6,8 @@ import datetime
from decimal import Decimal
import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
- test_depends, doctest_dropdb
+ test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.transaction import Transaction
DATES = [
@@ -132,6 +133,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockSupplyTestCase))
suite.addTests(doctest.DocFileSuite('scenario_stock_internal_supply.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 8c16ec2..4950e10 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
account
ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 678adf5..68d6a07 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-supply
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_stock_supply
====================
diff --git a/trytond_stock_supply.egg-info/SOURCES.txt b/trytond_stock_supply.egg-info/SOURCES.txt
index b9c26a3..ff1401a 100644
--- a/trytond_stock_supply.egg-info/SOURCES.txt
+++ b/trytond_stock_supply.egg-info/SOURCES.txt
@@ -11,11 +11,35 @@ shipment.xml
tryton.cfg
./__init__.py
./order_point.py
+./order_point.xml
./product.py
./purchase_request.py
+./purchase_request.xml
./shipment.py
+./shipment.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_stock_internal_supply.rst
./tests/test_stock_supply.py
+./view/order_point_form.xml
+./view/order_point_tree.xml
+./view/purchase_request_create_purchase_ask_party_form.xml
+./view/purchase_request_create_start_form.xml
+./view/purchase_request_form.xml
+./view/purchase_request_tree.xml
+./view/stock_shipment_internal_create_start_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -23,6 +47,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
@@ -39,7 +64,6 @@ trytond_stock_supply.egg-info/top_level.txt
view/order_point_form.xml
view/order_point_tree.xml
view/purchase_request_create_purchase_ask_party_form.xml
-view/purchase_request_create_purchase_ask_term_form.xml
view/purchase_request_create_start_form.xml
view/purchase_request_form.xml
view/purchase_request_tree.xml
diff --git a/trytond_stock_supply.egg-info/requires.txt b/trytond_stock_supply.egg-info/requires.txt
index f521c1a..2653bd9 100644
--- a/trytond_stock_supply.egg-info/requires.txt
+++ b/trytond_stock_supply.egg-info/requires.txt
@@ -1,7 +1,7 @@
python-sql
-trytond_account >= 3.2, < 3.3
-trytond_party >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond_purchase >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_account >= 3.4, < 3.5
+trytond_party >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond_purchase >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/view/order_point_form.xml b/view/order_point_form.xml
index 226bcdc..49d4bef 100644
--- a/view/order_point_form.xml
+++ b/view/order_point_form.xml
@@ -2,10 +2,19 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<form string="Order Point" cursor="product">
- <separator string="Product Info" colspan="4" id="info"/>
+ <separator string="Order Point Type" colspan="4" id="type"/>
+ <label name="type"/>
+ <field name="type"/>
<label name="company"/>
<field name="company"/>
+ <label name="warehouse_location"/>
+ <field name="warehouse_location"/>
<newline/>
+ <label name="storage_location"/>
+ <field name="storage_location"/>
+ <label name="provisioning_location"/>
+ <field name="provisioning_location"/>
+ <separator string="Product Info" colspan="4" id="info"/>
<label name="product"/>
<field name="product"/>
<label name="unit"/>
@@ -14,15 +23,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="min_quantity"/>
<label name="max_quantity"/>
<field name="max_quantity"/>
- <separator string="Order Point Type" colspan="4" id="type"/>
- <label name="type"/>
- <field name="type"/>
- <newline/>
- <label name="warehouse_location"/>
- <field name="warehouse_location"/>
- <newline/>
- <label name="storage_location"/>
- <field name="storage_location"/>
- <label name="provisioning_location"/>
- <field name="provisioning_location"/>
</form>
diff --git a/view/purchase_request_create_purchase_ask_term_form.xml b/view/purchase_request_create_purchase_ask_term_form.xml
deleted file mode 100644
index 26395cb..0000000
--- a/view/purchase_request_create_purchase_ask_term_form.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form string="Create Purchase: Missing Payment Term" col="2"
- cursor="payment_term">
- <label name="party"/>
- <field name="party"/>
- <label name="company"/>
- <field name="company"/>
- <label name="payment_term"/>
- <field name="payment_term"/>
-</form>
-
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list