[tryton-debian-vcs] tryton-modules-sale-price-list branch debian updated. debian/3.0.0-3-4-g812d124
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:10:12 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-price-list.git;a=commitdiff;h=debian/3.0.0-3-4-g812d124
commit 812d12477fdf589627c9189f50ecf817624245c7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 15:00:12 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index c4315f1..c1e8978 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-sale-price-list.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-sale-price-list.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-sale-price-list
Architecture: all
commit 80f3bca1ee2a553484e6feddc3b50e1df29ba7a3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:46:46 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index e942264..b1e1289 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2013 Cédric Krier
+Copyright: 2009-2014 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2013 B2CK SPRL
+ 2009-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 9067fa9bec07abe055d89eb81110576fa78812f9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:23:24 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index e1758e6..b602191 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 39f9196..4949045 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2014 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-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 1b2d7d1..e919d37 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_sale_price_list
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_party (http://www.tryton.org/)
* trytond_sale (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 2569955..e013c00 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,12 +1,10 @@
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/*
diff --git a/PKG-INFO b/PKG-INFO
index de11764..ad840bc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_price_list
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add price list on sale
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_sale_price_list
=======================
@@ -43,6 +43,7 @@ Description: trytond_sale_price_list
http://www.tryton.org/
+Keywords: tryton sale price list
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,7 +62,6 @@ 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
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index b787264..86bb228 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_price_list:"
msgid "Sale Price List"
-msgstr "Llista de preus de venda"
+msgstr "Tarifa de venda"
msgctxt "field:sale.sale,price_list:"
msgid "Price List"
-msgstr "Llista de preus"
+msgstr "Tarifa"
diff --git a/sale.py b/sale.py
index 492454f..88c9bc8 100644
--- a/sale.py
+++ b/sale.py
@@ -14,17 +14,15 @@ class Sale:
domain=[('company', '=', Eval('company'))],
states={
'readonly': Or(Not(Equal(Eval('state'), 'draft')),
- Bool(Eval('lines'))),
+ Bool(Eval('lines', [0]))),
},
- depends=['state', 'company', 'lines'])
+ depends=['state', 'company'])
@classmethod
def __setup__(cls):
super(Sale, cls).__setup__()
cls.party.states['readonly'] = (cls.party.states['readonly']
- | Eval('lines'))
- if 'lines' not in cls.party.depends:
- cls.party.depends.append('lines')
+ | Eval('lines', [0]))
cls.lines.states['readonly'] = (cls.lines.states['readonly']
| ~Eval('party'))
if 'party' not in cls.lines.depends:
@@ -45,12 +43,9 @@ class SaleLine:
@classmethod
def __setup__(cls):
super(SaleLine, cls).__setup__()
- if '_parent_sale.price_list' not in cls.quantity.on_change:
- cls.quantity.on_change.append('_parent_sale.price_list')
- if '_parent_sale.price_list' not in cls.unit.on_change:
- cls.unit.on_change.append('_parent_sale.price_list')
- if '_parent_sale.price_list' not in cls.product.on_change:
- cls.product.on_change.append('_parent_sale.price_list')
+ cls.quantity.on_change.add('_parent_sale.price_list')
+ cls.unit.on_change.add('_parent_sale.price_list')
+ cls.product.on_change.add('_parent_sale.price_list')
def _get_context_sale_price(self):
context = super(SaleLine, self)._get_context_sale_price()
diff --git a/setup.py b/setup.py
index a52f2e9..4257ce4 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_sale_price_list'
+
+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_sale_price_list',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to add price list on sale',
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 sale price list',
package_dir={'trytond.modules.sale_price_list': '.'},
packages=[
'trytond.modules.sale_price_list',
@@ -65,7 +83,6 @@ setup(name='trytond_sale_price_list',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
diff --git a/tests/test_sale_price_list.py b/tests/test_sale_price_list.py
index d952aea..825fe14 100644
--- a/tests/test_sale_price_list.py
+++ b/tests/test_sale_price_list.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
-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 trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
class SalePriceListTestCase(unittest.TestCase):
- '''
- Test SalePriceList module.
- '''
+ 'Test SalePriceList module'
def setUp(self):
trytond.tests.test_tryton.install_module('sale_price_list')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('sale_price_list')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
SalePriceListTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 607bc96..c571a1b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
ir
party
diff --git a/trytond_sale_price_list.egg-info/PKG-INFO b/trytond_sale_price_list.egg-info/PKG-INFO
index f03791f..3d0bb49 100644
--- a/trytond_sale_price_list.egg-info/PKG-INFO
+++ b/trytond_sale_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-price-list
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add price list on sale
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_sale_price_list
=======================
@@ -43,6 +43,7 @@ Description: trytond_sale_price_list
http://www.tryton.org/
+Keywords: tryton sale price list
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,7 +62,6 @@ 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
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_sale_price_list.egg-info/requires.txt b/trytond_sale_price_list.egg-info/requires.txt
index e0f1199..1210ffa 100644
--- a/trytond_sale_price_list.egg-info/requires.txt
+++ b/trytond_sale_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 3.0, < 3.1
-trytond_product_price_list >= 3.0, < 3.1
-trytond_sale >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_party >= 3.2, < 3.3
+trytond_product_price_list >= 3.2, < 3.3
+trytond_sale >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-sale-price-list
More information about the tryton-debian-vcs
mailing list