[tryton-debian-vcs] tryton-modules-product-cost-history branch debian updated. debian/3.4.1-1-2-g277e006
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:04:49 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-cost-history.git;a=commitdiff;h=debian/3.4.1-1-2-g277e006
commit 277e006990ec2f986f86bf206d0f2b05b3d02915
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:01 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3ea2623..6ce7926 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-22
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fcb8a54..249e792 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_cost_history
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to historize product cost
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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_product_cost_history
============================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 30f67ce..c97aa3e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.pool import Pool
from .ir import *
diff --git a/ir.py b/ir.py
index e5f9ccb..c22efca 100644
--- a/ir.py
+++ b/ir.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.pool import PoolMeta
__all__ = ['Property']
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8a63208..cf05bf5 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -53,3 +53,7 @@ msgstr "Historial de costos de producte"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Historial de costos de producte"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Temps"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3c57855..25d611c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -53,3 +53,7 @@ msgstr "Historie Kostenpreis Artikel"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Kostenpreis Artikel Historie"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Zeit"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 8853865..b6f28e4 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -53,3 +53,7 @@ msgstr "Histórico de costo de producto"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Costo histórico de producto"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Tiempo"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c7d2285..fba679d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -53,3 +53,7 @@ msgstr "Costos Históricos"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Costo Histórico de Producto"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Tiempo"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 29c7f0c..5f0f99b 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product.cost_history,cost_price:"
msgid "Cost Price"
-msgstr "Precio de Costo"
+msgstr "Precio de costo"
msgctxt "field:product.product.cost_history,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:product.product.cost_history,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:product.product.cost_history,date:"
msgid "Date"
@@ -32,24 +32,28 @@ msgstr "Producto"
msgctxt "field:product.product.cost_history,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:product.product.cost_history,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "model:ir.action,name:act_product_cost_history_form"
msgid "Product Cost History"
-msgstr "Historial de Costos de Producto"
+msgstr "Historial de costos de producto"
msgctxt "model:ir.action,name:wizard_product_cost_history_open"
msgid "Cost History"
-msgstr "Historial de Costos"
+msgstr "Historial de costos"
msgctxt "model:product.product.cost_history,name:"
msgid "History of Product Cost"
-msgstr "Historial de Costos de Producto"
+msgstr "Historial de costos de producto"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
-msgstr "Historial de Costos de Producto"
+msgstr "Historial de costos de producto"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Tiempo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 714283f..a2efe47 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -53,3 +53,7 @@ msgstr "Historial de costes de producto"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Historial de costes de producto"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Tiempo"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index db222a1..4ec825f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -53,3 +53,7 @@ msgstr "Historique du coût du produit"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Historique du coût du produit"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Heure"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index dc28b52..3db8659 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -53,3 +53,7 @@ msgstr "Zgodovina cen izdelka"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
msgstr "Zgodovina cen izdelka"
+
+msgctxt "view:product.product.cost_history:"
+msgid "Time"
+msgstr "Čas"
diff --git a/product.py b/product.py
index 489e079..6c811aa 100644
--- a/product.py
+++ b/product.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 sql import Column
from sql.aggregate import Max
from sql.conditionals import Coalesce
diff --git a/setup.py b/setup.py
index 7f9e377..0e678b6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/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.
+# 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 setuptools import setup
import re
@@ -85,6 +85,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index b651e41..cc4c289 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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_product_cost_history import suite
diff --git a/tests/test_product_cost_history.py b/tests/test_product_cost_history.py
index 0572fd9..b598c53 100644
--- a/tests/test_product_cost_history.py
+++ b/tests/test_product_cost_history.py
@@ -1,23 +1,13 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class ProductCostHistoryTestCase(unittest.TestCase):
+class ProductCostHistoryTestCase(ModuleTestCase):
'Test ProductCostHistory module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('product_cost_history')
-
- def test0005views(self):
- 'Test views'
- test_view('product_cost_history')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'product_cost_history'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 3df795e..7bb4e02 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
product
diff --git a/trytond_product_cost_history.egg-info/PKG-INFO b/trytond_product_cost_history.egg-info/PKG-INFO
index db18dd3..7416222 100644
--- a/trytond_product_cost_history.egg-info/PKG-INFO
+++ b/trytond_product_cost_history.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-cost-history
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to historize product cost
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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_product_cost_history
============================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_product_cost_history.egg-info/requires.txt b/trytond_product_cost_history.egg-info/requires.txt
index 2391ea2..dbf353e 100644
--- a/trytond_product_cost_history.egg-info/requires.txt
+++ b/trytond_product_cost_history.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/product_cost_history_tree.xml b/view/product_cost_history_tree.xml
index 90fbf3f..84a1ffc 100644
--- a/view/product_cost_history_tree.xml
+++ b/view/product_cost_history_tree.xml
@@ -3,6 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<tree string="Product Cost History">
<field name="template"/>
- <field name="date"/>
+ <field name="date" widget="date"/>
+ <field name="date" widget="time" string="Time"/>
<field name="cost_price"/>
</tree>
--
tryton-modules-product-cost-history
More information about the tryton-debian-vcs
mailing list