[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream updated. upstream/4.4.2-1-gb60832d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:19:47 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=upstream/4.4.2-1-gb60832d
commit b60832df853ca094e95be58ad529bbcadb04a584
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:19 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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 ddc42f9..d4b1422 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 4.4.2 - 2017-10-04
-* Bug fixes (see mercurial logs for details)
-
-Version 4.4.1 - 2017-06-06
+Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
Version 4.4.0 - 2017-05-01
diff --git a/PKG-INFO b/PKG-INFO
index 8d7001c..4d8a74b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 4.4.2
+Version: 4.6.0
Summary: Tryton module for sale supply drop shipment
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: sale_supply_drop_shipment
=========================
@@ -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 6e322d9..f6dc42e 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -106,10 +109,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -204,10 +206,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr "Планирана дата"
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/ca.po b/locale/ca.po
index 97ddd5e..ca972d5 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -8,6 +8,12 @@ msgstr ""
"S'ha de definir una adreça d'enviament pel pressupost de la compra \"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+"Heu de cancel·lar l'enviament directe \"%(shipment)s\" abans de ser "
+"eliminat."
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -37,8 +43,8 @@ msgid "Purchase Drop Location"
msgstr "Ubicació compra directa"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -97,8 +103,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -181,8 +187,8 @@ msgid "Planned Date"
msgstr "Data estimada"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/cs.po b/locale/cs.po
index 4d4b3d2..52f5a8c 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -33,10 +37,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -94,10 +97,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -179,10 +181,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/de.po b/locale/de.po
index 7a4d702..7b6898d 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -9,6 +9,10 @@ msgstr ""
"werden."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -38,8 +42,8 @@ msgid "Purchase Drop Location"
msgstr "Lagerort Direktlieferung Einkauf"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -98,8 +102,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -182,8 +186,8 @@ msgid "Planned Date"
msgstr "Geplantes Datum"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/es.po b/locale/es.po
index 5b284b5..232adb5 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -9,6 +9,10 @@ msgstr ""
"\"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr "Debe cancelar el envío directo \"%(shipment)s\" antes de eliminarlo."
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -38,8 +42,8 @@ msgid "Purchase Drop Location"
msgstr "Ubicación compra directa"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -98,8 +102,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -182,8 +186,8 @@ msgid "Planned Date"
msgstr "Fecha estimada"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/es_419.po b/locale/es_419.po
index 601bdcf..5af9a3b 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"
@@ -9,6 +9,10 @@ msgstr ""
"\"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -40,7 +44,7 @@ msgid "Purchase Drop Location"
msgstr "Ubicación de compra directa"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -102,7 +106,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -188,7 +192,7 @@ msgid "Planned Date"
msgstr "Fecha planificada"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/fr.po b/locale/fr.po
index 4eca004..9490427 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -8,6 +8,11 @@ msgstr ""
"L'adresse de livraison doit être définie pour le devis de l'achat « %s »."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+"La livraison direct « %(shipment)s » doit être annulée avant suppression."
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -37,8 +42,8 @@ msgid "Purchase Drop Location"
msgstr "Emplacement de livraison directe d'achat"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -50,7 +55,7 @@ msgstr "Mis à jour par"
msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
-msgstr "Drop shipment"
+msgstr "Livraison direct"
msgctxt "field:purchase.product_supplier,drop_shipment_available:"
msgid "Drop Shipment Available"
@@ -70,7 +75,7 @@ msgstr "Emplacement de livraison directe"
msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt "field:purchase.request,customer:"
msgid "Customer"
@@ -97,8 +102,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -118,11 +123,11 @@ msgstr "Emplacement de livraison directe"
msgctxt "field:sale.sale,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
-msgstr "Séquence de drop shipment"
+msgstr "Séquence de livraison directe"
msgctxt "field:stock.configuration.sequence,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
@@ -130,7 +135,7 @@ msgstr "Séquence de livraison directe"
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
-msgstr "Client drop shipment"
+msgstr "Livraison directe cliente"
msgctxt "field:stock.shipment.drop,code:"
msgid "Code"
@@ -181,8 +186,8 @@ msgid "Planned Date"
msgstr "Date planifiée"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
@@ -210,15 +215,15 @@ msgstr "Mis à jour par"
msgctxt "model:ir.action,name:act_purchase_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt "model:ir.action,name:act_sale_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt "model:ir.action,name:act_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_all"
@@ -242,15 +247,15 @@ msgstr "En attente"
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
-msgstr "Drop shipment"
+msgstr "Livraison directe"
msgctxt "model:ir.sequence.type,name:sequence_type_shipment_drop"
msgid "Drop Shipment"
-msgstr "Drop shipment"
+msgstr "Livraison directe"
msgctxt "model:ir.ui.menu,name:menu_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Drop shipments"
+msgstr "Livraisons directes"
msgctxt "model:purchase.configuration.purchase_drop_location,name:"
msgid "Purchase Configuration Purchase Drop Location"
@@ -266,7 +271,7 @@ msgstr "Livraison directe"
msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
-msgstr "Drop shipment"
+msgstr "Livraison directe"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 4895390..90fc293 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"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -104,10 +107,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -198,10 +200,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index df93bb6..1390f10 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"
@@ -9,6 +9,10 @@ msgstr ""
"dell'acquisto \"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -41,10 +45,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr "Locazione per acquisto diretto."
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -107,10 +110,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
@@ -197,8 +199,8 @@ msgid "Planned Date"
msgstr "Data prevista"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 6b0cdce..052004d 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"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -34,7 +38,7 @@ msgid "Purchase Drop Location"
msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -96,7 +100,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
@@ -181,7 +185,7 @@ msgid "Planned Date"
msgstr ""
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/lo.po b/locale/lo.po
index 9213057..e1dfe22 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -102,10 +105,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ເລດລຳດັບ"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -196,10 +198,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/lt.po b/locale/lt.po
index 4d4b3d2..52f5a8c 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -33,10 +37,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -94,10 +97,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -179,10 +181,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/nl.po b/locale/nl.po
index 1f37e0c..1a67762 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -104,10 +107,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -199,10 +201,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/pl.po b/locale/pl.po
index 6b0cdce..042d401 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -18,15 +22,15 @@ msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:purchase.configuration.purchase_drop_location,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:purchase.configuration.purchase_drop_location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt ""
"field:purchase.configuration.purchase_drop_location,purchase_drop_location:"
@@ -34,16 +38,16 @@ msgid "Purchase Drop Location"
msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:purchase.configuration.purchase_drop_location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
#, fuzzy
msgctxt "field:purchase.product_supplier,drop_shipment:"
@@ -56,28 +60,27 @@ msgstr ""
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
-msgstr ""
+msgstr "Odbiorca"
msgctxt "field:purchase.purchase,delivery_address:"
msgid "Delivery Address"
-msgstr ""
+msgstr "Adres dostawy"
msgctxt "field:purchase.purchase,drop_location:"
msgid "Drop Location"
-msgstr ""
+msgstr "Porzuć lokalizację"
-#, fuzzy
msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr "Porzuć wysyłki"
msgctxt "field:purchase.request,customer:"
msgid "Customer"
-msgstr ""
+msgstr "Odbiorca"
msgctxt "field:purchase.request,delivery_address:"
msgid "Delivery Address"
-msgstr ""
+msgstr "Adres dostawy"
msgctxt "field:sale.configuration,sale_drop_location:"
msgid "Sale Drop Location"
@@ -85,19 +88,19 @@ msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:sale.configuration.sale_drop_location,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -105,20 +108,19 @@ msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:sale.configuration.sale_drop_location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:sale.sale,drop_location:"
msgid "Drop Location"
-msgstr ""
+msgstr "Porzuć lokalizację"
-#, fuzzy
msgctxt "field:sale.sale,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr "Porzuć wysyłki"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
@@ -130,127 +132,127 @@ msgstr ""
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
-msgstr ""
+msgstr "Porzuć odbiorcę"
msgctxt "field:stock.shipment.drop,code:"
msgid "Code"
-msgstr ""
+msgstr "Kod"
msgctxt "field:stock.shipment.drop,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:stock.shipment.drop,contact_address:"
msgid "Contact Address"
-msgstr ""
+msgstr "Adres kontaktowy"
msgctxt "field:stock.shipment.drop,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:stock.shipment.drop,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:stock.shipment.drop,customer:"
msgid "Customer"
-msgstr ""
+msgstr "Odbiorca"
msgctxt "field:stock.shipment.drop,customer_moves:"
msgid "Customer Moves"
-msgstr ""
+msgstr "Ruchy odbiorcy"
msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
-msgstr ""
+msgstr "Adres dostawy"
msgctxt "field:stock.shipment.drop,effective_date:"
msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
msgctxt "field:stock.shipment.drop,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.shipment.drop,moves:"
msgid "Moves"
-msgstr ""
+msgstr "Ruchy"
msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
-msgstr ""
+msgstr "Data planowana"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
-msgstr ""
+msgstr "Referencja"
msgctxt "field:stock.shipment.drop,state:"
msgid "State"
-msgstr ""
+msgstr "Stan"
msgctxt "field:stock.shipment.drop,supplier:"
msgid "Supplier"
-msgstr ""
+msgstr "Dostawca"
msgctxt "field:stock.shipment.drop,supplier_moves:"
msgid "Supplier Moves"
-msgstr ""
+msgstr "Ruchy dostawcy"
msgctxt "field:stock.shipment.drop,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:stock.shipment.drop,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "model:ir.action,name:act_purchase_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr ""
msgctxt "model:ir.action,name:act_sale_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr ""
msgctxt "model:ir.action,name:act_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_all"
msgid "All"
-msgstr "All"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_draft"
msgid "Draft"
-msgstr "Draft"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_shipped"
msgid "Shipped"
-msgstr "Shipped"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_waiting"
msgid "Waiting"
-msgstr "Waiting"
+msgstr ""
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
-msgstr "Drop Shipment"
+msgstr ""
msgctxt "model:ir.sequence.type,name:sequence_type_shipment_drop"
msgid "Drop Shipment"
-msgstr "Drop Shipment"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Drop Shipments"
+msgstr ""
msgctxt "model:purchase.configuration.purchase_drop_location,name:"
msgid "Purchase Configuration Purchase Drop Location"
@@ -262,7 +264,7 @@ msgstr ""
msgctxt "model:stock.location,name:location_drop"
msgid "Drop"
-msgstr "Drop"
+msgstr ""
#, fuzzy
msgctxt "model:stock.shipment.drop,name:"
@@ -271,11 +273,11 @@ msgstr "Drop Shipment"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
-msgstr ""
+msgstr "Anulowano"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Done"
-msgstr ""
+msgstr "Wykonano"
#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
@@ -294,11 +296,11 @@ msgstr "Waiting"
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr ""
+msgstr "Wykonano"
#, fuzzy
msgctxt "view:stock.shipment.drop:"
@@ -311,4 +313,4 @@ msgstr ""
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
-msgstr ""
+msgstr "Czekaj"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 2ab8825..7cf94d9 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"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr "Um endereço de entrega deve ser definido para a cotação da compra \"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr "O envio direto \"%(shipment)s\" deve ser cancelado antes da exclusão."
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,8 +40,8 @@ msgid "Purchase Drop Location"
msgstr "Localização de Compra do Envio Direto"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -96,8 +100,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -180,8 +184,8 @@ msgid "Planned Date"
msgstr "Data Planejada"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/ru.po b/locale/ru.po
index 6726aaf..d4f0fb2 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -106,10 +109,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -204,10 +206,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr "Плановая дата"
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
diff --git a/locale/sl.po b/locale/sl.po
index eedc127..3b1b70f 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr "Naslov dostave mora biti naveden za nabavno ponudbo \"%s\"."
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,8 +40,8 @@ msgid "Purchase Drop Location"
msgstr "Nabavna dostavna lokacija"
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
msgid "Write Date"
@@ -96,8 +100,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -180,8 +184,8 @@ msgid "Planned Date"
msgstr "Načrtovan datum"
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 6edb0d7..fa703df 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"
@@ -7,6 +7,10 @@ msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
msgctxt "error:stock.shipment.drop:"
+msgid "Drop Shipment \"%(shipment)s\" must be cancelled before deletion."
+msgstr ""
+
+msgctxt "error:stock.shipment.drop:"
msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
@@ -36,10 +40,9 @@ msgctxt ""
msgid "Purchase Drop Location"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:purchase.configuration.purchase_drop_location,write_date:"
@@ -102,10 +105,9 @@ msgctxt "field:sale.configuration.sale_drop_location,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:sale.configuration.sale_drop_location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_drop_location,sale_drop_location:"
msgid "Sale Drop Location"
@@ -193,10 +195,9 @@ msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
diff --git a/purchase.py b/purchase.py
index 97518b0..d777bbc 100644
--- a/purchase.py
+++ b/purchase.py
@@ -132,6 +132,13 @@ class Purchase:
if self.customer:
self.delivery_address = self.customer.address_get(type='delivery')
+ @property
+ def delivery_full_address(self):
+ address = super(Purchase, self).delivery_full_address
+ if self.customer and self.delivery_address:
+ address = self.delivery_address.full_address
+ return address
+
def get_drop_shipments(self, name):
DropShipment = Pool().get('stock.shipment.drop')
return list(set(m.shipment.id for l in self.lines for m in l.moves
diff --git a/sale.py b/sale.py
index 5ac59a1..4bcbf10 100644
--- a/sale.py
+++ b/sale.py
@@ -114,13 +114,25 @@ class SaleLine:
or (self.moves and all(m.from_location.type == 'drop'
for m in self.moves)))
+ @property
+ def supply_on_sale_drop_move(self):
+ "Return True if the sale line can have drop move"
+ if not self.supply_on_sale:
+ return False
+ if not self.purchase_request or not self.purchase_request.customer:
+ return False
+ if self.purchase_request_state == 'cancel':
+ return False
+ purchase_line = self.purchase_request.purchase_line
+ if purchase_line and purchase_line.move_done:
+ return False
+ return True
+
def get_move(self, shipment_type):
result = super(SaleLine, self).get_move(shipment_type)
if (shipment_type == 'out'
- and not Transaction().context.get('_drop_shipment')
- and self.supply_on_sale):
- if (self.purchase_request and self.purchase_request.customer
- and self.purchase_request_state != 'cancel'):
+ and not Transaction().context.get('_drop_shipment')):
+ if self.supply_on_sale_drop_move:
return
return result
@@ -145,7 +157,7 @@ class SaleLine:
or not self.product):
return []
moves = []
- if self.purchase_request and self.purchase_request.customer:
+ if self.supply_on_sale_drop_move:
move = self.get_move('out')
if move is not None:
move.from_location = self.sale.drop_location
diff --git a/setup.py b/setup.py
index 96891ff..0db9a12 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/stock.py b/stock.py
index f9a3234..2112277 100644
--- a/stock.py
+++ b/stock.py
@@ -272,6 +272,8 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
cls._error_messages.update({
'reset_move': ('You cannot reset to draft move "%s" which was '
'generated by a sale or a purchase.'),
+ 'delete_cancel': ('Drop Shipment "%(shipment)s" must be '
+ 'cancelled before deletion.'),
})
@staticmethod
@@ -387,13 +389,29 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
return super(ShipmentDrop, cls).copy(shipments, default=default)
@classmethod
+ def delete(cls, shipments):
+ pool = Pool()
+ Move = pool.get('stock.move')
+
+ cls.cancel(shipments)
+ for shipment in shipments:
+ if shipment.state != 'cancel':
+ cls.raise_user_error('delete_cancel', {
+ 'shipment': shipment.rec_name,
+ })
+ Move.delete([m for s in shipments for m in s.supplier_moves])
+ super(ShipmentDrop, cls).delete(shipments)
+
+ @classmethod
@ModelView.button
@Workflow.transition('cancel')
def cancel(cls, shipments):
Move = Pool().get('stock.move')
Move.cancel([m for s in shipments for m in s.supplier_moves])
- Move.write([m for s in shipments for m in s.customer_moves],
- {'shipment': None})
+ Move.cancel([m for s in shipments for m in s.customer_moves
+ if s.state == 'shipped'])
+ Move.write([m for s in shipments for m in s.customer_moves
+ if s.state != 'shipped'], {'shipment': None})
@classmethod
@ModelView.button
@@ -538,7 +556,8 @@ class Move:
@classmethod
def search_customer_drop(cls, name, clause):
return ['OR',
- ('origin.sale.party',) + tuple(clause[1:]) + ('sale.line',),
- (('origin.purchase.customer',) + tuple(clause[1:])
- + ('purchase.line',)),
+ ('origin.sale.party' + clause[0].lstrip(name),)
+ + tuple(clause[1:3]) + ('sale.line',) + tuple(clause[3:]),
+ ('origin.purchase.customer' + clause[0].lstrip(name),)
+ + tuple(clause[1:3]) + ('purchase.line',) + tuple(clause[3:]),
]
diff --git a/tests/scenario_sale_supply_drop_shipment.rst b/tests/scenario_sale_supply_drop_shipment.rst
index 7a241c7..42652ca 100644
--- a/tests/scenario_sale_supply_drop_shipment.rst
+++ b/tests/scenario_sale_supply_drop_shipment.rst
@@ -8,7 +8,7 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import Model, Wizard
- >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.tests.tools import activate_modules, set_user
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
@@ -96,8 +96,7 @@ Create product::
>>> ProductSupplier = Model.get('purchase.product_supplier')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
>>> ProductTemplate = Model.get('product.template')
- >>> Product = Model.get('product.product')
- >>> product = Product()
+
>>> template = ProductTemplate()
>>> template.name = 'product'
>>> template.default_uom = unit
@@ -105,13 +104,11 @@ Create product::
>>> template.purchasable = True
>>> template.salable = True
>>> template.list_price = Decimal('10')
- >>> template.cost_price = Decimal('5')
>>> template.account_expense = expense
>>> template.account_revenue = revenue
>>> template.supply_on_sale = True
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
>>> product_supplier = ProductSupplier()
>>> product_supplier.product = template
>>> product_supplier.party = supplier
@@ -126,7 +123,7 @@ Create payment term::
Sale 250 products::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> Sale = Model.get('sale.sale')
>>> sale = Sale()
>>> sale.party = customer
@@ -146,7 +143,7 @@ Sale 250 products::
Create Purchase from Request::
- >>> config.user = purchase_user.id
+ >>> set_user(purchase_user)
>>> Purchase = Model.get('purchase.purchase')
>>> PurchaseRequest = Model.get('purchase.request')
>>> purchase_request, = PurchaseRequest.find()
@@ -166,7 +163,7 @@ Create Purchase from Request::
>>> purchase.state
u'processing'
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipments
[]
@@ -174,28 +171,28 @@ Create Purchase from Request::
Receiving only 100 products::
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> move, = shipment.supplier_moves
>>> move.quantity = 100
>>> shipment.click('ship')
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipments
[]
>>> shipment, = sale.drop_shipments
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> shipment.click('done')
>>> shipment.state
u'done'
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipments
[]
The purchase is now waiting for his new drop shipment::
- >>> config.user = purchase_user.id
+ >>> set_user(purchase_user)
>>> purchase.reload()
>>> purchase.shipment_state
u'waiting'
@@ -211,10 +208,10 @@ The purchase is now waiting for his new drop shipment::
Let's cancel the shipment and handle the issue on the purchase.
As a consequence the sale order is now in exception::
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> shipment.click('cancel')
- >>> config.user = purchase_user.id
+ >>> set_user(purchase_user)
>>> purchase.reload()
>>> purchase.shipment_state
u'exception'
@@ -226,7 +223,7 @@ As a consequence the sale order is now in exception::
>>> purchase.shipment_state
u'received'
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipment_state
u'exception'
@@ -250,7 +247,7 @@ Cancelling the workflow on the purchase step::
>>> sale.drop_shipments
[]
- >>> config.user = purchase_user.id
+ >>> set_user(purchase_user)
>>> purchase_request, = PurchaseRequest.find([('purchase_line', '=', None)])
>>> purchase_request.quantity
125.0
@@ -292,7 +289,7 @@ the sale::
The sale is then in exception::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipment_state
u'exception'
@@ -307,12 +304,12 @@ from stock::
>>> shipment, = sale.shipments
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> shipment.click('assign_force')
>>> shipment.click('pack')
>>> shipment.click('done')
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.reload()
>>> sale.shipment_state
u'sent'
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 30e3ba1..5508265 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.2
+version=4.6.0
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index e4b9764..21dc1d8 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 4.4.2
+Version: 4.6.0
Summary: Tryton module for sale supply drop shipment
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: sale_supply_drop_shipment
=========================
@@ -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_sale_supply_drop_shipment.egg-info/SOURCES.txt b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
index d4197ad..89a4bcf 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
@@ -1,13 +1,21 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+party.py
+purchase.py
purchase.xml
+sale.py
sale.xml
setup.py
+stock.py
stock.xml
+tox.ini
tryton.cfg
./__init__.py
./party.py
@@ -68,7 +76,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_sale_supply_drop_shipment.rst
+tests/test_sale_supply_drop_shipment.py
trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
trytond_sale_supply_drop_shipment.egg-info/dependency_links.txt
diff --git a/trytond_sale_supply_drop_shipment.egg-info/requires.txt b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
index fc8f32a..8db8f96 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/requires.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
@@ -1,7 +1,7 @@
-trytond_company >= 4.4, < 4.5
-trytond_purchase >= 4.4, < 4.5
-trytond_purchase_request >= 4.4, < 4.5
-trytond_sale >= 4.4, < 4.5
-trytond_sale_supply >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_company >= 4.6, < 4.7
+trytond_purchase >= 4.6, < 4.7
+trytond_purchase_request >= 4.6, < 4.7
+trytond_sale >= 4.6, < 4.7
+trytond_sale_supply >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list