[tryton-debian-vcs] tryton-modules-sale-shipment-grouping branch debian updated. debian/4.4.0-4-5-ge6f7a0b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:18:59 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-shipment-grouping.git;a=commitdiff;h=debian/4.4.0-4-5-ge6f7a0b
commit e6f7a0be682129f72d799d73695decb985061326
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:24:58 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 38dc26c..c5df349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-sale-shipment-grouping (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:20:32 +0100
+
tryton-modules-sale-shipment-grouping (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit a4de42f8179da67e21fce1be6fb925f8a11498aa
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 96fd3fb..959833f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_sale_shipment_grouping-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_sale_shipment_grouping-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 60f70a4be249ce58b479e7839e39626db4db0547
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:18 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 0a0b8d0..bbc075a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Add default shipment grouping method
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
@@ -18,4 +22,4 @@ Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index b8236f5..cdd0462 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_grouping
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/4.4/
+Download-URL: http://dowloads.tryton.org/4.6/
Description: sale_shipment_grouping
======================
@@ -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/__init__.py b/__init__.py
index 3fd8490..b881cbf 100644
--- a/__init__.py
+++ b/__init__.py
@@ -4,6 +4,7 @@
from trytond.pool import Pool
from .party import *
from .sale import *
+from . import configuration
def register():
@@ -11,4 +12,6 @@ def register():
Party,
PartySaleShipmentGroupingMethod,
Sale,
+ configuration.Configuration,
+ configuration.ConfigurationSaleMethod,
module='sale_shipment_grouping', type_='model')
diff --git a/configuration.py b/configuration.py
new file mode 100644
index 0000000..fc6fb81
--- /dev/null
+++ b/configuration.py
@@ -0,0 +1,57 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.model import fields
+from trytond.pool import Pool, PoolMeta
+
+__all__ = ['Configuration', 'ConfigurationSaleMethod']
+
+
+sale_shipment_grouping_method = fields.Selection(
+ 'get_sale_shipment_grouping_methods', "Sale Shipment Grouping Method",
+ help="The default shipment grouping method for new customers.")
+
+
+ at classmethod
+def get_sale_shipment_grouping_methods(cls):
+ pool = Pool()
+ Party = pool.get('party.party')
+ field_name = 'sale_shipment_grouping_method'
+ return Party.fields_get([field_name])[field_name]['selection']
+
+
+class Configuration:
+ __metaclass__ = PoolMeta
+ __name__ = 'sale.configuration'
+
+ sale_shipment_grouping_method = fields.MultiValue(
+ sale_shipment_grouping_method)
+ get_sale_shipment_grouping_methods = get_sale_shipment_grouping_methods
+
+ @classmethod
+ def multivalue_model(cls, field):
+ pool = Pool()
+ if field == 'sale_shipment_grouping_method':
+ return pool.get('sale.configuration.sale_method')
+ return super(Configuration, cls).multivalue_model(field)
+
+ @classmethod
+ def get_sale_shipment_grouping_methods(cls):
+ pool = Pool()
+ Party = pool.get('party.party')
+ field_name = 'sale_shipment_grouping_method'
+ return Party.fields_get([field_name])[field_name]['selection']
+
+
+class ConfigurationSaleMethod():
+ __metaclass__ = PoolMeta
+ __name__ = 'sale.configuration.sale_method'
+
+ sale_shipment_grouping_method = sale_shipment_grouping_method
+ get_sale_shipment_grouping_methods = get_sale_shipment_grouping_methods
+
+ @classmethod
+ def get_sale_shipment_grouping_methods(cls):
+ pool = Pool()
+ Party = pool.get('party.party')
+ field_name = 'sale_shipment_grouping_method'
+ return Party.fields_get([field_name])[field_name]['selection']
diff --git a/configuration.xml b/configuration.xml
new file mode 100644
index 0000000..1be072a
--- /dev/null
+++ b/configuration.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="sale_configuration_view_form">
+ <field name="model">sale.configuration</field>
+ <field name="inherit" ref="sale.sale_configuration_view_form"/>
+ <field name="name">configuration_form</field>
+ </record>
+ </data>
+</tryton>
diff --git a/locale/bg.po b/locale/bg.po
index 718e6fd..0117c57 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 0225280..09d8f0c 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Tercer"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Usuari de modificació"
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Mètode d'agrupació albarans de venda"
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Mètode d'agrupació albarans de venda"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr "El mètode d'agrupació per defecte per als nous clients."
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr "El mètode d'agrupació per defecte per als nous clients."
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Mètode d'agrupació albarans de venda"
diff --git a/locale/cs.po b/locale/cs.po
index 579d2ce..4f84273 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index b810601..130161d 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Partei"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,6 +43,24 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+#, fuzzy
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Gruppierungsmethode Lieferposten (Verkauf)"
+
+#, fuzzy
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Gruppierungsmethode Lieferposten (Verkauf)"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Gruppierungsmethode Lieferposten (Verkauf)"
diff --git a/locale/es.po b/locale/es.po
index 197fa10..ae01fd0 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Tercero"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,6 +43,24 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método agrupación albaranes de venta"
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método agrupación albaranes de venta"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+"El método de agrupación de albaranes por defecto para los nuevos clientes."
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+"El método de agrupación de albaranes por defecto para los nuevos clientes."
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Método agrupación albaranes de venta"
diff --git a/locale/es_419.po b/locale/es_419.po
index a1bf62c..2718dd3 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 "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -46,6 +46,24 @@ msgid "Write User"
msgstr ""
#, fuzzy
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de agrupación de guías de remisión de venta"
+
+#, fuzzy
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de agrupación de guías de remisión de venta"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+#, fuzzy
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Método de agrupación de guías de remisión de venta"
diff --git a/locale/fr.po b/locale/fr.po
index 368577a..edf704b 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Tiers"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,9 +43,29 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Méthode de regroupement des expéditions de vente"
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Méthode de regroupement des expéditions de vente"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+"La méthode de regroupement d'expédition par défaut pour les nouveaux "
+"clients."
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+"La méthode de regroupement d'expédition par défaut pour les nouveaux "
+"clients."
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
-msgstr "Tiers Méthode de regroupement des expéditions de vente"
+msgstr "Méthode de regroupement des expéditions de vente du tiers"
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index d67fc7d..2081ff2 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"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 838c62d..0669511 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"
@@ -28,7 +28,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -46,6 +46,24 @@ msgid "Write User"
msgstr ""
#, fuzzy
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "metodo di raggruppamento della spedizione "
+
+#, fuzzy
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "metodo di raggruppamento della spedizione "
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+#, fuzzy
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "metodo di raggruppamento della spedizione "
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 579d2ce..4f84273 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"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 476b944..448cc07 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,7 +28,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
#, fuzzy
@@ -46,6 +46,24 @@ msgid "Write User"
msgstr ""
#, fuzzy
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "ວິທີການໂຮມກຸ່ມການຂາຍ"
+
+#, fuzzy
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "ວິທີການໂຮມກຸ່ມການຂາຍ"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+#, fuzzy
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "ວິທີການໂຮມກຸ່ມການຂາຍ"
diff --git a/locale/lt.po b/locale/lt.po
index 579d2ce..4f84273 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 781d69c..c0dcf3e 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 579d2ce..b0ca2e4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -12,23 +12,23 @@ msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:party.party.sale_shipment_grouping_method,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:party.party.sale_shipment_grouping_method,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party.sale_shipment_grouping_method,party:"
msgid "Party"
-msgstr ""
+msgstr "Strona"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -37,10 +37,26 @@ msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
+msgstr "Zapisał"
+
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
msgstr ""
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
@@ -49,12 +65,12 @@ msgstr ""
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
-msgstr ""
+msgstr "Brak"
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
-msgstr ""
+msgstr "Standardowa"
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "Wysyłki"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 11a45e1..a1157c4 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"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Pessoa"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Editado por"
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de Agrupamento de Remessa de Venda"
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de Agrupamento de Remessa de Venda"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr "O método padrão de agrupamento de remessas para novos clientes."
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr "O método padrão de agrupamento de remessas para novos clientes."
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Método de Agrupamento de Remessa de Venda da Pessoa"
diff --git a/locale/ru.po b/locale/ru.po
index dad10b3..a5c53d6 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index 3316886..2ad4cd7 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -27,8 +27,8 @@ msgid "Party"
msgstr "Partner"
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt ""
"field:party.party.sale_shipment_grouping_method,sale_shipment_grouping_method:"
@@ -43,6 +43,24 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+#, fuzzy
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Način združevanja pošiljk"
+
+#, fuzzy
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Način združevanja pošiljk"
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr "Način združevanja pošiljk partnerja"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 579d2ce..4f84273 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"
@@ -27,7 +27,7 @@ msgid "Party"
msgstr ""
msgctxt "field:party.party.sale_shipment_grouping_method,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt ""
@@ -43,6 +43,22 @@ msgctxt "field:party.party.sale_shipment_grouping_method,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:sale.configuration,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "field:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr ""
+
+msgctxt "help:sale.configuration,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
+msgctxt "help:sale.configuration.sale_method,sale_shipment_grouping_method:"
+msgid "The default shipment grouping method for new customers."
+msgstr ""
+
msgctxt "model:party.party.sale_shipment_grouping_method,name:"
msgid "Party Sale Shipment Grouping Method"
msgstr ""
diff --git a/party.py b/party.py
index eb90936..e3991f8 100644
--- a/party.py
+++ b/party.py
@@ -21,6 +21,13 @@ class Party:
'party.party.sale_shipment_grouping_method', 'party',
"Sale Shipment Grouping Methods")
+ @classmethod
+ def default_sale_shipment_grouping_method(cls, **pattern):
+ pool = Pool()
+ Configuration = pool.get('sale.configuration')
+ return Configuration(1).get_multivalue(
+ 'sale_shipment_grouping_method', **pattern)
+
class PartySaleShipmentGroupingMethod(ModelSQL, ValueMixin):
"Party Sale Shipment Grouping Method"
diff --git a/sale.py b/sale.py
index 07bbe57..0b96f85 100644
--- a/sale.py
+++ b/sale.py
@@ -2,6 +2,7 @@
# this repository contains the full copyright notices and license terms.
from trytond.pool import PoolMeta
+from trytond.transaction import Transaction
__all__ = ['Sale']
@@ -41,9 +42,14 @@ class Sale:
return shipment_domain
def _get_shipment_sale(self, shipment_type, values):
+ transaction = Transaction()
+ context = transaction.context
shipment = super(Sale, self)._get_shipment_sale(shipment_type, values)
- Shipment = shipment.__class__
- if self.shipment_grouping_method:
+ if (not context.get('skip_grouping', False)
+ and self.shipment_grouping_method):
+ with transaction.set_context(skip_grouping=True):
+ shipment = self._get_shipment_sale(shipment_type, values)
+ Shipment = shipment.__class__
domain = self._get_grouped_shipment_domain(shipment)
order = self._get_grouped_shipment_order()
grouped_shipments = Shipment.search(domain, order=order, limit=1)
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 8317650..63db6df 100644
--- a/setup.py
+++ b/setup.py
@@ -100,9 +100,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/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..b405d75
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,9 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+try:
+ from trytond.modules.sale_shipment_grouping.tests.test_sale_shipment_grouping import suite
+except ImportError:
+ from .test_sale_shipment_grouping import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_sale_shipment_grouping.rst b/tests/scenario_sale_shipment_grouping.rst
index 0d4c652..b9abae2 100644
--- a/tests/scenario_sale_shipment_grouping.rst
+++ b/tests/scenario_sale_shipment_grouping.rst
@@ -9,7 +9,7 @@ Imports::
>>> from decimal import Decimal
>>> from operator import attrgetter
>>> 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, \
@@ -76,8 +76,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
@@ -85,13 +84,10 @@ 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
Create payment term::
@@ -100,7 +96,7 @@ Create payment term::
Create an inventory::
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> Inventory = Model.get('stock.inventory')
>>> InventoryLine = Model.get('stock.inventory.line')
>>> Location = Model.get('stock.location')
@@ -119,7 +115,7 @@ Create an inventory::
Sell some products::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> Sale = Model.get('sale.sale')
>>> sale = Sale()
>>> sale.party = customer
@@ -145,7 +141,7 @@ Make another sale::
Check the shipments::
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> ShipmentOut = Model.get('stock.shipment.out')
>>> shipments = ShipmentOut.find([('customer', '=', customer.id)])
>>> len(shipments)
@@ -157,7 +153,7 @@ Check the shipments::
Now we'll use the same scenario with the grouped customer::
- >>> config.user = sale_user.id
+ >>> set_user(sale_user)
>>> sale = Sale()
>>> sale.party = customer_grouped
>>> sale.payment_term = payment_term
@@ -188,7 +184,7 @@ Make another sale::
Check the shipments::
- >>> config.user = stock_user.id
+ >>> set_user(stock_user)
>>> shipments = ShipmentOut.find([
... ('customer', '=', customer_grouped.id),
... ('state', '=', 'waiting'),
diff --git a/tests/test_sale_shipment_grouping.py b/tests/test_sale_shipment_grouping.py
new file mode 100644
index 0000000..30403cb
--- /dev/null
+++ b/tests/test_sale_shipment_grouping.py
@@ -0,0 +1,24 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+import unittest
+import doctest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
+
+
+class SaleShipmentGroupingTestCase(ModuleTestCase):
+ 'Test Sale module'
+ module = 'sale_shipment_grouping'
+
+
+def suite():
+ suite = trytond.tests.test_tryton.suite()
+ loader = unittest.TestLoader()
+ suite.addTests(loader.loadTestsFromTestCase(SaleShipmentGroupingTestCase))
+ suite.addTests(doctest.DocFileSuite('scenario_sale_shipment_grouping.rst',
+ tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+ return suite
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 1eec555..2ce3385 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
ir
res
@@ -8,3 +8,4 @@ depends:
sale
xml:
party.xml
+ configuration.xml
diff --git a/trytond_sale_shipment_grouping.egg-info/PKG-INFO b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
index a19d229..50060bb 100644
--- a/trytond_sale_shipment_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-grouping
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/4.4/
+Download-URL: http://dowloads.tryton.org/4.6/
Description: sale_shipment_grouping
======================
@@ -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_shipment_grouping.egg-info/SOURCES.txt b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
index 87bc4da..9049696 100644
--- a/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
@@ -1,13 +1,23 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+configuration.py
+configuration.xml
+party.py
party.xml
+sale.py
setup.py
+tox.ini
tryton.cfg
./__init__.py
+./configuration.py
+./configuration.xml
./party.py
./party.xml
./sale.py
@@ -31,6 +41,7 @@ tryton.cfg
./locale/sl.po
./locale/zh_CN.po
./tests/scenario_sale_shipment_grouping.rst
+./view/configuration_form.xml
./view/party_form.xml
doc/index.rst
locale/bg.po
@@ -51,7 +62,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_sale_shipment_grouping.rst
+tests/test_sale_shipment_grouping.py
trytond_sale_shipment_grouping.egg-info/PKG-INFO
trytond_sale_shipment_grouping.egg-info/SOURCES.txt
trytond_sale_shipment_grouping.egg-info/dependency_links.txt
@@ -59,4 +72,5 @@ trytond_sale_shipment_grouping.egg-info/entry_points.txt
trytond_sale_shipment_grouping.egg-info/not-zip-safe
trytond_sale_shipment_grouping.egg-info/requires.txt
trytond_sale_shipment_grouping.egg-info/top_level.txt
+view/configuration_form.xml
view/party_form.xml
\ No newline at end of file
diff --git a/trytond_sale_shipment_grouping.egg-info/requires.txt b/trytond_sale_shipment_grouping.egg-info/requires.txt
index 0195a61..5ba3e0b 100644
--- a/trytond_sale_shipment_grouping.egg-info/requires.txt
+++ b/trytond_sale_shipment_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond_sale >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_party >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond_sale >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000..90cac3a
--- /dev/null
+++ b/view/configuration_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- 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/field[@name='sale_shipment_method']" position="after">
+ <label name="sale_shipment_grouping_method"/>
+ <field name="sale_shipment_grouping_method"/>
+ </xpath>
+</data>
--
tryton-modules-sale-shipment-grouping
More information about the tryton-debian-vcs
mailing list