Commit 392a6043 authored by Mathias Behrle's avatar Mathias Behrle

Merging upstream version 4.0.1.

parent 031a12d9
Version 4.0.1 - 2016-05-11
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Rename Asset reference into number
......
Metadata-Version: 1.1
Name: trytond_account_asset
Version: 4.0.0
Version: 4.0.1
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
......
......@@ -528,25 +528,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
msgctxt "report:account.asset.depreciation_table:"
msgid "Actual Value"
......
......@@ -73,7 +73,7 @@ msgstr "Assentament comptable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Número"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -311,32 +311,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actiu utilitzat"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortització"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortitzable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durada de l'amortització"
......@@ -373,7 +367,6 @@ msgstr ""
"La data ha d'estar compresa entre l'últim dia de la data de "
"amortització/actualització i la següent data de amortització."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En mesos"
......@@ -648,7 +641,7 @@ msgstr "Actiu"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Seqüència"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -468,25 +468,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
msgctxt "report:account.asset.depreciation_table:"
msgid "Actual Value"
......
......@@ -73,7 +73,7 @@ msgstr "Buchungssatz"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Nummer"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -311,32 +311,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Verwendetes Anlagenkonto"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Abschreibungskonto"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Abschreibungsfähig"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Abschreibungsdauer"
......@@ -373,7 +367,6 @@ msgstr ""
"Das Datum muss zwischen dem letztem Aktualisierungs- bzw Abschreibungsdatum "
"und dem nächsten Abschreibungsdatum liegen."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "In Monaten"
......@@ -648,7 +641,7 @@ msgstr "Anlage"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Nummernkreis"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -73,7 +73,7 @@ msgstr "Asiento contable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Número"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -311,32 +311,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de amortización"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortizable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la amortización"
......@@ -373,7 +367,6 @@ msgstr ""
"La fecha debe estar entre la última fecha de actualización/amortización y la"
" siguiente fecha de amortización."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En meses"
......@@ -648,7 +641,7 @@ msgstr "Activo"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Secuencia"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -4,19 +4,21 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.asset:"
msgid "Asset \"%s\" must be in draft to be deleted."
msgstr ""
msgstr "El activo fijo \"%s\" debe estar en borrador para ser eliminado."
msgctxt "error:account.asset:"
msgid "Supplier Invoice Line can be used only once on asset."
msgstr ""
"La línea de factura de proveedor puede ser usada una sola vez en activos "
"fijos."
msgctxt "error:account.invoice.line:"
msgid "Asset can be used only once on invoice line!"
msgstr "El activo solo puede ser usado una vez en línea de factura!"
msgstr "El activo fijo solo puede ser usado una vez en línea de factura!"
msgctxt "error:purchase.line:"
msgid "It misses an \"Account Asset\" on product \"%s\"."
msgstr ""
msgstr "Falta la \"Cuenta de Activo Fijo\" en el producto \"%s\"."
msgctxt "field:account.asset,account_journal:"
msgid "Journal"
......@@ -48,7 +50,7 @@ msgstr "Línea de Factura de Cliente"
msgctxt "field:account.asset,depreciation_method:"
msgid "Depreciation Method"
msgstr "Método de la Depreciación"
msgstr "Método de Depreciación"
msgctxt "field:account.asset,end_date:"
msgid "End Date"
......@@ -72,7 +74,7 @@ msgstr "Asiento Contable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Número"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -226,17 +228,14 @@ msgctxt "field:account.asset.line,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
#, fuzzy
msgctxt "field:account.asset.print_depreciation_table.start,end_date:"
msgid "End Date"
msgstr "Fecha Final"
#, fuzzy
msgctxt "field:account.asset.print_depreciation_table.start,id:"
msgid "ID"
msgstr "ID"
#, fuzzy
msgctxt "field:account.asset.print_depreciation_table.start,start_date:"
msgid "Start Date"
msgstr "Fecha de Inicio"
......@@ -313,32 +312,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de Depreciación Usada"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de Activos"
msgstr "Cuenta de Activo Fijo"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de Activos Usada"
msgstr "Cuenta de Activo Fijo Usada"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de Depreciación"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de Depreciación Usada"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Depreciable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la Depreciación"
......@@ -375,10 +368,9 @@ msgstr ""
"La fecha debe estar entre la ultima fecha de actualización/depreciación y la"
" siguiente fecha de depreciación."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En meses."
msgstr "En meses"
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
......@@ -402,7 +394,7 @@ msgstr "Línea de Activo"
msgctxt "model:account.asset.print_depreciation_table.start,name:"
msgid "Asset Depreciation Table Start"
msgstr ""
msgstr "Tabla de Depreciación de Activo"
msgctxt "model:account.asset.update.show_depreciation,name:"
msgid "Update Asset Show Depreciation"
......@@ -426,7 +418,7 @@ msgstr "Activos Fijos"
msgctxt "model:ir.action,name:report_depreciation_table"
msgid "Depreciation Table"
msgstr ""
msgstr "Tabla de Depreciación"
msgctxt "model:ir.action,name:wizard_create_moves"
msgid "Create Assets Moves"
......@@ -434,7 +426,7 @@ msgstr "Crear Asiento de Activos Fijos"
msgctxt "model:ir.action,name:wizard_print_depreciation_table"
msgid "Print Depreciation Table"
msgstr ""
msgstr "Imprimir Tabla de Depreciación"
msgctxt "model:ir.action,name:wizard_update"
msgid "Update Asset"
......@@ -474,7 +466,7 @@ msgstr "Activos Fijos"
msgctxt "model:ir.ui.menu,name:menu_create_depreciation_table"
msgid "Print Depreciation Table"
msgstr ""
msgstr "Imprimir Tabla de Depreciación"
msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
......@@ -482,23 +474,23 @@ msgstr "Crear Asiento de Activos Fijos"
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
msgstr "+"
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
msgctxt "report:account.asset.depreciation_table:"
msgid "Actual Value"
......@@ -506,11 +498,11 @@ msgstr "Valor Actual"
msgctxt "report:account.asset.depreciation_table:"
msgid "Amortization"
msgstr ""
msgstr "Amortización"
msgctxt "report:account.asset.depreciation_table:"
msgid "Amortization Table"
msgstr ""
msgstr "Tabla de Amortización"
msgctxt "report:account.asset.depreciation_table:"
msgid "Assets"
......@@ -518,40 +510,39 @@ msgstr "Activos Fijos"
msgctxt "report:account.asset.depreciation_table:"
msgid "Closing Value"
msgstr ""
msgstr "Valor de Cierre"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "Company:"
msgstr "Compañía"
msgstr "Compañía:"
msgctxt "report:account.asset.depreciation_table:"
msgid "Fixed"
msgstr ""
msgstr "Fijo"
msgctxt "report:account.asset.depreciation_table:"
msgid "From:"
msgstr ""
msgstr "Desde:"
msgctxt "report:account.asset.depreciation_table:"
msgid "Print Date:"
msgstr ""
msgstr "Fecha de Impresión:"
msgctxt "report:account.asset.depreciation_table:"
msgid "To:"
msgstr ""
msgstr "A:"
msgctxt "report:account.asset.depreciation_table:"
msgid "Total -"
msgstr ""
msgstr "Total -"
msgctxt "report:account.asset.depreciation_table:"
msgid "User:"
msgstr ""
msgstr "Usuario:"
msgctxt "report:account.asset.depreciation_table:"
msgid "at"
msgstr ""
msgstr "a"
msgctxt "selection:account.asset,depreciation_method:"
msgid "Linear"
......@@ -595,7 +586,7 @@ msgstr "Líneas de Activo"
msgctxt "view:account.asset.print_depreciation_table.start:"
msgid "Choose Dates"
msgstr ""
msgstr "Fechas Seleccionadas"
msgctxt "view:account.asset.update.show_depreciation:"
msgid "Asset Depreciation Move"
......@@ -651,7 +642,7 @@ msgstr "Activo Fijo"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Secuencia"
msgctxt "view:product.template:"
msgid "Depreciation"
......@@ -665,12 +656,10 @@ msgctxt "wizard_button:account.asset.create_moves,start,end:"
msgid "Cancel"
msgstr "Cancelar"
#, fuzzy
msgctxt "wizard_button:account.asset.print_depreciation_table,start,end:"
msgid "Cancel"
msgstr "Cancelar"
#, fuzzy
msgctxt "wizard_button:account.asset.print_depreciation_table,start,print_:"
msgid "Print"
msgstr "Imprimir"
......
......@@ -74,7 +74,7 @@ msgstr "Asiento contable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Número"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -312,32 +312,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de depreciación"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortizable"
msgstr "Depreciable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la depreciación"
......@@ -374,7 +368,6 @@ msgstr ""
"La fecha debe estar entre la última fecha de actualización/depreciación y la"
" siguiente fecha de depreciación."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En meses"
......@@ -649,7 +642,7 @@ msgstr "Activo"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Secuencia"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -74,7 +74,7 @@ msgstr "Asiento contable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Número"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -312,32 +312,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Cuenta de activo utilizada"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Cuenta de amortización"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Amortizable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la amortización"
......@@ -374,7 +368,6 @@ msgstr ""
"La fecha debe estar comprendida entre el último día de la fecha de "
"amortización/actualización y la siguiente fecha de amortización."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En meses"
......@@ -649,7 +642,7 @@ msgstr "Activo"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Secuencia"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -479,25 +479,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr "Crear asientos de activo"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
......
......@@ -74,7 +74,7 @@ msgstr "Mouvement comptable"
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr ""
msgstr "Numéro"
msgctxt "field:account.asset,product:"
msgid "Product"
......@@ -312,32 +312,26 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortissement utilisé"
#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actif"
#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
msgstr "Compte d'actif utilisé"
#, fuzzy
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
msgstr "Compte d'amortissement"
#, fuzzy
msgctxt "field:product.product,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortissement utilisé"
#, fuzzy
msgctxt "field:product.product,depreciable:"
msgid "Depreciable"
msgstr "Dépréciable"
msgstr "Amortissable"
#, fuzzy
msgctxt "field:product.product,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durée d'amortissement"
......@@ -374,7 +368,6 @@ msgstr ""
"La date doit être comprise entre la dernière date de mise à "
"jour/d'amortissement et la prochaine date d'amortissement."
#, fuzzy
msgctxt "help:product.product,depreciation_duration:"
msgid "In months"
msgstr "En mois"
......@@ -649,7 +642,7 @@ msgstr "Actif"
msgctxt "view:account.configuration:"
msgid "Sequence"
msgstr ""
msgstr "Séquence"
msgctxt "view:product.template:"
msgid "Depreciation"
......
......@@ -468,25 +468,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
msgctxt "report:account.asset.depreciation_table:"
msgid "Actual Value"
......
......@@ -468,25 +468,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "("
msgstr ""
msgstr "("
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid ")"
msgstr ""
msgstr ")"
msgctxt "report:account.asset.depreciation_table:"
msgid "+"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "-"
msgstr ""
msgstr "-"
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"
msgid "/"
msgstr ""
msgstr "/"
msgctxt "report:account.asset.depreciation_table:"
msgid "Actual Value"
......
......@@ -468,25 +468,29 @@ msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
msgstr ""
#, fuzzy
msgctxt "report:account.asset.depreciation_table:"