[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch upstream updated. upstream/3.0.0-1-g8f1ae3e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:09:46 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-purchase-shipment-cost.git;a=commitdiff;h=upstream/3.0.0-1-g8f1ae3e
commit 8f1ae3e63c973b674016337e2507cd70f7956ce1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:23:11 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8258af5..6811c91 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 87a90a4..3731ce2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2013 Cédric Krier.
+Copyright (C) 2011-2014 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2013 B2CK SPRL.
+Copyright (C) 2011-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 618c72a..6a53387 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_purchase_shipment_cost
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_carrier (http://www.tryton.org/)
* trytond_currency (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index fc0b03e..f2f691a 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 tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 374da64..b4cdc6d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module for purchase shipment cost
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_purchase_shipment_cost
==============================
@@ -43,9 +43,11 @@ Description: trytond_purchase_shipment_cost
http://www.tryton.org/
+Keywords: tryton purchase shipment cost
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
@@ -61,6 +63,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/de_DE.po b/locale/de_DE.po
index af98325..e857e73 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:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Frachkosten Zuordnungsmethode"
+msgstr "Frachtkosten Zuordnungsmethode"
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
@@ -24,7 +24,7 @@ msgstr "Währung Kosten"
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Kosten Währung Stellen "
+msgstr "Nachkommastellen Währung Kosten"
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
diff --git a/setup.py b/setup.py
index 9ba663c..2aaa9ae 100644
--- a/setup.py
+++ b/setup.py
@@ -11,43 +11,58 @@ 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_purchase_shipment_cost'
+
+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'))
extras_require = {}
for dep in info.get('extras_depend', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- extras_require[dep] = ('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ extras_require[dep] = get_require_version('trytond_%s' % dep)
-tests_require = ['proteus >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1)]
+tests_require = [get_require_version('proteus')]
-setup(name='trytond_purchase_shipment_cost',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for purchase shipment cost',
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 purchase shipment cost',
package_dir={'trytond.modules.purchase_shipment_cost': '.'},
packages=[
'trytond.modules.purchase_shipment_cost',
@@ -60,6 +75,7 @@ setup(name='trytond_purchase_shipment_cost',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
@@ -75,7 +91,6 @@ setup(name='trytond_purchase_shipment_cost',
'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/stock.py b/stock.py
index 3dc7b1d..d2b454a 100644
--- a/stock.py
+++ b/stock.py
@@ -16,7 +16,7 @@ class ShipmentIn:
__name__ = 'stock.shipment.in'
carrier = fields.Many2One('carrier', 'Carrier', states={
'readonly': Eval('state') != 'draft',
- }, on_change=['carrier', 'incoming_moves'],
+ },
depends=['state'])
cost_currency = fields.Many2One('currency.currency', 'Cost Currency',
states={
@@ -24,25 +24,14 @@ class ShipmentIn:
'readonly': ~Eval('state').in_(['draft', 'assigned', 'packed']),
}, depends=['cost', 'state'])
cost_currency_digits = fields.Function(fields.Integer(
- 'Cost Currency Digits', on_change_with=['currency']),
+ 'Cost Currency Digits'),
'on_change_with_cost_currency_digits')
cost = fields.Numeric('Cost', digits=(16, Eval('cost_currency_digits', 2)),
states={
'readonly': ~Eval('state').in_(['draft', 'assigned', 'packed']),
}, depends=['carrier', 'state', 'cost_currency_digits'])
- @classmethod
- def __setup__(cls):
- super(ShipmentIn, cls).__setup__()
- if not cls.incoming_moves.on_change:
- cls.incoming_moves.on_change = []
- for fname in ('carrier', 'incoming_moves'):
- if fname not in cls.incoming_moves.on_change:
- cls.incoming_moves.on_change.append(fname)
- for fname in cls.incoming_moves.on_change:
- if fname not in cls.carrier.on_change:
- cls.carrier.on_change.append(fname)
-
+ @fields.depends('currency')
def on_change_with_cost_currency_digits(self, name=None):
if self.cost_currency:
return self.cost_currency.digits
@@ -51,9 +40,11 @@ class ShipmentIn:
def _get_carrier_context(self):
return {}
+ @fields.depends(methods=['incoming_moves'])
def on_change_carrier(self):
return self.on_change_incoming_moves()
+ @fields.depends('carrier', 'incoming_moves')
def on_change_incoming_moves(self):
Currency = Pool().get('currency.currency')
diff --git a/tests/scenario_purchase_shipment_cost.rst b/tests/scenario_purchase_shipment_cost.rst
index baedbb6..46acc0a 100644
--- a/tests/scenario_purchase_shipment_cost.rst
+++ b/tests/scenario_purchase_shipment_cost.rst
@@ -37,14 +37,14 @@ Create company::
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> party = Party(name='B2CK')
+ >>> party = Party(name='Dunder Mifflin')
>>> party.save()
>>> company.party = party
- >>> currencies = Currency.find([('code', '=', 'EUR')])
+ >>> currencies = Currency.find([('code', '=', 'USD')])
>>> if not currencies:
- ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
+ ... currency = Currency(name='U.S. Dollar', symbol='$', code='USD',
... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
- ... mon_decimal_point=',')
+ ... mon_decimal_point='.', mon_thousands_sep=',')
... currency.save()
... CurrencyRate(date=today + relativedelta(month=1, day=1),
... rate=Decimal('1.0'), currency=currency).save()
@@ -126,11 +126,11 @@ Receive a single product line::
>>> move.to_location = shipment.warehouse.input_location
>>> move.product = product
>>> move.quantity = 50
- >>> move.unit_price == Decimal('8')
- True
+ >>> move.unit_price
+ Decimal('8')
>>> shipment.carrier = carrier
- >>> shipment.cost == Decimal('3')
- True
+ >>> shipment.cost
+ Decimal('3')
>>> shipment.cost_currency == currency
True
>>> shipment.save()
@@ -139,8 +139,8 @@ Receive a single product line::
>>> shipment.state
u'received'
>>> move, = shipment.incoming_moves
- >>> move.unit_price == Decimal('8.0600')
- True
+ >>> move.unit_price
+ Decimal('8.0600')
Receive many product lines::
@@ -154,8 +154,8 @@ Receive many product lines::
... move.product = product
... move.quantity = quantity
>>> shipment.carrier = carrier
- >>> shipment.cost == Decimal('3')
- True
+ >>> shipment.cost
+ Decimal('3')
>>> shipment.save()
>>> ShipmentIn.receive([shipment.id], config.context)
>>> shipment.reload()
diff --git a/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
index 1d32d43..d313a74 100644
--- a/tests/scenario_purchase_shipment_cost_with_account_stock.rst
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
@@ -38,14 +38,14 @@ Create company::
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> party = Party(name='B2CK')
+ >>> party = Party(name='Dunder Mifflin')
>>> party.save()
>>> company.party = party
- >>> currencies = Currency.find([('code', '=', 'EUR')])
+ >>> currencies = Currency.find([('code', '=', 'USD')])
>>> if not currencies:
- ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
+ ... currency = Currency(name='U.S. Dollar', symbol='$', code='USD',
... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
- ... mon_decimal_point=',')
+ ... mon_decimal_point='.', mon_thousands_sep=',')
... currency.save()
... CurrencyRate(date=today + relativedelta(month=1, day=1),
... rate=Decimal('1.0'), currency=currency).save()
@@ -202,19 +202,19 @@ Receive a single product line::
>>> move.to_location = shipment.warehouse.input_location
>>> move.product = product
>>> move.quantity = 30
- >>> move.unit_price == Decimal('8')
- True
+ >>> move.unit_price
+ Decimal('8')
>>> move = Move()
>>> shipment.incoming_moves.append(move)
>>> move.from_location = supplier_location
>>> move.to_location = shipment.warehouse.input_location
>>> move.product = product_average
>>> move.quantity = 20
- >>> move.unit_price == Decimal('8')
- True
+ >>> move.unit_price
+ Decimal('8')
>>> shipment.carrier = carrier
- >>> shipment.cost == Decimal('3')
- True
+ >>> shipment.cost
+ Decimal('3')
>>> shipment.cost_currency == currency
True
>>> shipment.save()
@@ -223,10 +223,10 @@ Receive a single product line::
>>> shipment.state
u'received'
>>> move, move_average = shipment.incoming_moves
- >>> move.unit_price == Decimal('8.0600')
- True
- >>> move_average.unit_price == Decimal('8.0600')
- True
+ >>> move.unit_price
+ Decimal('8.0600')
+ >>> move_average.unit_price
+ Decimal('8.0600')
>>> stock_supplier.reload()
>>> (stock_supplier.debit, stock_supplier.credit) == \
... (Decimal('0.00'), Decimal('398.20'))
@@ -252,8 +252,8 @@ Receive many product lines::
... move.product = product
... move.quantity = quantity
>>> shipment.carrier = carrier
- >>> shipment.cost == Decimal('3')
- True
+ >>> shipment.cost
+ Decimal('3')
>>> shipment.save()
>>> ShipmentIn.receive([shipment.id], config.context)
>>> shipment.reload()
diff --git a/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
index defb51e..8fb8757 100644
--- a/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
@@ -234,8 +234,8 @@ Receive 4 products::
>>> move.quantity = 4.0
>>> shipment.incoming_moves.append(move)
>>> shipment.carrier = carrier
- >>> shipment.cost == Decimal('3')
- True
+ >>> shipment.cost
+ Decimal('3')
>>> shipment.cost_currency == currency
True
>>> shipment.save()
@@ -244,25 +244,28 @@ Receive 4 products::
>>> shipment.state
u'received'
>>> move, = shipment.incoming_moves
- >>> move.unit_price == Decimal('5.75')
- True
+ >>> move.unit_price
+ Decimal('5.7500')
>>> ShipmentIn.done([shipment.id], current_config.context)
>>> shipment.reload()
>>> shipment.state
u'done'
>>> stock_supplier.reload()
>>> stock.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('0.00'), Decimal('20.00'))
- True
+ >>> stock_supplier.debit
+ Decimal('0.00')
+ >>> stock_supplier.credit
+ Decimal('20.00')
>>> stock.reload()
- >>> (stock.debit, stock.credit) == \
- ... (Decimal('23.00'), Decimal('0.00'))
- True
+ >>> stock.debit
+ Decimal('23.00')
+ >>> stock.credit
+ Decimal('0.00')
>>> expense.reload()
- >>> (expense.debit, expense.credit) == \
- ... (Decimal('0.00'), Decimal('3.00'))
- True
+ >>> expense.debit
+ Decimal('0.00')
+ >>> expense.credit
+ Decimal('3.00')
Open supplier invoice::
@@ -275,14 +278,17 @@ Open supplier invoice::
>>> invoice.state
u'posted'
>>> payable.reload()
- >>> (payable.debit, payable.credit) == \
- ... (Decimal('0.00'), Decimal('20.00'))
- True
+ >>> payable.debit
+ Decimal('0.00')
+ >>> payable.credit
+ Decimal('20.00')
>>> expense.reload()
- >>> (expense.debit, expense.credit) == \
- ... (Decimal('20.00'), Decimal('23.00'))
- True
+ >>> expense.debit
+ Decimal('20.00')
+ >>> expense.credit
+ Decimal('23.00')
>>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('20.00'), Decimal('20.00'))
- True
+ >>> stock_supplier.debit
+ Decimal('20.00')
+ >>> stock_supplier.credit
+ Decimal('20.00')
diff --git a/tests/test_purchase_shipment_cost.py b/tests/test_purchase_shipment_cost.py
index 3a51af8..95dd442 100644
--- a/tests/test_purchase_shipment_cost.py
+++ b/tests/test_purchase_shipment_cost.py
@@ -1,54 +1,27 @@
#!/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
-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 unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
-from trytond.backend.sqlite.database import Database as SQLiteDatabase
+from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
class PurchaseShipmentCostTestCase(unittest.TestCase):
- '''
- Test Purchase Shipment Cost module.
- '''
+ 'Test Purchase Shipment Cost module'
def setUp(self):
trytond.tests.test_tryton.install_module('purchase_shipment_cost')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('purchase_shipment_cost')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
-def doctest_dropdb(test):
- '''
- Remove sqlite memory database
- '''
- database = SQLiteDatabase().connect()
- cursor = database.cursor(autocommit=True)
- try:
- database.drop(cursor, ':memory:')
- cursor.commit()
- finally:
- cursor.close()
-
-
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
@@ -65,6 +38,3 @@ def suite():
setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 8d2148f..8206b49 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
carrier
currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index bc3f49d..7d29bdb 100644
--- a/trytond_purchase_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-purchase-shipment-cost
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module for purchase shipment cost
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_purchase_shipment_cost
==============================
@@ -43,9 +43,11 @@ Description: trytond_purchase_shipment_cost
http://www.tryton.org/
+Keywords: tryton purchase shipment cost
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
@@ -61,6 +63,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_purchase_shipment_cost.egg-info/requires.txt b/trytond_purchase_shipment_cost.egg-info/requires.txt
index f514cee..a379f6c 100644
--- a/trytond_purchase_shipment_cost.egg-info/requires.txt
+++ b/trytond_purchase_shipment_cost.egg-info/requires.txt
@@ -1,13 +1,13 @@
-trytond_carrier >= 3.0, < 3.1
-trytond_currency >= 3.0, < 3.1
-trytond_stock >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
+trytond_carrier >= 3.2, < 3.3
+trytond_currency >= 3.2, < 3.3
+trytond_stock >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
[account_product]
-trytond_account_product >= 3.0, < 3.1
+trytond_account_product >= 3.2, < 3.3
[account_stock_continental]
-trytond_account_stock_continental >= 3.0, < 3.1
+trytond_account_stock_continental >= 3.2, < 3.3
[account_stock_anglo_saxon]
-trytond_account_stock_anglo_saxon >= 3.0, < 3.1
\ No newline at end of file
+trytond_account_stock_anglo_saxon >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-purchase-shipment-cost
More information about the tryton-debian-vcs
mailing list