[tryton-debian-vcs] tryton-modules-account-invoice-stock branch debian updated. debian/3.8.0-2-5-gf11ccd2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:07:01 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice-stock.git;a=commitdiff;h=debian/3.8.0-2-5-gf11ccd2
commit f11ccd221898d02af283186a074a1afa87188c8a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:13 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index f69c635..b53b1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-invoice-stock (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:27:04 +0200
+
tryton-modules-account-invoice-stock (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 82f7a589a840d17de370c1a615ed412d31ec6c52
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 0a9ad89..f760dca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2014-2015 Cédric Krier
- 2014-2015 B2CK SPRL
+Copyright: 2014-2016 Cédric Krier
+ 2014-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright: 2014-2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2014-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit f80a360b82d8b4be4dba476fbff25154b41d1c53
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:08 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 68cbe07..269fc46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index 43be1ec..7f40486 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice_stock
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index ce590a6..21dd929 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,48 +4,48 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.invoice.line,stock_moves:"
msgid "Stock Moves"
-msgstr ""
+msgstr "ເຄື່ອນຍ້າຍສາງ"
msgctxt "field:account.invoice.line-stock.move,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
msgctxt "field:account.invoice.line-stock.move,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
msgctxt "field:account.invoice.line-stock.move,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລກລໍາດັບ"
msgctxt "field:account.invoice.line-stock.move,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "ລາຍການ"
msgctxt "field:account.invoice.line-stock.move,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
msgctxt "field:account.invoice.line-stock.move,stock_move:"
msgid "Stock Move"
-msgstr ""
+msgstr "ເຄື່ອນຍ້າຍສາງ"
msgctxt "field:account.invoice.line-stock.move,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
msgctxt "field:account.invoice.line-stock.move,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້"
msgctxt "field:stock.move,invoice_lines:"
msgid "Invoice Lines"
-msgstr ""
+msgstr "ລາຍການ"
msgctxt "model:account.invoice.line-stock.move,name:"
msgid "Invoice Line - Stock Move"
-msgstr ""
+msgstr "ລາຍການ - ເຄື່ອນຍ້າຍສາງ"
msgctxt "view:account.invoice.line:"
msgid "Stock"
-msgstr ""
+msgstr "ສາງ"
diff --git a/tryton.cfg b/tryton.cfg
index ed721ba..42fd9c0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
account_invoice
stock
diff --git a/trytond_account_invoice_stock.egg-info/PKG-INFO b/trytond_account_invoice_stock.egg-info/PKG-INFO
index 63214cd..a7667c2 100644
--- a/trytond_account_invoice_stock.egg-info/PKG-INFO
+++ b/trytond_account_invoice_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-invoice-stock
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_invoice_stock.egg-info/SOURCES.txt b/trytond_account_invoice_stock.egg-info/SOURCES.txt
index 3d964a6..5ce0297 100644
--- a/trytond_account_invoice_stock.egg-info/SOURCES.txt
+++ b/trytond_account_invoice_stock.egg-info/SOURCES.txt
@@ -27,11 +27,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_account_invoice_stock.py
./view/invoice_line_form.xml
diff --git a/trytond_account_invoice_stock.egg-info/requires.txt b/trytond_account_invoice_stock.egg-info/requires.txt
index 69143c1..8c29a98 100644
--- a/trytond_account_invoice_stock.egg-info/requires.txt
+++ b/trytond_account_invoice_stock.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_account_invoice >= 4.0, < 4.1
trytond_stock >= 4.0, < 4.1
trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit d3fa492b2f9bb1de2e021c6af38002d32adca7a0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:49 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8d80dcb..68cbe07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a085246..a29b425 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2014-2015 Cédric Krier.
-Copyright (C) 2014-2015 B2CK SPRL.
+Copyright (C) 2014-2016 Cédric Krier.
+Copyright (C) 2014-2016 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/PKG-INFO b/PKG-INFO
index a01c6d6..43be1ec 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_invoice_stock
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_invoice_stock
=============================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/account.py b/account.py
index 64dca57..f48cc9e 100644
--- a/account.py
+++ b/account.py
@@ -6,7 +6,6 @@ from trytond.pyson import Eval
__all__ = ['InvoiceLineStockMove', 'InvoiceLine']
-__metaclass__ = PoolMeta
class InvoiceLineStockMove(ModelSQL):
@@ -20,6 +19,7 @@ class InvoiceLineStockMove(ModelSQL):
class InvoiceLine:
+ __metaclass__ = PoolMeta
__name__ = 'account.invoice.line'
stock_moves = fields.Many2Many('account.invoice.line-stock.move',
'invoice_line', 'stock_move', 'Stock Moves',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 6cc6384..0d3cb8e 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,9 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:account.invoice.line,stock_moves:"
msgid "Stock Moves"
-msgstr ""
+msgstr "Движение на наличност"
#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_date:"
diff --git a/locale/bg_BG.po b/locale/lo_LA.po
similarity index 71%
copy from locale/bg_BG.po
copy to locale/lo_LA.po
index 6cc6384..ce590a6 100644
--- a/locale/bg_BG.po
+++ b/locale/lo_LA.po
@@ -6,50 +6,41 @@ msgctxt "field:account.invoice.line,stock_moves:"
msgid "Stock Moves"
msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_date:"
msgid "Create Date"
-msgstr "Създадено на"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_uid:"
msgid "Create User"
-msgstr "Създадено от"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,invoice_line:"
msgid "Invoice Line"
-msgstr "Ред от фактура"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,rec_name:"
msgid "Name"
-msgstr "Условие за плащане"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,stock_move:"
msgid "Stock Move"
-msgstr "Движение на наличност"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,write_date:"
msgid "Write Date"
-msgstr "Променено на"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,write_uid:"
msgid "Write User"
-msgstr "Променено от"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.move,invoice_lines:"
msgid "Invoice Lines"
-msgstr "Редове от фактура"
+msgstr ""
msgctxt "model:account.invoice.line-stock.move,name:"
msgid "Invoice Line - Stock Move"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 69026bc..9963573 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,9 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:account.invoice.line,stock_moves:"
msgid "Stock Moves"
-msgstr ""
+msgstr "Хранилище перемещение товара"
#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_date:"
diff --git a/locale/bg_BG.po b/locale/zh_CN.po
similarity index 71%
copy from locale/bg_BG.po
copy to locale/zh_CN.po
index 6cc6384..ce590a6 100644
--- a/locale/bg_BG.po
+++ b/locale/zh_CN.po
@@ -6,50 +6,41 @@ msgctxt "field:account.invoice.line,stock_moves:"
msgid "Stock Moves"
msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_date:"
msgid "Create Date"
-msgstr "Създадено на"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,create_uid:"
msgid "Create User"
-msgstr "Създадено от"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,invoice_line:"
msgid "Invoice Line"
-msgstr "Ред от фактура"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,rec_name:"
msgid "Name"
-msgstr "Условие за плащане"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,stock_move:"
msgid "Stock Move"
-msgstr "Движение на наличност"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,write_date:"
msgid "Write Date"
-msgstr "Променено на"
+msgstr ""
-#, fuzzy
msgctxt "field:account.invoice.line-stock.move,write_uid:"
msgid "Write User"
-msgstr "Променено от"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.move,invoice_lines:"
msgid "Invoice Lines"
-msgstr "Редове от фактура"
+msgstr ""
msgctxt "model:account.invoice.line-stock.move,name:"
msgid "Invoice Line - Stock Move"
diff --git a/setup.py b/setup.py
index 8a88cd0..a1223c9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -75,6 +81,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -88,6 +95,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/stock.py b/stock.py
index 14dcf4a..9d2603d 100644
--- a/stock.py
+++ b/stock.py
@@ -5,10 +5,10 @@ from trytond.pool import Pool, PoolMeta
__all__ = ['StockMove']
-__metaclass__ = PoolMeta
class StockMove:
+ __metaclass__ = PoolMeta
__name__ = 'stock.move'
invoice_lines = fields.Many2Many('account.invoice.line-stock.move',
'stock_move', 'invoice_line', 'Invoice Lines')
diff --git a/tests/__init__.py b/tests/__init__.py
index 2cb9193..b572d0e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from .test_account_invoice_stock import suite
+try:
+ from trytond.modules.account_invoice_stock.tests.test_account_invoice_stock import suite
+except ImportError:
+ from .test_account_invoice_stock import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index f25ae34..ed721ba 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account_invoice
stock
diff --git a/trytond_account_invoice_stock.egg-info/PKG-INFO b/trytond_account_invoice_stock.egg-info/PKG-INFO
index 8f02df9..63214cd 100644
--- a/trytond_account_invoice_stock.egg-info/PKG-INFO
+++ b/trytond_account_invoice_stock.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-invoice-stock
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_invoice_stock
=============================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_account_invoice_stock.egg-info/SOURCES.txt b/trytond_account_invoice_stock.egg-info/SOURCES.txt
index eee7612..3d964a6 100644
--- a/trytond_account_invoice_stock.egg-info/SOURCES.txt
+++ b/trytond_account_invoice_stock.egg-info/SOURCES.txt
@@ -49,11 +49,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_account_invoice_stock.egg-info/PKG-INFO
trytond_account_invoice_stock.egg-info/SOURCES.txt
trytond_account_invoice_stock.egg-info/dependency_links.txt
diff --git a/trytond_account_invoice_stock.egg-info/requires.txt b/trytond_account_invoice_stock.egg-info/requires.txt
index 73d5c75..69143c1 100644
--- a/trytond_account_invoice_stock.egg-info/requires.txt
+++ b/trytond_account_invoice_stock.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account_invoice >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account_invoice >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-account-invoice-stock
More information about the tryton-debian-vcs
mailing list