[tryton-debian-vcs] tryton-modules-account-asset branch upstream updated. upstream/3.6.0-1-gc8a74c2

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=upstream/3.6.0-1-gc8a74c2

commit c8a74c2583e748bfa256fd70c011a3c4416a2713
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:59:49 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 9d2dd32..14231ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/MANIFEST.in b/MANIFEST.in
index f2f691a..05c3f79 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include LICENSE
 include tryton.cfg
 include *.xml
 include view/*.xml
+include *.odt
 include locale/*.po
 include doc/*
 include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index b3ac05b..3907e0b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_asset
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/asset_table.odt b/asset_table.odt
new file mode 100644
index 0000000..2ae979e
Binary files /dev/null and b/asset_table.odt differ
diff --git a/setup.py b/setup.py
index 96565ff..9f765e4 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,8 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.account_asset': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst',
+                'asset_table.odt']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index d755180..2b2f577 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     ir
     res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index 587008d..fe5821a 100644
--- a/trytond_account_asset.egg-info/PKG-INFO
+++ b/trytond_account_asset.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-asset
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_asset.egg-info/SOURCES.txt b/trytond_account_asset.egg-info/SOURCES.txt
index a19e9ea..bb39b1b 100644
--- a/trytond_account_asset.egg-info/SOURCES.txt
+++ b/trytond_account_asset.egg-info/SOURCES.txt
@@ -6,6 +6,7 @@ MANIFEST.in
 README
 account.xml
 asset.xml
+asset_table.odt
 invoice.xml
 product.xml
 setup.py
@@ -15,6 +16,7 @@ tryton.cfg
 ./account.xml
 ./asset.py
 ./asset.xml
+./asset_table.odt
 ./invoice.py
 ./invoice.xml
 ./product.py
-- 
tryton-modules-account-asset