[tryton-debian-vcs] tryton-modules-stock-supply-production branch upstream updated. upstream/3.8.0-1-g73265fe
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:29:14 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply-production.git;a=commitdiff;h=upstream/3.8.0-1-g73265fe
commit 73265fe8a45a008d5e3cf35eb035fa0f5d22f938
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:24 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index b5b205d..95338d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 776aee6..442fb2d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2015 Cédric Krier.
-Copyright (C) 2012-2015 B2CK SPRL.
+Copyright (C) 2012-2016 Cédric Krier.
+Copyright (C) 2012-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 059eda3..4c5b5f3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_production
-Version: 3.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_stock_supply_production
===============================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/es_MX.po b/locale/es_MX.po
index b0805ee..a7b2dad 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -51,13 +51,15 @@ msgctxt "selection:stock.order_point,type:"
msgid "Production"
msgstr "Producción"
+#, fuzzy
msgctxt "view:production.create_request.start:"
msgid "Create Production Requests"
-msgstr ""
+msgstr "Crear solicitudes de producción"
+#, fuzzy
msgctxt "view:production.create_request.start:"
msgid "Create Production Requests?"
-msgstr ""
+msgstr "Crear solicitudes de producción"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index c634266..65d284c 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -4,65 +4,65 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:production.create_request:"
msgid "There are some late productions."
-msgstr ""
+msgstr "Nincs késésben termelés"
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr ""
+msgstr "Beszerzési időszak"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "help:production.configuration,supply_period:"
msgid "In number of days"
-msgstr ""
+msgstr "Napok száma"
msgctxt "model:ir.action,name:act_production_request"
msgid "Request Productions"
-msgstr ""
+msgstr "Termelés igénylés"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
-msgstr ""
+msgstr "Termelés igényének megalkotása?"
msgctxt ""
"model:ir.action.act_window.domain,name:act_order_point_form_domain_production"
msgid "Production"
-msgstr ""
+msgstr "Termelés"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr ""
+msgstr "Termelés igény"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
-msgstr ""
+msgstr "Termelés igény"
msgctxt "model:production.create_request.start,name:"
msgid "Create Production Request"
-msgstr ""
+msgstr "Termelés igény"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Production Request"
-msgstr ""
+msgstr "Termelés igény tervező"
msgctxt "selection:stock.order_point,type:"
msgid "Production"
-msgstr ""
+msgstr "Termelés"
msgctxt "view:production.create_request.start:"
msgid "Create Production Requests"
-msgstr ""
+msgstr "Termelés igény"
msgctxt "view:production.create_request.start:"
msgid "Create Production Requests?"
-msgstr ""
+msgstr "Termelés igényének megalkotása?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
-msgstr ""
+msgstr "Létrehozás"
msgctxt "wizard_button:production.create_request,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
diff --git a/product.py b/product.py
index fdf47c8..2f31370 100644
--- a/product.py
+++ b/product.py
@@ -4,10 +4,10 @@
from trytond.pool import Pool, PoolMeta
__all__ = ['Product']
-__metaclass__ = PoolMeta
class Product:
+ __metaclass__ = PoolMeta
__name__ = 'product.product'
def get_supply_period(self):
diff --git a/production.py b/production.py
index ec4ef3c..ab39fdd 100644
--- a/production.py
+++ b/production.py
@@ -2,6 +2,7 @@
# this repository contains the full copyright notices and license terms.
import datetime
from decimal import Decimal
+from collections import defaultdict
from trytond.model import ModelView, fields
from trytond.pool import Pool, PoolMeta
@@ -11,10 +12,10 @@ from trytond.tools import grouped_slice
__all__ = ['Configuration', 'Production',
'CreateProductionRequestStart', 'CreateProductionRequest']
-__metaclass__ = PoolMeta
class Configuration:
+ __metaclass__ = PoolMeta
__name__ = 'production.configuration'
supply_period = fields.Property(fields.Numeric('Supply Period',
digits=(16, 0), help='In number of days', required=True))
@@ -25,6 +26,7 @@ class Configuration:
class Production:
+ __metaclass__ = PoolMeta
__name__ = 'production'
@classmethod
@@ -91,8 +93,8 @@ class Production:
for p in sub_products)
for warehouse in warehouses:
- quantities = dict((x, pbl.pop((warehouse.id, x), 0))
- for x in product_ids)
+ quantities = defaultdict(lambda: 0,
+ ((x, pbl.pop((warehouse.id, x), 0)) for x in product_ids))
shortages = cls.get_shortage(warehouse.id, product_ids, today,
quantities, products_period, product2ops)
diff --git a/setup.py b/setup.py
index 356a3b4..f457ddb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -76,6 +82,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -89,6 +96,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/stock.py b/stock.py
index 68e4d99..574c72b 100644
--- a/stock.py
+++ b/stock.py
@@ -4,10 +4,10 @@ from trytond.pyson import Eval
from trytond.pool import PoolMeta
__all__ = ['OrderPoint']
-__metaclass__ = PoolMeta
class OrderPoint:
+ __metaclass__ = PoolMeta
__name__ = 'stock.order_point'
@classmethod
diff --git a/tests/__init__.py b/tests/__init__.py
index 263698f..5dd993e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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
+try:
+ from trytond.modules.stock_supply_production.tests.test_stock_supply_production import suite
+except ImportError:
+ from .test_stock_supply_production import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index ad61722..f90a25f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.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 0627dc6..86cb14e 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.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_stock_supply_production
===============================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
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/SOURCES.txt b/trytond_stock_supply_production.egg-info/SOURCES.txt
index ecf39b4..b65ff85 100644
--- a/trytond_stock_supply_production.egg-info/SOURCES.txt
+++ b/trytond_stock_supply_production.egg-info/SOURCES.txt
@@ -51,11 +51,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_stock_supply_production.egg-info/PKG-INFO
trytond_stock_supply_production.egg-info/SOURCES.txt
trytond_stock_supply_production.egg-info/dependency_links.txt
diff --git a/trytond_stock_supply_production.egg-info/requires.txt b/trytond_stock_supply_production.egg-info/requires.txt
index bfb6bc4..6c8ccc7 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.8, < 3.9
-trytond_production >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond_stock_supply >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_product >= 4.0, < 4.1
+trytond_production >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond_stock_supply >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-stock-supply-production
More information about the tryton-debian-vcs
mailing list