[tryton-debian-vcs] tryton-modules-sale-opportunity branch upstream-4.2 updated. upstream/4.2.0-1-g57915b9
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:24:27 UTC 2017
The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-opportunity.git;a=commitdiff;h=upstream/4.2.0-1-g57915b9
commit 57915b96cc668d464e85c4f91ef113ad8057c2d9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:35:51 2017 +0200
Adding upstream version 4.2.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index e54225d..f495ed0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Change probability into conversion probability
diff --git a/COPYRIGHT b/COPYRIGHT
index a7725d2..a936332 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2010-2011 Open Labs Business Solutions.
-Copyright (C) 2010-2016 Cédric Krier.
-Copyright (C) 2010-2016 B2CK SPRL.
+Copyright (C) 2010-2017 Cédric Krier.
+Copyright (C) 2010-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 15fd7b9..3754341 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_opportunity
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module with leads and opportunities
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index d59f3af..da937aa 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -428,7 +428,6 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
class SaleOpportunityLine(sequence_ordered(), ModelSQL, ModelView):
'Sale Opportunity Line'
__name__ = "sale.opportunity.line"
- _rec_name = "product"
_history = True
_states = {
'readonly': Eval('opportunity_state').in_(
@@ -503,6 +502,13 @@ class SaleOpportunityLine(sequence_ordered(), ModelSQL, ModelView):
sale_line.on_change_product()
return sale_line
+ def get_rec_name(self, name):
+ return self.product.rec_name
+
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ return [('product',) + tuple(clause[1:])]
+
class SaleOpportunityReportMixin:
number = fields.Integer('Number')
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/tryton.cfg b/tryton.cfg
index 0bee205..46a654d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.1
depends:
account
account_invoice
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 0f514a9..93b2091 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-opportunity
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module with leads and opportunities
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 61bb67a..4bb1caa 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -75,10 +75,8 @@ locale/ru.po
locale/sl.po
locale/zh_CN.po
tests/__init__.py
-tests/__init__.pyc
tests/scenario_sale_opportunity.rst
tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
trytond_sale_opportunity.egg-info/PKG-INFO
trytond_sale_opportunity.egg-info/SOURCES.txt
trytond_sale_opportunity.egg-info/dependency_links.txt
--
tryton-modules-sale-opportunity
More information about the tryton-debian-vcs
mailing list