[tryton-debian-vcs] tryton-modules-sale-price-list branch upstream updated. upstream/2.8.0-1-ge5cfdf2

git repository hosting tryton-debian-vcs at m9s.biz
Mon Nov 25 19:37:19 UTC 2013


The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale-price-list.git;a=commitdiff;h=upstream/2.8.0-1-ge5cfdf2

commit e5cfdf2b0a392d807586f7d7fc966b6e06483e93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:27:58 2013 +0100

    Adding upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index ef04e90..e1758e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 022c6eb..de11764 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_sale_price_list
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add price list on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_sale_price_list
         =======================
         
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..bd7086d
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,11 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_price_list:"
+msgid "Sale Price List"
+msgstr "Prodajni cenik"
+
+msgctxt "field:sale.sale,price_list:"
+msgid "Price List"
+msgstr "Cenik"
diff --git a/party.py b/party.py
index 3cb274e..ceea96f 100644
--- a/party.py
+++ b/party.py
@@ -13,7 +13,7 @@ class Party:
     sale_price_list = fields.Property(fields.Many2One('product.price_list',
             'Sale Price List',
             domain=[
-                ('company', '=', Eval('context', {}).get('company')),
+                ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
             states={
                 'invisible': ~Eval('context', {}).get('company'),
diff --git a/setup.py b/setup.py
index 9388286..a52f2e9 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_sale_price_list',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
+        'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 7c3921d..d53ce84 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
 #this repository contains the full copyright notices and license terms.
 
 from .test_sale_price_list import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 07f555c..607bc96 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=3.0.0
 depends:
     ir
     party
diff --git a/trytond_sale_price_list.egg-info/PKG-INFO b/trytond_sale_price_list.egg-info/PKG-INFO
index e972979..f03791f 100644
--- a/trytond_sale_price_list.egg-info/PKG-INFO
+++ b/trytond_sale_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-sale-price-list
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add price list on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_sale_price_list
         =======================
         
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_sale_price_list.egg-info/SOURCES.txt b/trytond_sale_price_list.egg-info/SOURCES.txt
index ad9364d..1c2bc50 100644
--- a/trytond_sale_price_list.egg-info/SOURCES.txt
+++ b/trytond_sale_price_list.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 trytond_sale_price_list.egg-info/PKG-INFO
 trytond_sale_price_list.egg-info/SOURCES.txt
 trytond_sale_price_list.egg-info/dependency_links.txt
diff --git a/trytond_sale_price_list.egg-info/requires.txt b/trytond_sale_price_list.egg-info/requires.txt
index 499f7c1..e0f1199 100644
--- a/trytond_sale_price_list.egg-info/requires.txt
+++ b/trytond_sale_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 2.8, < 2.9
-trytond_product_price_list >= 2.8, < 2.9
-trytond_sale >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_party >= 3.0, < 3.1
+trytond_product_price_list >= 3.0, < 3.1
+trytond_sale >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/party_form.xml b/view/party_form.xml
index ad6a0a9..5a4a99a 100644
--- a/view/party_form.xml
+++ b/view/party_form.xml
@@ -2,7 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook/page[@id='price_list']" position="inside">
+    <xpath expr="/form/notebook/page[@id='sale']" position="inside">
         <label name="sale_price_list"/>
         <field name="sale_price_list"/>
         <newline/>
-- 
tryton-modules-sale-price-list



More information about the tryton-debian-vcs mailing list