Commit 37aee083 authored by Mathias Behrle's avatar Mathias Behrle

Merging upstream version 4.6.0.

parent 8945abca
clone:
hg:
image: plugins/hg
pipeline:
tox:
image: ${IMAGE}
environment:
- CFLAGS=-O0
- DB_CACHE=/cache
- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
commands:
- pip install tox
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
services:
postgresql:
image: postgres
when:
matrix:
DATABASE: postgresql
matrix:
include:
- IMAGE: python:2.7
TOXENV: py27
DATABASE: sqlite
- IMAGE: python:2.7
TOXENV: py27
DATABASE: postgresql
- IMAGE: python:3.4
TOXENV: py34
DATABASE: sqlite
- IMAGE: python:3.4
TOXENV: py34
DATABASE: postgresql
- IMAGE: python:3.5
TOXENV: py35
DATABASE: sqlite
- IMAGE: python:3.5
TOXENV: py35
DATABASE: postgresql
- IMAGE: python:3.6
TOXENV: py36
DATABASE: sqlite
- IMAGE: python:3.6
TOXENV: py36
DATABASE: postgresql
Version 4.4.1 - 2017-08-08
Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
Version 4.4.0 - 2017-05-01
......
......@@ -6,7 +6,7 @@ include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
include *.odt
include *.fodt
include locale/*.po
include doc/*
include tests/*.rst
Metadata-Version: 1.1
Name: trytond_account_asset
Version: 4.4.1
Version: 4.6.0
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker@tryton.org
License: GPL-3
Download-URL: http://downloads.tryton.org/4.4/
Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_account_asset
=====================
......@@ -69,9 +69,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 :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
......
......@@ -194,7 +194,7 @@
<field name="name">Depreciation Table</field>
<field name="model">account.asset</field>
<field name="report_name">account.asset.depreciation_table</field>
<field name="report">account_asset/asset_table.odt</field>
<field name="report">account_asset/asset_table.fodt</field>
</record>
<record model="ir.ui.view"
id="print_depreciation_table_start_view_form">
......
This diff is collapsed.
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -100,10 +100,9 @@ msgctxt "field:account.asset,quantity:"
msgid "Quantity"
msgstr "Количество"
#, fuzzy
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Условие за плащане"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -177,10 +176,9 @@ msgctxt "field:account.asset-update-account.move,move:"
msgid "Move"
msgstr "Движение"
#, fuzzy
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Условие за плащане"
msgid "Record Name"
msgstr ""
#, fuzzy
msgctxt "field:account.asset-update-account.move,write_date:"
......@@ -252,10 +250,9 @@ msgctxt "field:account.asset.line,move:"
msgid "Account Move"
msgstr "Движение по сметка"
#, fuzzy
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Условие за плащане"
msgid "Record Name"
msgstr ""
#, fuzzy
msgctxt "field:account.asset.line,write_date:"
......@@ -359,10 +356,9 @@ msgctxt "field:account.configuration.asset_sequence,id:"
msgid "ID"
msgstr "ID"
#, fuzzy
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Условие за плащане"
msgid "Record Name"
msgstr ""
#, fuzzy
msgctxt "field:account.configuration.asset_sequence,write_date:"
......@@ -387,18 +383,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
msgstr ""
......@@ -411,18 +399,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr ""
......@@ -435,18 +415,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr ""
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -88,8 +88,8 @@ msgid "Quantity"
msgstr "Quantitat"
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom del registre"
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -152,8 +152,8 @@ msgid "Move"
msgstr "Assentament"
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom del registre"
msgctxt "field:account.asset-update-account.move,write_date:"
msgid "Write Date"
......@@ -216,8 +216,8 @@ msgid "Account Move"
msgstr "Assentament comptable"
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom del registre"
msgctxt "field:account.asset.line,write_date:"
msgid "Write Date"
......@@ -308,8 +308,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom del registre"
msgctxt "field:account.configuration.asset_sequence,write_date:"
msgid "Write Date"
......@@ -331,18 +331,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actiu utilitzat"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortització"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
......@@ -355,18 +347,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actiu utilitzat"
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortització"
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortitzable"
......@@ -379,18 +363,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actiu utilitzat"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortització"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr "Amortitzable"
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -86,10 +86,9 @@ msgctxt "field:account.asset,quantity:"
msgid "Quantity"
msgstr ""
#, fuzzy
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Namu"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -151,10 +150,9 @@ msgctxt "field:account.asset-update-account.move,move:"
msgid "Move"
msgstr ""
#, fuzzy
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Namu"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset-update-account.move,write_date:"
msgid "Write Date"
......@@ -216,10 +214,9 @@ msgctxt "field:account.asset.line,move:"
msgid "Account Move"
msgstr ""
#, fuzzy
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Namu"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset.line,write_date:"
msgid "Write Date"
......@@ -309,10 +306,9 @@ msgctxt "field:account.configuration.asset_sequence,id:"
msgid "ID"
msgstr ""
#, fuzzy
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Namu"
msgid "Record Name"
msgstr ""
msgctxt "field:account.configuration.asset_sequence,write_date:"
msgid "Write Date"
......@@ -334,18 +330,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
msgstr ""
......@@ -358,18 +346,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr ""
......@@ -382,18 +362,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr ""
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr ""
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr ""
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr ""
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -88,8 +88,8 @@ msgid "Quantity"
msgstr "Menge"
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -152,8 +152,8 @@ msgid "Move"
msgstr "Buchungssatz"
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset-update-account.move,write_date:"
msgid "Write Date"
......@@ -216,8 +216,8 @@ msgid "Account Move"
msgstr "Buchungssatz"
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset.line,write_date:"
msgid "Write Date"
......@@ -308,8 +308,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.configuration.asset_sequence,write_date:"
msgid "Write Date"
......@@ -331,18 +331,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr "Verwendetes Anlagenkonto"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr "Abschreibungskonto"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
......@@ -355,18 +347,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Verwendetes Anlagenkonto"
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Abschreibungskonto"
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Abschreibungsfähig"
......@@ -379,18 +363,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr "Verwendetes Anlagenkonto"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr "Abschreibungskonto"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr "Abschreibungsfähig"
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -89,8 +89,8 @@ msgid "Quantity"
msgstr "Cantidad"
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Nombre"
msgid "Record Name"
msgstr "Nombre del registro"
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -153,8 +153,8 @@ msgid "Move"
msgstr "Asiento"
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Nombre"
msgid "Record Name"
msgstr "Nombre del registro"
msgctxt "field:account.asset-update-account.move,write_date:"
msgid "Write Date"
......@@ -217,8 +217,8 @@ msgid "Account Move"
msgstr "Asiento contable"
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Nombre"
msgid "Record Name"
msgstr "Nombre del registro"
msgctxt "field:account.asset.line,write_date:"
msgid "Write Date"
......@@ -309,8 +309,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Nombre"
msgid "Record Name"
msgstr "Nombre del registro"
msgctxt "field:account.configuration.asset_sequence,write_date:"
msgid "Write Date"
......@@ -332,18 +332,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de amortización"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
......@@ -356,18 +348,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de amortización"
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortizable"
......@@ -380,18 +364,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de amortización"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr "Amortizable"
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -87,7 +87,7 @@ msgid "Quantity"
msgstr ""
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset,residual_value:"
......@@ -151,7 +151,7 @@ msgid "Move"
msgstr ""
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset-update-account.move,write_date:"
......@@ -215,7 +215,7 @@ msgid "Account Move"
msgstr ""
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.asset.line,write_date:"
......@@ -308,7 +308,7 @@ msgid "ID"
msgstr ""
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgid "Record Name"
msgstr ""
msgctxt "field:account.configuration.asset_sequence,write_date:"
......@@ -331,18 +331,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo fijo"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo fijo utilizada"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de depreciación"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
#, fuzzy
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"
......@@ -358,19 +350,10 @@ msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo fijo"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo fijo utilizada"
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de depreciación"
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Depreciable"
......@@ -383,18 +366,10 @@ msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo fijo"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo fijo"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de depreciación"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
msgstr "Depreciable"
......
#
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
......@@ -89,8 +89,8 @@ msgid "Quantity"
msgstr "Quantité"
msgctxt "field:account.asset,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom de l'enregistrement"
msgctxt "field:account.asset,residual_value:"
msgid "Residual Value"
......@@ -153,8 +153,8 @@ msgid "Move"
msgstr "Mouvement"
msgctxt "field:account.asset-update-account.move,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom de l'enregistrement"
msgctxt "field:account.asset-update-account.move,write_date:"
msgid "Write Date"
......@@ -217,8 +217,8 @@ msgid "Account Move"
msgstr "Mouvement comptable"
msgctxt "field:account.asset.line,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom de l'enregistrement"
msgctxt "field:account.asset.line,write_date:"
msgid "Write Date"
......@@ -309,8 +309,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.configuration.asset_sequence,rec_name:"
msgid "Name"
msgstr "Nom"
msgid "Record Name"
msgstr "Nom de l'enregistrement"
msgctxt "field:account.configuration.asset_sequence,write_date:"
msgid "Write Date"
......@@ -332,18 +332,10 @@ msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actif"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actif utilisé"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortissement"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortissement utilisé"
msgctxt "field:product.category.account,account_asset:"
msgid "Account Asset"