[tryton-debian-vcs] tryton-modules-production branch upstream updated. upstream/3.2.1-1-g1c0937f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:16:54 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-production.git;a=commitdiff;h=upstream/3.2.1-1-g1c0937f
commit 1c0937f9668e8b441c8e1f3e84af03ce4ecabed4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:16 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 828906e..1bb2c95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.2.1 - 2014-09-29
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
diff --git a/PKG-INFO b/PKG-INFO
index b7f6712..5faac36 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_production
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for production
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_production
==================
diff --git a/bom.py b/bom.py
index 9651ed2..7ce8a29 100644
--- a/bom.py
+++ b/bom.py
@@ -69,6 +69,7 @@ class BOMInput(ModelSQL, ModelView):
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
quantity = fields.Float('Quantity', required=True,
+ domain=[('quantity', '>=', 0)],
digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
diff --git a/locale/de_DE.po b/locale/de_DE.po
index cd51d67..540021a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -467,7 +467,7 @@ msgstr "Entwurf"
msgctxt ""
"model:ir.action.act_window.domain,name:act_production_list_domain_requests"
msgid "Requests"
-msgstr "Anfragen"
+msgstr "Anforderungen"
msgctxt ""
"model:ir.action.act_window.domain,name:act_production_list_domain_running"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 28a4366..6f8dc82 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -570,7 +570,7 @@ msgstr "Asignado"
msgctxt "selection:production,state:"
msgid "Canceled"
-msgstr "Anulado"
+msgstr "Anulada"
msgctxt "selection:production,state:"
msgid "Done"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 95%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 28a4366..93ff511 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -7,12 +7,12 @@ msgid ""
"You are trying to create a recursive BOM with product \"%s\" which is not "
"allowed."
msgstr ""
-"Esta intentando crear una LDM recursiva con el producto \"%s\" lo cual no "
-"esta permitido."
+"Está intentando crear una LDM recursiva con el producto \"%s\" que no está "
+"permitido."
msgctxt "error:production.bom.input:"
msgid "Product must be unique per BOM."
-msgstr "El producto debe ser único en la LDM!"
+msgstr "El producto debe ser único por LDM."
msgctxt "error:production.bom.input:"
msgid "You can not create recursive BOMs."
@@ -24,7 +24,7 @@ msgstr "El producto debe ser único en la LDM."
msgctxt "error:production.bom.output:"
msgid "Product must be unique per BOM."
-msgstr "El producto debe ser único en la LDM!"
+msgstr "El producto debe ser único por LDM."
msgctxt "error:production.bom.output:"
msgid "You can not create recursive BOMs."
@@ -39,12 +39,12 @@ msgid ""
"The costs of the outputs (%(outputs)s) of production \"%(production)s\" do "
"not match the cost of the production (%(costs)s)."
msgstr ""
-"El costo de las salidas (%(output)s) de la producción \"%(production)s\" no "
-"coincide con el costo de producción (%(costs)s)."
+"Los costos de las salidas (%(output)s) de la producción \"%(production)s\" "
+"no coinciden con el costo de producción (%(costs)s)."
msgctxt "field:product.product,boms:"
msgid "BOMs"
-msgstr "LDM"
+msgstr "LDMs"
msgctxt "field:product.product-production.bom,bom:"
msgid "BOM"
@@ -92,7 +92,7 @@ msgstr "Código"
msgctxt "field:production,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:production,cost:"
msgid "Cost"
@@ -128,7 +128,7 @@ msgstr "Salidas"
msgctxt "field:production,planned_date:"
msgid "Planned Date"
-msgstr "Fecha Planeada"
+msgstr "Fecha Planificada"
msgctxt "field:production,product:"
msgid "Product"
@@ -208,7 +208,7 @@ msgstr "Nombre"
msgctxt "field:production.bom,output_products:"
msgid "Output Products"
-msgstr "Salida de Productos"
+msgstr "Productos de Salida"
msgctxt "field:production.bom,outputs:"
msgid "Outputs"
@@ -396,7 +396,7 @@ msgstr "ID"
msgctxt "field:production.configuration,production_sequence:"
msgid "Production Sequence"
-msgstr "Secuencia Producción"
+msgstr "Secuencia de Producción"
msgctxt "field:production.configuration,rec_name:"
msgid "Name"
@@ -498,7 +498,7 @@ msgstr "Configuración"
msgctxt "model:ir.ui.menu,name:menu_production"
msgid "Production"
-msgstr "Gestión de Producción"
+msgstr "Producción"
msgctxt "model:ir.ui.menu,name:menu_production_calendar"
msgid "Productions"
@@ -542,11 +542,11 @@ msgstr "Árbol LDM"
msgctxt "model:production.bom.tree.open.start,name:"
msgid "Open BOM Tree"
-msgstr "Abrir Arbol de LDM"
+msgstr "Abrir Árbol de LDM"
msgctxt "model:production.bom.tree.open.tree,name:"
msgid "Open BOM Tree"
-msgstr "Abrir Arbol de LDM"
+msgstr "Abrir Árbol de LDM"
msgctxt "model:production.configuration,name:"
msgid "Production Configuration"
@@ -570,11 +570,11 @@ msgstr "Asignado"
msgctxt "selection:production,state:"
msgid "Canceled"
-msgstr "Anulado"
+msgstr "Cancelada"
msgctxt "selection:production,state:"
msgid "Done"
-msgstr "Hecho"
+msgstr "Realizada"
msgctxt "selection:production,state:"
msgid "Draft"
@@ -582,11 +582,11 @@ msgstr "Borrador"
msgctxt "selection:production,state:"
msgid "Request"
-msgstr "Solicitado"
+msgstr "Solicitud"
msgctxt "selection:production,state:"
msgid "Running"
-msgstr "En ejecución"
+msgstr "En Ejecución"
msgctxt "selection:production,state:"
msgid "Waiting"
@@ -634,7 +634,7 @@ msgstr "LDM"
msgctxt "view:production.bom:"
msgid "BOMs"
-msgstr "LDM"
+msgstr "LDMs"
msgctxt "view:production.bom:"
msgid "Lines"
@@ -654,7 +654,7 @@ msgstr "Cancelar"
msgctxt "view:production:"
msgid "Done"
-msgstr "Hecho"
+msgstr "Realizado"
msgctxt "view:production:"
msgid "Draft"
@@ -666,7 +666,7 @@ msgstr "Líneas"
msgctxt "view:production:"
msgid "Other Info"
-msgstr "Info Adicional"
+msgstr "Información Adicional"
msgctxt "view:production:"
msgid "Production"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 858d907..17a49c1 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -40,7 +40,7 @@ msgid ""
"not match the cost of the production (%(costs)s)."
msgstr ""
"Los costes de los movimientos de salida (%(outputs)s) de la producción "
-"\"%(production)s\" no coinciden con el coste de la producción (%(cost)s)."
+"\"%(production)s\" no coinciden con el coste de la producción (%(costs)s)."
msgctxt "field:product.product,boms:"
msgid "BOMs"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f6f0f94..8c88e27 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
"You are trying to create a recursive BOM with product \"%s\" which is not "
"allowed."
msgstr ""
-"Vous essayez de créer une BOM récursive avec le produit \"%s\", ce qui n'est"
+"Vous essayez de créer une BOM récursive avec le produit « %s », ce qui n'est"
" pas autorisé."
msgctxt "error:production.bom.input:"
@@ -39,7 +39,7 @@ msgid ""
"The costs of the outputs (%(outputs)s) of production \"%(production)s\" do "
"not match the cost of the production (%(costs)s)."
msgstr ""
-"Le coût des sorties (%(outputs)s) de production \"%(production)s\" ne "
+"Le coût des sorties (%(outputs)s) de production « %(production)s » ne "
"correspond pas au coût de production (%(costs)s)."
msgctxt "field:product.product,boms:"
@@ -606,7 +606,7 @@ msgstr "Impossible d'assigner"
msgctxt "view:production.assign.failed:"
msgid "Unable to assign those products:"
-msgstr "Impossible d'assigner ces produits :"
+msgstr "Impossible d'assigner ces produits :"
msgctxt "view:production.bom.input:"
msgid "BOM Inputs"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 9cb8f54..61440a1 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -50,11 +50,11 @@ msgstr "Kosovnica"
msgctxt "field:product.product-production.bom,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.product-production.bom,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.product-production.bom,id:"
msgid "ID"
@@ -98,11 +98,11 @@ msgstr "Strošek"
msgctxt "field:production,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:production,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:production,effective_date:"
msgid "Effective Date"
@@ -186,11 +186,11 @@ msgstr "Aktivno"
msgctxt "field:production.bom,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:production.bom,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:production.bom,id:"
msgid "ID"
@@ -230,11 +230,11 @@ msgstr "Kosovnica"
msgctxt "field:production.bom.input,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:production.bom.input,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:production.bom.input,id:"
msgid "ID"
@@ -278,11 +278,11 @@ msgstr "Kosovnica"
msgctxt "field:production.bom.output,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:production.bom.output,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:production.bom.output,id:"
msgid "ID"
@@ -382,11 +382,11 @@ msgstr "ID"
msgctxt "field:production.configuration,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:production.configuration,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:production.configuration,id:"
msgid "ID"
diff --git a/production.py b/production.py
index 8863027..2abade3 100644
--- a/production.py
+++ b/production.py
@@ -70,7 +70,8 @@ class Production(Workflow, ModelSQL, ModelView):
('output_products', '=', Eval('product', 0)),
],
states={
- 'readonly': ~Eval('state').in_(['request', 'draft']),
+ 'readonly': (~Eval('state').in_(['request', 'draft'])
+ | ~Eval('warehouse', 0) | ~Eval('location', 0)),
'invisible': ~Eval('product'),
},
depends=['product'])
@@ -106,7 +107,7 @@ class Production(Workflow, ModelSQL, ModelView):
],
states={
'readonly': (~Eval('state').in_(['request', 'draft', 'waiting'])
- | ~Eval('location')),
+ | ~Eval('warehouse') | ~Eval('location')),
},
depends=['warehouse', 'location'])
outputs = fields.One2Many('stock.move', 'production_output', 'Outputs',
@@ -116,7 +117,7 @@ class Production(Workflow, ModelSQL, ModelView):
],
states={
'readonly': (Eval('state').in_(['done', 'cancel'])
- | ~Eval('location')),
+ | ~Eval('warehouse') | ~Eval('location')),
},
depends=['warehouse', 'location'])
state = fields.Selection([
diff --git a/tests/scenario_production.rst b/tests/scenario_production.rst
index c161c5a..29fc30d 100644
--- a/tests/scenario_production.rst
+++ b/tests/scenario_production.rst
@@ -58,14 +58,6 @@ Reload the context::
>>> User = Model.get('res.user')
>>> config._context = User.get_preferences(True, config.context)
-Configuration production location::
-
- >>> Location = Model.get('stock.location')
- >>> warehouse, = Location.find([('code', '=', 'WH')])
- >>> production_location, = Location.find([('code', '=', 'PROD')])
- >>> warehouse.production_location = production_location
- >>> warehouse.save()
-
Create product::
>>> ProductUom = Model.get('product.uom')
@@ -138,6 +130,7 @@ Create an Inventory::
>>> Inventory = Model.get('stock.inventory')
>>> InventoryLine = Model.get('stock.inventory.line')
+ >>> Location = Model.get('stock.location')
>>> storage, = Location.find([
... ('code', '=', 'STO'),
... ])
@@ -217,3 +210,23 @@ Make a production with effective date yesterday::
>>> output, = production.outputs
>>> output.effective_date == yesterday
True
+
+
+Make a production with a bom of zero quantity::
+
+ >>> zero_bom, = BOM.duplicate([bom])
+ >>> for input_ in bom.inputs:
+ ... input_.quantity = 0.0
+ >>> bom_output, = bom.outputs
+ >>> bom_output.quantity = 0.0
+ >>> bom.save()
+ >>> production = Production()
+ >>> production.effective_date = yesterday
+ >>> production.product = product
+ >>> production.bom = bom
+ >>> production.quantity = 2
+ >>> [i.quantity for i in production.inputs]
+ [0.0, 0.0]
+ >>> output, = production.outputs
+ >>> output.quantity
+ 0.0
diff --git a/tests/test_production.py b/tests/test_production.py
index b689710..4ae51cd 100644
--- a/tests/test_production.py
+++ b/tests/test_production.py
@@ -3,7 +3,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class ProductionTestCase(unittest.TestCase):
@@ -26,6 +27,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProductionTestCase))
suite.addTests(doctest.DocFileSuite('scenario_production.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 8c0bd7e..e5fac1f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
company
ir
diff --git a/trytond_production.egg-info/PKG-INFO b/trytond_production.egg-info/PKG-INFO
index e320f54..cba6b9d 100644
--- a/trytond_production.egg-info/PKG-INFO
+++ b/trytond_production.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-production
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for production
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_production
==================
diff --git a/trytond_production.egg-info/SOURCES.txt b/trytond_production.egg-info/SOURCES.txt
index 5dbbf7a..7ad3b2d 100644
--- a/trytond_production.egg-info/SOURCES.txt
+++ b/trytond_production.egg-info/SOURCES.txt
@@ -29,6 +29,7 @@ tryton.cfg
./locale/de_DE.po
./locale/es_AR.po
./locale/es_CO.po
+./locale/es_EC.po
./locale/es_ES.po
./locale/fr_FR.po
./locale/nl_NL.po
@@ -63,6 +64,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_production.egg-info/requires.txt b/trytond_production.egg-info/requires.txt
index 465c9eb..e8d951f 100644
--- a/trytond_production.egg-info/requires.txt
+++ b/trytond_production.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_company >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-production
More information about the tryton-debian-vcs
mailing list