[tryton-debian-vcs] tryton-modules-stock-supply branch debian updated. debian/2.8.1-2-6-g11cf203
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:38:29 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply.git;a=commitdiff;h=debian/2.8.1-2-6-g11cf203
commit 11cf2037eb97a8cafc393e43cb1d1cdbbd199cb3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:40 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 191dcbb..9b86bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-supply (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating copyright.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:55:40 +0100
+
tryton-modules-stock-supply (2.8.1-2) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 06455af0809327dc5cfb7cb1ab4aed02e9de828d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:49:47 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index f7f2db7..f3acd4c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Depends:
tryton-modules-party (>= ${version:major}),
tryton-modules-product (>= ${version:major}),
tryton-modules-purchase (>= ${version:major}),
- tryton-modules-stock (>= ${version:major}), python-pkg-resources
+ tryton-modules-stock (>= ${version:major}),
+ python-sql, python-pkg-resources
Description: Tryton Application Platform (Stock Supply Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 38b46b31f0f96ef78a2fea3b777e1f0a401a07cc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index e6de184..f7f2db7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 66970bd7aece960d828e5be0e62f22bc6fa236b5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index fab15a1..e6de184 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-supply.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-supply.git
commit 2c23826b92130ecd5a5ade6c0253c4fec6aa28f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:38:44 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 115c003..4f12b80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2013 Cédric Krier
+Copyright: 2013 NaN-tic
+ 2008-2013 Cédric Krier
2008-2013 Bertrand Chenal
2008-2013 B2CK SPRL
License: GPL-3+
commit 1c88c0e765ac4fa3e5a3047b2ab3949993ae4225
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:31 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 85acf08..a09c106 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
-Version 2.8.1 - 2013-06-09
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
+* Add wizard to create internal shipments
+* Add warning for late supplier moves when creating purchase request
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 9192c97..14a0f29 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,3 +1,4 @@
+Copyright (C) 2013 NaN-tic.
Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
Copyright (C) 2008-2013 B2CK SPRL.
diff --git a/INSTALL b/INSTALL
index dea2748..cf3c35d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,7 @@ Prerequisites
-------------
* Python 2.6 or later (http://www.python.org/)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 576a69d..b98dbac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_stock_supply
====================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/__init__.py b/__init__.py
index bb58ef5..89e6e06 100644
--- a/__init__.py
+++ b/__init__.py
@@ -17,8 +17,10 @@ def register():
CreatePurchaseAskTerm,
CreatePurchaseAskParty,
ShipmentInternal,
+ CreateShipmentInternalStart,
module='stock_supply', type_='model')
Pool.register(
CreatePurchaseRequest,
CreatePurchase,
+ CreateShipmentInternal,
module='stock_supply', type_='wizard')
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 6609784..1c684b2 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,6 +2,10 @@
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 ""
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "Поръчаното количество трябва да е по-голямо от 0"
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr ""
+
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
msgstr ""
@@ -232,6 +240,11 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Променено от"
+#, fuzzy
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Пренареждания"
@@ -248,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "Заявки за покупка"
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Създаване на покупка"
@@ -283,6 +300,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Заявки за покупки"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Заявка за покупка"
@@ -315,6 +336,10 @@ 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:purchase.request,state:"
msgid "Cancel"
msgstr "Отказ"
@@ -387,6 +412,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Информация за продукт"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr ""
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr "Създаване"
@@ -410,3 +443,13 @@ 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"
+msgstr "Създаване"
+
+#, fuzzy
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Отказване"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ec1bd45..34f61d1 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,6 +2,11 @@
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 moviments de proveïdor pendents. Esteu segur de voler ignorar-los?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "No es troba el preu de compra del producte \"%s\"."
@@ -18,6 +23,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "La quantitat sol·licitada ha de ser més gran que 0."
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr "No podeu eliminar una sol·licitud comprada."
+
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"
@@ -232,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Regles d'estoc mínim"
@@ -248,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "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:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Crear una compra"
@@ -282,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Sol·licituds de compra"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crea albarans interns"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Sol·licitud de compra"
@@ -314,13 +335,17 @@ msgctxt "model:stock.order_point,name:"
msgid "Order Point"
msgstr "Regla d'estoc mínim"
+msgctxt "model:stock.shipment.internal.create.start,name:"
+msgid "Create Shipment Internal"
+msgstr "Crea albarans interns"
+
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
msgstr "Regla d'estoc mínim"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancel·lat"
msgctxt "selection:purchase.request,state:"
msgid "Done"
@@ -390,6 +415,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Informació del producte"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr "Crea albarans interns"
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr "Crear albarans interns?"
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr "Crea"
@@ -413,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 661f1ba..03af768 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,6 +2,10 @@
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 ""
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr ""
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr ""
+
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
msgstr ""
@@ -228,6 +236,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr ""
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr ""
@@ -244,6 +256,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr ""
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr ""
@@ -278,6 +294,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr ""
@@ -310,6 +330,10 @@ 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:purchase.request,state:"
msgid "Cancel"
msgstr ""
@@ -382,6 +406,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr ""
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr ""
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr ""
@@ -405,3 +437,11 @@ 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 ""
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index a90322a..f1b7852 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,6 +2,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 ""
+"Es existieren spätere Lieferbewegungen von Lieferanten.\n"
+"Ignorieren und fortfahren?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "Fehlender Einkaufspreis für Artikel \"%s\"."
@@ -18,6 +24,11 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "Die angefragte Menge muss größer als 0 sein"
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr ""
+"Für einen Einkauf benutzte Bestellvorschläge können nicht gelöscht werden."
+
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"
@@ -230,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Bestellpunkte"
@@ -246,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "Bestellvorschläge"
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Interne Lieferposten erstellen"
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Verkauf erstellen"
@@ -280,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Bestellvorschläge"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Interne Lieferposten erstellen"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Bestellvorschlag"
@@ -312,6 +335,10 @@ 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:purchase.request,origin:"
msgid "Order Point"
msgstr "Bestellpunkt"
@@ -388,6 +415,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Artikelinfo"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr "Interne Lieferbewegungen erstellen"
+
+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"
@@ -411,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Abbrechen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a68a77b..7a8b0b9 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,6 +2,11 @@
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?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "Falta el precio de compra del producto «%s»."
@@ -18,6 +23,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "La cantidad solicitada debe ser mayor que 0."
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr "No puede eliminar una solicitud comprada."
+
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"
@@ -232,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
@@ -248,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "Solicitudes de compra"
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crear Remitos internos"
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Crear compra"
@@ -268,7 +285,7 @@ msgstr "Generar solicitudes de compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
-msgstr "Generar envíos internos"
+msgstr "Generar Remitos internos"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
@@ -282,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Solicitudes de compra"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crear Remitos internos"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Solicitud de compra"
@@ -308,12 +329,16 @@ msgstr "Programador de solicitud de compra"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Programador de envío interno"
+msgstr "Programador de Remito interno"
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 Remito interno"
+
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
msgstr "Regla de abastecimiento"
@@ -390,6 +415,14 @@ 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 Remitos internos"
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr "¿Crear Remitos internos?"
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr "Crear"
@@ -413,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 41c0e1c..31c2131 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,13 +2,19 @@
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?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
-msgstr ""
+msgstr "Falta el precio de compra del producto \"%s\"."
msgctxt "error:purchase.request.create_purchase:"
msgid "This price is necessary for creating purchases."
-msgstr ""
+msgstr "Este precio es ncesario para crear compras."
msgctxt "error:purchase.request:"
msgid "Purchase requests are only created by the system."
@@ -18,6 +24,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
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."
+
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
msgstr "La cantidad máxima debe ser mayor que la cantidad mínima"
@@ -49,7 +59,7 @@ msgstr "Cantidad Calculada"
msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
-msgstr "UOM Calculada"
+msgstr "UdM Calculada"
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
@@ -101,7 +111,7 @@ msgstr "Estado"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Almacenar al Momento en la fecha de abastecimiento"
+msgstr "Almacenar la Fecha de Abastecimiento"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
@@ -109,7 +119,7 @@ msgstr "Fecha Esperada de Abastecimiento"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
-msgstr "UDM"
+msgstr "UdM"
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
@@ -181,7 +191,7 @@ msgstr "ID"
msgctxt "field:stock.order_point,location:"
msgid "Location"
-msgstr "Locación"
+msgstr "Bodega"
msgctxt "field:stock.order_point,max_quantity:"
msgid "Maximal Quantity"
@@ -197,7 +207,7 @@ msgstr "Producto"
msgctxt "field:stock.order_point,provisioning_location:"
msgid "Provisioning Location"
-msgstr "Locación de Aprovisionamiento"
+msgstr "Bodega de Aprovisionamiento"
msgctxt "field:stock.order_point,rec_name:"
msgid "Name"
@@ -205,7 +215,7 @@ msgstr "Nombre"
msgctxt "field:stock.order_point,storage_location:"
msgid "Storage Location"
-msgstr "Locación de Almacenamiento"
+msgstr "Bodega de Almacenamiento"
msgctxt "field:stock.order_point,type:"
msgid "Type"
@@ -221,7 +231,7 @@ msgstr "Decimales de Unidad"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
-msgstr "Locación del Depósito"
+msgstr "Bodega de Depósito"
msgctxt "field:stock.order_point,write_date:"
msgid "Write Date"
@@ -231,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Puntos de Orden"
@@ -247,17 +261,19 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "Solicitudes de Compra"
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crear Envío Interno"
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Crear Compra"
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
msgstr "Todo"
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_draft"
msgid "Draft"
@@ -283,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Ordenes de Compra"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crear Envíos Internos"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Orden de Compra"
@@ -311,11 +331,14 @@ msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
msgstr "Cron Envío Interno"
-#, fuzzy
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
msgstr "Punto de Orden"
+msgctxt "model:stock.shipment.internal.create.start,name:"
+msgid "Create Shipment Internal"
+msgstr "Crear Envío Interno"
+
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
msgstr "Punto de Orden"
@@ -392,6 +415,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Información de Producto"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr "Crear Envíos Internos"
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr "Crear Envíos Internos?"
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr "Crear"
@@ -415,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 6a6758e..0d4fb99 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,6 +2,11 @@
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?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "Falta el precio de compra del producto \"%s\"."
@@ -18,6 +23,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "La cantidad solicitada debe ser más grande que 0."
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr "No puede eliminar una solicitud de compra."
+
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."
@@ -232,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
@@ -248,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "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:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Crear compra"
@@ -282,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Solicitudes de compra"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Crear albaranes internos"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Solicitud de compra"
@@ -314,6 +335,10 @@ 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:purchase.request,origin:"
msgid "Order Point"
msgstr "Regla de abastecimiento"
@@ -348,15 +373,15 @@ msgstr "Crear solicitud de compra"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Request?"
-msgstr "Crear solicitudes de compra?"
+msgstr "¿Crear solicitudes de compra?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
-msgstr "Crear compra: Sin proveedor"
+msgstr "Crear compra: Falta proveedor"
msgctxt "view:purchase.request.create_purchase.ask_term:"
msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear compra: Sin plazo de pago"
+msgstr "Crear compra: Falta plazo de pago"
msgctxt "view:purchase.request:"
msgid "Product Info"
@@ -390,6 +415,14 @@ 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 "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"
@@ -413,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c1f918d..cab1ed1 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,6 +2,11 @@
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 ?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "Le prix d'achat du produit \"%s\" est manquant."
@@ -15,16 +20,12 @@ msgid "Purchase requests are only created by the system."
msgstr "Les demandes d'achat sont uniquement crées par le sytème"
msgctxt "error:purchase.request:"
-msgid "Purchase requests are only created by the system."
-msgstr "Les demandes d'achat sont uniquement crées par le sytème"
-
-msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "La quantité requise doit être supérieure à zéro"
-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:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr "Vous ne pouvez pas supprimer des demandes d'achat commandées."
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
@@ -37,20 +38,6 @@ msgstr ""
"emplacement"
msgctxt "error:stock.order_point:"
-msgid "Only one order point is allowed for each product-location pair."
-msgstr ""
-"Une seule règle d'approvisionnement est autorisée par paire produit-"
-"emplacement"
-
-msgctxt "error:stock.order_point:"
-msgid ""
-"You can not define two order points on the same product with opposite "
-"locations."
-msgstr ""
-"Vous ne pouvez pas définir deux règles d'approvisionnement sur le même "
-"produit avec des emplacement opposés"
-
-msgctxt "error:stock.order_point:"
msgid ""
"You can not define two order points on the same product with opposite "
"locations."
@@ -254,6 +241,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Règles d'approvisionnement"
@@ -270,6 +261,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "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:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Créer achat"
@@ -304,6 +299,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Demandes d'achat"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Créer les expéditions internes"
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Demande d'achat"
@@ -336,6 +335,10 @@ 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:purchase.request,origin:"
msgid "Order Point"
msgstr "Règle d'approvisionnement"
@@ -345,14 +348,6 @@ msgid "Cancel"
msgstr "Annulé"
msgctxt "selection:purchase.request,state:"
-msgid "Cancel"
-msgstr "Annulé"
-
-msgctxt "selection:purchase.request,state:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "selection:purchase.request,state:"
msgid "Done"
msgstr "Fait"
@@ -361,14 +356,6 @@ msgid "Draft"
msgstr "Brouillon"
msgctxt "selection:purchase.request,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "selection:purchase.request,state:"
-msgid "Purchased"
-msgstr "Commandé"
-
-msgctxt "selection:purchase.request,state:"
msgid "Purchased"
msgstr "Commandé"
@@ -377,14 +364,6 @@ msgid "Internal"
msgstr "Interne"
msgctxt "selection:stock.order_point,type:"
-msgid "Internal"
-msgstr "Interne"
-
-msgctxt "selection:stock.order_point,type:"
-msgid "Purchase"
-msgstr "Achat"
-
-msgctxt "selection:stock.order_point,type:"
msgid "Purchase"
msgstr "Achat"
@@ -398,33 +377,17 @@ msgstr "Créer les demandes d'achat ?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
-msgstr "Création de la commande: fournisseur absent"
-
-msgctxt "view:purchase.request.create_purchase.ask_party:"
-msgid "Create Purchase: Missing Supplier"
-msgstr "Création de la commande: fournisseur absent"
-
-msgctxt "view:purchase.request.create_purchase.ask_term:"
-msgid "Create Purchase: Missing Payment Term"
-msgstr "Création de la commande: règle d'appro. absente"
+msgstr "Créer la commande: fournisseur absent"
msgctxt "view:purchase.request.create_purchase.ask_term:"
msgid "Create Purchase: Missing Payment Term"
-msgstr "Création de la commande: règle d'appro. absente"
+msgstr "Créer la commande: condition de paiement absente"
msgctxt "view:purchase.request:"
msgid "Product Info"
msgstr "Info produit"
msgctxt "view:purchase.request:"
-msgid "Product Info"
-msgstr "Info produit"
-
-msgctxt "view:purchase.request:"
-msgid "Purchase Request"
-msgstr "Demande d'achat"
-
-msgctxt "view:purchase.request:"
msgid "Purchase Request"
msgstr "Demande d'achat"
@@ -433,21 +396,9 @@ msgid "Purchase Requests"
msgstr "Demandes d'achat"
msgctxt "view:purchase.request:"
-msgid "Purchase Requests"
-msgstr "Demandes d'achat"
-
-msgctxt "view:purchase.request:"
msgid "Supply Info"
msgstr "Information d'approvisionnement"
-msgctxt "view:purchase.request:"
-msgid "Supply Info"
-msgstr "Information d'approvisionnement"
-
-msgctxt "view:stock.order_point:"
-msgid "Order Point"
-msgstr "Règle d'approvisionnement"
-
msgctxt "view:stock.order_point:"
msgid "Order Point"
msgstr "Règle d'approvisionnement"
@@ -457,14 +408,6 @@ msgid "Order Point Type"
msgstr "Type de Règle d'approvisionnement"
msgctxt "view:stock.order_point:"
-msgid "Order Point Type"
-msgstr "Type de Règle d'approvisionnement"
-
-msgctxt "view:stock.order_point:"
-msgid "Order Points"
-msgstr "Règles d'approvisionnements"
-
-msgctxt "view:stock.order_point:"
msgid "Order Points"
msgstr "Règles d'approvisionnements"
@@ -472,9 +415,13 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Info produit"
-msgctxt "view:stock.order_point:"
-msgid "Product Info"
-msgstr "Info produit"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+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 ?"
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
@@ -499,3 +446,11 @@ 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"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Annuler"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 167e1ef..9cb2df9 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,6 +2,10 @@
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 ""
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr ""
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr ""
+
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
msgstr ""
@@ -247,6 +255,10 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr ""
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr ""
@@ -263,6 +275,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr ""
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr ""
@@ -298,6 +314,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr ""
@@ -330,6 +350,10 @@ msgctxt "model:stock.order_point,name:"
msgid "Order Point"
msgstr ""
+msgctxt "model:stock.shipment.internal.create.start,name:"
+msgid "Create Shipment Internal"
+msgstr ""
+
#, fuzzy
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
@@ -405,6 +429,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr ""
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr ""
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr ""
@@ -431,3 +463,12 @@ 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 ""
+
+#, fuzzy
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Annuleren"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index faa656b..873f709 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,6 +2,10 @@
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 ""
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
msgstr "Цена покупки отсутствует у продукта \"%s\"."
@@ -18,6 +22,10 @@ msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
msgstr "Запрашиваемое кол-во должно быть больше 0"
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr ""
+
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
msgstr "Максимальное кол-во должно быть больше чем минимальное."
@@ -231,6 +239,11 @@ msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
+#, fuzzy
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Точки заказа"
@@ -247,6 +260,10 @@ msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
msgstr "Запросы на покупку"
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
msgstr "Создать покупку"
@@ -281,6 +298,10 @@ msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
msgstr "Запросы на покупку"
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr ""
+
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
msgstr "Запрос на покупку"
@@ -313,6 +334,10 @@ 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:purchase.request,state:"
msgid "Cancel"
msgstr "Отменить"
@@ -385,6 +410,14 @@ msgctxt "view:stock.order_point:"
msgid "Product Info"
msgstr "Информация о продукте"
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr ""
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments?"
+msgstr ""
+
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
msgstr "Создать"
@@ -408,3 +441,13 @@ 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"
+msgstr "Создать"
+
+#, fuzzy
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Отменить"
diff --git a/locale/es_AR.po b/locale/sl_SI.po
similarity index 66%
copy from locale/es_AR.po
copy to locale/sl_SI.po
index a68a77b..5092d47 100644
--- a/locale/es_AR.po
+++ b/locale/sl_SI.po
@@ -2,63 +2,71 @@
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?"
+
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
-msgstr "Falta el precio de compra del producto «%s»."
+msgstr "Pri izdelku \"%s\" manjka nabavna cena."
msgctxt "error:purchase.request.create_purchase:"
msgid "This price is necessary for creating purchases."
-msgstr "Este precio es necesario para crear compras."
+msgstr "Ta cena je potrebna pri izdelavi nabavnih nalogov."
msgctxt "error:purchase.request:"
msgid "Purchase requests are only created by the system."
-msgstr "Las solicitudes de compra solo las crea el sistema."
+msgstr "Nabavni zahtevki so izdelani samo s strani sistema."
msgctxt "error:purchase.request:"
msgid "The requested quantity must be greater than 0"
-msgstr "La cantidad solicitada debe ser mayor que 0."
+msgstr "Zahtevana količina mora biti večja od nič."
+
+msgctxt "error:purchase.request:"
+msgid "You can not delete purchased request."
+msgstr "Nabavnega zahtevka ni možno zbrisati."
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"
+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 ""
-"Sólo se permite una regla de abastecimiento por cada combinación de "
-"producto-ubicación."
+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."
msgstr ""
-"No puede definir dos reglas de abastecimiento en el mismo producto con "
-"ubicaciones opuestas."
+"Dveh točk naročanja ni možno določiti na istem izdelku z nasprotujočima "
+"lokacijama."
msgctxt "field:product.product,order_points:"
msgid "Order Points"
-msgstr "Reglas de abastecimiento"
+msgstr "Točke naročanja"
msgctxt "field:purchase.request,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:purchase.request,computed_quantity:"
msgid "Computed Quantity"
-msgstr "Cantidad calculada"
+msgstr "Izračunana količina"
msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
-msgstr "UdM calculada"
+msgstr "Izračunana ME"
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:purchase.request,id:"
msgid "ID"
@@ -66,67 +74,67 @@ msgstr "ID"
msgctxt "field:purchase.request,origin:"
msgid "Origin"
-msgstr "Origen"
+msgstr "Poreklo"
msgctxt "field:purchase.request,party:"
msgid "Party"
-msgstr "Entidad"
+msgstr "Stranka"
msgctxt "field:purchase.request,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Izdelek"
msgctxt "field:purchase.request,purchase:"
msgid "Purchase"
-msgstr "Compra"
+msgstr "Nabavni nalog"
msgctxt "field:purchase.request,purchase_date:"
msgid "Best Purchase Date"
-msgstr "Mejor fecha de compra"
+msgstr "Najugodnejši datum nabave"
msgctxt "field:purchase.request,purchase_line:"
msgid "Purchase Line"
-msgstr "Línea de compra"
+msgstr "Nabavna postavka"
msgctxt "field:purchase.request,quantity:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr "Količina"
msgctxt "field:purchase.request,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:purchase.request,state:"
msgid "State"
-msgstr "Estado"
+msgstr "Stanje"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Existencias a la fecha del suministro"
+msgstr "Zaloga na dan dobave"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
-msgstr "Fecha estimada de suministro"
+msgstr "Predviden datum dobave"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
-msgstr "UdM"
+msgstr "ME"
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
-msgstr "Almacén"
+msgstr "Skladišče"
msgctxt "field:purchase.request,warehouse_required:"
msgid "Warehouse Required"
-msgstr "Almacén requerido"
+msgstr "Skladišče zahtevano"
msgctxt "field:purchase.request,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:purchase.request,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:purchase.request.create.start,id:"
msgid "ID"
@@ -134,7 +142,7 @@ msgstr "ID"
msgctxt "field:purchase.request.create_purchase.ask_party,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:purchase.request.create_purchase.ask_party,id:"
msgid "ID"
@@ -142,15 +150,15 @@ msgstr "ID"
msgctxt "field:purchase.request.create_purchase.ask_party,party:"
msgid "Supplier"
-msgstr "Proveedor"
+msgstr "Dobavitelj"
msgctxt "field:purchase.request.create_purchase.ask_party,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Izdelek"
msgctxt "field:purchase.request.create_purchase.ask_term,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:purchase.request.create_purchase.ask_term,id:"
msgid "ID"
@@ -158,23 +166,23 @@ msgstr "ID"
msgctxt "field:purchase.request.create_purchase.ask_term,party:"
msgid "Supplier"
-msgstr "Proveedor"
+msgstr "Dobavitelj"
msgctxt "field:purchase.request.create_purchase.ask_term,payment_term:"
msgid "Payment Term"
-msgstr "Término de pago"
+msgstr "Plačilni rok"
msgctxt "field:stock.order_point,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:stock.order_point,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:stock.order_point,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:stock.order_point,id:"
msgid "ID"
@@ -182,157 +190,169 @@ msgstr "ID"
msgctxt "field:stock.order_point,location:"
msgid "Location"
-msgstr "Ubicación"
+msgstr "Lokacija"
msgctxt "field:stock.order_point,max_quantity:"
msgid "Maximal Quantity"
-msgstr "Cantidad máxima"
+msgstr "Največja količina"
msgctxt "field:stock.order_point,min_quantity:"
msgid "Minimal Quantity"
-msgstr "Cantidad mínima"
+msgstr "Najmanjša količina"
msgctxt "field:stock.order_point,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Izdelek"
msgctxt "field:stock.order_point,provisioning_location:"
msgid "Provisioning Location"
-msgstr "Ubicación del aprovisionamiento"
+msgstr "Preskrba"
msgctxt "field:stock.order_point,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:stock.order_point,storage_location:"
msgid "Storage Location"
-msgstr "Ubicación del depósito"
+msgstr "Shramba"
msgctxt "field:stock.order_point,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr "Vrsta"
msgctxt "field:stock.order_point,unit:"
msgid "Unit"
-msgstr "Unidad"
+msgstr "enota"
msgctxt "field:stock.order_point,unit_digits:"
msgid "Unit Digits"
-msgstr "Dígitos de unidad"
+msgstr "Decimalke"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
-msgstr "Ubicación del almacén"
+msgstr "Skladišče"
msgctxt "field:stock.order_point,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
+
+msgctxt "field:stock.shipment.internal.create.start,id:"
+msgid "ID"
+msgstr "ID"
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
-msgstr "Reglas de abastecimiento"
+msgstr "Točke naročanja"
msgctxt "model:ir.action,name:act_purchase_form"
msgid "Purchases"
-msgstr "Compras"
+msgstr "Nabavni nalogi"
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear solicitudes de compra"
+msgstr "Izdelava nabavnih zahtevkov"
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
+msgstr "Nabavni zahtevki"
+
+msgctxt "model:ir.action,name:act_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Izdelava notranjih odpremnic"
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
-msgstr "Crear compra"
+msgstr "Izdelava nabavnega naloga"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
-msgstr "Todo"
+msgstr "Vse"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_draft"
msgid "Draft"
-msgstr "Borrador"
+msgstr "Osnutki"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Purchase Requests"
-msgstr "Generar solicitudes de compra"
+msgstr "Izdelava nabavnih zahtevkov"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
-msgstr "Generar envíos internos"
+msgstr "Izdelava notranjih odpremnic"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
-msgstr "Reglas de abastecimiento"
+msgstr "Točke naročanja"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear solicitudes de compra"
+msgstr "Izdelava nabavnih zahtevkov"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
+msgstr "Nabavni zahtevki"
+
+msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
+msgid "Create Internal Shipments"
+msgstr "Izdelava notranjih odpremnic"
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
-msgstr "Solicitud de compra"
+msgstr "Nabavni zahtevek"
msgctxt "model:purchase.request.create.start,name:"
msgid "Create Purchase Request"
-msgstr "Crear solicitud de compra"
+msgstr "Izdelava nabavnega zahtevka"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Crear compra - Petición de tercero"
+msgstr "Izdelava nabavnega naloga: Stranka"
msgctxt "model:purchase.request.create_purchase.ask_term,name:"
msgid "Create Purchase Ask Term"
-msgstr "Crear compra - Petición de plazo"
+msgstr "Izdelava nabavnega naloga: Plačilni rok"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
-msgstr "Solicitud de compra"
+msgstr "Nabava - zahtevki"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Purchase Request"
-msgstr "Programador de solicitud de compra"
+msgstr "Razporejevalnik nabavnih zahtevkov"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Programador de envío interno"
+msgstr "Razporejevalnik notranjih odpremnic"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
-msgstr "Regla de abastecimiento"
+msgstr "Točka naročanja"
-msgctxt "selection:purchase.request,origin:"
-msgid "Order Point"
-msgstr "Regla de abastecimiento"
+msgctxt "model:stock.shipment.internal.create.start,name:"
+msgid "Create Shipment Internal"
+msgstr "Izdelava notranje odpremnice"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Preklicano"
msgctxt "selection:purchase.request,state:"
msgid "Done"
-msgstr "Realizada"
+msgstr "Zaključeno"
msgctxt "selection:purchase.request,state:"
msgid "Draft"
-msgstr "Borrador"
+msgstr "Osnutek"
msgctxt "selection:purchase.request,state:"
msgid "Purchased"
-msgstr "Comprado"
+msgstr "Nabavljeno"
msgctxt "selection:stock.order_point,type:"
msgid "Internal"
@@ -340,76 +360,92 @@ msgstr "Interno"
msgctxt "selection:stock.order_point,type:"
msgid "Purchase"
-msgstr "Compra"
+msgstr "Nabavni nalog"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Request"
-msgstr "Crear solicitud de compra"
+msgstr "Izdelava nabavnega zahtevka"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Request?"
-msgstr "¿Crear solicitud de compra?"
+msgstr "Izdelava nabavnega zahtevka?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
-msgstr "Crear compra: sin proveedor"
+msgstr "Izdelava nabavnega naloga: Dobavitelj manjka"
msgctxt "view:purchase.request.create_purchase.ask_term:"
msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear compra: sin término de pago"
+msgstr "Izdelava nabavnega naloga: Plačilni rok manjka"
msgctxt "view:purchase.request:"
msgid "Product Info"
-msgstr "Información del producto"
+msgstr "Podatek o izdelku"
msgctxt "view:purchase.request:"
msgid "Purchase Request"
-msgstr "Solicitud de compra"
+msgstr "Nabavni zahtevek"
msgctxt "view:purchase.request:"
msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
+msgstr "Nabavni zahtevki"
msgctxt "view:purchase.request:"
msgid "Supply Info"
-msgstr "Información del suministro"
+msgstr "Podatek o dobavi"
msgctxt "view:stock.order_point:"
msgid "Order Point"
-msgstr "Regla de abastecimiento"
+msgstr "Točka naročanja"
msgctxt "view:stock.order_point:"
msgid "Order Point Type"
-msgstr "Tipo de regla de abastecimiento"
+msgstr "Tip točke naročanja"
msgctxt "view:stock.order_point:"
msgid "Order Points"
-msgstr "Reglas de abastecimiento"
+msgstr "Točke naročanja"
msgctxt "view:stock.order_point:"
msgid "Product Info"
-msgstr "Información del producto"
+msgstr "Podatek o izdelku"
+
+msgctxt "view:stock.shipment.internal.create.start:"
+msgid "Create Internal Shipments"
+msgstr "Izdelava notranjih odpremnic"
+
+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 "Crear"
+msgstr "Ustvari"
msgctxt "wizard_button:purchase.request.create,start,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:purchase.request.create_purchase,ask_party,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
msgid "Continue"
-msgstr "Continuar"
+msgstr "Naprej"
msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
msgid "Continue"
-msgstr "Continuar"
+msgstr "Naprej"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,create_:"
+msgid "Create"
+msgstr "Ustvari"
+
+msgctxt "wizard_button:stock.shipment.internal.create,start,end:"
+msgid "Cancel"
+msgstr "Prekliči"
diff --git a/order_point.py b/order_point.py
index 75ff205..360b334 100644
--- a/order_point.py
+++ b/order_point.py
@@ -3,7 +3,7 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import If, Equal, Eval, Not, In, Get
from trytond.transaction import Transaction
-from trytond.backend import TableHandler
+from trytond import backend
__all__ = ['OrderPoint']
@@ -63,7 +63,7 @@ class OrderPoint(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
domain=[
('id', If(In('company', Eval('context', {})), '=', '!='),
- Get(Eval('context', {}), 'company', 0)),
+ Eval('context', {}).get('company', -1)),
])
unit = fields.Function(fields.Many2One('product.uom', 'Unit'), 'get_unit')
unit_digits = fields.Function(fields.Integer('Unit Digits'),
@@ -87,6 +87,7 @@ class OrderPoint(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
# Migration from 2.2
table = TableHandler(cursor, cls, module_name)
diff --git a/purchase_request.py b/purchase_request.py
index 8f1371e..f6362cc 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -55,7 +55,7 @@ class PurchaseRequest(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
readonly=True, domain=[
('id', If(In('company', Eval('context', {})), '=', '!='),
- Get(Eval('context', {}), 'company', 0)),
+ Eval('context', {}).get('company', -1)),
])
origin = fields.Reference('Origin', selection='origin_get', readonly=True,
required=True)
@@ -73,6 +73,8 @@ class PurchaseRequest(ModelSQL, ModelView):
cls._error_messages.update({
'create_request': ('Purchase requests are only created '
'by the system.'),
+ 'delete_purchase_line': ('You can not delete purchased '
+ 'request.'),
})
cls._sql_constraints += [
('check_purchase_request_quantity', 'CHECK(quantity > 0)',
@@ -82,12 +84,14 @@ class PurchaseRequest(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
cursor = Transaction().cursor
+ sql_table = cls.__table__()
super(PurchaseRequest, cls).__register__(module_name)
# Migration from 2.0: empty order point origin is -1 instead of 0
- cursor.execute('UPDATE "%s" '
- 'SET origin = %%s WHERE origin = %%s' % cls._table,
- ('stock.order_point,-1', 'stock.order_point,0'))
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.origin],
+ values=['stock.order_point,-1'],
+ where=sql_table.origin == 'stock.order_point,0'))
def get_rec_name(self, name):
if self.warehouse:
@@ -190,9 +194,9 @@ class PurchaseRequest(ModelSQL, ModelView):
with Transaction().set_context(forecast=True,
stock_date_end=min_date or datetime.date.max):
pbl = Product.products_by_location(warehouse_ids,
- product_ids, with_childs=True, skip_zero=False)
+ product_ids, with_childs=True)
for warehouse_id in warehouse_ids:
- min_date_qties = dict((x, pbl.pop((warehouse_id, x)))
+ min_date_qties = dict((x, pbl.pop((warehouse_id, x), 0))
for x in product_ids)
# Search for shortage between min-max
shortages = cls.get_shortage(warehouse_id, product_ids,
@@ -431,7 +435,7 @@ class PurchaseRequest(ModelSQL, ModelView):
with Transaction().set_context(stock_date_start=current_date,
stock_date_end=current_date):
pbl = Product.products_by_location([location_id],
- product_ids, with_childs=True, skip_zero=False)
+ product_ids, with_childs=True)
for key, qty in pbl.iteritems():
_, product_id = key
current_qties[product_id] += qty
@@ -450,6 +454,12 @@ class PurchaseRequest(ModelSQL, ModelView):
cls.raise_user_error('create_request')
return super(PurchaseRequest, cls).create(vlist)
+ @classmethod
+ def delete(cls, requests):
+ if any(r.purchase_line for r in requests):
+ cls.raise_user_error('delete_purchase_line')
+ super(PurchaseRequest, cls).delete(requests)
+
class CreatePurchaseRequestStart(ModelView):
'Create Purchase Request'
@@ -466,8 +476,28 @@ class CreatePurchaseRequest(Wizard):
])
create_ = StateAction('stock_supply.act_purchase_request_form')
+ @classmethod
+ 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?'),
+ })
+
def do_create_(self, action):
- PurchaseRequest = Pool().get('purchase.request')
+ pool = Pool()
+ PurchaseRequest = pool.get('purchase.request')
+ Move = pool.get('stock.move')
+ Date = pool.get('ir.date')
+ today = Date.today()
+ if Move.search([
+ ('from_location.type', '=', 'supplier'),
+ ('to_location.type', '=', 'storage'),
+ ('state', '=', 'draft'),
+ ('planned_date', '<', today),
+ ], order=[]):
+ self.raise_user_warning('%s@%s' % (self.__name__, today),
+ 'late_supplier_moves')
PurchaseRequest.generate_requests()
return action, {}
diff --git a/purchase_request.xml b/purchase_request.xml
index dc836b5..c8b5e8c 100644
--- a/purchase_request.xml
+++ b/purchase_request.xml
@@ -195,5 +195,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="function">generate_requests</field>
</record>
+ <record model="ir.model.access" id="access_purchase_purchase_request">
+ <field name="model" search="[('model', '=', 'purchase.purchase')]"/>
+ <field name="group" ref="group_purchase_request"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_purchase_line_purchase_request">
+ <field name="model" search="[('model', '=', 'purchase.line')]"/>
+ <field name="group" ref="group_purchase_request"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 014db6c..d61c602 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +64,7 @@ setup(name='trytond_stock_supply',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/shipment.py b/shipment.py
index dad1f39..f1cfff7 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1,10 +1,15 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from sql import Table
+from sql.functions import Overlay, Position
+
from trytond.model import ModelView, ModelSQL
+from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
-__all__ = ['ShipmentInternal']
+__all__ = ['ShipmentInternal',
+ 'CreateShipmentInternalStart', 'CreateShipmentInternal']
__metaclass__ = PoolMeta
@@ -14,15 +19,23 @@ class ShipmentInternal(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
cursor = Transaction().cursor
+ model_data = Table('ir_model_data')
+ model = Table('ir_model')
# Migration from 1.2: packing renamed into shipment
- cursor.execute("UPDATE ir_model_data "
- "SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "
- "WHERE fs_id like '%%packing%%' AND module = %s",
- (module_name,))
- cursor.execute("UPDATE ir_model "
- "SET model = REPLACE(model, 'packing', 'shipment') "
- "WHERE model like '%%packing%%' AND module = %s",
- (module_name,))
+ cursor.execute(*model_data.update(
+ columns=[model_data.fs_id],
+ values=[Overlay(model_data.fs_id, 'shipment',
+ Position('packing', model_data.fs_id),
+ len('packing'))],
+ where=model_data.fs_id.like('%packing%')
+ & (model_data.module == module_name)))
+ cursor.execute(*model.update(
+ columns=[model.model],
+ values=[Overlay(model.model, 'shipment',
+ Position('packing', model.model),
+ len('packing'))],
+ where=model.model.like('%packing%')
+ & (model.module == module_name)))
super(ShipmentInternal, cls).__register__(module_name)
@classmethod
@@ -33,7 +46,6 @@ class ShipmentInternal(ModelSQL, ModelView):
"""
pool = Pool()
OrderPoint = pool.get('stock.order_point')
- Uom = pool.get('product.uom')
Product = pool.get('product.product')
Date = pool.get('ir.date')
User = pool.get('res.user')
@@ -50,7 +62,8 @@ class ShipmentInternal(ModelSQL, ModelView):
id2product[op.product.id] = op.product
location_ids.append(op.storage_location.id)
- with Transaction().set_context(stock_date_end=today):
+ # TODO Allow to compute for other future date
+ with Transaction().set_context(forecast=True, stock_date_end=today):
pbl = Product.products_by_location(location_ids,
list(id2product.iterkeys()), with_childs=True)
@@ -64,33 +77,15 @@ class ShipmentInternal(ModelSQL, ModelView):
op.product.id)
moves[key] = op.max_quantity - qty
- # Compare with existing draft shipments
- shipments = cls.search([
- ('state', '=', 'draft'),
- ['OR',
- ('planned_date', '<=', today),
- ('planned_date', '=', None),
- ],
- ])
- for shipment in shipments:
- for move in shipment.moves:
- key = (shipment.from_location.id,
- shipment.to_location.id,
- move.product.id)
- if key not in moves:
- continue
- quantity = Uom.compute_qty(move.uom, move.quantity,
- id2product[move.product.id].default_uom)
- moves[key] = max(0, moves[key] - quantity)
-
# Group moves by {from,to}_location
- shipments = {}
+ to_create = {}
for key, qty in moves.iteritems():
from_location, to_location, product = key
- shipments.setdefault(
+ to_create.setdefault(
(from_location, to_location), []).append((product, qty))
# Create shipments and moves
- for locations, moves in shipments.iteritems():
+ shipments = []
+ for locations, moves in to_create.iteritems():
from_location, to_location = locations
shipment = cls(
from_location=from_location,
@@ -109,3 +104,30 @@ class ShipmentInternal(ModelSQL, ModelView):
company=user_record.company,
))
shipment.save()
+ shipments.append(shipment)
+ cls.wait(shipments)
+ return shipments
+
+
+class CreateShipmentInternalStart(ModelView):
+ 'Create Shipment Internal'
+ __name__ = 'stock.shipment.internal.create.start'
+
+
+class CreateShipmentInternal(Wizard):
+ 'Create Shipment Internal'
+ __name__ = 'stock.shipment.internal.create'
+ start = StateView('stock.shipment.internal.create.start',
+ 'stock_supply.shipment_internal_create_start_view_form', [
+ Button('Cancel', 'end', 'tryton-cancel'),
+ Button('Create', 'create_', 'tryton-ok', default=True),
+ ])
+ create_ = StateAction('stock.act_shipment_internal_form')
+
+ def do_create_(self, action):
+ ShipmentInternal = Pool().get('stock.shipment.internal')
+ ShipmentInternal.generate_internal_shipment()
+ return action, {}
+
+ def transition_create_(self):
+ return 'end'
diff --git a/shipment.xml b/shipment.xml
index e1a1a07..7963904 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -28,5 +28,23 @@ this repository contains the full copyright notices and license terms. -->
<field name="function">generate_internal_shipment</field>
</record>
+ <record model="ir.action.wizard" id="act_shipment_internal_create">
+ <field name="name">Create Internal Shipments</field>
+ <field name="wiz_name">stock.shipment.internal.create</field>
+ </record>
+ <record model="ir.ui.view"
+ id="shipment_internal_create_start_view_form">
+ <field name="model">stock.shipment.internal.create.start</field>
+ <field name="type">form</field>
+ <field name="name">stock_shipment_internal_create_start_form</field>
+ </record>
+ <menuitem parent="stock.menu_shipment_internal_form" sequence="10"
+ action="act_shipment_internal_create"
+ id="menu_shipment_internal_create"/>
+ <record model="ir.ui.menu-res.group"
+ id="menu_shipment_internal_form_group_purchase_request">
+ <field name="menu" ref="menu_shipment_internal_create"/>
+ <field name="group" ref="stock.group_stock_admin"/>
+ </record>
</data>
</tryton>
diff --git a/tests/__init__.py b/tests/__init__.py
index 19ea390..25b15ed 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_stock_supply import suite
+
+__all__ = ['suite']
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index 79809aa..1d78c0a 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -17,6 +17,7 @@ import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
test_depends
from trytond.transaction import Transaction
+from trytond.backend.sqlite.database import Database as SQLiteDatabase
DATES = [
# purchase date, delivery time, supply date
@@ -136,6 +137,16 @@ class StockSupplyTestCase(unittest.TestCase):
return product_supplier
+def doctest_dropdb(test):
+ database = SQLiteDatabase().connect()
+ cursor = database.cursor(autocommit=True)
+ try:
+ database.drop(cursor, ':memory:')
+ cursor.commit()
+ finally:
+ cursor.close()
+
+
def suite():
suite = trytond.tests.test_tryton.suite()
from trytond.modules.company.tests import test_company
@@ -148,6 +159,9 @@ def suite():
suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockSupplyTestCase))
+ suite.addTests(doctest.DocFileSuite('scenario_stock_internal_supply.rst',
+ setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
if __name__ == '__main__':
diff --git a/tryton.cfg b/tryton.cfg
index 319cde5..19267e0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
account
ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index a4855fb..94893db 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: 2.8.1
+Version: 3.0.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_stock_supply
====================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_stock_supply.egg-info/SOURCES.txt b/trytond_stock_supply.egg-info/SOURCES.txt
index dbd7359..f49268f 100644
--- a/trytond_stock_supply.egg-info/SOURCES.txt
+++ b/trytond_stock_supply.egg-info/SOURCES.txt
@@ -27,6 +27,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_stock_supply.egg-info/PKG-INFO
trytond_stock_supply.egg-info/SOURCES.txt
trytond_stock_supply.egg-info/dependency_links.txt
@@ -40,4 +41,5 @@ 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
\ No newline at end of file
+view/purchase_request_tree.xml
+view/stock_shipment_internal_create_start_form.xml
\ No newline at end of file
diff --git a/trytond_stock_supply.egg-info/requires.txt b/trytond_stock_supply.egg-info/requires.txt
index c6176f5..32963a6 100644
--- a/trytond_stock_supply.egg-info/requires.txt
+++ b/trytond_stock_supply.egg-info/requires.txt
@@ -1,6 +1,7 @@
-trytond_account >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond_purchase >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_account >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond_purchase >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/stock_shipment_internal_create_start_form.xml b/view/stock_shipment_internal_create_start_form.xml
new file mode 100644
index 0000000..1b7fc1c
--- /dev/null
+++ b/view/stock_shipment_internal_create_start_form.xml
@@ -0,0 +1,8 @@
+<?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 Internal Shipments" col="2">
+ <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+ <label string="Create Internal Shipments?" id="create"
+ yalign="0.0" xalign="0.0" xexpand="1"/>
+</form>
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list