[tryton-debian-vcs] tryton-modules-sale-promotion branch debian updated. debian/4.2.0-1-2-gd92bd42

[Mathias Behrle]

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-promotion.git;a=commitdiff;h=debian/4.2.0-1-2-gd92bd42

commit d92bd42034e9683a310e619c19ec1bdcb4db6893
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 7 15:26:58 2017 +0200

    Merging upstream version 4.4.0.

diff --git a/PKG-INFO b/PKG-INFO
index 9e8a204..ec7be8b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_sale_promotion
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module for sale promotion
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_sale_promotion
         ======================
         
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/sl.po b/locale/sl.po
index 104db24..a4feb53 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -128,7 +128,7 @@ msgid ""
 "- unit_price: the original unit_price"
 msgstr ""
 "Pythonski izraz, preračunan z:\n"
-"- cena: izvorna cena"
+"- unit_price: izvorna cena"
 
 msgctxt "model:ir.action,name:act_promotion_form"
 msgid "Promotions"
diff --git a/sale.xml b/sale.xml
index cf9e133..516fd5b 100644
--- a/sale.xml
+++ b/sale.xml
@@ -38,7 +38,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Sale Promotions</field>
             <field name="res_model">sale.promotion</field>
             <field name="domain"
-                eval="[('price_list', 'in', Eval('active_ids', []))]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('price_list', '=', Eval('active_id')), ('price_list', 'in', Eval('active_ids')))]"
                 pyson="1"/>
             <field name="search_value"
                 eval="['OR', ('end_date', '>=', Date()), ('end_date', '=', None)]"
diff --git a/setup.py b/setup.py
index ec22e6f..7f491c5 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@ setup(name=name,
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
         'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index ff7f677..a766cdc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.4.0
 depends:
     company
     ir
diff --git a/trytond_sale_promotion.egg-info/PKG-INFO b/trytond_sale_promotion.egg-info/PKG-INFO
index ebd9d3e..245445d 100644
--- a/trytond_sale_promotion.egg-info/PKG-INFO
+++ b/trytond_sale_promotion.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-sale-promotion
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module for sale promotion
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_sale_promotion
         ======================
         
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_sale_promotion.egg-info/requires.txt b/trytond_sale_promotion.egg-info/requires.txt
index 6d4136b..4eed543 100644
--- a/trytond_sale_promotion.egg-info/requires.txt
+++ b/trytond_sale_promotion.egg-info/requires.txt
@@ -1,7 +1,7 @@
 simpleeval
-trytond_company >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond_product_price_list >= 4.2, < 4.3
-trytond_sale >= 4.2, < 4.3
-trytond_sale_price_list >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_company >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond_product_price_list >= 4.4, < 4.5
+trytond_sale >= 4.4, < 4.5
+trytond_sale_price_list >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
-- 
tryton-modules-sale-promotion