[tryton-debian-vcs] tryton-modules-stock-supply branch debian updated. debian/3.4.1-1-4-g7f8277f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:27 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=debian/3.4.1-1-4-g7f8277f
commit 7f8277fa5c056ac50e9726af41588d7a99a64ad5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:59:12 2015 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 7366afb..354b21c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2013-2014 NaN-tic
+Copyright: 2013-2015 NaN-tic
2008-2015 Cédric Krier
2008-2013 Bertrand Chenal
2008-2015 B2CK SPRL
commit 333fec808a772b866229408ecec9176c760ea7bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:09 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index abf7a23..4465fe9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
-Version 3.4.1 - 2015-02-17
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
+* Add support for PyPy
+* Add relate from product to order points
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index d66ec79..4f0ee3a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2013-2014 NaN-tic.
+Copyright (C) 2013-2015 NaN-tic.
Copyright (C) 2008-2015 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
Copyright (C) 2008-2015 B2CK SPRL.
diff --git a/PKG-INFO b/PKG-INFO
index bfec9a4..129731f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 3.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_stock_supply
====================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 2760752..ca8ad42 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.pool import Pool
from .order_point import *
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index f5169cf..848d7b3 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -60,6 +60,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "Изчислена мер. ед."
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -68,6 +72,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Създадено от"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -120,6 +128,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "Мер. ед."
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Склад"
@@ -237,6 +249,16 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Пренареждания"
+#, fuzzy
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Пренареждания"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Пренареждания"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Създаване на заявки за покупка"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 583386d..d40ff82 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
msgid "There are some late supplier moves."
-msgstr "Hi ha alguns moviments de proveïdor anteriors."
+msgstr "Hi ha alguns moviments de proveïdor endarrerits."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -60,6 +60,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UdM calculada"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Decimals de la UdM calculada"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -68,6 +72,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Usuari creació"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Decimals de la UdM per defecte"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -120,6 +128,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "UdM"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Decimals de la UdM"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Magatzem"
@@ -236,6 +248,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Regles de proveïment"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Regles de proveïment"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Regles de proveïment"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crea sol·licituds de compra"
@@ -255,7 +275,7 @@ msgstr "Crear una compra"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
msgid "All"
-msgstr "Tots"
+msgstr "Totes"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
@@ -270,7 +290,7 @@ msgstr "Compra"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
-msgstr "Tots"
+msgstr "Totes"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_draft"
@@ -279,7 +299,7 @@ msgstr "Esborrany"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Purchase Requests"
-msgstr "Generar peticions de compra"
+msgstr "Generació sol·licituds de compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
@@ -343,7 +363,7 @@ msgstr "Cancel·lada"
msgctxt "selection:purchase.request,state:"
msgid "Done"
-msgstr "Acabada"
+msgstr "Finalitzada"
msgctxt "selection:purchase.request,state:"
msgid "Draft"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index b817e37..a3e7939 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -56,6 +56,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr ""
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr ""
@@ -64,6 +68,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr ""
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr ""
@@ -116,6 +124,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr ""
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr ""
@@ -232,6 +244,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr ""
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr ""
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 1c1c29c..032d89f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -59,6 +59,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "Berechnete Maßeinheit"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Maßeinheit berechnete Nachkommastellen"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -67,6 +71,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Erstellt durch"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Standardeinheit Nachkommastellen"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -119,6 +127,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "Maßeinheit"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Maßeinheit Nachkommastellen"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Warenlager"
@@ -235,6 +247,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Bestellpunkte"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Bestellpunkte"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Bestellpunkte"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Bestellvorschläge erstellen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 5d8d57b..fa7fae4 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -60,6 +60,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UdM calculada"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Decimales de UdM calculada"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -68,6 +72,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Usuario creación"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Decimales de UdM por defecto"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -120,6 +128,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "UdM"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Decimales de UdM"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Almacén"
@@ -198,7 +210,7 @@ msgstr "Nombre"
msgctxt "field:stock.order_point,storage_location:"
msgid "Storage Location"
-msgstr "Ubicación del depósito"
+msgstr "Ubicación de depósito"
msgctxt "field:stock.order_point,type:"
msgid "Type"
@@ -210,7 +222,7 @@ msgstr "Unidad"
msgctxt "field:stock.order_point,unit_digits:"
msgid "Unit Digits"
-msgstr "Dígitos de unidad"
+msgstr "Decimales de unidad"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
@@ -236,6 +248,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Reglas de abastecimiento"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Reglas de abastecimiento"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear solicitudes de compra"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c7d8f2b..41546a5 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -58,6 +58,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UdM Calculada"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Digitos UdM Computado"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -66,6 +70,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Creado por Usuario"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Digitos de UdM por Defecto"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -108,16 +116,20 @@ msgstr "Estado"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Almacenar la Fecha de Abastecimiento"
+msgstr "Inventario a Fecha de Aprovisionamiento"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
-msgstr "Fecha Esperada de Abastecimiento"
+msgstr "Fecha Esperada de Aprovisionamiento"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "UDM"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Dígitos de UdM"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Depósito"
@@ -188,7 +200,7 @@ msgstr "Producto"
msgctxt "field:stock.order_point,provisioning_location:"
msgid "Provisioning Location"
-msgstr "Bodega de Aprovisionamiento"
+msgstr "Bodega de Almacenamiento"
msgctxt "field:stock.order_point,rec_name:"
msgid "Name"
@@ -234,6 +246,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Requisiciones"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Requisiciones"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Requisiciones"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear Ordenes de Compras"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 79b158f..8e19dd5 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
msgid "There are some late supplier moves."
-msgstr "Hay algunos movimientos de proveedor atrasados."
+msgstr "Hay algunos movimientos de proveedor retrasados."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -24,15 +24,16 @@ 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."
+msgstr "No puede eliminar la 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 cantidad mínima"
+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 "Sólo se permite una requisición para cada par producto-ubicación."
+msgstr ""
+"Sólo se permite una requisición para cada combinación producto-ubicación."
msgctxt "error:stock.order_point:"
msgid ""
@@ -52,19 +53,27 @@ msgstr "Empresa"
msgctxt "field:purchase.request,computed_quantity:"
msgid "Computed Quantity"
-msgstr "Cantidad Calculada"
+msgstr "Cantidad calculada"
msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UdM Calculada"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Decimales de UdM calculada"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
+
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Decimales de UdM por defecto"
msgctxt "field:purchase.request,id:"
msgid "ID"
@@ -88,11 +97,11 @@ msgstr "Compra"
msgctxt "field:purchase.request,purchase_date:"
msgid "Best Purchase Date"
-msgstr "Mejor Fecha de Compra"
+msgstr "Mejor fecha de compra"
msgctxt "field:purchase.request,purchase_line:"
msgid "Purchase Line"
-msgstr "Línea de Compra"
+msgstr "Línea de compra"
msgctxt "field:purchase.request,quantity:"
msgid "Quantity"
@@ -108,15 +117,19 @@ msgstr "Estado"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Existencias a la Fecha de Abastecimiento"
+msgstr "Stock a la fecha del suministro"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
-msgstr "Fecha Esperada de Abastecimiento"
+msgstr "Fecha esperada de suministro"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
-msgstr "UDM"
+msgstr "UdM"
+
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Decimales de UdM"
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
@@ -124,15 +137,15 @@ msgstr "Depósito"
msgctxt "field:purchase.request,warehouse_required:"
msgid "Warehouse Required"
-msgstr "Almacén Requerido"
+msgstr "Almacén requerido"
msgctxt "field:purchase.request,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:purchase.request,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:purchase.request.create.start,id:"
msgid "ID"
@@ -160,11 +173,11 @@ msgstr "Empresa"
msgctxt "field:stock.order_point,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:stock.order_point,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:stock.order_point,id:"
msgid "ID"
@@ -176,11 +189,11 @@ msgstr "Bodega"
msgctxt "field:stock.order_point,max_quantity:"
msgid "Maximal Quantity"
-msgstr "Cantidad Máxima"
+msgstr "Cantidad máxima"
msgctxt "field:stock.order_point,min_quantity:"
msgid "Minimal Quantity"
-msgstr "Cantidad Mínima"
+msgstr "Cantidad mínima"
msgctxt "field:stock.order_point,product:"
msgid "Product"
@@ -188,7 +201,7 @@ msgstr "Producto"
msgctxt "field:stock.order_point,provisioning_location:"
msgid "Provisioning Location"
-msgstr "Bodega de Aprovisionamiento"
+msgstr "Bodega de aprovisionamiento"
msgctxt "field:stock.order_point,rec_name:"
msgid "Name"
@@ -196,7 +209,7 @@ msgstr "Nombre"
msgctxt "field:stock.order_point,storage_location:"
msgid "Storage Location"
-msgstr "Bodega de Almacenamiento"
+msgstr "Bodega de almacenamiento"
msgctxt "field:stock.order_point,type:"
msgid "Type"
@@ -208,19 +221,19 @@ msgstr "Unidad"
msgctxt "field:stock.order_point,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de Unidad"
+msgstr "Decimales de unidad"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
-msgstr "Bodega"
+msgstr "Ubicación de la bodega"
msgctxt "field:stock.order_point,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:stock.order_point,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
@@ -234,21 +247,29 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Requisiciones"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Requisiciones"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Requisiciones"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear Solicitudes de Compra"
+msgstr "Crear solicitudes de compra"
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Solicitudes de Compra"
+msgstr "Solicitudes de compra"
msgctxt "model:ir.action,name:act_shipment_internal_create"
msgid "Create Internal Shipments"
-msgstr "Crear Envíos Internos"
+msgstr "Crear envíos internos"
msgctxt "model:ir.action,name:wizard_create_purchase"
msgid "Create Purchase"
-msgstr "Crear Compra"
+msgstr "Crear compra"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
@@ -277,11 +298,11 @@ msgstr "Borrador"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Purchase Requests"
-msgstr "Generar Solicitudes de Compra"
+msgstr "Generar solicitudes de compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
-msgstr "Generar Envío Interno"
+msgstr "Generar envíos internos"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
@@ -289,27 +310,27 @@ msgstr "Requisiciones"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
msgid "Create Purchase Requests"
-msgstr "Crear Solicitudes de Compra"
+msgstr "Crear solicitudes de compra"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Solicitudes de Compra"
+msgstr "Solicitudes de compra"
msgctxt "model:ir.ui.menu,name:menu_shipment_internal_create"
msgid "Create Internal Shipments"
-msgstr "Crear Envíos Internos"
+msgstr "Crear envíos internos"
msgctxt "model:purchase.request,name:"
msgid "Purchase Request"
-msgstr "Solicitud de Compra"
+msgstr "Solicitud de compra"
msgctxt "model:purchase.request.create.start,name:"
msgid "Create Purchase Request"
-msgstr "Crear Solicitud de Compra"
+msgstr "Crear solicitud de compra"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Crear Compra - Petición de Tercero"
+msgstr "Crear compra - Petición de tercero"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
@@ -317,11 +338,11 @@ msgstr "Solicitud de Compra"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Purchase Request"
-msgstr "Programador de Solicitudes de Compra"
+msgstr "Programador de solicitudes de compra"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Programador de Envío Interno"
+msgstr "Programador de envíos internos"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
@@ -329,7 +350,7 @@ msgstr "Requisición"
msgctxt "model:stock.shipment.internal.create.start,name:"
msgid "Create Shipment Internal"
-msgstr "Crear Envío Interno"
+msgstr "Crear envío interno"
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
@@ -361,31 +382,31 @@ msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Requests"
-msgstr "Crear Solicitudes de Compras"
+msgstr "Crear solicitudes de compras"
msgctxt "view:purchase.request.create.start:"
msgid "Create Purchase Requests?"
-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: Falta Proveedor"
+msgstr "Crear compra: Falta proveedor"
msgctxt "view:purchase.request:"
msgid "Product Info"
-msgstr "Información del Producto"
+msgstr "Información del producto"
msgctxt "view:purchase.request:"
msgid "Purchase Request"
-msgstr "Solicitud de Compra"
+msgstr "Solicitud de compra"
msgctxt "view:purchase.request:"
msgid "Purchase Requests"
-msgstr "Solicitudes de Compra"
+msgstr "Solicitudes de compra"
msgctxt "view:purchase.request:"
msgid "Supply Info"
-msgstr "Información del Suministro"
+msgstr "Información del suministro"
msgctxt "view:stock.order_point:"
msgid "Order Point"
@@ -393,7 +414,7 @@ msgstr "Requisición"
msgctxt "view:stock.order_point:"
msgid "Order Point Type"
-msgstr "Tipo de Requisición"
+msgstr "Tipo de requisición"
msgctxt "view:stock.order_point:"
msgid "Order Points"
@@ -401,15 +422,15 @@ msgstr "Requisiciones"
msgctxt "view:stock.order_point:"
msgid "Product Info"
-msgstr "Información del Producto"
+msgstr "Información del producto"
msgctxt "view:stock.shipment.internal.create.start:"
msgid "Create Internal Shipments"
-msgstr "Crear Envíos Internos"
+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"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 03936b6..8660bb5 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
msgid "There are some late supplier moves."
-msgstr "Hay algunos movimientos de proveedor anteriores."
+msgstr "Hay algunos movimientos de proveedor retrasados."
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -60,6 +60,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UdM calculada"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Decimales de la UdM calculada"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -68,6 +72,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Usuario creación"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Decimales de la UdM por defecto"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -120,6 +128,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "UdM"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Decimales de la UdM"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Almacén"
@@ -236,6 +248,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Reglas de abastecimiento"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Reglas de abastecimiento"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear solicitudes de compra"
@@ -255,7 +275,7 @@ msgstr "Crear compra"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_all"
msgid "All"
-msgstr "Todos"
+msgstr "Todas"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_internal"
@@ -270,7 +290,7 @@ msgstr "Compra"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_all"
msgid "All"
-msgstr "Todos"
+msgstr "Todas"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_draft"
@@ -343,7 +363,7 @@ msgstr "Cancelada"
msgctxt "selection:purchase.request,state:"
msgid "Done"
-msgstr "Realizada"
+msgstr "Finalizada"
msgctxt "selection:purchase.request,state:"
msgid "Draft"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5002832..f6c2880 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -46,7 +46,7 @@ msgstr ""
msgctxt "field:product.product,order_points:"
msgid "Order Points"
-msgstr "Règles d'approvisionnements"
+msgstr "Règles d'approvisionnement"
msgctxt "field:purchase.request,company:"
msgid "Company"
@@ -60,6 +60,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "UDM calculée"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Décimales d'unité de mesure calculée"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -68,6 +72,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Créé par"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Décimales d'unité de mesure par défaut"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -120,6 +128,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "UDM"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "Décimales d'unité de mesure"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Entrepôt"
@@ -236,6 +248,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Règles d'approvisionnement"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Règles d'approvisionnement"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Règles d'approvisionnement"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Créer les demandes d'achat"
@@ -399,7 +419,7 @@ msgstr "Type de Règle d'approvisionnement"
msgctxt "view:stock.order_point:"
msgid "Order Points"
-msgstr "Règles d'approvisionnements"
+msgstr "Règles d'approvisionnement"
msgctxt "view:stock.order_point:"
msgid "Product Info"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 70795f8..a13516d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -57,6 +57,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr ""
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr ""
@@ -65,6 +69,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr ""
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr ""
@@ -122,6 +130,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr ""
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr ""
+
#, fuzzy
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
@@ -248,6 +260,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr ""
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr ""
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 0e0aad1..cb6e998 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -59,6 +59,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "Расчитанные ед. измерения"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Дата создания"
@@ -67,6 +71,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Создано пользователем"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -119,6 +127,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "Ед.изм."
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr ""
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Товарный склад"
@@ -236,6 +248,16 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Точки заказа"
+#, fuzzy
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Точки заказа"
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Точки заказа"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Создать запросы на покупку"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index d8c4415..e90111d 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -58,6 +58,10 @@ msgctxt "field:purchase.request,computed_uom:"
msgid "Computed UOM"
msgstr "Izračunana ME"
+msgctxt "field:purchase.request,computed_uom_digits:"
+msgid "Computed UOM Digits"
+msgstr "Decimalke izračunane ME"
+
msgctxt "field:purchase.request,create_date:"
msgid "Create Date"
msgstr "Izdelano"
@@ -66,6 +70,10 @@ msgctxt "field:purchase.request,create_uid:"
msgid "Create User"
msgstr "Izdelal"
+msgctxt "field:purchase.request,default_uom_digits:"
+msgid "Default UOM Digits"
+msgstr "Privzete decimalke ME"
+
msgctxt "field:purchase.request,id:"
msgid "ID"
msgstr "ID"
@@ -118,6 +126,10 @@ msgctxt "field:purchase.request,uom:"
msgid "UOM"
msgstr "ME"
+msgctxt "field:purchase.request,uom_digits:"
+msgid "UOM Digits"
+msgstr "ME decimalke"
+
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
msgstr "Skladišče"
@@ -200,7 +212,7 @@ msgstr "Shramba"
msgctxt "field:stock.order_point,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tip"
msgctxt "field:stock.order_point,unit:"
msgid "Unit"
@@ -234,6 +246,14 @@ msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Točke naročanja"
+msgctxt "model:ir.action,name:act_order_point_form_relate"
+msgid "Order Points"
+msgstr "Točke naročanja"
+
+msgctxt "model:ir.action,name:act_order_point_form_relate2"
+msgid "Order Points"
+msgstr "Točke naročanja"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Izdelava nabavnih zahtevkov"
diff --git a/order_point.py b/order_point.py
index c03f76d..a252004 100644
--- a/order_point.py
+++ b/order_point.py
@@ -1,7 +1,7 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import If, Equal, Eval, Not, In, Get
+from trytond.pyson import If, Equal, Eval, Not, In
from trytond.transaction import Transaction
from trytond import backend
@@ -100,16 +100,11 @@ class OrderPoint(ModelSQL, ModelView):
@fields.depends('product')
def on_change_product(self):
- res = {
- 'unit': None,
- 'unit.rec_name': '',
- 'unit_digits': 2,
- }
+ self.unit = None
+ self.unit_digits = 2
if self.product:
- res['unit'] = self.product.default_uom.id
- res['unit.rec_name'] = self.product.default_uom.rec_name
- res['unit_digits'] = self.product.default_uom.digits
- return res
+ self.unit = self.product.default_uom
+ self.unit_digits = self.product.default_uom.digits
def get_unit(self, name):
return self.product.default_uom.id
diff --git a/order_point.xml b/order_point.xml
index bf74dee..53e509b 100644
--- a/order_point.xml
+++ b/order_point.xml
@@ -32,14 +32,14 @@ this repository contains the full copyright notices and license terms. -->
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="domain" eval="[('type', '=', 'purchase')]" pyson="1"/>
<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="domain" eval="[('type', '=', 'internal')]" pyson="1"/>
<field name="act_window" ref="act_order_point_form"/>
</record>
<record model="ir.action.act_window.domain"
@@ -72,7 +72,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_order_point">
- <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+ <field name="domain"
+ eval="[('company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
<field name="rule_group" ref="rule_group_order_point"/>
</record>
</data>
diff --git a/product.py b/product.py
index f259f0b..175a000 100644
--- a/product.py
+++ b/product.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.model import fields
from trytond.pool import PoolMeta
diff --git a/product.xml b/product.xml
new file mode 100644
index 0000000..1097e23
--- /dev/null
+++ b/product.xml
@@ -0,0 +1,30 @@
+<?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. -->
+<tryton>
+ <data>
+ <record model="ir.action.act_window" id="act_order_point_form_relate">
+ <field name="name">Order Points</field>
+ <field name="res_model">stock.order_point</field>
+ <field name="domain"
+ eval="[('product', 'in', Eval('active_ids'))]" pyson="1"/>
+ </record>
+ <record model="ir.action.keyword" id="act_open_order_point_keyword1">
+ <field name="keyword">form_relate</field>
+ <field name="model">product.product,-1</field>
+ <field name="action" ref="act_order_point_form_relate"/>
+ </record>
+
+ <record model="ir.action.act_window" id="act_order_point_form_relate2">
+ <field name="name">Order Points</field>
+ <field name="res_model">stock.order_point</field>
+ <field name="domain"
+ eval="[('product.template', 'in', Eval('active_ids'))]" pyson="1"/>
+ </record>
+ <record model="ir.action.keyword" id="act_open_order_point_keyword2">
+ <field name="keyword">form_relate</field>
+ <field name="model">product.template,-1</field>
+ <field name="action" ref="act_order_point_form_relate2"/>
+ </record>
+ </data>
+</tryton>
diff --git a/purchase_request.py b/purchase_request.py
index 2da0fb0..d425eef 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import datetime
import operator
from itertools import groupby
@@ -8,7 +8,7 @@ from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
Button
-from trytond.pyson import If, In, Eval, Get
+from trytond.pyson import If, In, Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.tools import grouped_slice
@@ -31,15 +31,26 @@ class PurchaseRequest(ModelSQL, ModelView):
party = fields.Many2One('party.party', 'Party', select=True, states=STATES,
depends=DEPENDS)
quantity = fields.Float('Quantity', required=True, states=STATES,
- depends=DEPENDS)
+ digits=(16, Eval('uom_digits', 2)), depends=DEPENDS + ['uom_digits'])
uom = fields.Many2One('product.uom', 'UOM', required=True, select=True,
states=STATES, depends=DEPENDS)
- computed_quantity = fields.Float('Computed Quantity', readonly=True)
+ uom_digits = fields.Function(fields.Integer('UOM Digits'),
+ 'on_change_with_uom_digits')
+ computed_quantity = fields.Float('Computed Quantity', readonly=True,
+ digits=(16, Eval('computed_uom_digits', 2)),
+ depends=['computed_uom_digits'])
computed_uom = fields.Many2One('product.uom', 'Computed UOM',
readonly=True)
+ computed_uom_digits = fields.Function(fields.Integer(
+ 'Computed UOM Digits'),
+ 'on_change_with_computed_uom_digits')
purchase_date = fields.Date('Best Purchase Date', readonly=True)
supply_date = fields.Date('Expected Supply Date', readonly=True)
- stock_level = fields.Float('Stock at Supply Date', readonly=True)
+ default_uom_digits = fields.Function(fields.Integer('Default UOM Digits'),
+ 'on_change_with_default_uom_digits')
+ stock_level = fields.Float('Stock at Supply Date', readonly=True,
+ digits=(16, Eval('default_uom_digits', 2)),
+ depends=['default_uom_digits'])
warehouse = fields.Many2One(
'stock.location', "Warehouse",
states={
@@ -134,6 +145,24 @@ class PurchaseRequest(ModelSQL, ModelView):
def get_warehouse_required(self, name):
return self.product.type in ('goods', 'assets')
+ @fields.depends('uom')
+ def on_change_with_uom_digits(self, name=None):
+ if self.uom:
+ return self.uom.digits
+ return 2
+
+ @fields.depends('computed_uom')
+ def on_change_with_computed_uom_digits(self, name=None):
+ if self.computed_uom:
+ return self.computed_uom.digits
+ return 2
+
+ @fields.depends('product')
+ def on_change_with_default_uom_digits(self, name=None):
+ if self.product:
+ return self.product.default_uom.digits
+ return 2
+
@staticmethod
def _get_origin():
'Return the set of Model names for origin Reference'
@@ -176,6 +205,7 @@ class PurchaseRequest(ModelSQL, ModelView):
# fetch order points
order_points = OrderPoint.search([
('type', '=', 'purchase'),
+ ('company', '=', company.id if company else None),
])
# index them by product
product2ops = {}
@@ -193,7 +223,7 @@ class PurchaseRequest(ModelSQL, ModelView):
('purchasable', '=', True),
], order=[('id', 'ASC')])
product_ids = [p.id for p in products]
- #aggregate product by minimum supply date
+ # aggregate product by minimum supply date
date2products = {}
for product in products:
min_date, max_date = cls.get_supply_dates(product)
diff --git a/purchase_request.xml b/purchase_request.xml
index 7b11b64..1d96e6c 100644
--- a/purchase_request.xml
+++ b/purchase_request.xml
@@ -37,7 +37,7 @@ this repository contains the full copyright notices and license terms. -->
id="act_purchase_request_form_domain_draft">
<field name="name">Draft</field>
<field name="sequence" eval="10"/>
- <field name="domain">[('purchase_line', '=', None)]</field>
+ <field name="domain" eval="[('purchase_line', '=', None)]" pyson="1"/>
<field name="act_window" ref="act_purchase_request_form"/>
</record>
<record model="ir.action.act_window.domain"
@@ -103,7 +103,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_purchase_request">
- <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+ <field name="domain"
+ eval="[('company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
<field name="rule_group" ref="rule_group_purchase_request"/>
</record>
diff --git a/setup.py b/setup.py
index cd68399..c532948 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 setuptools import setup
import re
@@ -92,6 +92,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/shipment.py b/shipment.py
index f1cfff7..f8b6c1b 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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
@@ -91,11 +91,11 @@ class ShipmentInternal(ModelSQL, ModelView):
from_location=from_location,
to_location=to_location,
planned_date=today,
- moves=[],
)
+ shipment_moves = []
for move in moves:
product, qty = move
- shipment.moves.append(Move(
+ shipment_moves.append(Move(
from_location=from_location,
to_location=to_location,
product=product,
@@ -103,6 +103,7 @@ class ShipmentInternal(ModelSQL, ModelView):
uom=id2product[product].default_uom,
company=user_record.company,
))
+ shipment.moves = shipment_moves
shipment.save()
shipments.append(shipment)
cls.wait(shipments)
diff --git a/tests/__init__.py b/tests/__init__.py
index 25b15ed..0ff96a5 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 .test_stock_supply import suite
diff --git a/tests/scenario_stock_internal_supply.rst b/tests/scenario_stock_internal_supply.rst
index 70ecdc0..a0f638f 100644
--- a/tests/scenario_stock_internal_supply.rst
+++ b/tests/scenario_stock_internal_supply.rst
@@ -2,16 +2,14 @@
Stock Shipment Out Scenario
===========================
-=============
-General Setup
-=============
-
Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import config, Model, Wizard
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
>>> today = datetime.date.today()
Create database::
@@ -22,35 +20,14 @@ Create database::
Install stock Module::
>>> Module = Model.get('ir.module.module')
- >>> modules = Module.find([('name', '=', 'stock_supply')])
- >>> Module.install([x.id for x in modules], config.context)
+ >>> module, = Module.find([('name', '=', 'stock_supply')])
+ >>> module.click('install')
>>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
Create company::
- >>> Currency = Model.get('currency.currency')
- >>> CurrencyRate = Model.get('currency.currency.rate')
- >>> Company = Model.get('company.company')
- >>> Party = Model.get('party.party')
- >>> company_config = Wizard('company.company.config')
- >>> company_config.execute('company')
- >>> company = company_config.form
- >>> party = Party(name='Dunder Mifflin')
- >>> party.save()
- >>> company.party = party
- >>> currencies = Currency.find([('code', '=', 'USD')])
- >>> if not currencies:
- ... currency = Currency(name='US Dollar', symbol=u'$', code='USD',
- ... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
- ... mon_decimal_point='.')
- ... currency.save()
- ... CurrencyRate(date=today + relativedelta(month=1, day=1),
- ... rate=Decimal('1.0'), currency=currency).save()
- ... else:
- ... currency, = currencies
- >>> company.currency = currency
- >>> company_config.execute('add')
- >>> company, = Company.find()
+ >>> _ = create_company()
+ >>> company = get_company()
Reload the context::
@@ -144,17 +121,12 @@ Create inventory to add enough quantity in Provisioning Location::
>>> config.user = stock_user.id
>>> Inventory = Model.get('stock.inventory')
- >>> InventoryLine = Model.get('stock.inventory.line')
- >>> Location = Model.get('stock.location')
>>> inventory = Inventory()
>>> inventory.location = provisioning_loc
- >>> inventory.save()
- >>> inventory_line = InventoryLine(product=product, inventory=inventory)
+ >>> inventory_line = inventory.lines.new(product=product)
>>> inventory_line.quantity = 100.0
>>> inventory_line.expected_quantity = 0.0
- >>> inventory.save()
- >>> inventory_line.save()
- >>> Inventory.confirm([inventory.id], config.context)
+ >>> inventory.click('confirm')
>>> inventory.state
u'done'
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index e0e5a12..9f29a88 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -1,12 +1,12 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import unittest
import doctest
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
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.transaction import Transaction
@@ -22,11 +22,12 @@ DATES = [
]
-class StockSupplyTestCase(unittest.TestCase):
+class StockSupplyTestCase(ModuleTestCase):
'Test StockSupply module'
+ module = 'stock_supply'
def setUp(self):
- trytond.tests.test_tryton.install_module('stock_supply')
+ super(StockSupplyTestCase, self).setUp()
self.uom = POOL.get('product.uom')
self.uom_category = POOL.get('product.uom.category')
self.category = POOL.get('product.category')
@@ -38,14 +39,6 @@ class StockSupplyTestCase(unittest.TestCase):
self.product_supplier = POOL.get('purchase.product_supplier')
self.user = POOL.get('res.user')
- def test0005views(self):
- 'Test views'
- test_view('stock_supply')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
-
def test0010compute_supply_date(self):
'Test compute_supply_date'
for purchase_date, delivery_time, supply_date in DATES:
diff --git a/tryton.cfg b/tryton.cfg
index ca1157f..f9177b7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
account
ir
@@ -12,3 +12,4 @@ xml:
order_point.xml
purchase_request.xml
shipment.xml
+ product.xml
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 3d7412c..c0844f6 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.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_stock_supply
====================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_stock_supply.egg-info/SOURCES.txt b/trytond_stock_supply.egg-info/SOURCES.txt
index ff1401a..e0ee884 100644
--- a/trytond_stock_supply.egg-info/SOURCES.txt
+++ b/trytond_stock_supply.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
order_point.xml
+product.xml
purchase_request.xml
setup.py
shipment.xml
@@ -13,6 +14,7 @@ tryton.cfg
./order_point.py
./order_point.xml
./product.py
+./product.xml
./purchase_request.py
./purchase_request.xml
./shipment.py
diff --git a/trytond_stock_supply.egg-info/requires.txt b/trytond_stock_supply.egg-info/requires.txt
index 2653bd9..be181aa 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.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
+trytond_account >= 3.6, < 3.7
+trytond_party >= 3.6, < 3.7
+trytond_product >= 3.6, < 3.7
+trytond_purchase >= 3.6, < 3.7
+trytond_stock >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list