[tryton-debian-vcs] tryton-modules-account-stock-landed-cost branch debian updated. debian/3.8.0-2-5-g707faf2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:08:37 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-landed-cost.git;a=commitdiff;h=debian/3.8.0-2-5-g707faf2
commit 707faf20d3e9c8d35e0a56873717bdc2e21cafaf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:16 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 433cd0e..501e055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-stock-landed-cost (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:27:39 +0200
+
tryton-modules-account-stock-landed-cost (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 82ac602ac13fdcb12f6a4e39aaf9cb09d8931fcc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 30cf87b..41aa6a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2015 Cédric Krier
- 2015 B2CK SPRL
+Copyright: 2015-2016 Cédric Krier
+ 2015-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright: 2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2015-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 8bdde27bc3373b19711223b0978f88930c74109b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:12 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 60b9ab4..c8ccec4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+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 Landed Cost code into number
diff --git a/PKG-INFO b/PKG-INFO
index df12610..a50ca3d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_stock_landed_cost
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for landed cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 9361b40..9daebb9 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.configuration,landed_cost_sequence:"
msgid "Landed Cost Sequence"
-msgstr "Seqüència cost de recepció"
+msgstr "Seqüència de cost de recepció"
msgctxt "field:account.invoice.line,landed_cost:"
msgid "Landed Cost"
@@ -36,7 +36,7 @@ msgstr "Línies de factura"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Número"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Cost de recepció"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Comptabilitzats"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Cost de recepció"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 8ddfa4c..24f67b3 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -36,7 +36,7 @@ msgstr "Rechnungspositionen"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Nummer"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Einstandskosten"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Festgeschrieben"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Einstandskosten"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Nummernkreis"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index b4d95ab..f8c2865 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -36,7 +36,7 @@ msgstr "Líneas de factura"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Número"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Costo de recepción"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Confirmado"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Costo de recepción"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1ac7495..aeb56df 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,187 +4,187 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.configuration,landed_cost_sequence:"
msgid "Landed Cost Sequence"
-msgstr ""
+msgstr "Secuencia de Costo de Envío"
msgctxt "field:account.invoice.line,landed_cost:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
-msgstr ""
+msgstr "Método de Distibución"
msgctxt "field:account.landed_cost,company:"
msgid "Company"
-msgstr ""
+msgstr "Compañia"
msgctxt "field:account.landed_cost,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
msgctxt "field:account.landed_cost,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "field:account.landed_cost,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
-msgstr ""
+msgstr "Líneas de Factura"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Número"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
-msgstr ""
+msgstr "Fecha de Contabilización"
msgctxt "field:account.landed_cost,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
-msgstr ""
+msgstr "Envíos"
msgctxt "field:account.landed_cost,state:"
msgid "State"
-msgstr ""
+msgstr "Estado"
msgctxt "field:account.landed_cost,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:account.landed_cost,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:account.landed_cost-stock.shipment.in,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
msgctxt "field:account.landed_cost-stock.shipment.in,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "field:account.landed_cost-stock.shipment.in,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
-msgstr ""
+msgstr "Envío"
msgctxt "field:account.landed_cost-stock.shipment.in,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "field:stock.move,unit_landed_cost:"
msgid "Unit Landed Cost"
-msgstr ""
+msgstr "Unidad Costo de Envío"
msgctxt "model:account.landed_cost,name:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "model:account.landed_cost-stock.shipment.in,name:"
msgid "Landed Cost - Shipment"
-msgstr ""
+msgstr "Costo de Envío - Envíos"
msgctxt "model:ir.action,name:act_landed_cost_form"
msgid "Landed Costs"
-msgstr ""
+msgstr "Costos de Envío"
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "Todo"
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_draft"
msgid "Draft"
-msgstr ""
+msgstr "Borrador"
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_posted"
msgid "Posted"
-msgstr ""
+msgstr "Contabilización"
msgctxt "model:ir.sequence,name:sequence_landed_cost"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "model:ir.sequence.type,name:sequence_type_landed_cost"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "model:ir.ui.menu,name:menu_landed_cost"
msgid "Landed Costs"
-msgstr ""
+msgstr "Costos de Envío"
msgctxt "selection:account.landed_cost,allocation_method:"
msgid "By Value"
-msgstr ""
+msgstr "Por Valor"
msgctxt "selection:account.landed_cost,state:"
msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
msgctxt "selection:account.landed_cost,state:"
msgid "Draft"
-msgstr ""
+msgstr "Borrador"
msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
-msgstr ""
+msgstr "Contabilizado"
msgctxt "view:account.configuration:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
msgctxt "view:account.landed_cost:"
msgid "Draft"
-msgstr ""
+msgstr "Borrador"
msgctxt "view:account.landed_cost:"
msgid "Landed Cost"
-msgstr ""
+msgstr "Costo de Envío"
msgctxt "view:account.landed_cost:"
msgid "Landed Costs"
-msgstr ""
+msgstr "Costos de Envío"
msgctxt "view:account.landed_cost:"
msgid "Post"
-msgstr ""
+msgstr "Contabilizar"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 07f3fbd..d39b3c0 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -36,7 +36,7 @@ msgstr "Líneas de factura"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Número"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Modificado por usuario"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Costo de recepción"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Contabilizado"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Costo de recepción"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 6215026..6a12694 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.configuration,landed_cost_sequence:"
msgid "Landed Cost Sequence"
-msgstr "Secuencia coste de recepción"
+msgstr "Secuencia de coste de recepción"
msgctxt "field:account.invoice.line,landed_cost:"
msgid "Landed Cost"
@@ -36,7 +36,7 @@ msgstr "Líneas de factura"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Número"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Coste de recepción"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Contabilizados"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Coste de recepción"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c8212cd..a72ff98 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -36,7 +36,7 @@ msgstr "Lignes de facture"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Numéro"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Coût de débarquement"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Posté"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Coût de débarquement"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index cdec854..2c2cdfb 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -36,7 +36,7 @@ msgstr "Postavke računov"
msgctxt "field:account.landed_cost,number:"
msgid "Number"
-msgstr ""
+msgstr "Številka"
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
@@ -94,7 +94,6 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-#, fuzzy
msgctxt "field:product.product,landed_cost:"
msgid "Landed Cost"
msgstr "Raztovor"
@@ -127,7 +126,7 @@ msgstr "Vse"
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_draft"
msgid "Draft"
-msgstr "V pripravi"
+msgstr "Priprava"
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_posted"
@@ -162,14 +161,13 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Knjiženo"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Landed Cost"
msgstr "Raztovor"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Štetje"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
diff --git a/tryton.cfg b/tryton.cfg
index 2cea8b3..f823f4b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
account
account_invoice
diff --git a/trytond_account_stock_landed_cost.egg-info/PKG-INFO b/trytond_account_stock_landed_cost.egg-info/PKG-INFO
index 60697c4..9258d6a 100644
--- a/trytond_account_stock_landed_cost.egg-info/PKG-INFO
+++ b/trytond_account_stock_landed_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-stock-landed-cost
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for landed cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
index d73ca7c..10571cf 100644
--- a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
+++ b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
@@ -28,11 +28,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_account_stock_landed_cost.rst
./tests/test_account_stock_landed_cost.py
diff --git a/trytond_account_stock_landed_cost.egg-info/requires.txt b/trytond_account_stock_landed_cost.egg-info/requires.txt
index 5d6025b..435ef6b 100644
--- a/trytond_account_stock_landed_cost.egg-info/requires.txt
+++ b/trytond_account_stock_landed_cost.egg-info/requires.txt
@@ -2,4 +2,4 @@ trytond_account >= 4.0, < 4.1
trytond_account_invoice >= 4.0, < 4.1
trytond_product >= 4.0, < 4.1
trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit b4291cbe0b4d099087f898fe94be1899041bd90e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:53 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 11180c5..60b9ab4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Rename Landed Cost code into number
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 7aea85f..be9339f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2015 Cédric Krier.
-Copyright (C) 2015 B2CK SPRL.
+Copyright (C) 2015-2016 Cédric Krier.
+Copyright (C) 2015-2016 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 b92f2d5..df12610 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_landed_cost
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for landed 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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_stock_landed_cost
=================================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,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 :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 94e680c..7e2ac4c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,6 +10,7 @@ from .stock import *
def register():
Pool.register(
Template,
+ Product,
Configuration,
LandedCost,
LandedCost_Shipment,
diff --git a/account.py b/account.py
index a697c58..6470aa4 100644
--- a/account.py
+++ b/account.py
@@ -7,6 +7,7 @@ from trytond.model import ModelSQL, ModelView, Workflow, fields
from trytond.pool import Pool, PoolMeta
from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond import backend
__all__ = ['Configuration', 'LandedCost', 'LandedCost_Shipment', 'InvoiceLine']
@@ -25,8 +26,8 @@ class Configuration:
class LandedCost(Workflow, ModelSQL, ModelView):
'Landed Cost'
__name__ = 'account.landed_cost'
- _rec_name = 'code'
- code = fields.Char('Code', select=True, readonly=True)
+ _rec_name = 'number'
+ number = fields.Char('Number', select=True, readonly=True)
company = fields.Many2One('company.company', 'Company', required=True,
states={
'readonly': Eval('state') != 'draft',
@@ -52,7 +53,7 @@ class LandedCost(Workflow, ModelSQL, ModelView):
],
domain=[
('invoice.state', 'in', ['posted', 'paid']),
- ('invoice.type', '=', 'in_invoice'),
+ ('invoice.type', '=', 'in'),
('product.template.landed_cost', '=', True),
('type', '=', 'line'),
],
@@ -76,7 +77,7 @@ class LandedCost(Workflow, ModelSQL, ModelView):
super(LandedCost, cls).__setup__()
cls._order = [
- ('code', 'DESC'),
+ ('number', 'DESC'),
('id', 'DESC'),
]
cls._transitions |= set((
@@ -96,6 +97,17 @@ class LandedCost(Workflow, ModelSQL, ModelView):
},
})
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ table_h = TableHandler(cls, module_name)
+
+ # Migration from 3.8: rename code into number
+ if table_h.column_exist('code'):
+ table_h.column_rename('code', 'number')
+
+ super(LandedCost, cls).__register__(module_name)
+
@staticmethod
def default_company():
return Transaction().context.get('company')
@@ -235,7 +247,9 @@ class LandedCost(Workflow, ModelSQL, ModelView):
vlist = [v.copy() for v in vlist]
config = Config(1)
for values in vlist:
- values['code'] = Sequence.get_id(config.landed_cost_sequence.id)
+ if values.get('number') is None:
+ values['number'] = Sequence.get_id(
+ config.landed_cost_sequence.id)
return super(LandedCost, cls).create(vlist)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index fd79be5..1ac7495 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 1ad19f3..9361b40 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Mètode d'assignació"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Codi"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Empresa"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Línies de factura"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Data de comptabilització"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Cost de recepció"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Cost de recepció"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Comptabilitzats"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Cost de recepció"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Cancel·la"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index fd79be5..1ac7495 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 04c4ea8..8ddfa4c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Zuordnungsmethode"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Code"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Unternehmen"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Rechnungspositionen"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Festschreibungsdatum"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Einstandskosten"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Einstandskosten"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Festgeschrieben"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Einstandskosten"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Annullieren"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a1d2821..b4d95ab 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Método de asignación"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Código"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Empresa"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Fecha confirmación"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Costo de recepción"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Costo de recepción"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Confirmado"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Costo de recepción"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index fd79be5..1ac7495 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 555051f..07f3fbd 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Método de asignación"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Código"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Empresa"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Fecha de contabilización"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Modificado por usuario"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Costo de recepción"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Costo de recepción"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Contabilizado"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Costo de recepción"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1c7d51b..6215026 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Método de asignación"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Código"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Empresa"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Fecha contabilización"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Coste de recepción"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Coste de recepción"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Contabilizados"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Coste de recepción"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index fd79be5..1ac7495 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index a470987..c8212cd 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Méthode d'allocation"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Code"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Société"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Lignes de facture"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Date de postage"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Coût de débarquement"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Coût de débarquement"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Posté"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Coût de débarquement"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Annuler"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index fd79be5..1ac7495 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index fd79be5..1ac7495 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index fd79be5..1ac7495 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/bg_BG.po b/locale/lo_LA.po
similarity index 92%
copy from locale/bg_BG.po
copy to locale/lo_LA.po
index fd79be5..1ac7495 100644
--- a/locale/bg_BG.po
+++ b/locale/lo_LA.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index fd79be5..1ac7495 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index fd79be5..1ac7495 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 821636e..fa239c4 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Método de Alocação"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Código"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Empresa"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Linhas da Fatura"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Data de Confirmação"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Editado por"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Custo de Recepção"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Custo de Recepção"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Confirmado"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Custo de Recepção"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index fd79be5..1ac7495 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index eaa1f67..cdec854 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr "Metoda porazdelitve"
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr "Šifra"
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr "Družba"
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr "Postavke računov"
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr "Datum knjiženja"
@@ -94,6 +94,11 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+#, fuzzy
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr "Raztovor"
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr "Raztovor"
@@ -157,6 +162,15 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr "Knjiženo"
+#, fuzzy
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr "Raztovor"
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr "Preklic"
diff --git a/locale/bg_BG.po b/locale/zh_CN.po
similarity index 92%
copy from locale/bg_BG.po
copy to locale/zh_CN.po
index fd79be5..1ac7495 100644
--- a/locale/bg_BG.po
+++ b/locale/zh_CN.po
@@ -14,10 +14,6 @@ msgctxt "field:account.landed_cost,allocation_method:"
msgid "Allocation Method"
msgstr ""
-msgctxt "field:account.landed_cost,code:"
-msgid "Code"
-msgstr ""
-
msgctxt "field:account.landed_cost,company:"
msgid "Company"
msgstr ""
@@ -38,6 +34,10 @@ msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
+msgctxt "field:account.landed_cost,number:"
+msgid "Number"
+msgstr ""
+
msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
@@ -94,6 +94,10 @@ msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.product,landed_cost:"
+msgid "Landed Cost"
+msgstr ""
+
msgctxt "field:product.template,landed_cost:"
msgid "Landed Cost"
msgstr ""
@@ -157,6 +161,14 @@ msgctxt "selection:account.landed_cost,state:"
msgid "Posted"
msgstr ""
+msgctxt "view:account.configuration:"
+msgid "Landed Cost"
+msgstr ""
+
+msgctxt "view:account.configuration:"
+msgid "Sequence"
+msgstr ""
+
msgctxt "view:account.landed_cost:"
msgid "Cancel"
msgstr ""
diff --git a/product.py b/product.py
index 1855bd4..c335ca7 100644
--- a/product.py
+++ b/product.py
@@ -5,13 +5,18 @@ from trytond.model import fields
from trytond.pyson import Eval
-__all__ = ['Template']
+__all__ = ['Template', 'Product']
class Template:
- __name__ = 'product.template'
__metaclass__ = PoolMeta
+ __name__ = 'product.template'
landed_cost = fields.Boolean('Landed Cost', states={
'readonly': ~Eval('active', True),
'invisible': Eval('type') != 'service',
}, depends=['active', 'type'])
+
+
+class Product:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.product'
diff --git a/setup.py b/setup.py
index af13904..c432c8a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -81,6 +87,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -94,6 +101,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -110,4 +120,8 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=[
+ 'tests/scenario_account_stock_landed_cost.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 573f1cc..24a90f3 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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_account_stock_landed_cost import suite
+try:
+ from trytond.modules.account_stock_landed_cost.tests.test_account_stock_landed_cost import suite
+except ImportError:
+ from .test_account_stock_landed_cost import suite
__all__ = ['suite']
diff --git a/tests/scenario_account_stock_landed_cost.rst b/tests/scenario_account_stock_landed_cost.rst
index c18be29..de382bc 100644
--- a/tests/scenario_account_stock_landed_cost.rst
+++ b/tests/scenario_account_stock_landed_cost.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... set_fiscalyear_invoice_sequences
>>> today = datetime.date.today()
@@ -125,7 +125,7 @@ Invoice landed cost::
>>> Invoice = Model.get('account.invoice')
>>> invoice = Invoice()
- >>> invoice.type = 'in_invoice'
+ >>> invoice.type = 'in'
>>> invoice.party = supplier
>>> invoice.payment_term = payment_term
>>> invoice.invoice_date = today
diff --git a/tests/test_account_stock_landed_cost.py b/tests/test_account_stock_landed_cost.py
index 8bf12fb..17ca6f8 100644
--- a/tests/test_account_stock_landed_cost.py
+++ b/tests/test_account_stock_landed_cost.py
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class AccountStockLandedCostTestCase(ModuleTestCase):
@@ -19,5 +20,6 @@ def suite():
suite.addTests(doctest.DocFileSuite(
'scenario_account_stock_landed_cost.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 43d2793..2cea8b3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account
account_invoice
diff --git a/trytond_account_stock_landed_cost.egg-info/PKG-INFO b/trytond_account_stock_landed_cost.egg-info/PKG-INFO
index 8026f49..60697c4 100644
--- a/trytond_account_stock_landed_cost.egg-info/PKG-INFO
+++ b/trytond_account_stock_landed_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-stock-landed-cost
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for landed 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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_stock_landed_cost
=================================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,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 :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
index 4dd912f..d73ca7c 100644
--- a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
+++ b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
@@ -55,11 +55,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
tests/scenario_account_stock_landed_cost.rst
trytond_account_stock_landed_cost.egg-info/PKG-INFO
trytond_account_stock_landed_cost.egg-info/SOURCES.txt
diff --git a/trytond_account_stock_landed_cost.egg-info/requires.txt b/trytond_account_stock_landed_cost.egg-info/requires.txt
index 3bac01d..5d6025b 100644
--- a/trytond_account_stock_landed_cost.egg-info/requires.txt
+++ b/trytond_account_stock_landed_cost.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_account >= 3.8, < 3.9
-trytond_account_invoice >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_account_invoice >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
index 4f2726e..63c397c 100644
--- a/view/configuration_form.xml
+++ b/view/configuration_form.xml
@@ -3,7 +3,8 @@
this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form" position="inside">
- <label name="landed_cost_sequence"/>
+ <separator id="landed_cost" string="Landed Cost" colspan="4"/>
+ <label name="landed_cost_sequence" string="Sequence"/>
<field name="landed_cost_sequence"/>
<newline/>
</xpath>
diff --git a/view/landed_cost_form.xml b/view/landed_cost_form.xml
index c718831..a524f4e 100644
--- a/view/landed_cost_form.xml
+++ b/view/landed_cost_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
<form string="Landed Cost">
<label name="posted_date"/>
<field name="posted_date"/>
- <label name="code"/>
- <field name="code"/>
+ <label name="number"/>
+ <field name="number"/>
<label name="allocation_method"/>
<field name="allocation_method"/>
<label name="company"/>
diff --git a/view/landed_cost_list.xml b/view/landed_cost_list.xml
index 0edda77..3fbbc1e 100644
--- a/view/landed_cost_list.xml
+++ b/view/landed_cost_list.xml
@@ -2,7 +2,7 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tree string="Landed Costs">
- <field name="code"/>
+ <field name="number"/>
<field name="posted_date"/>
<field name="state"/>
</tree>
--
tryton-modules-account-stock-landed-cost
More information about the tryton-debian-vcs
mailing list