[tryton-debian-vcs] tryton-modules-timesheet-cost branch upstream-3.0 updated. upstream/3.0.1-1-gfa7dbf3

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:06:43 UTC 2015


The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet-cost.git;a=commitdiff;h=upstream/3.0.1-1-gfa7dbf3

commit fa7dbf3dc456cbd5dba80cd39404844fe1ec463c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:16:52 2015 +0100

    Adding upstream version 3.0.2.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index be7289e..0753c92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2015-02-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.1 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cf5f3f9..0634fbe 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2013 Cédric Krier.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2015 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 c664541..724a750 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_timesheet_cost
-Version: 3.0.1
+Version: 3.0.2
 Summary: Tryton module to add cost on timesheet
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tests/test_timesheet_cost.py b/tests/test_timesheet_cost.py
index ab24c60..a31ed32 100644
--- a/tests/test_timesheet_cost.py
+++ b/tests/test_timesheet_cost.py
@@ -10,6 +10,7 @@ if os.path.isdir(DIR):
     sys.path.insert(0, os.path.dirname(DIR))
 
 import unittest
+import doctest
 import datetime
 from decimal import Decimal
 
@@ -83,7 +84,7 @@ def suite():
     suite = trytond.tests.test_tryton.suite()
     from trytond.modules.company.tests import test_company
     for test in test_company.suite():
-        if test not in suite:
+        if test not in suite and not isinstance(test, doctest.DocTestCase):
             suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         TimesheetCostTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 886d243..c5e854d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.1
+version=3.0.2
 depends:
     ir
     company
diff --git a/trytond_timesheet_cost.egg-info/PKG-INFO b/trytond_timesheet_cost.egg-info/PKG-INFO
index f72a5d7..7bc3f6c 100644
--- a/trytond_timesheet_cost.egg-info/PKG-INFO
+++ b/trytond_timesheet_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-timesheet-cost
-Version: 3.0.1
+Version: 3.0.2
 Summary: Tryton module to add cost on timesheet
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_timesheet_cost.egg-info/SOURCES.txt b/trytond_timesheet_cost.egg-info/SOURCES.txt
index 79fd4fa..bbf1d87 100644
--- a/trytond_timesheet_cost.egg-info/SOURCES.txt
+++ b/trytond_timesheet_cost.egg-info/SOURCES.txt
@@ -9,9 +9,25 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./company.py
+./company.xml
 ./timesheet.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
 ./tests/test_timesheet_cost.py
+./view/employee_cost_price_form.xml
+./view/employee_cost_price_tree.xml
+./view/employee_form.xml
 locale/bg_BG.po
 locale/ca_ES.po
 locale/cs_CZ.po
-- 
tryton-modules-timesheet-cost



More information about the tryton-debian-vcs mailing list