[tryton-debian-vcs] tryton-modules-stock-supply-production branch debian updated. debian/3.4.1-1-3-g1b226f1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:42 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-production.git;a=commitdiff;h=debian/3.4.1-1-3-g1b226f1
commit 1b226f134e285fd12b169c73922fa9d15f40e8e7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:10 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index af9fa41..8945a83 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 warning for late production when creating production request.
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 98563d3..49bb320 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_production
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for stock supply of 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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_stock_supply_production
===============================
@@ -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 ba6a502..4a0677e 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 stock import *
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 2438955..ae4d504 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:production.create_request:"
+msgid "There are some late productions."
+msgstr ""
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 13e7536..ef70952 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Hi ha algunes produccions endarrerides."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Període de subministre"
@@ -29,7 +33,7 @@ msgstr "Producció"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr "Creació sol·licituds de producció"
+msgstr "Generació sol·licituds de producció"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index e99c332..c634266 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:production.create_request:"
+msgid "There are some late productions."
+msgstr ""
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index d87c789..8856780 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Es gibt einige verspätete Produktionen"
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Beschaffungszeitraum"
@@ -29,7 +33,7 @@ msgstr "Produktion"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr "Erstellen von Produktionsanforderungen"
+msgstr "Erstellung von Produktionsanforderungen"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 74c3563..443a8e5 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Hay algunas producciones tardías."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Período de suministro"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 090a485..50d26ef 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,9 +2,13 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Hay algunas producciones atrasadas."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Período de Abastecimiento"
+msgstr "Período de Aparovisionamiento"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 1799ac2..87a51c1 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -2,9 +2,13 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Hay algunas producciones retrasadas."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Período de Abastecimiento"
+msgstr "Período de Suministro"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 76b72a7..8b51737 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Hay algunas producciones retrasadas."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Período de suministro"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f5a37af..d39d81e 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Il y a des productions en retard."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Période d'approvisionnement"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 24dfacb..44c85a4 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:production.create_request:"
+msgid "There are some late productions."
+msgstr ""
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 72b37bc..9a47497 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:production.create_request:"
+msgid "There are some late productions."
+msgstr ""
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 0c09593..626ed24 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:production.create_request:"
+msgid "There are some late productions."
+msgstr "Obstajajo nekaj zakasnelih proizvodnje."
+
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
msgstr "Obdobje dobave"
diff --git a/product.py b/product.py
index 05ff745..fdf47c8 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.pool import Pool, PoolMeta
diff --git a/production.py b/production.py
index cd6ebc1..ec4ef3c 100644
--- a/production.py
+++ b/production.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
from decimal import Decimal
@@ -212,13 +212,33 @@ class CreateProductionRequest(Wizard):
])
create_ = StateAction('stock_supply_production.act_production_request')
+ @classmethod
+ def __setup__(cls):
+ super(CreateProductionRequest, cls).__setup__()
+ cls._error_messages.update({
+ 'late_productions': 'There are some late productions.',
+ })
+
@property
def _requests_parameters(self):
return {}
def do_create_(self, action):
pool = Pool()
+ Date = pool.get('ir.date')
+ Move = pool.get('stock.move')
Production = pool.get('production')
+
+ today = Date.today()
+ if Move.search([
+ ('from_location.type', '=', 'production'),
+ ('to_location.type', '=', 'storage'),
+ ('state', '=', 'draft'),
+ ('planned_date', '<', today),
+ ], order=[]):
+ self.raise_user_warning('%s@%s' % (self.__name__, today),
+ 'late_productions')
+
Production.generate_requests(**self._requests_parameters)
return action, {}
diff --git a/production.xml b/production.xml
index 38de72f..b648768 100644
--- a/production.xml
+++ b/production.xml
@@ -26,7 +26,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_production_request">
<field name="name">Request Productions</field>
<field name="res_model">production</field>
- <field name="search_value">[('state', '=', 'request')]</field>
+ <field name="search_value"
+ eval="[('state', '=', 'request')]" pyson="1"/>
</record>
<record model="ir.action.act_window.view"
id="act_production_request_view1">
diff --git a/setup.py b/setup.py
index b0dbe1d..acdbfc6 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
@@ -86,6 +86,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/stock.py b/stock.py
index 135cf7f..68e4d99 100644
--- a/stock.py
+++ b/stock.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.pyson import Eval
from trytond.pool import PoolMeta
diff --git a/stock.xml b/stock.xml
index d718449..60ff5b7 100644
--- a/stock.xml
+++ b/stock.xml
@@ -7,7 +7,8 @@ this repository contains the full copyright notices and license terms. -->
id="act_order_point_form_domain_production">
<field name="name">Production</field>
<field name="sequence" eval="30"/>
- <field name="domain">[('type', '=', 'production')]</field>
+ <field name="domain"
+ eval="[('type', '=', 'production')]" pyson="1"/>
<field name="act_window" ref="stock_supply.act_order_point_form"/>
</record>
</data>
diff --git a/tests/__init__.py b/tests/__init__.py
index 9c8d55e..263698f 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_production import suite
diff --git a/tests/test_stock_supply_production.py b/tests/test_stock_supply_production.py
index 000670f..ecfe52f 100644
--- a/tests/test_stock_supply_production.py
+++ b/tests/test_stock_supply_production.py
@@ -1,23 +1,13 @@
-#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 trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class StockSupplyProductionTestCase(unittest.TestCase):
+class StockSupplyProductionTestCase(ModuleTestCase):
'Test Stock Supply Production module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('stock_supply_production')
-
- def test0005views(self):
- 'Test views'
- test_view('stock_supply_production')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'stock_supply_production'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index a6d4f4c..fb0c952 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
product
diff --git a/trytond_stock_supply_production.egg-info/PKG-INFO b/trytond_stock_supply_production.egg-info/PKG-INFO
index 835e24b..a91f006 100644
--- a/trytond_stock_supply_production.egg-info/PKG-INFO
+++ b/trytond_stock_supply_production.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-supply-production
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for stock supply of 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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_stock_supply_production
===============================
@@ -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_production.egg-info/requires.txt b/trytond_stock_supply_production.egg-info/requires.txt
index 576c688..482b294 100644
--- a/trytond_stock_supply_production.egg-info/requires.txt
+++ b/trytond_stock_supply_production.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_product >= 3.4, < 3.5
-trytond_production >= 3.4, < 3.5
-trytond_stock >= 3.4, < 3.5
-trytond_stock_supply >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_product >= 3.6, < 3.7
+trytond_production >= 3.6, < 3.7
+trytond_stock >= 3.6, < 3.7
+trytond_stock_supply >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-stock-supply-production
More information about the tryton-debian-vcs
mailing list