[tryton-debian-vcs] tryton-modules-sale-promotion branch debian updated. debian/3.8.0-2-5-gb9596d2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:26:26 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-sale-promotion.git;a=commitdiff;h=debian/3.8.0-2-5-gb9596d2
commit b9596d2ac090ac7625a68b348c56b416d24a9bef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:31 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 82661c9..538ac6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-sale-promotion (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:31:20 +0200
+
tryton-modules-sale-promotion (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 01a522244ac6d1a3f08b9e53305a7b129ce65ff4
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 30cf87b..410a82f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright: 2015 Cédric Krier
License: GPL-3+
Files: debian/*
-Copyright: 2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2015-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit a6786711dfcdda354d89395c5d5a762d9a432a35
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:30 2016 +0200
Merging upstream version 4.0.1.
diff --git a/PKG-INFO b/PKG-INFO
index 56174f1..3d42f18 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_promotion
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for sale promotion
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0bfa06a..e7c70be 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -7,149 +7,153 @@ msgid ""
"Invalid formula \"%(formula)s\" in promotion \"%(promotion)s\" with "
"exception \"%(exception)s\"."
msgstr ""
+"Formula inválida \"%(formula)s\" en la promoción \"%(promoción)s\" con la "
+"excepción \"%(exception)s\"."
msgctxt "field:sale.line,draft_unit_price:"
msgid "Draft Unit Price"
-msgstr ""
+msgstr "Precio Unitario en Borrador"
msgctxt "field:sale.line,promotion:"
msgid "Promotion"
-msgstr ""
+msgstr "Promoción"
msgctxt "field:sale.promotion,active:"
msgid "Active"
-msgstr ""
+msgstr "Activo"
msgctxt "field:sale.promotion,company:"
msgid "Company"
-msgstr ""
+msgstr "Compañia"
msgctxt "field:sale.promotion,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
msgctxt "field:sale.promotion,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "field:sale.promotion,end_date:"
msgid "End Date"
-msgstr ""
+msgstr "Fecha Final"
msgctxt "field:sale.promotion,formula:"
msgid "Formula"
-msgstr ""
+msgstr "Fórmula"
msgctxt "field:sale.promotion,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:sale.promotion,name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:sale.promotion,price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Precio de Venta"
msgctxt "field:sale.promotion,products:"
msgid "Products"
-msgstr ""
+msgstr "Productos"
msgctxt "field:sale.promotion,quantity:"
msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
msgctxt "field:sale.promotion,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:sale.promotion,start_date:"
msgid "Start Date"
-msgstr ""
+msgstr "Fecha Inicio"
msgctxt "field:sale.promotion,unit:"
msgid "Unit"
-msgstr ""
+msgstr "Unidad"
msgctxt "field:sale.promotion,unit_category:"
msgid "Unit Category"
-msgstr ""
+msgstr "Unidad de la Categoría"
msgctxt "field:sale.promotion,unit_digits:"
msgid "Unit Digits"
-msgstr ""
+msgstr "Digitos de la Unidad"
msgctxt "field:sale.promotion,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:sale.promotion,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:sale.promotion-product.product,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
msgctxt "field:sale.promotion-product.product,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "field:sale.promotion-product.product,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:sale.promotion-product.product,product:"
msgid "Product"
-msgstr ""
+msgstr "Producto"
msgctxt "field:sale.promotion-product.product,promotion:"
msgid "Promotion"
-msgstr ""
+msgstr "Promoción"
msgctxt "field:sale.promotion-product.product,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:sale.promotion-product.product,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:sale.promotion-product.product,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "help:sale.promotion,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
msgstr ""
+"Expresión Python que será evaluada con:\n"
+"- unit_price: el precio unitario original"
msgctxt "model:ir.action,name:act_promotion_form"
msgid "Promotions"
-msgstr ""
+msgstr "Promociones"
msgctxt "model:ir.action,name:act_promotion_relate"
msgid "Sale Promotions"
-msgstr ""
+msgstr "Promociones de Venta"
msgctxt "model:ir.ui.menu,name:menu_promotion"
msgid "Promotions"
-msgstr ""
+msgstr "Promociones"
msgctxt "model:sale.promotion,name:"
msgid "Sale Promotion"
-msgstr ""
+msgstr "Promoción de Venta"
msgctxt "model:sale.promotion-product.product,name:"
msgid "Sale Promotion - Product"
-msgstr ""
+msgstr "Promoción de Venta - Producto"
msgctxt "view:sale.promotion:"
msgid "Sale Promotion"
-msgstr ""
+msgstr "Promoción de Venta"
msgctxt "view:sale.promotion:"
msgid "Sale Promotions"
-msgstr ""
+msgstr "Promociones de Venta"
diff --git a/locale/es_CO.po b/locale/lo_LA.po
similarity index 100%
copy from locale/es_CO.po
copy to locale/lo_LA.po
diff --git a/locale/es_CO.po b/locale/zh_CN.po
similarity index 100%
copy from locale/es_CO.po
copy to locale/zh_CN.po
diff --git a/tryton.cfg b/tryton.cfg
index 5a33608..56fbb71 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
company
ir
diff --git a/trytond_sale_promotion.egg-info/PKG-INFO b/trytond_sale_promotion.egg-info/PKG-INFO
index 154086a..930d4c4 100644
--- a/trytond_sale_promotion.egg-info/PKG-INFO
+++ b/trytond_sale_promotion.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-promotion
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for sale promotion
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_promotion.egg-info/SOURCES.txt b/trytond_sale_promotion.egg-info/SOURCES.txt
index 4bbc12b..306dd97 100644
--- a/trytond_sale_promotion.egg-info/SOURCES.txt
+++ b/trytond_sale_promotion.egg-info/SOURCES.txt
@@ -17,11 +17,13 @@ setup.py
./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/scenario_sale_promotion.rst
./tests/test_sale_promotion.py
diff --git a/trytond_sale_promotion.egg-info/requires.txt b/trytond_sale_promotion.egg-info/requires.txt
index 1d2150d..86772c8 100644
--- a/trytond_sale_promotion.egg-info/requires.txt
+++ b/trytond_sale_promotion.egg-info/requires.txt
@@ -4,4 +4,4 @@ trytond_product >= 4.0, < 4.1
trytond_product_price_list >= 4.0, < 4.1
trytond_sale >= 4.0, < 4.1
trytond_sale_price_list >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 3a797fc42f5b15d7b9bf58f27baad5deea0949a5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:17 2016 +0200
Merging upstream version 4.0.0.
diff --git a/PKG-INFO b/PKG-INFO
index 46398a8..56174f1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_promotion
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for sale promotion
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_sale_promotion
======================
@@ -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/sale.py b/sale.py
index 577b40f..43095a1 100644
--- a/sale.py
+++ b/sale.py
@@ -15,10 +15,10 @@ from trytond.modules.product import price_digits
__all__ = ['Sale', 'SaleLine',
'SalePromotion', 'SalePromotion_Product']
-__metaclass__ = PoolMeta
class Sale:
+ __metaclass__ = PoolMeta
__name__ = 'sale.sale'
@classmethod
@@ -66,6 +66,7 @@ class Sale:
class SaleLine:
+ __metaclass__ = PoolMeta
__name__ = 'sale.line'
draft_unit_price = fields.Numeric('Draft Unit Price',
diff --git a/setup.py b/setup.py
index 1d97ad3..5e2de3d 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 = ['simpleeval']
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'))
@@ -81,6 +87,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',
@@ -94,6 +101,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',
@@ -110,4 +120,8 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=[
+ 'tests/scenario_sale_promotion.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 1d3e89f..a55c6a6 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_sale_promotion import suite
+try:
+ from trytond.modules.sale_promotion.tests.test_sale_promotion import suite
+except ImportError:
+ from .test_sale_promotion import suite
__all__ = ['suite']
diff --git a/tests/scenario_sale_promotion.rst b/tests/scenario_sale_promotion.rst
index c0bc44f..020a26b 100644
--- a/tests/scenario_sale_promotion.rst
+++ b/tests/scenario_sale_promotion.rst
@@ -4,6 +4,7 @@ Sale Promotion Scenario
Imports::
+ >>> import datetime
>>> from decimal import Decimal
>>> from proteus import config, Model, Wizard
>>> from trytond.modules.company.tests.tools import create_company, \
@@ -55,7 +56,7 @@ Create products::
>>> template.default_uom = unit
>>> template.type = 'goods'
>>> template.salable = True
- >>> template.delivery_time = 0
+ >>> template.lead_time = datetime.timedelta(0)
>>> template.list_price = Decimal('20')
>>> template.cost_price = Decimal('8')
>>> template.account_revenue = revenue
diff --git a/tests/test_sale_promotion.py b/tests/test_sale_promotion.py
index b2f10af..bffeb3d 100644
--- a/tests/test_sale_promotion.py
+++ b/tests/test_sale_promotion.py
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class SalePromotionTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
SalePromotionTestCase))
suite.addTests(doctest.DocFileSuite('scenario_sale_promotion.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index c54b814..5a33608 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
company
ir
diff --git a/trytond_sale_promotion.egg-info/PKG-INFO b/trytond_sale_promotion.egg-info/PKG-INFO
index e0aa74e..154086a 100644
--- a/trytond_sale_promotion.egg-info/PKG-INFO
+++ b/trytond_sale_promotion.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-promotion
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for sale promotion
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_sale_promotion
======================
@@ -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_sale_promotion.egg-info/requires.txt b/trytond_sale_promotion.egg-info/requires.txt
index 893c9f8..1d2150d 100644
--- a/trytond_sale_promotion.egg-info/requires.txt
+++ b/trytond_sale_promotion.egg-info/requires.txt
@@ -1,7 +1,7 @@
simpleeval
-trytond_company >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond_product_price_list >= 3.8, < 3.9
-trytond_sale >= 3.8, < 3.9
-trytond_sale_price_list >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond_product_price_list >= 4.0, < 4.1
+trytond_sale >= 4.0, < 4.1
+trytond_sale_price_list >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-sale-promotion
More information about the tryton-debian-vcs
mailing list