[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-4.2 updated. debian/4.2.2-1-2-gbe44911
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:34:38 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=debian/4.2.2-1-2-gbe44911
commit be449110f51e2f8bf3df07d0db204bb83899cad4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 17:53:05 2017 +0100
Releasing debian version 4.2.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index b5a9533..44bb646 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-sale (4.2.3-1) unstable; urgency=medium
+
+ * Merging upstream version 4.2.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 17:53:05 +0100
+
tryton-modules-sale (4.2.2-1) unstable; urgency=medium
* Use the preferred https URL format in the copyright file.
commit cad0a43d3a45256be9a5b42a69c02084e22f5c63
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 17:53:04 2017 +0100
Merging upstream version 4.2.3.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..c4fd423
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+image: python:all
+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,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters
+services:
+ - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 1ae01e2..2ea3621 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.3 - 2017-11-07
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.2 - 2017-09-04
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b485ba2..08e350e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.2.2
+Version: 4.2.3
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 09f351c..be7cfc2 100644
--- a/invoice.py
+++ b/invoice.py
@@ -73,7 +73,8 @@ class Invoice:
@classmethod
def search_sales(cls, name, clause):
- return [('lines.origin.sale',) + tuple(clause[1:]) + ('sale.line',)]
+ return [('lines.origin.sale' + clause[0].lstrip(name),)
+ + tuple(clause[1:3]) + ('sale.line',) + tuple(clause[3:])]
@classmethod
def copy(cls, invoices, default=None):
diff --git a/sale.py b/sale.py
index c92caa3..9dd0758 100644
--- a/sale.py
+++ b/sale.py
@@ -536,7 +536,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
@classmethod
def search_invoices(cls, name, clause):
- return [('lines.invoice_lines.invoice',) + tuple(clause[1:])]
+ return [('lines.invoice_lines.invoice' + clause[0].lstrip(name),)
+ + tuple(clause[1:])]
def get_invoice_state(self):
'''
@@ -584,12 +585,12 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
Search on shipments or returns
'''
def method(self, name, clause):
- if isinstance(clause[2], basestring):
- target = 'rec_name'
+ nested = clause[0].lstrip(name)
+ if nested:
+ return [('lines.moves.shipment' + nested,)
+ + tuple(clause[1:3]) + (model_name,) + tuple(clause[3:])]
else:
- target = 'id'
- return [('lines.moves.shipment.' + target,) + tuple(clause[1:])
- + (model_name,)]
+ return [('lines.moves.shipment',) + tuple(clause[1:3])]
return classmethod(method)
search_shipments = search_shipments_returns('stock.shipment.out')
diff --git a/stock.py b/stock.py
index 83c67bf..2fd42b7 100644
--- a/stock.py
+++ b/stock.py
@@ -165,7 +165,8 @@ class Move:
@classmethod
def search_sale(cls, name, clause):
- return [('origin.' + name,) + tuple(clause[1:]) + ('sale.line',)]
+ return [('origin.' + clause[0],) + tuple(clause[1:3])
+ + ('sale.line',) + tuple(clause[3:])]
def get_sale_exception_state(self, name):
SaleLine = Pool().get('sale.line')
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..08e43cf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py33,py34,py35}-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 24ffda0..c4b2eb9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.2
+version=4.2.3
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 2a1aea4..dd678e5 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale
-Version: 4.2.2
+Version: 4.2.3
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale.egg-info/SOURCES.txt b/trytond_sale.egg-info/SOURCES.txt
index 5ab48f1..90b4fad 100644
--- a/trytond_sale.egg-info/SOURCES.txt
+++ b/trytond_sale.egg-info/SOURCES.txt
@@ -1,16 +1,26 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+configuration.py
configuration.xml
+invoice.py
+party.py
party.xml
+product.py
product.xml
sale.odt
+sale.py
sale.xml
setup.py
+stock.py
stock.xml
+tox.ini
tryton.cfg
./__init__.py
./configuration.py
@@ -80,7 +90,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_sale.rst
+tests/test_sale.py
trytond_sale.egg-info/PKG-INFO
trytond_sale.egg-info/SOURCES.txt
trytond_sale.egg-info/dependency_links.txt
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list