[tryton-debian-vcs] tryton-modules-sale-price-list branch debian updated. debian/4.4.0-4-6-g675d2ec
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:18:23 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-sale-price-list.git;a=commitdiff;h=debian/4.4.0-4-6-g675d2ec
commit 675d2ec20cb424a712cd3054254df11d2817deef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:24:57 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 762a938..44d4546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale-price-list (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.
+ * Update Depends for 4.6.
+ * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 07 Nov 2017 10:20:30 +0100
+
tryton-modules-sale-price-list (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit 3cbb3057b100050217a39faa034cd3099d9ec889
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 80b0bc4..65b3d0f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_sale_price_list-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_sale_price_list-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 9b61ebe641e40eaa42db22225e06d4da77b72d9e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:57:52 2017 +0100
Update Depends for 4.6.
diff --git a/debian/control b/debian/control
index f9e9c87..f64adb9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Package: tryton-modules-sale-price-list
Architecture: all
Depends:
python3-pkg-resources,
+ tryton-modules-company (>= ${version:major}),
tryton-modules-party (>= ${version:major}),
tryton-modules-product-price-list (>= ${version:major}),
tryton-modules-sale (>= ${version:major}),
commit 062f545395a292072b4c1c2a5b86c12022691313
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:16 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 e1d4c2d..c56c6ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Compute sale price with price list even if there is no customer
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 911d100..ff6adb4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_price_list
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add price list on sale
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_sale_price_list
=======================
@@ -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/configuration.py b/configuration.py
index 63ce486..5703f82 100644
--- a/configuration.py
+++ b/configuration.py
@@ -14,6 +14,7 @@ class Configuration(CompanyMultiValueMixin):
__name__ = 'sale.configuration'
sale_price_list = fields.MultiValue(fields.Many2One(
'product.price_list', "Sale Price List",
+ help="The default price list for new parties.",
domain=[
('company', '=', Eval('context', {}).get('company', -1)),
],
diff --git a/locale/bg.po b/locale/bg.po
index 7b66773..92936ed 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -32,7 +32,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -70,7 +70,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -90,6 +90,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Ценова листа"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 648ac10..8232305 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Tercer"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Tarifa"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr "La tarifa per defecte per les noves vendes."
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr "La tarifa per defecte per als nous tercers."
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr "Utilitza per calcular el preu unitari de les línies."
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Tarifa de venda per tercer"
diff --git a/locale/cs.po b/locale/cs.po
index e1f47e8..ac9c62a 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 42f972b..efe82d6 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Partei"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Preisliste"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Preisliste Verkauf für Partei"
diff --git a/locale/es.po b/locale/es.po
index 011852a..a7566b4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Tercero"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Tarifa"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr "La tarifa por defecto de las nuevas ventas."
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr "La tarifa por defecto para los nuevos terceros."
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr "Utiliza para calcular el precio unitario de la líneas. "
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Tarifa de venta del tercero"
diff --git a/locale/es_419.po b/locale/es_419.po
index b01d5ef..bcc8eeb 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"
@@ -32,7 +32,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -69,7 +69,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -89,6 +89,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Lista de precios"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index ceb4b06..c4fbad2 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Tiers"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Liste de prix"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr "La liste de prix par défaut pour les nouvelles ventes."
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr "La liste de prix par défaut pour les nouveaux tiers."
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr "Utiliser pour calculer le prix unitaire des lignes."
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Liste de prix de vente tiers"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index a2adf0a..9a975d4 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,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -87,6 +87,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Árlista"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 44159bb..2a4bfc9 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,7 +32,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -69,7 +69,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -89,6 +89,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Listino"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index e1f47e8..ac9c62a 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"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 6cce5e9..386392b 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -32,7 +32,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -69,7 +69,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -89,6 +89,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "ລາຍການລາຄາ"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index e1f47e8..ac9c62a 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index e1f47e8..ac9c62a 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index e1f47e8..6c8d439 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,94 +1,106 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_price_list:"
msgid "Sale Price List"
-msgstr ""
+msgstr "Cennik sprzedaży"
msgctxt "field:party.party,sale_price_lists:"
msgid "Sale Price Lists"
-msgstr ""
+msgstr "Cenniki sprzedaży"
msgctxt "field:party.party.sale_price_list,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:party.party.sale_price_list,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:party.party.sale_price_list,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:party.party.sale_price_list,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party.sale_price_list,party:"
msgid "Party"
-msgstr ""
+msgstr "Strona"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
-msgstr ""
+msgstr "Cennik sprzedaży"
msgctxt "field:party.party.sale_price_list,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:party.party.sale_price_list,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:sale.configuration,sale_price_list:"
msgid "Sale Price List"
-msgstr ""
+msgstr "Cennik sprzedaży"
msgctxt "field:sale.configuration.sale_price_list,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:sale.configuration.sale_price_list,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:sale.configuration.sale_price_list,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:sale.configuration.sale_price_list,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
-msgstr ""
+msgstr "Cennik sprzedaży"
msgctxt "field:sale.configuration.sale_price_list,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:sale.configuration.sale_price_list,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:sale.sale,price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Cennik"
+
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr "Domyślny cennik dla nowych sprzedaży."
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr "Domyślny cennika dla nowych stron."
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr "Użyj, aby wyliczyć cenę jednostkową wierszy."
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
-msgstr ""
+msgstr "Cennik sprzedaży strony"
msgctxt "model:sale.configuration.sale_price_list,name:"
msgid "Sale Configuration Sale PriceList"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 6892278..50788c3 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"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Pessoa"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Lista de Preços"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr "A lista de preços padrão para novas vendas."
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr "A lista de preços padrão para novas pessoas."
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr "usado para computar o preço unitários das linhas."
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Lista de Preço de Venda da Pessoa"
diff --git a/locale/ru.po b/locale/ru.po
index e1f47e8..ac9c62a 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index c4e0b1d..1540291 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -31,8 +31,8 @@ msgid "Party"
msgstr "Partner"
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -67,8 +67,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
msgid "Sale Price List"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr "Cenik"
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr "Prodajni cenik partnerja"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index e1f47e8..ac9c62a 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"
@@ -31,7 +31,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:party.party.sale_price_list,sale_price_list:"
@@ -67,7 +67,7 @@ msgid "ID"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:sale.configuration.sale_price_list,sale_price_list:"
@@ -86,6 +86,18 @@ msgctxt "field:sale.sale,price_list:"
msgid "Price List"
msgstr ""
+msgctxt "help:party.party,sale_price_list:"
+msgid "The default price list for new sales."
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_price_list:"
+msgid "The default price list for new parties."
+msgstr ""
+
+msgctxt "help:sale.sale,price_list:"
+msgid "Use to compute the unit price of lines."
+msgstr ""
+
msgctxt "model:party.party.sale_price_list,name:"
msgid "Party Sale Price List"
msgstr ""
diff --git a/party.py b/party.py
index 0d42707..d7f935c 100644
--- a/party.py
+++ b/party.py
@@ -16,6 +16,7 @@ class Party(CompanyMultiValueMixin):
__name__ = 'party.party'
sale_price_list = fields.MultiValue(fields.Many2One(
'product.price_list', "Sale Price List",
+ help="The default price list for new sales.",
domain=[
('company', '=', Eval('context', {}).get('company', -1)),
],
diff --git a/product.py b/product.py
index 8abab5d..b050ffc 100644
--- a/product.py
+++ b/product.py
@@ -21,9 +21,12 @@ class Product:
prices = super(Product, cls).get_sale_price(products,
quantity=quantity)
- if context.get('price_list') and context.get('customer'):
+ if context.get('price_list'):
price_list = PriceList(Transaction().context['price_list'])
- customer = Party(Transaction().context['customer'])
+ if context.get('customer'):
+ customer = Party(context['customer'])
+ else:
+ customer = None
context_uom = None
if context.get('uom'):
context_uom = Uom(Transaction().context['uom'])
diff --git a/sale.py b/sale.py
index b580cd3..e30eaaf 100644
--- a/sale.py
+++ b/sale.py
@@ -11,6 +11,7 @@ class Sale:
__metaclass__ = PoolMeta
__name__ = 'sale.sale'
price_list = fields.Many2One('product.price_list', 'Price List',
+ help="Use to compute the unit price of lines.",
domain=[('company', '=', Eval('company'))],
states={
'readonly': Or(Not(Equal(Eval('state'), 'draft')),
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 3b16212..ff384b3 100644
--- a/setup.py
+++ b/setup.py
@@ -101,9 +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 :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/scenario_sale_price_list.rst b/tests/scenario_sale_price_list.rst
index 8d64e29..1ba48f7 100644
--- a/tests/scenario_sale_price_list.rst
+++ b/tests/scenario_sale_price_list.rst
@@ -7,7 +7,7 @@ Imports::
>>> import datetime
>>> 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, \
@@ -73,8 +73,7 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> 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
@@ -82,28 +81,21 @@ Create product::
>>> template.purchasable = True
>>> template.salable = True
>>> template.list_price = Decimal('10')
- >>> template.cost_price = Decimal('5')
- >>> template.cost_price_method = 'fixed'
>>> template.account_expense = expense
>>> template.account_revenue = revenue
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
- >>> service = Product()
>>> template = ProductTemplate()
>>> template.name = 'service'
>>> template.default_uom = unit
>>> template.type = 'service'
>>> template.salable = True
>>> template.list_price = Decimal('30')
- >>> template.cost_price = Decimal('10')
- >>> template.cost_price_method = 'fixed'
>>> template.account_expense = expense
>>> template.account_revenue = revenue
>>> template.save()
- >>> service.template = template
- >>> service.save()
+ >>> service, = template.products
Create payment term::
@@ -129,7 +121,7 @@ Create a price List and assign it to customer::
Use the price list on sale::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> Sale = Model.get('sale.sale')
>>> sale = Sale()
>>> sale.party = customer
@@ -153,7 +145,7 @@ Use the price list on sale::
Create a sale price List and assign to configuration::
- >>> config.user = sale_admin.id
+ >>> set_user(sale_admin)
>>> sale_price_list = PriceList(name='Sale price List')
>>> sale_price_list_line = sale_price_list.lines.new()
>>> sale_price_list_line.formula = 'unit_price * 0.5'
@@ -165,7 +157,7 @@ Create a sale price List and assign to configuration::
Use the sale price list on sale::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale.party = customer_without_price_list
>>> sale.price_list == sale_price_list
True
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 77ecd45..bc76238 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
company
ir
diff --git a/trytond_sale_price_list.egg-info/PKG-INFO b/trytond_sale_price_list.egg-info/PKG-INFO
index fd5ab5a..b212bf4 100644
--- a/trytond_sale_price_list.egg-info/PKG-INFO
+++ b/trytond_sale_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-price-list
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add price list on sale
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_sale_price_list
=======================
@@ -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_price_list.egg-info/SOURCES.txt b/trytond_sale_price_list.egg-info/SOURCES.txt
index 2b10111..22fe2f0 100644
--- a/trytond_sale_price_list.egg-info/SOURCES.txt
+++ b/trytond_sale_price_list.egg-info/SOURCES.txt
@@ -1,13 +1,21 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+configuration.py
configuration.xml
+party.py
party.xml
+product.py
+sale.py
sale.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./configuration.py
@@ -60,6 +68,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/scenario_sale_price_list.rst
+tests/test_sale_price_list.py
trytond_sale_price_list.egg-info/PKG-INFO
trytond_sale_price_list.egg-info/SOURCES.txt
trytond_sale_price_list.egg-info/dependency_links.txt
diff --git a/trytond_sale_price_list.egg-info/requires.txt b/trytond_sale_price_list.egg-info/requires.txt
index 24fbd8b..6b2b640 100644
--- a/trytond_sale_price_list.egg-info/requires.txt
+++ b/trytond_sale_price_list.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_company >= 4.4, < 4.5
-trytond_party >= 4.4, < 4.5
-trytond_product_price_list >= 4.4, < 4.5
-trytond_sale >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_company >= 4.6, < 4.7
+trytond_party >= 4.6, < 4.7
+trytond_product_price_list >= 4.6, < 4.7
+trytond_sale >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-sale-price-list
More information about the tryton-debian-vcs
mailing list