[tryton-debian-vcs] tryton-modules-sale-invoice-grouping branch debian updated. debian/3.0.1-2-4-g03f44cf
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:10:00 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-invoice-grouping.git;a=commitdiff;h=debian/3.0.1-2-4-g03f44cf
commit 03f44cf3c0f1be1af5b5db41b315e3d228ba4982
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 15:00:11 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index 86c82d7..7952089 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-invoice-grouping.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-sale-invoice-grouping.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-sale-invoice-grouping
Architecture: all
commit fe487258c5ea87417ada044087d17ca423eca43a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:46:41 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index d19ea13..67f876e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2013 Nicolas Évrard
- 2013 B2CK SPRL
+ 2013-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 728fcf1e2528b206231fb9fdaabb62b5a2a33887
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:23:20 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index be7289e..a77894f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.0.1 - 2013-12-04
+Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
Version 3.0.0 - 2013-10-21
diff --git a/COPYRIGHT b/COPYRIGHT
index dc1963d..34c8f0e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2013 Nicolas Évrard.
-Copyright (C) 2013 B2CK SPRL.
+Copyright (C) 2013-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 68e36a2..a7847f1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_sale_invoice_grouping
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_account_invoice (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 26df3f3..44b53d9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_invoice_grouping
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module to group sale invoices
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: sale_invoice_grouping
=====================
@@ -43,6 +43,7 @@ Description: sale_invoice_grouping
http://www.tryton.org/
+Keywords: tryton sale group invoice
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,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 8c22282..9f123ae 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_invoice_grouping_method:"
msgid "Sale Invoice Grouping Method"
-msgstr "Mètode d'agrupació de les vendes per facturar"
+msgstr "Mètode d'agrupació factures de venda"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 481c793..55171de 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:party.party,sale_invoice_grouping_method:"
msgid "Sale Invoice Grouping Method"
-msgstr "Methode Gruppierung Verkauf Rechnungsstellung"
+msgstr "Gruppierungsmethode Rechnungsstellung (Verkauf)"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
diff --git a/locale/es_ES.po b/locale/es_CO.po
similarity index 87%
copy from locale/es_ES.po
copy to locale/es_CO.po
index 4282da6..4d20640 100644
--- a/locale/es_ES.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_invoice_grouping_method:"
msgid "Sale Invoice Grouping Method"
-msgstr "Método de agrupación de las ventas para facturar"
+msgstr "Método de Agrupación de Factura"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 4282da6..882f583 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_invoice_grouping_method:"
msgid "Sale Invoice Grouping Method"
-msgstr "Método de agrupación de las ventas para facturar"
+msgstr "Método agrupación facturas de venta"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 140ca55..64d86c1 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -8,7 +8,7 @@ msgstr "Méthode de regroupement des factures de vente"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
-msgstr "Aucun"
+msgstr "Aucune"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "Standard"
diff --git a/party.py b/party.py
index 00374e5..5eeb8eb 100644
--- a/party.py
+++ b/party.py
@@ -5,6 +5,7 @@ from trytond.model import fields
from trytond.pool import PoolMeta
__metaclass__ = PoolMeta
+__all__ = ['Party']
class Party:
diff --git a/setup.py b/setup.py
index 58ec6f6..7902041 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_invoice_grouping'
+
+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_invoice_grouping',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to group sale invoices',
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 group invoice',
package_dir={'trytond.modules.sale_invoice_grouping': '.'},
packages=[
'trytond.modules.sale_invoice_grouping',
@@ -65,7 +83,6 @@ setup(name='trytond_sale_invoice_grouping',
'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/tryton.cfg b/tryton.cfg
index 7e143d7..9a168f2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.2.0
depends:
ir
res
diff --git a/trytond_sale_invoice_grouping.egg-info/PKG-INFO b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
index 6c21cbc..6db0dd2 100644
--- a/trytond_sale_invoice_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-invoice-grouping
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module to group sale invoices
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: sale_invoice_grouping
=====================
@@ -43,6 +43,7 @@ Description: sale_invoice_grouping
http://www.tryton.org/
+Keywords: tryton sale group invoice
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,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_invoice_grouping.egg-info/SOURCES.txt b/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
index d139669..81af19e 100644
--- a/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
@@ -14,6 +14,7 @@ doc/index.rst
locale/ca_ES.po
locale/de_DE.po
locale/es_AR.po
+locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
locale/sl_SI.po
diff --git a/trytond_sale_invoice_grouping.egg-info/requires.txt b/trytond_sale_invoice_grouping.egg-info/requires.txt
index e2fd339..e814ea0 100644
--- a/trytond_sale_invoice_grouping.egg-info/requires.txt
+++ b/trytond_sale_invoice_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 3.0, < 3.1
-trytond_account_invoice >= 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_account_invoice >= 3.2, < 3.3
+trytond_sale >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-sale-invoice-grouping
More information about the tryton-debian-vcs
mailing list