[tryton-debian-vcs] tryton-modules-stock-package branch debian updated. debian/3.4.1-1-2-gf30bf0d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:12 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-package.git;a=commitdiff;h=debian/3.4.1-1-2-gf30bf0d
commit f30bf0d9ecbdf9767caf32ac55f18bba3fb01008
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:08 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index f01f897..24733d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-18
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 04cbf3f..8c1cccd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for stock packaging
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_package
=====================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Russian
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 65d8f6a..21ba638 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/sl_SI.po b/locale/sl_SI.po
index c384974..57f8a73 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -56,7 +56,7 @@ msgstr "Pošiljka"
msgctxt "field:stock.package,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tip"
msgctxt "field:stock.package,write_date:"
msgid "Write Date"
diff --git a/setup.py b/setup.py
index 22a67a7..d082184 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/stock.py b/stock.py
index bd4ef88..50ac5d4 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.model import ModelSQL, ModelView, Workflow, fields
from trytond.pool import Pool, PoolMeta
diff --git a/tests/__init__.py b/tests/__init__.py
index e9111b2..648f60e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,6 @@
-#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_package import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_stock_package.rst b/tests/scenario_stock_package.rst
index e7e1bcf..f1cc35a 100644
--- a/tests/scenario_stock_package.rst
+++ b/tests/scenario_stock_package.rst
@@ -2,10 +2,6 @@
Stock Package Scenario
======================
-=============
-General Setup
-=============
-
Imports::
>>> import datetime
@@ -13,6 +9,8 @@ Imports::
>>> from decimal import Decimal
>>> from proteus import config, Model, Wizard
>>> from trytond.exceptions import UserError
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
>>> today = datetime.date.today()
Create database::
@@ -23,35 +21,14 @@ Create database::
Install stock Module::
>>> Module = Model.get('ir.module.module')
- >>> modules = Module.find([('name', '=', 'stock_package')])
- >>> Module.install([x.id for x in modules], config.context)
+ >>> module, = Module.find([('name', '=', 'stock_package')])
+ >>> 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='$', code='USD',
- ... rounding=Decimal('0.01'), mon_grouping='[]',
- ... 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::
@@ -111,7 +88,7 @@ Add two shipment lines of same product::
... move.to_location = customer_loc
... move.company = company
... move.unit_price = Decimal('1')
- ... move.currency = currency
+ ... move.currency = company.currency
>>> shipment_out.save()
Pack shipment::
diff --git a/tests/test_stock_package.py b/tests/test_stock_package.py
index deba2b5..0cf8297 100644
--- a/tests/test_stock_package.py
+++ b/tests/test_stock_package.py
@@ -1,31 +1,15 @@
-#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 trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
-class StockPackageTestCase(unittest.TestCase):
- '''
- Test Stock Package module.
- '''
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('stock_package')
-
- def test0005views(self):
- '''
- Test views.
- '''
- test_view('stock_package')
-
- def test0006depends(self):
- '''
- Test depends.
- '''
- test_depends()
+class StockPackageTestCase(ModuleTestCase):
+ 'Test Stock Package module'
+ module = 'stock_package'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index bfd23c4..4955439 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
res
diff --git a/trytond_stock_package.egg-info/PKG-INFO b/trytond_stock_package.egg-info/PKG-INFO
index 16c4975..f1c7a38 100644
--- a/trytond_stock_package.egg-info/PKG-INFO
+++ b/trytond_stock_package.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-package
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for stock packaging
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_package
=====================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Russian
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_package.egg-info/requires.txt b/trytond_stock_package.egg-info/requires.txt
index 90735a7..a3426d7 100644
--- a/trytond_stock_package.egg-info/requires.txt
+++ b/trytond_stock_package.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_stock >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-stock-package
More information about the tryton-debian-vcs
mailing list