[tryton-debian-vcs] tryton-modules-stock-supply-production branch upstream updated. upstream/3.0.0-1-g1f82937
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:11:38 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-stock-supply-production.git;a=commitdiff;h=upstream/3.0.0-1-g1f82937
commit 1f82937fd74081d087e720d05870547c47514b7e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:24:03 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2863f4a..e5f2927 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7668cfa..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2013 Cédric Krier.
-Copyright (C) 2012-2013 B2CK SPRL.
+Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-2014 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/INSTALL b/INSTALL
index 1e69f1b..ba506af 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_supply_production
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_stock (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 732a76e..8db8a3e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,11 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 38828a3..09988ff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_production
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module for stock supply of production
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_supply_production
===============================
@@ -43,6 +43,7 @@ Description: trytond_stock_supply_production
http://www.tryton.org/
+Keywords: tryton stock supply production
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 1ae8447..d1430c6 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -46,11 +46,11 @@ msgid "Production"
msgstr "Управление на производство"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
+msgid "Create Production Requests"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
+msgid "Create Production Requests?"
msgstr ""
#, fuzzy
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ed5ff18..a31f75c 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 "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Període de suministre"
+msgstr "Període de subministre"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
@@ -12,7 +12,7 @@ msgstr "ID"
msgctxt "help:production.configuration,supply_period:"
msgid "In number of days"
-msgstr "En número de dies"
+msgstr "En nombre de dies."
msgctxt "model:ir.action,name:act_production_request"
msgid "Request Productions"
@@ -20,15 +20,15 @@ msgstr "Sol·licituds de producció"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
-msgstr "Crea sol·licituts de producció"
+msgstr "Crea sol·licituds de producció"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
-msgstr "Creació sol·licituts de producció"
+msgstr "Creació sol·licituds de producció"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
-msgstr "Crea sol·licituts de producció"
+msgstr "Crea sol·licituds de producció"
msgctxt "model:production.create_request.start,name:"
msgid "Create Production Request"
@@ -36,19 +36,19 @@ msgstr "Crea la petició de producció"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Production Request"
-msgstr "Planificador de solicitut de producció"
+msgstr "Planificador de sol·licituds de producció"
msgctxt "selection:stock.order_point,type:"
msgid "Production"
msgstr "Producció"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Crea sol·licituts de producció"
+msgid "Create Production Requests"
+msgstr "Crea sol·licituds de producció"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "Voleu crear la petició de producció?"
+msgid "Create Production Requests?"
+msgstr ""
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 937f611..ea27b90 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -43,11 +43,11 @@ msgid "Production"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
+msgid "Create Production Requests"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
+msgid "Create Production Requests?"
msgstr ""
msgctxt "wizard_button:production.create_request,start,create_:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0e33002..090f61d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:production.configuration,supply_period:"
msgid "Supply Period"
-msgstr "Lieferzeitraum"
+msgstr "Auslieferungszeitraum"
msgctxt "field:production.create_request.start,id:"
msgid "ID"
@@ -16,11 +16,11 @@ msgstr "In Anzahl von Tagen"
msgctxt "model:ir.action,name:act_production_request"
msgid "Request Productions"
-msgstr "Prouktionen anfragen"
+msgstr "Produktionen anfordern"
msgctxt "model:ir.action,name:act_production_request_create"
msgid "Create Production Requests"
-msgstr "Produktionsanforderung erstellen"
+msgstr "Produktionsanforderungen erstellen"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Production Requests"
@@ -28,7 +28,7 @@ msgstr "Erstellen von Produktionsanforderungen"
msgctxt "model:ir.ui.menu,name:menu_production_request_create"
msgid "Create Production Requests"
-msgstr "Produktionsanforderung erstellen"
+msgstr "Produktionsanforderungen erstellen"
msgctxt "model:production.create_request.start,name:"
msgid "Create Production Request"
@@ -43,12 +43,12 @@ msgid "Production"
msgstr "Produktion"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Produktionsanforderung erstellen"
+msgid "Create Production Requests"
+msgstr "Produktionsanforderungen erstellen"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "Produktionsanforderung erstellen?"
+msgid "Create Production Requests?"
+msgstr "Produktionsanforderungen erstellen?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 3564bc2..6a43613 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -43,12 +43,12 @@ msgid "Production"
msgstr "Producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Crear solicitud de producción"
+msgid "Create Production Requests"
+msgstr "Crear solicitudes de producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "¿Crear solicitud de producción?"
+msgid "Create Production Requests?"
+msgstr "¿Crear solicitudes de producción?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 85f2597..127a771 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -43,12 +43,12 @@ msgid "Production"
msgstr "Producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Crear Orden de Producción"
+msgid "Create Production Requests"
+msgstr "Crear Ordenes de Producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "¿Crear Orden de Producción?"
+msgid "Create Production Requests?"
+msgstr "Crear Ordenes de Producción?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 7c696ea..8797fc3 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -36,19 +36,19 @@ msgstr "Crear solicitud de producción"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Production Request"
-msgstr "Cron solicitud de producción"
+msgstr "Planificador de solicitudes de producción"
msgctxt "selection:stock.order_point,type:"
msgid "Production"
msgstr "Producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Crear solicitud de producción"
+msgid "Create Production Requests"
+msgstr "Crear solicitudes de producción"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "¿Crear solicitud de producción?"
+msgid "Create Production Requests?"
+msgstr "¿Quiere crear las solicitudes de producción?"
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 3074d11..1eaff94 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -43,11 +43,11 @@ msgid "Production"
msgstr "Production"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
+msgid "Create Production Requests"
msgstr "Créer les demandes de production"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
+msgid "Create Production Requests?"
msgstr "Créer les demandes de production ?"
msgctxt "wizard_button:production.create_request,start,create_:"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 6abd670..fe6ac0a 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -43,11 +43,11 @@ msgid "Production"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
+msgid "Create Production Requests"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
+msgid "Create Production Requests?"
msgstr ""
msgctxt "wizard_button:production.create_request,start,create_:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 684cd2b..b589084 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -46,11 +46,11 @@ msgid "Production"
msgstr "Производство"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
+msgid "Create Production Requests"
msgstr ""
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
+msgid "Create Production Requests?"
msgstr ""
#, fuzzy
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 00f312a..315f58b 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -42,13 +42,14 @@ msgctxt "selection:stock.order_point,type:"
msgid "Production"
msgstr "Proizvodni nalog"
+#, fuzzy
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request"
-msgstr "Izdelava proizvodnega zahtevka"
+msgid "Create Production Requests"
+msgstr "Izdelava proizvodnih zahtevkov"
msgctxt "view:production.create_request.start:"
-msgid "Create Production Request?"
-msgstr "Izdelava proizvodnega zahtevka?"
+msgid "Create Production Requests?"
+msgstr ""
msgctxt "wizard_button:production.create_request,start,create_:"
msgid "Create"
diff --git a/production.py b/production.py
index 13682a3..338334b 100644
--- a/production.py
+++ b/production.py
@@ -197,7 +197,7 @@ class CreateProductionRequestStart(ModelView):
class CreateProductionRequest(Wizard):
- 'Create Production Request'
+ 'Create Production Requests'
__name__ = 'production.create_request'
start = StateView('production.create_request.start',
'stock_supply_production.production_create_request_start_view_form', [
diff --git a/production.xml b/production.xml
index f844b6e..38de72f 100644
--- a/production.xml
+++ b/production.xml
@@ -62,9 +62,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="request_user" ref="res.user_admin"/>
<field name="user" ref="user_generate_request"/>
<field name="active" eval="True"/>
- <field name="interval_number">1</field>
+ <field name="interval_number" eval="1"/>
<field name="interval_type">days</field>
- <field name="number_calls">-1</field>
+ <field name="number_calls" eval="-1"/>
<field name="repeat_missed" eval="False"/>
<field name="model">production</field>
<field name="function">generate_requests</field>
diff --git a/setup.py b/setup.py
index 5bdf686..b0dbe1d 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_stock_supply_production'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_stock_supply_production',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for stock supply of production',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton stock supply production',
package_dir={'trytond.modules.stock_supply_production': '.'},
packages=[
'trytond.modules.stock_supply_production',
@@ -67,7 +85,6 @@ setup(name='trytond_stock_supply_production',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
diff --git a/tests/test_stock_supply_production.py b/tests/test_stock_supply_production.py
index 341fad1..000670f 100644
--- a/tests/test_stock_supply_production.py
+++ b/tests/test_stock_supply_production.py
@@ -1,37 +1,22 @@
-#!/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.
-import sys
-import os
import unittest
-
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
class StockSupplyProductionTestCase(unittest.TestCase):
- '''
- Test Stock Supply Production module.
- '''
+ 'Test Stock Supply Production module'
def setUp(self):
trytond.tests.test_tryton.install_module('stock_supply_production')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('stock_supply_production')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockSupplyProductionTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 00e751d..dc3b837 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.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 d3dd9e4..c42d023 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.0.0
+Version: 3.2.0
Summary: Tryton module for stock supply of production
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_supply_production
===============================
@@ -43,6 +43,7 @@ Description: trytond_stock_supply_production
http://www.tryton.org/
+Keywords: tryton stock supply production
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
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 ec13481..b2b7a19 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.0, < 3.1
-trytond_production >= 3.0, < 3.1
-trytond_stock >= 3.0, < 3.1
-trytond_stock_supply >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_product >= 3.2, < 3.3
+trytond_production >= 3.2, < 3.3
+trytond_stock >= 3.2, < 3.3
+trytond_stock_supply >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
diff --git a/view/production_create_request_start_form.xml b/view/production_create_request_start_form.xml
index c0d4061..ca62946 100644
--- a/view/production_create_request_start_form.xml
+++ b/view/production_create_request_start_form.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
-<form string="Create Production Request" col="2">
+<form string="Create Production Requests" col="2">
<image name="tryton-dialog-information" xexpand="0" xfill="0"/>
- <label string="Create Production Request?" id="create"
+ <label string="Create Production Requests?" id="create"
yalign="0.0" xalign="0.0" xexpand="1"/>
</form>
--
tryton-modules-stock-supply-production
More information about the tryton-debian-vcs
mailing list