[tryton-debian-vcs] tryton-modules-carrier branch debian updated. debian/3.0.0-3-4-gc1c3ce4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:06:57 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-carrier.git;a=commitdiff;h=debian/3.0.0-3-4-gc1c3ce4
commit c1c3ce4eaadc6960490c828e1c01f506917e52c8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:51 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index 8f9b1d5..c826d53 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-carrier.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-carrier.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-carrier
Architecture: all
commit e259077b2788cc4158dbc9cf323411e44e52b44b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:45:54 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 80406ce..51c54a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2013 Cédric Krier
+Copyright: 2011-2014 Cédric Krier
2011-2013 Bertrand Chenal
2011 Nicolas Évrard
- 2011-2013 B2CK SPRL
+ 2011-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit ba7a5193a85c04a16cb50b89fd80e571d4b7605a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:21:39 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 4f015bc..3f07838 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+* Add default access rights
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index cb2d2c5..2687aff 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-2013 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 1f6afc6..a71486f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_carrier
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_product (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 1d83c64..08ac49e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,14 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with carriers
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
- =============
+ ===============
The carrier module of the Tryton application platform.
@@ -43,9 +43,11 @@ Description: trytond_carrier
http://www.tryton.org/
+Keywords: tryton carrier
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
@@ -62,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/README b/README
index 8936017..dc59933 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
trytond_carrier
-=============
+===============
The carrier module of the Tryton application platform.
diff --git a/carrier.py b/carrier.py
index ab13c6e..dc2ee9d 100644
--- a/carrier.py
+++ b/carrier.py
@@ -15,6 +15,7 @@ class Carrier(ModelSQL, ModelView):
carrier_product = fields.Many2One('product.product', 'Carrier Product',
required=True, domain=[
('type', '=', 'service'),
+ ('template.type', '=', 'service'),
])
carrier_cost_method = fields.Selection([
('product', 'Product Price'),
diff --git a/carrier.xml b/carrier.xml
index 1a88c57..60955f5 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -51,5 +51,22 @@ this repository contains the full copyright notices and license terms. -->
</record>
<menuitem parent="menu_carrier" action="act_carrier_form"
id="menu_carrier_form"/>
+
+ <record model="ir.model.access" id="access_carrier">
+ <field name="model" search="[('model', '=', 'carrier')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_carrier_carrier_admin">
+ <field name="model" search="[('model', '=', 'carrier')]"/>
+ <field name="group" ref="group_carrier_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
</data>
</tryton>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index c88ee2b..8d78acf 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -60,7 +60,7 @@ msgstr "Transportistes"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administració transportistes"
+msgstr "Administració de transportistes"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index fc57ef4..2488b10 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -24,11 +24,11 @@ msgstr "ID"
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr "Terceros"
+msgstr "Tercero"
msgctxt "field:carrier,rec_name:"
msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ea443be..1dffddd 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -60,7 +60,7 @@ msgstr "Transportistas"
msgctxt "model:res.group,name:group_carrier_admin"
msgid "Carrier Administration"
-msgstr "Administración de transportista"
+msgstr "Administración de transportistas"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index a8adb87..9f32d80 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -24,7 +24,7 @@ msgstr "ID"
msgctxt "field:carrier,party:"
msgid "Party"
-msgstr "Stranka"
+msgstr "Partner"
msgctxt "field:carrier,rec_name:"
msgid "Name"
diff --git a/setup.py b/setup.py
index 00c5171..9a40628 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'
+
+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',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module with carriers',
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',
package_dir={'trytond.modules.carrier': '.'},
packages=[
'trytond.modules.carrier',
@@ -50,6 +68,7 @@ setup(name='trytond_carrier',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
@@ -66,7 +85,6 @@ setup(name='trytond_carrier',
'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_carrier.py b/tests/test_carrier.py
index c3d813d..04c0b1f 100644
--- a/tests/test_carrier.py
+++ b/tests/test_carrier.py
@@ -1,36 +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 CarrierTestCase(unittest.TestCase):
- '''
- Test Carrier module.
- '''
+ 'Test Carrier module'
def setUp(self):
trytond.tests.test_tryton.install_module('carrier')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('carrier')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -39,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
CarrierTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 79c2613..b6de206 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_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index 700c0d8..aa27b12 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
Metadata-Version: 1.1
Name: trytond-carrier
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with carriers
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
- =============
+ ===============
The carrier module of the Tryton application platform.
@@ -43,9 +43,11 @@ Description: trytond_carrier
http://www.tryton.org/
+Keywords: tryton carrier
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
@@ -62,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_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index 9e4982f..9baefe1 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_party >= 3.0, < 3.1
-trytond_product >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_party >= 3.2, < 3.3
+trytond_product >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list