[tryton-debian-vcs] tryton-modules-carrier-percentage branch upstream updated. upstream/3.0.0-1-g052b815
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:07:03 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-carrier-percentage.git;a=commitdiff;h=upstream/3.0.0-1-g052b815
commit 052b8157dbfb2cfd2fbe510c55a3d7bfbf7bccc9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:21:40 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 69dc0e9..b63bd8a 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 60b27dd..e4fdd6b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_carrier_percentage
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 05c3f79..f2f691a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,6 @@ 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 12b5202..bfec30c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier_percentage
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -43,6 +43,7 @@ Description: trytond_carrier_percentage
http://www.tryton.org/
+Keywords: tryton carrier percentage
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,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/sale.py b/sale.py
index e53fce8..d54bcd7 100644
--- a/sale.py
+++ b/sale.py
@@ -21,7 +21,9 @@ class Sale:
context = context.copy()
amount = 0
for line in self.lines or []:
- if line.unit_price and line.quantity and not line.shipment_cost:
+ if (getattr(line, 'unit_price', None)
+ and getattr(line, 'quantity', None)
+ and not getattr(line, 'shipment_cost', None)):
amount += (line.unit_price
* Decimal(str(line.quantity or 0)))
context['amount'] = amount
diff --git a/setup.py b/setup.py
index eec35ce..4d7c9c6 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_carrier_percentage'
+
+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_carrier_percentage',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to add cost method "on percentage" on carrier',
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 carrier percentage',
package_dir={'trytond.modules.carrier_percentage': '.'},
packages=[
'trytond.modules.carrier_percentage',
@@ -66,7 +84,6 @@ setup(name='trytond_carrier_percentage',
'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/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index eef5a7f..d7e06da 100644
--- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.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()
@@ -191,11 +191,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('60')
- True
+ >>> shipment.cost
+ Decimal('60.00')
>>> shipment.cost_currency == currency
True
>>> shipment.save()
@@ -204,8 +204,8 @@ Receive a single product line::
>>> shipment.state
u'received'
>>> move, = shipment.incoming_moves
- >>> move.unit_price == Decimal('9.2')
- True
+ >>> move.unit_price
+ Decimal('9.2000')
Create payment term::
@@ -233,18 +233,18 @@ Sale products with cost on shipment::
>>> cost_line = sale.lines[-1]
>>> cost_line.product == carrier_product
True
- >>> cost_line.quantity == 1
- True
- >>> cost_line.amount == Decimal(15)
- True
+ >>> cost_line.quantity
+ 1
+ >>> cost_line.amount
+ Decimal('15.00')
>>> sale.save()
>>> Sale.quote([sale.id], config.context)
>>> Sale.confirm([sale.id], config.context)
>>> Sale.process([sale.id], config.context)
>>> sale.state
u'processing'
- >>> sale.untaxed_amount == Decimal(115)
- True
+ >>> sale.untaxed_amount
+ Decimal('115.00')
Send products::
@@ -252,14 +252,14 @@ Send products::
>>> shipment, = sale.shipments
>>> shipment.carrier == carrier
True
- >>> shipment.cost == Decimal(15)
- True
+ >>> shipment.cost
+ Decimal('15.00')
>>> shipment.cost_currency == currency
True
>>> move, = shipment.inventory_moves
>>> move.quantity = 4
- >>> shipment.cost == Decimal(12)
- True
+ >>> shipment.cost
+ Decimal('12.00')
>>> shipment.cost_currency == currency
True
>>> shipment.state
@@ -282,8 +282,8 @@ Check customer invoice::
>>> sale.reload()
>>> invoice, = sale.invoices
- >>> invoice.untaxed_amount == Decimal('92')
- True
+ >>> invoice.untaxed_amount
+ Decimal('92.00')
Sale products with cost on order::
@@ -302,16 +302,16 @@ Sale products with cost on order::
True
>>> cost_line.quantity == 1
True
- >>> cost_line.amount == Decimal(9)
- True
+ >>> cost_line.amount
+ Decimal('9.00')
>>> sale.save()
>>> Sale.quote([sale.id], config.context)
>>> Sale.confirm([sale.id], config.context)
>>> Sale.process([sale.id], config.context)
>>> sale.state
u'processing'
- >>> sale.untaxed_amount == Decimal(69)
- True
+ >>> sale.untaxed_amount
+ Decimal('69.00')
Check customer shipment::
@@ -323,5 +323,5 @@ Check customer invoice::
>>> sale.reload()
>>> invoice, = sale.invoices
- >>> invoice.untaxed_amount == Decimal(69)
- True
+ >>> invoice.untaxed_amount
+ Decimal('69.00')
diff --git a/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py
index 4a250b0..102bd9f 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_carrier_percentage.py
@@ -1,27 +1,16 @@
-#!/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
from decimal import Decimal
import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, \
- test_view, test_depends
+ test_view, test_depends, doctest_dropdb
from trytond.transaction import Transaction
-from trytond.backend.sqlite.database import Database as SQLiteDatabase
class CarrierWeightTestCase(unittest.TestCase):
- '''
- Test CarrierWeight module.
- '''
+ 'Test CarrierWeight module'
def setUp(self):
trytond.tests.test_tryton.install_module('carrier_percentage')
@@ -34,21 +23,15 @@ class CarrierWeightTestCase(unittest.TestCase):
self.carrier = POOL.get('carrier')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('carrier_percentage')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
def test0010compute_percentage(self):
- '''
- Test compute_percentage.
- '''
+ 'Test compute_percentage'
with Transaction().start(DB_NAME, USER, context=CONTEXT):
party, = self.party.create([{
'name': 'Carrier',
@@ -89,19 +72,6 @@ class CarrierWeightTestCase(unittest.TestCase):
(price, currency.id))
-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()
from trytond.modules.product.tests import test_product
@@ -119,6 +89,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 dea281d..f5a1c1d 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_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index 6de05d3..f3d61c3 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier-percentage
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -43,6 +43,7 @@ Description: trytond_carrier_percentage
http://www.tryton.org/
+Keywords: tryton carrier percentage
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,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_carrier_percentage.egg-info/requires.txt b/trytond_carrier_percentage.egg-info/requires.txt
index e08e1be..5108cdd 100644
--- a/trytond_carrier_percentage.egg-info/requires.txt
+++ b/trytond_carrier_percentage.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_carrier >= 3.0, < 3.1
-trytond_currency >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_carrier >= 3.2, < 3.3
+trytond_currency >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-carrier-percentage
More information about the tryton-debian-vcs
mailing list