[tryton-debian-vcs] tryton-modules-account-stock-landed-cost branch debian updated. debian/4.4.2-3-5-gf26dfcd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:08:16 UTC 2017
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/4.4.2-3-5-gf26dfcd
commit f26dfcd68c2547955b4b485d3e898114b8ab9e4a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:24:40 2017 +0100
Releasing debian version 4.6.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index b1cc5ab..308ac74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-stock-landed-cost (4.6.0-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Bump the Standards-Version to 4.1.1, no changes needed.
+ * Merging upstream version 4.6.0.
+ * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 07 Nov 2017 10:19:57 +0100
+
tryton-modules-account-stock-landed-cost (4.4.2-3) unstable; urgency=medium
* Switch to Python3.
commit 3bb3c501e385af91b28a909440888fa2edfc27ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 10:16:46 2017 +0100
Use https in the watch file.
diff --git a/debian/watch b/debian/watch
index bd7ae82..72dd00b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_account_stock_landed_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_account_stock_landed_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 62209ca64cedf974d17cd276415a5769173f2418
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:40:33 2017 +0100
Merging upstream version 4.6.0.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+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
diff --git a/CHANGELOG b/CHANGELOG
index 3ffe7ff..2e7c08f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,6 @@
-Version 4.4.2 - 2017-08-08
-* Bug fixes (see mercurial logs for details)
-
-Version 4.4.1 - 2017-07-01
+Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
+* Move landed_cost inside checkboxes group
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 18eed3c..ae3140c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_landed_cost
-Version: 4.4.2
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_account_stock_landed_cost
=================================
@@ -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
diff --git a/locale/bg.po b/locale/bg.po
index f7c5529..1fc7ab2 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,10 +31,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -88,10 +87,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost,shipments:"
@@ -132,10 +130,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/ca.po b/locale/ca.po
index b27fbb1..07a0f98 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Seqüència de cost de recepció"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Data comptabilització"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Cost de recepció"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/cs.po b/locale/cs.po
index 36de70e..2e342d3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,10 +27,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,10 +75,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -113,10 +111,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/de.po b/locale/de.po
index c75195e..e76b64d 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Nummernkreis Einstandskosten"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Festschreibungsdatum"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Einstandskosten"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/es.po b/locale/es.po
index d22c580..17c1b66 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Secuencia de coste de recepción"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Fecha contabilización"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Coste de recepción"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/es_419.po b/locale/es_419.po
index 7865200..a05fc80 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,7 +28,7 @@ msgid "Landed Cost Sequence"
msgstr "Secuencia de costo final"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -76,7 +76,7 @@ msgid "Posted Date"
msgstr ""
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.landed_cost,shipments:"
@@ -112,7 +112,7 @@ msgid "Landed Cost"
msgstr "Costo final"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/fr.po b/locale/fr.po
index 476e162..4530450 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Séquence de coût de débarquement"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Date de postage"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Coût de débarquement"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 4cd0cc9..9eed491 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,10 +31,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -87,10 +86,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost,shipments:"
@@ -131,10 +129,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 1d0a4f9..12eeb8d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -32,10 +32,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr "Sequenza costo atterrato"
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -84,8 +83,8 @@ msgid "Posted Date"
msgstr "Data di registrazione"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -120,8 +119,8 @@ msgid "Landed Cost"
msgstr "Costo di atterraggio"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 6838bab..954011f 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,7 +28,7 @@ msgid "Landed Cost Sequence"
msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -77,7 +77,7 @@ msgid "Posted Date"
msgstr ""
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.landed_cost,shipments:"
@@ -114,7 +114,7 @@ msgid "Landed Cost"
msgstr "Landed Cost"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/lo.po b/locale/lo.po
index 6083d97..177dbde 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,10 +31,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -88,10 +87,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -131,10 +129,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/lt.po b/locale/lt.po
index 36de70e..2e342d3 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,10 +27,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,10 +75,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -113,10 +111,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/nl.po b/locale/nl.po
index 6731aaa..a45f43d 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,10 +31,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -88,10 +87,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost,shipments:"
@@ -132,10 +130,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/pl.po b/locale/pl.po
index 6838bab..bc4d266 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -8,19 +8,19 @@ msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:account.configuration.landed_cost_sequence,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:account.configuration.landed_cost_sequence,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:account.configuration.landed_cost_sequence,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt ""
"field:account.configuration.landed_cost_sequence,landed_cost_sequence:"
@@ -28,16 +28,16 @@ msgid "Landed Cost Sequence"
msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:account.configuration.landed_cost_sequence,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
#, fuzzy
msgctxt "field:account.invoice.line,landed_cost:"
@@ -50,19 +50,19 @@ msgstr ""
msgctxt "field:account.landed_cost,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:account.landed_cost,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:account.landed_cost,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:account.landed_cost,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.landed_cost,invoice_lines:"
msgid "Invoice Lines"
@@ -77,8 +77,8 @@ msgid "Posted Date"
msgstr ""
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -86,27 +86,27 @@ msgstr ""
msgctxt "field:account.landed_cost,state:"
msgid "State"
-msgstr ""
+msgstr "Stan"
msgctxt "field:account.landed_cost,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:account.landed_cost,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:account.landed_cost-stock.shipment.in,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:account.landed_cost-stock.shipment.in,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:account.landed_cost-stock.shipment.in,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
@@ -114,8 +114,8 @@ msgid "Landed Cost"
msgstr "Landed Cost"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
@@ -123,11 +123,11 @@ msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:account.landed_cost-stock.shipment.in,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
#, fuzzy
msgctxt "field:product.product,landed_cost:"
@@ -158,34 +158,34 @@ msgstr ""
msgctxt "model:ir.action,name:act_landed_cost_form"
msgid "Landed Costs"
-msgstr "Landed Costs"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_all"
msgid "All"
-msgstr "All"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_draft"
msgid "Draft"
-msgstr "Draft"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_landed_cost_form_domain_posted"
msgid "Posted"
-msgstr "Posted"
+msgstr ""
msgctxt "model:ir.sequence,name:sequence_landed_cost"
msgid "Landed Cost"
-msgstr "Landed Cost"
+msgstr ""
msgctxt "model:ir.sequence.type,name:sequence_type_landed_cost"
msgid "Landed Cost"
-msgstr "Landed Cost"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_landed_cost"
msgid "Landed Costs"
-msgstr "Landed Costs"
+msgstr ""
msgctxt "selection:account.landed_cost,allocation_method:"
msgid "By Value"
@@ -212,17 +212,18 @@ msgstr "Landed Cost"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
msgctxt "view:account.landed_cost:"
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
#, fuzzy
msgctxt "view:account.landed_cost:"
msgid "Draft"
msgstr "Draft"
+#, fuzzy
msgctxt "view:account.landed_cost:"
msgid "Post"
-msgstr ""
+msgstr "Księgowanie"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8e742e2..ede79b2 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Sequência de Custo de Recepção"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Data de Confirmação"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Custo de Recepção"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/ru.po b/locale/ru.po
index 9be7311..bc6256e 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,10 +31,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -88,10 +87,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost,shipments:"
@@ -132,10 +130,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
diff --git a/locale/sl.po b/locale/sl.po
index 97671c8..dafc498 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,8 +28,8 @@ msgid "Landed Cost Sequence"
msgstr "Štetje raztovora"
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
msgid "Write Date"
@@ -76,8 +76,8 @@ msgid "Posted Date"
msgstr "Datum knjiženja"
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -112,8 +112,8 @@ msgid "Landed Cost"
msgstr "Raztovor"
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index cc26d40..66bea8f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -30,10 +30,9 @@ msgctxt ""
msgid "Landed Cost Sequence"
msgstr ""
-#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:account.configuration.landed_cost_sequence,write_date:"
@@ -84,10 +83,9 @@ msgctxt "field:account.landed_cost,posted_date:"
msgid "Posted Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost,shipments:"
msgid "Shipments"
@@ -127,10 +125,9 @@ msgctxt "field:account.landed_cost-stock.shipment.in,landed_cost:"
msgid "Landed Cost"
msgstr ""
-#, fuzzy
msgctxt "field:account.landed_cost-stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:account.landed_cost-stock.shipment.in,shipment:"
msgid "Shipment"
diff --git a/setup.py b/setup.py
index bf08fe3..ca302a3 100644
--- a/setup.py
+++ b/setup.py
@@ -102,9 +102,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 :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/scenario_account_stock_landed_cost.rst b/tests/scenario_account_stock_landed_cost.rst
index 60e6582..7fa6f37 100644
--- a/tests/scenario_account_stock_landed_cost.rst
+++ b/tests/scenario_account_stock_landed_cost.rst
@@ -51,35 +51,32 @@ Create products::
>>> ProductUom = Model.get('product.uom')
>>> ProductTemplate = Model.get('product.template')
- >>> Product = Model.get('product.product')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
- >>> product = Product()
>>> template = ProductTemplate()
>>> template.name = 'Product'
>>> template.default_uom = unit
>>> template.type = 'goods'
>>> template.list_price = Decimal('300')
- >>> template.cost_price = Decimal('80')
>>> template.cost_price_method = 'average'
>>> template.account_expense = expense
>>> template.account_revenue = revenue
+ >>> product, = template.products
+ >>> product.cost_price = Decimal('80')
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
- >>> product_landed_cost = Product()
>>> template = ProductTemplate()
>>> template.name = 'Landed Cost'
>>> template.default_uom = unit
>>> template.type = 'service'
>>> template.landed_cost = True
>>> template.list_price = Decimal('10')
- >>> template.cost_price = Decimal('10')
>>> template.account_expense = expense
>>> template.account_revenue = revenue
+ >>> product_landed_cost, = template.products
+ >>> product_landed_cost.cost_price = Decimal('10')
>>> template.save()
- >>> product_landed_cost.template = template
- >>> product_landed_cost.save()
+ >>> product_landed_cost, = template.products
Get stock locations::
@@ -149,3 +146,10 @@ Check move unit price is 101::
>>> move.reload()
>>> move.unit_price
Decimal('101.0000')
+
+Landed cost is cleared when duplicated invoice::
+
+ >>> copy_invoice = invoice.duplicate()
+ >>> landed_cost.reload()
+ >>> len(landed_cost.invoice_lines)
+ 1
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 731b88f..0b498d2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.2
+version=4.6.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 c3e8f7c..add3fdb 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: 4.4.2
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_account_stock_landed_cost
=================================
@@ -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
diff --git a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
index d539c4d..d0b5ee1 100644
--- a/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
+++ b/trytond_account_stock_landed_cost.egg-info/SOURCES.txt
@@ -1,12 +1,19 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+account.py
account.xml
+product.py
product.xml
setup.py
+stock.py
+tox.ini
tryton.cfg
./__init__.py
./account.py
@@ -60,7 +67,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_account_stock_landed_cost.rst
+tests/test_account_stock_landed_cost.py
trytond_account_stock_landed_cost.egg-info/PKG-INFO
trytond_account_stock_landed_cost.egg-info/SOURCES.txt
trytond_account_stock_landed_cost.egg-info/dependency_links.txt
diff --git a/trytond_account_stock_landed_cost.egg-info/requires.txt b/trytond_account_stock_landed_cost.egg-info/requires.txt
index a9a0704..ec64399 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 >= 4.4, < 4.5
-trytond_account_invoice >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_account >= 4.6, < 4.7
+trytond_account_invoice >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/template_form.xml b/view/template_form.xml
index c4691b3..cb5f7b6 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -2,9 +2,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. -->
<data>
- <xpath expr="/form/notebook/page/field[@name='cost_price_method']"
- position="after">
+ <xpath expr="/form/notebook/page/group[@id='checkboxes']"
+ position="inside">
<label name="landed_cost"/>
- <field name="landed_cost"/>
+ <field name="landed_cost" xexpand="0" width="25"/>
</xpath>
</data>
--
tryton-modules-account-stock-landed-cost
More information about the tryton-debian-vcs
mailing list