[tryton-debian-vcs] tryton-modules-purchase branch debian-stretch-3.6 updated. debian/3.6.4-1-2-g850db34
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:33:47 UTC 2017
The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/3.6.4-1-2-g850db34
commit 850db34a13881dbfa40e02aaefd6687dc15a0962
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 15:08:41 2017 +0100
Releasing debian version 3.6.5-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 289634f..1768266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-purchase (3.6.5-1) unstable; urgency=medium
+
+ * Merging upstream version 3.6.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 15:08:41 +0100
+
tryton-modules-purchase (3.6.4-1) unstable; urgency=medium
* Add the actual upstream maintainer key to signing-key.asc.
commit c69f7ab1406a0d08abce3643235450d5d6ea3cd0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 15:08:40 2017 +0100
Merging upstream version 3.6.5.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..9d7c769
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+image: python2.7
+env:
+ - POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/
+ - MYSQL_URI=mysql://root@127.0.0.1:3306/
+script:
+ - pip install tox
+ - tox -e "py27-{sqlite,postgresql}"
+services:
+ - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 0795681..d288602 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.5 - 2017-11-07
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.4 - 2017-09-04
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3b55639..375e11c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.6.4
+Version: 3.6.5
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 42007df..0c1de22 100644
--- a/invoice.py
+++ b/invoice.py
@@ -66,8 +66,8 @@ class Invoice:
@classmethod
def search_purchases(cls, name, clause):
- return [('lines.origin.purchase.id',) + tuple(clause[1:])
- + ('purchase.line',)]
+ return [('lines.origin.purchase' + clause[0].lstrip(name),)
+ + tuple(clause[1:3]) + ('purchase.line',) + tuple(clause[3:])]
@classmethod
@process_purchase
diff --git a/purchase.py b/purchase.py
index 5abc666..f840fa9 100644
--- a/purchase.py
+++ b/purchase.py
@@ -505,7 +505,8 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin):
@classmethod
def search_invoices(cls, name, clause):
- return [('lines.invoice_lines.invoice.id',) + tuple(clause[1:])]
+ return [('lines.invoice_lines.invoice' + clause[0].lstrip(name),)
+ + tuple(clause[1:])]
def get_invoice_state(self):
'''
@@ -1055,7 +1056,7 @@ class PurchaseLine(ModelSQL, ModelView):
if self.unit:
context['uom'] = self.unit.id
else:
- self.product.purchase_uom.id
+ context['uom'] = self.product.purchase_uom.id
context['taxes'] = [t.id for t in self.taxes]
return context
diff --git a/stock.py b/stock.py
index 6c95b38..c533211 100644
--- a/stock.py
+++ b/stock.py
@@ -216,7 +216,8 @@ class Move:
@classmethod
def search_purchase(cls, name, clause):
- return [('origin.' + name,) + tuple(clause[1:]) + ('purchase.line',)]
+ return [('origin.' + clause[0],) + tuple(clause[1:3])
+ + ('purchase.line',) + tuple(clause[3:])]
def get_purchase_exception_state(self, name):
PurchaseLine = Pool().get('purchase.line')
@@ -268,8 +269,8 @@ class Move:
@classmethod
def search_supplier(cls, name, clause):
- return [('origin.purchase.party',) + tuple(clause[1:]) +
- ('purchase.line',)]
+ return [('origin.purchase.party' + clause[0].lstrip(name),)
+ + tuple(clause[1:3]) + ('purchase.line',) + tuple(clause[3:])]
@classmethod
@ModelView.button
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..e9d2876
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+envlist = py27-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ py27-postgresql: psycopg2 >= 2.0
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+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 6848263..5d7ea83 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.4
+version=3.6.5
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index c7899cb..062d1ea 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 3.6.4
+Version: 3.6.5
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_purchase.egg-info/SOURCES.txt b/trytond_purchase.egg-info/SOURCES.txt
index 2eddac9..ad50d9d 100644
--- a/trytond_purchase.egg-info/SOURCES.txt
+++ b/trytond_purchase.egg-info/SOURCES.txt
@@ -1,16 +1,25 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+configuration.py
configuration.xml
+invoice.py
party.xml
+product.py
product.xml
purchase.odt
+purchase.py
purchase.xml
setup.py
+stock.py
stock.xml
+tox.ini
tryton.cfg
./__init__.py
./configuration.py
@@ -72,7 +81,9 @@ locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
locale/sl_SI.po
+tests/__init__.py
tests/scenario_purchase.rst
+tests/test_purchase.py
trytond_purchase.egg-info/PKG-INFO
trytond_purchase.egg-info/SOURCES.txt
trytond_purchase.egg-info/dependency_links.txt
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list