diff -Nru tryton-modules-sale-1.4.0/CHANGELOG tryton-modules-sale-1.4.1/CHANGELOG --- tryton-modules-sale-1.4.0/CHANGELOG 2009-10-19 17:36:58.000000000 +0100 +++ tryton-modules-sale-1.4.1/CHANGELOG 2009-11-24 17:06:46.000000000 +0000 @@ -1,3 +1,6 @@ +Version 1.4.1 - 2009-11-24 +* Some bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Bug fixes (see mercurial logs for details) diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/debian/changelog /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/debian/changelog --- tryton-modules-sale-1.4.0/debian/changelog 2009-12-08 02:48:11.000000000 +0000 +++ tryton-modules-sale-1.4.1/debian/changelog 2009-12-08 02:48:11.000000000 +0000 @@ -1,3 +1,12 @@ +tryton-modules-sale (1.4.1-1) unstable; urgency=low + + * Making depends versioned for tryton 1.4. + * Merging upstream version 1.4.1. + * Updating README.source. + * Adding explicit debian source version 1.0 until switch to 3.0. + + -- Daniel Baumann Wed, 25 Nov 2009 13:21:31 +0100 + tryton-modules-sale (1.4.0-1) unstable; urgency=low * Merging upstream version 1.4.0. diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/debian/control /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/debian/control --- tryton-modules-sale-1.4.0/debian/control 2009-12-08 02:48:11.000000000 +0000 +++ tryton-modules-sale-1.4.1/debian/control 2009-12-08 02:48:11.000000000 +0000 @@ -15,10 +15,12 @@ Package: tryton-modules-sale Architecture: all Depends: - ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, - tryton-modules-account-invoice, tryton-modules-account-product, - tryton-modules-company, tryton-modules-currency, tryton-modules-party, - tryton-modules-product, tryton-modules-stock, python-pkg-resources + ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4), + tryton-modules-account (>= 1.4), tryton-modules-account-invoice (>= 1.4), + tryton-modules-account-product (>= 1.4), tryton-modules-company (>= 1.4), + tryton-modules-currency (>= 1.4), tryton-modules-party (>= 1.4), + tryton-modules-product (>= 1.4), tryton-modules-stock (>= 1.4), + python-pkg-resources XB-Python-Version: ${python:Versions} Description: Tryton Application Platform (Sale Module) Tryton is a high-level general purpose application platform written in Python diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/debian/README.source /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/debian/README.source --- tryton-modules-sale-1.4.0/debian/README.source 2009-12-08 02:48:11.000000000 +0000 +++ tryton-modules-sale-1.4.1/debian/README.source 2009-12-08 02:48:11.000000000 +0000 @@ -32,6 +32,6 @@ debian/diff and are applied during the build. Current modifications can be applied to the source tree with: - $ quilt push -a + $ QUILT_PATCHES=debian/patches quilt push -a More information about Quilt can be found in the quilt package. diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/debian/source/format /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/debian/source/format --- tryton-modules-sale-1.4.0/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ tryton-modules-sale-1.4.1/debian/source/format 2009-12-08 02:48:11.000000000 +0000 @@ -0,0 +1 @@ +1.0 diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/PKG-INFO /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/PKG-INFO --- tryton-modules-sale-1.4.0/PKG-INFO 2009-10-19 17:37:18.000000000 +0100 +++ tryton-modules-sale-1.4.1/PKG-INFO 2009-11-24 17:07:06.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: trytond_sale -Version: 1.4.0 +Version: 1.4.1 Summary: Define sale order. Add to product sale informations. Define the sale price as the list price. diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/sale.py /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/sale.py --- tryton-modules-sale-1.4.0/sale.py 2009-10-07 13:59:10.000000000 +0100 +++ tryton-modules-sale-1.4.1/sale.py 2009-11-02 18:20:03.000000000 +0000 @@ -18,7 +18,8 @@ company = fields.Many2One('company.company', 'Company', required=True, states={ 'readonly': "state != 'draft' or bool(lines)", - }, domain=["('id', '=', context.get('company', 0))"]) + }, domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) reference = fields.Char('Reference', readonly=True, select=1) description = fields.Char('Description', states={ 'readonly': "state != 'draft'", diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/trytond_sale.egg-info/PKG-INFO /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/trytond_sale.egg-info/PKG-INFO --- tryton-modules-sale-1.4.0/trytond_sale.egg-info/PKG-INFO 2009-10-19 17:37:18.000000000 +0100 +++ tryton-modules-sale-1.4.1/trytond_sale.egg-info/PKG-INFO 2009-11-24 17:07:06.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: trytond-sale -Version: 1.4.0 +Version: 1.4.1 Summary: Define sale order. Add to product sale informations. Define the sale price as the list price. diff -Nru /tmp/12RXUsKA8t/tryton-modules-sale-1.4.0/__tryton__.py /tmp/7OqXaGDf60/tryton-modules-sale-1.4.1/__tryton__.py --- tryton-modules-sale-1.4.0/__tryton__.py 2009-10-19 17:37:07.000000000 +0100 +++ tryton-modules-sale-1.4.1/__tryton__.py 2009-11-06 09:30:44.000000000 +0000 @@ -6,7 +6,7 @@ 'name_es_CO': 'Ventas', 'name_es_ES': 'Venta', 'name_fr_FR': 'Vente', - 'version': '1.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',