[tryton-debian-vcs] tryton-modules-sale-shipment-grouping branch debian updated. debian/3.2.1-1-4-g7471074
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:18:12 UTC 2014
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/3.2.1-1-4-g7471074
commit 74710742c267cbe620adeb49179c7c453356581f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:08 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 802b1c8..1e7dc0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale-shipment-grouping (3.4.0-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:27 +0200
+
tryton-modules-sale-shipment-grouping (3.2.1-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit 412b4b55d010b0f162c90dead44d2f674e2eec03
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:21 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0093e9c..b9db783 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.2.1 - 2014-07-02
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
diff --git a/PKG-INFO b/PKG-INFO
index 4d511af..97377e4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_grouping
-Version: 3.2.1
+Version: 3.4.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/3.2/
+Download-URL: http://dowloads.tryton.org/3.4/
Description: sale_shipment_grouping
======================
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..3e9dda1
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de Agrupación de Despacho de Venta"
+
+msgctxt "selection:party.party,sale_shipment_grouping_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:party.party,sale_shipment_grouping_method:"
+msgid "Standard"
+msgstr "Estándar"
+
+msgctxt "view:party.party:"
+msgid "Shipments"
+msgstr "Envíos"
diff --git a/locale/es_EC.po b/locale/es_EC.po
new file mode 100644
index 0000000..3bb7d17
--- /dev/null
+++ b/locale/es_EC.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_shipment_grouping_method:"
+msgid "Sale Shipment Grouping Method"
+msgstr "Método de Agrupación de los Envíos de Venta"
+
+msgctxt "selection:party.party,sale_shipment_grouping_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:party.party,sale_shipment_grouping_method:"
+msgid "Standard"
+msgstr "Estándar"
+
+msgctxt "view:party.party:"
+msgid "Shipments"
+msgstr "Envíos"
diff --git a/sale.py b/sale.py
index 305a058..bdb963f 100644
--- a/sale.py
+++ b/sale.py
@@ -45,11 +45,9 @@ class Sale:
shipment = super(Sale, self)._get_shipment_sale(shipment_type, values)
Shipment = shipment.__class__
if self.shipment_grouping_method:
- with Transaction().set_user(0, set_context=True):
- domain = self._get_grouped_shipment_domain(shipment)
- order = self._get_grouped_shipment_order()
- grouped_shipments = Shipment.search(domain, order=order,
- limit=1)
+ domain = self._get_grouped_shipment_domain(shipment)
+ order = self._get_grouped_shipment_order()
+ grouped_shipments = Shipment.search(domain, order=order, limit=1)
if grouped_shipments:
shipment, = grouped_shipments
return shipment
diff --git a/tryton.cfg b/tryton.cfg
index 990a5bb..e107132 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
ir
res
diff --git a/trytond_sale_shipment_grouping.egg-info/PKG-INFO b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
index a48e021..ac7e866 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: 3.2.1
+Version: 3.4.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/3.2/
+Download-URL: http://dowloads.tryton.org/3.4/
Description: sale_shipment_grouping
======================
diff --git a/trytond_sale_shipment_grouping.egg-info/SOURCES.txt b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
index ee19c33..b9e9f86 100644
--- a/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
@@ -9,11 +9,25 @@ setup.py
tryton.cfg
./__init__.py
./party.py
+./party.xml
./sale.py
+./tryton.cfg
+./locale/ca_ES.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/sl_SI.po
+./tests/scenario_sale_shipment_grouping.rst
+./view/party_form.xml
doc/index.rst
locale/ca_ES.po
locale/de_DE.po
locale/es_AR.po
+locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/sl_SI.po
diff --git a/trytond_sale_shipment_grouping.egg-info/requires.txt b/trytond_sale_shipment_grouping.egg-info/requires.txt
index 97516fa..04eb019 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 >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond_sale >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_party >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond_sale >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-sale-shipment-grouping
More information about the tryton-debian-vcs
mailing list